]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blob - test/grsecurity-3.0-3.15.5-201407132027.patch
projects / thirdparty / grsecurity-scrape.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
blame | history | raw | HEAD
Auto commit, 1 new patch{es}.
[thirdparty/grsecurity-scrape.git] / test / grsecurity-3.0-3.15.5-201407132027.patch
1 diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2 index 9de9813..1462492 100644
3 --- a/Documentation/dontdiff
4 +++ b/Documentation/dontdiff
5 @@ -3,9 +3,11 @@
6 *.bc
7 *.bin
8 *.bz2
9 +*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13 +*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17 @@ -15,6 +17,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21 +*.gmo
22 *.grep
23 *.grp
24 *.gz
25 @@ -51,14 +54,17 @@
26 *.tab.h
27 *.tex
28 *.ver
29 +*.vim
30 *.xml
31 *.xz
32 *_MODULES
33 +*_reg_safe.h
34 *_vga16.c
35 *~
36 \#*#
37 *.9
38 -.*
39 +.[^g]*
40 +.gen*
41 .*.d
42 .mm
43 53c700_d.h
44 @@ -72,9 +78,11 @@ Image
45 Module.markers
46 Module.symvers
47 PENDING
48 +PERF*
49 SCCS
50 System.map*
51 TAGS
52 +TRACEEVENT-CFLAGS
53 aconf
54 af_names.h
55 aic7*reg.h*
56 @@ -83,6 +91,7 @@ aic7*seq.h*
57 aicasm
58 aicdb.h*
59 altivec*.c
60 +ashldi3.S
61 asm-offsets.h
62 asm_offsets.h
63 autoconf.h*
64 @@ -95,32 +104,40 @@ bounds.h
65 bsetup
66 btfixupprep
67 build
68 +builtin-policy.h
69 bvmlinux
70 bzImage*
71 capability_names.h
72 capflags.c
73 classlist.h*
74 +clut_vga16.c
75 +common-cmds.h
76 comp*.log
77 compile.h*
78 conf
79 config
80 config-*
81 config_data.h*
82 +config.c
83 config.mak
84 config.mak.autogen
85 +config.tmp
86 conmakehash
87 consolemap_deftbl.c*
88 cpustr.h
89 crc32table.h*
90 cscope.*
91 defkeymap.c
92 +devicetable-offsets.h
93 devlist.h*
94 dnotify_test
95 docproc
96 dslm
97 +dtc-lexer.lex.c
98 elf2ecoff
99 elfconfig.h*
100 evergreen_reg_safe.h
101 +exception_policy.conf
102 fixdep
103 flask.h
104 fore200e_mkfirm
105 @@ -128,12 +145,15 @@ fore200e_pca_fw.c*
106 gconf
107 gconf.glade.h
108 gen-devlist
109 +gen-kdb_cmds.c
110 gen_crc32table
111 gen_init_cpio
112 generated
113 genheaders
114 genksyms
115 *_gray256.c
116 +hash
117 +hid-example
118 hpet_example
119 hugepage-mmap
120 hugepage-shm
121 @@ -148,14 +168,14 @@ int32.c
122 int4.c
123 int8.c
124 kallsyms
125 -kconfig
126 +kern_constants.h
127 keywords.c
128 ksym.c*
129 ksym.h*
130 kxgettext
131 lex.c
132 lex.*.c
133 -linux
134 +lib1funcs.S
135 logo_*.c
136 logo_*_clut224.c
137 logo_*_mono.c
138 @@ -165,14 +185,15 @@ mach-types.h
139 machtypes.h
140 map
141 map_hugetlb
142 -media
143 mconf
144 +mdp
145 miboot*
146 mk_elfconfig
147 mkboot
148 mkbugboot
149 mkcpustr
150 mkdep
151 +mkpiggy
152 mkprep
153 mkregtable
154 mktables
155 @@ -188,6 +209,8 @@ oui.c*
156 page-types
157 parse.c
158 parse.h
159 +parse-events*
160 +pasyms.h
161 patches*
162 pca200e.bin
163 pca200e_ecd.bin2
164 @@ -197,6 +220,7 @@ perf-archive
165 piggyback
166 piggy.gzip
167 piggy.S
168 +pmu-*
169 pnmtologo
170 ppc_defs.h*
171 pss_boot.h
172 @@ -206,7 +230,12 @@ r200_reg_safe.h
173 r300_reg_safe.h
174 r420_reg_safe.h
175 r600_reg_safe.h
176 +randomize_layout_hash.h
177 +randomize_layout_seed.h
178 +realmode.lds
179 +realmode.relocs
180 recordmcount
181 +regdb.c
182 relocs
183 rlim_names.h
184 rn50_reg_safe.h
185 @@ -216,8 +245,12 @@ series
186 setup
187 setup.bin
188 setup.elf
189 +signing_key*
190 +size_overflow_hash.h
191 sImage
192 +slabinfo
193 sm_tbl*
194 +sortextable
195 split-include
196 syscalltab.h
197 tables.c
198 @@ -227,6 +260,7 @@ tftpboot.img
199 timeconst.h
200 times.h*
201 trix_boot.h
202 +user_constants.h
203 utsrelease.h*
204 vdso-syms.lds
205 vdso.lds
206 @@ -238,13 +272,17 @@ vdso32.lds
207 vdso32.so.dbg
208 vdso64.lds
209 vdso64.so.dbg
210 +vdsox32.lds
211 +vdsox32-syms.lds
212 version.h*
213 vmImage
214 vmlinux
215 vmlinux-*
216 vmlinux.aout
217 vmlinux.bin.all
218 +vmlinux.bin.bz2
219 vmlinux.lds
220 +vmlinux.relocs
221 vmlinuz
222 voffset.h
223 vsyscall.lds
224 @@ -252,9 +290,12 @@ vsyscall_32.lds
225 wanxlfw.inc
226 uImage
227 unifdef
228 +utsrelease.h
229 wakeup.bin
230 wakeup.elf
231 wakeup.lds
232 +x509*
233 zImage*
234 zconf.hash.c
235 +zconf.lex.c
236 zoffset.h
237 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
238 index 30a8ad0d..2ed9efd 100644
239 --- a/Documentation/kernel-parameters.txt
240 +++ b/Documentation/kernel-parameters.txt
241 @@ -1103,6 +1103,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
242 Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
243 Default: 1024
244
245 + grsec_proc_gid= [GRKERNSEC_PROC_USERGROUP] Chooses GID to
246 + ignore grsecurity's /proc restrictions
247 +
248 +
249 hashdist= [KNL,NUMA] Large hashes allocated during boot
250 are distributed across NUMA nodes. Defaults on
251 for 64-bit NUMA, off otherwise.
252 @@ -2099,6 +2103,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
253 noexec=on: enable non-executable mappings (default)
254 noexec=off: disable non-executable mappings
255
256 + nopcid [X86-64]
257 + Disable PCID (Process-Context IDentifier) even if it
258 + is supported by the processor.
259 +
260 nosmap [X86]
261 Disable SMAP (Supervisor Mode Access Prevention)
262 even if it is supported by processor.
263 @@ -2366,6 +2374,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
264 the specified number of seconds. This is to be used if
265 your oopses keep scrolling off the screen.
266
267 + pax_nouderef [X86] disables UDEREF. Most likely needed under certain
268 + virtualization environments that don't cope well with the
269 + expand down segment used by UDEREF on X86-32 or the frequent
270 + page table updates on X86-64.
271 +
272 + pax_sanitize_slab=
273 + 0/1 to disable/enable slab object sanitization (enabled by
274 + default).
275 +
276 + pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
277 +
278 + pax_extra_latent_entropy
279 + Enable a very simple form of latent entropy extraction
280 + from the first 4GB of memory as the bootmem allocator
281 + passes the memory pages to the buddy allocator.
282 +
283 + pax_weakuderef [X86-64] enables the weaker but faster form of UDEREF
284 + when the processor supports PCID.
285 +
286 pcbit= [HW,ISDN]
287
288 pcd. [PARIDE]
289 diff --git a/Makefile b/Makefile
290 index e6b01ed..74dbc85 100644
291 --- a/Makefile
292 +++ b/Makefile
293 @@ -246,7 +246,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
294 HOSTCC = gcc
295 HOSTCXX = g++
296 HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
297 -HOSTCXXFLAGS = -O2
298 +HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
299 +HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
300 +HOSTCXXFLAGS = -O2 -Wall -W -Wno-array-bounds
301
302 ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)
303 HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \
304 @@ -438,8 +440,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
305 # Rules shared between *config targets and build targets
306
307 # Basic helpers built in scripts/
308 -PHONY += scripts_basic
309 -scripts_basic:
310 +PHONY += scripts_basic gcc-plugins
311 +scripts_basic: gcc-plugins
312 $(Q)$(MAKE) $(build)=scripts/basic
313 $(Q)rm -f .tmp_quiet_recordmcount
314
315 @@ -600,6 +602,72 @@ else
316 KBUILD_CFLAGS += -O2
317 endif
318
319 +ifndef DISABLE_PAX_PLUGINS
320 +ifeq ($(call cc-ifversion, -ge, 0408, y), y)
321 +PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
322 +else
323 +PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
324 +endif
325 +ifneq ($(PLUGINCC),)
326 +ifdef CONFIG_PAX_CONSTIFY_PLUGIN
327 +CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
328 +endif
329 +ifdef CONFIG_PAX_MEMORY_STACKLEAK
330 +STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
331 +STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
332 +endif
333 +ifdef CONFIG_KALLOCSTAT_PLUGIN
334 +KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
335 +endif
336 +ifdef CONFIG_PAX_KERNEXEC_PLUGIN
337 +KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
338 +KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
339 +KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
340 +endif
341 +ifdef CONFIG_GRKERNSEC_RANDSTRUCT
342 +RANDSTRUCT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/randomize_layout_plugin.so -DRANDSTRUCT_PLUGIN
343 +ifdef CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE
344 +RANDSTRUCT_PLUGIN_CFLAGS += -fplugin-arg-randomize_layout_plugin-performance-mode
345 +endif
346 +endif
347 +ifdef CONFIG_CHECKER_PLUGIN
348 +ifeq ($(call cc-ifversion, -ge, 0406, y), y)
349 +CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
350 +endif
351 +endif
352 +COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
353 +ifdef CONFIG_PAX_SIZE_OVERFLOW
354 +SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
355 +endif
356 +ifdef CONFIG_PAX_LATENT_ENTROPY
357 +LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
358 +endif
359 +ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
360 +STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
361 +endif
362 +GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
363 +GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
364 +GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
365 +GCC_PLUGINS_CFLAGS += $(RANDSTRUCT_PLUGIN_CFLAGS)
366 +GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
367 +export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN LATENT_ENTROPY_PLUGIN_CFLAGS
368 +ifeq ($(KBUILD_EXTMOD),)
369 +gcc-plugins:
370 + $(Q)$(MAKE) $(build)=tools/gcc
371 +else
372 +gcc-plugins: ;
373 +endif
374 +else
375 +gcc-plugins:
376 +ifeq ($(call cc-ifversion, -ge, 0405, y), y)
377 + $(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.))
378 +else
379 + $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
380 +endif
381 + $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
382 +endif
383 +endif
384 +
385 include $(srctree)/arch/$(SRCARCH)/Makefile
386
387 ifdef CONFIG_READABLE_ASM
388 @@ -816,7 +884,7 @@ export mod_sign_cmd
389
390
391 ifeq ($(KBUILD_EXTMOD),)
392 -core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
393 +core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
394
395 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
396 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
397 @@ -865,6 +933,8 @@ endif
398
399 # The actual objects are generated when descending,
400 # make sure no implicit rule kicks in
401 +$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
402 +$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
403 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
404
405 # Handle descending into subdirectories listed in $(vmlinux-dirs)
406 @@ -874,7 +944,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
407 # Error messages still appears in the original language
408
409 PHONY += $(vmlinux-dirs)
410 -$(vmlinux-dirs): prepare scripts
411 +$(vmlinux-dirs): gcc-plugins prepare scripts
412 $(Q)$(MAKE) $(build)=$@
413
414 define filechk_kernel.release
415 @@ -917,10 +987,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
416
417 archprepare: archheaders archscripts prepare1 scripts_basic
418
419 +prepare0: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
420 +prepare0: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
421 prepare0: archprepare FORCE
422 $(Q)$(MAKE) $(build)=.
423
424 # All the preparing..
425 +prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
426 prepare: prepare0
427
428 # Generate some files
429 @@ -1028,6 +1101,8 @@ all: modules
430 # using awk while concatenating to the final file.
431
432 PHONY += modules
433 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
434 +modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
435 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
436 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
437 @$(kecho) ' Building modules, stage 2.';
438 @@ -1043,7 +1118,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
439
440 # Target to prepare building external modules
441 PHONY += modules_prepare
442 -modules_prepare: prepare scripts
443 +modules_prepare: gcc-plugins prepare scripts
444
445 # Target to install modules
446 PHONY += modules_install
447 @@ -1109,7 +1184,10 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
448 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
449 signing_key.priv signing_key.x509 x509.genkey \
450 extra_certificates signing_key.x509.keyid \
451 - signing_key.x509.signer include/linux/version.h
452 + signing_key.x509.signer include/linux/version.h \
453 + tools/gcc/size_overflow_plugin/size_overflow_hash_aux.h \
454 + tools/gcc/size_overflow_plugin/size_overflow_hash.h \
455 + tools/gcc/randomize_layout_seed.h
456
457 # clean - Delete most, but leave enough to build external modules
458 #
459 @@ -1148,7 +1226,7 @@ distclean: mrproper
460 @find $(srctree) $(RCS_FIND_IGNORE) \
461 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
462 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
463 - -o -name '.*.rej' -o -name '*%' -o -name 'core' \) \
464 + -o -name '.*.rej' -o -name '*.so' -o -name '*%' -o -name 'core' \) \
465 -type f -print | xargs rm -f
466
467
468 @@ -1309,6 +1387,8 @@ PHONY += $(module-dirs) modules
469 $(module-dirs): crmodverdir $(objtree)/Module.symvers
470 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
471
472 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
473 +modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
474 modules: $(module-dirs)
475 @$(kecho) ' Building modules, stage 2.';
476 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
477 @@ -1448,17 +1528,21 @@ else
478 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
479 endif
480
481 -%.s: %.c prepare scripts FORCE
482 +%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
483 +%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
484 +%.s: %.c gcc-plugins prepare scripts FORCE
485 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
486 %.i: %.c prepare scripts FORCE
487 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
488 -%.o: %.c prepare scripts FORCE
489 +%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
490 +%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
491 +%.o: %.c gcc-plugins prepare scripts FORCE
492 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
493 %.lst: %.c prepare scripts FORCE
494 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
495 -%.s: %.S prepare scripts FORCE
496 +%.s: %.S gcc-plugins prepare scripts FORCE
497 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
498 -%.o: %.S prepare scripts FORCE
499 +%.o: %.S gcc-plugins prepare scripts FORCE
500 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
501 %.symtypes: %.c prepare scripts FORCE
502 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
503 @@ -1468,11 +1552,15 @@ endif
504 $(cmd_crmodverdir)
505 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
506 $(build)=$(build-dir)
507 -%/: prepare scripts FORCE
508 +%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
509 +%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
510 +%/: gcc-plugins prepare scripts FORCE
511 $(cmd_crmodverdir)
512 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
513 $(build)=$(build-dir)
514 -%.ko: prepare scripts FORCE
515 +%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
516 +%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
517 +%.ko: gcc-plugins prepare scripts FORCE
518 $(cmd_crmodverdir)
519 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
520 $(build)=$(build-dir) $(@:.ko=.o)
521 diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
522 index 78b03ef..da28a51 100644
523 --- a/arch/alpha/include/asm/atomic.h
524 +++ b/arch/alpha/include/asm/atomic.h
525 @@ -292,6 +292,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
526 #define atomic_dec(v) atomic_sub(1,(v))
527 #define atomic64_dec(v) atomic64_sub(1,(v))
528
529 +#define atomic64_read_unchecked(v) atomic64_read(v)
530 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
531 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
532 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
533 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
534 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
535 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
536 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
537 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
538 +
539 #define smp_mb__before_atomic_dec() smp_mb()
540 #define smp_mb__after_atomic_dec() smp_mb()
541 #define smp_mb__before_atomic_inc() smp_mb()
542 diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
543 index ad368a9..fbe0f25 100644
544 --- a/arch/alpha/include/asm/cache.h
545 +++ b/arch/alpha/include/asm/cache.h
546 @@ -4,19 +4,19 @@
547 #ifndef __ARCH_ALPHA_CACHE_H
548 #define __ARCH_ALPHA_CACHE_H
549
550 +#include <linux/const.h>
551
552 /* Bytes per L1 (data) cache line. */
553 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
554 -# define L1_CACHE_BYTES 64
555 # define L1_CACHE_SHIFT 6
556 #else
557 /* Both EV4 and EV5 are write-through, read-allocate,
558 direct-mapped, physical.
559 */
560 -# define L1_CACHE_BYTES 32
561 # define L1_CACHE_SHIFT 5
562 #endif
563
564 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
565 #define SMP_CACHE_BYTES L1_CACHE_BYTES
566
567 #endif
568 diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
569 index 968d999..d36b2df 100644
570 --- a/arch/alpha/include/asm/elf.h
571 +++ b/arch/alpha/include/asm/elf.h
572 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
573
574 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
575
576 +#ifdef CONFIG_PAX_ASLR
577 +#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
578 +
579 +#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
580 +#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
581 +#endif
582 +
583 /* $0 is set by ld.so to a pointer to a function which might be
584 registered using atexit. This provides a mean for the dynamic
585 linker to call DT_FINI functions for shared libraries that have
586 diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
587 index aab14a0..b4fa3e7 100644
588 --- a/arch/alpha/include/asm/pgalloc.h
589 +++ b/arch/alpha/include/asm/pgalloc.h
590 @@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
591 pgd_set(pgd, pmd);
592 }
593
594 +static inline void
595 +pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
596 +{
597 + pgd_populate(mm, pgd, pmd);
598 +}
599 +
600 extern pgd_t *pgd_alloc(struct mm_struct *mm);
601
602 static inline void
603 diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
604 index d8f9b7e..f6222fa 100644
605 --- a/arch/alpha/include/asm/pgtable.h
606 +++ b/arch/alpha/include/asm/pgtable.h
607 @@ -102,6 +102,17 @@ struct vm_area_struct;
608 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
609 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
610 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
611 +
612 +#ifdef CONFIG_PAX_PAGEEXEC
613 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
614 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
615 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
616 +#else
617 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
618 +# define PAGE_COPY_NOEXEC PAGE_COPY
619 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
620 +#endif
621 +
622 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
623
624 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
625 diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
626 index 2fd00b7..cfd5069 100644
627 --- a/arch/alpha/kernel/module.c
628 +++ b/arch/alpha/kernel/module.c
629 @@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
630
631 /* The small sections were sorted to the end of the segment.
632 The following should definitely cover them. */
633 - gp = (u64)me->module_core + me->core_size - 0x8000;
634 + gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
635 got = sechdrs[me->arch.gotsecindex].sh_addr;
636
637 for (i = 0; i < n; i++) {
638 diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
639 index 1402fcc..0b1abd2 100644
640 --- a/arch/alpha/kernel/osf_sys.c
641 +++ b/arch/alpha/kernel/osf_sys.c
642 @@ -1298,10 +1298,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
643 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
644
645 static unsigned long
646 -arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
647 - unsigned long limit)
648 +arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
649 + unsigned long limit, unsigned long flags)
650 {
651 struct vm_unmapped_area_info info;
652 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
653
654 info.flags = 0;
655 info.length = len;
656 @@ -1309,6 +1310,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
657 info.high_limit = limit;
658 info.align_mask = 0;
659 info.align_offset = 0;
660 + info.threadstack_offset = offset;
661 return vm_unmapped_area(&info);
662 }
663
664 @@ -1341,20 +1343,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
665 merely specific addresses, but regions of memory -- perhaps
666 this feature should be incorporated into all ports? */
667
668 +#ifdef CONFIG_PAX_RANDMMAP
669 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
670 +#endif
671 +
672 if (addr) {
673 - addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
674 + addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
675 if (addr != (unsigned long) -ENOMEM)
676 return addr;
677 }
678
679 /* Next, try allocating at TASK_UNMAPPED_BASE. */
680 - addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
681 - len, limit);
682 + addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
683 +
684 if (addr != (unsigned long) -ENOMEM)
685 return addr;
686
687 /* Finally, try allocating in low memory. */
688 - addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
689 + addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
690
691 return addr;
692 }
693 diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
694 index 98838a0..b304fb4 100644
695 --- a/arch/alpha/mm/fault.c
696 +++ b/arch/alpha/mm/fault.c
697 @@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
698 __reload_thread(pcb);
699 }
700
701 +#ifdef CONFIG_PAX_PAGEEXEC
702 +/*
703 + * PaX: decide what to do with offenders (regs->pc = fault address)
704 + *
705 + * returns 1 when task should be killed
706 + * 2 when patched PLT trampoline was detected
707 + * 3 when unpatched PLT trampoline was detected
708 + */
709 +static int pax_handle_fetch_fault(struct pt_regs *regs)
710 +{
711 +
712 +#ifdef CONFIG_PAX_EMUPLT
713 + int err;
714 +
715 + do { /* PaX: patched PLT emulation #1 */
716 + unsigned int ldah, ldq, jmp;
717 +
718 + err = get_user(ldah, (unsigned int *)regs->pc);
719 + err |= get_user(ldq, (unsigned int *)(regs->pc+4));
720 + err |= get_user(jmp, (unsigned int *)(regs->pc+8));
721 +
722 + if (err)
723 + break;
724 +
725 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
726 + (ldq & 0xFFFF0000U) == 0xA77B0000U &&
727 + jmp == 0x6BFB0000U)
728 + {
729 + unsigned long r27, addr;
730 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
731 + unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
732 +
733 + addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
734 + err = get_user(r27, (unsigned long *)addr);
735 + if (err)
736 + break;
737 +
738 + regs->r27 = r27;
739 + regs->pc = r27;
740 + return 2;
741 + }
742 + } while (0);
743 +
744 + do { /* PaX: patched PLT emulation #2 */
745 + unsigned int ldah, lda, br;
746 +
747 + err = get_user(ldah, (unsigned int *)regs->pc);
748 + err |= get_user(lda, (unsigned int *)(regs->pc+4));
749 + err |= get_user(br, (unsigned int *)(regs->pc+8));
750 +
751 + if (err)
752 + break;
753 +
754 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
755 + (lda & 0xFFFF0000U) == 0xA77B0000U &&
756 + (br & 0xFFE00000U) == 0xC3E00000U)
757 + {
758 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
759 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
760 + unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
761 +
762 + regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
763 + regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
764 + return 2;
765 + }
766 + } while (0);
767 +
768 + do { /* PaX: unpatched PLT emulation */
769 + unsigned int br;
770 +
771 + err = get_user(br, (unsigned int *)regs->pc);
772 +
773 + if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
774 + unsigned int br2, ldq, nop, jmp;
775 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
776 +
777 + addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
778 + err = get_user(br2, (unsigned int *)addr);
779 + err |= get_user(ldq, (unsigned int *)(addr+4));
780 + err |= get_user(nop, (unsigned int *)(addr+8));
781 + err |= get_user(jmp, (unsigned int *)(addr+12));
782 + err |= get_user(resolver, (unsigned long *)(addr+16));
783 +
784 + if (err)
785 + break;
786 +
787 + if (br2 == 0xC3600000U &&
788 + ldq == 0xA77B000CU &&
789 + nop == 0x47FF041FU &&
790 + jmp == 0x6B7B0000U)
791 + {
792 + regs->r28 = regs->pc+4;
793 + regs->r27 = addr+16;
794 + regs->pc = resolver;
795 + return 3;
796 + }
797 + }
798 + } while (0);
799 +#endif
800 +
801 + return 1;
802 +}
803 +
804 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
805 +{
806 + unsigned long i;
807 +
808 + printk(KERN_ERR "PAX: bytes at PC: ");
809 + for (i = 0; i < 5; i++) {
810 + unsigned int c;
811 + if (get_user(c, (unsigned int *)pc+i))
812 + printk(KERN_CONT "???????? ");
813 + else
814 + printk(KERN_CONT "%08x ", c);
815 + }
816 + printk("\n");
817 +}
818 +#endif
819
820 /*
821 * This routine handles page faults. It determines the address,
822 @@ -133,8 +251,29 @@ retry:
823 good_area:
824 si_code = SEGV_ACCERR;
825 if (cause < 0) {
826 - if (!(vma->vm_flags & VM_EXEC))
827 + if (!(vma->vm_flags & VM_EXEC)) {
828 +
829 +#ifdef CONFIG_PAX_PAGEEXEC
830 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
831 + goto bad_area;
832 +
833 + up_read(&mm->mmap_sem);
834 + switch (pax_handle_fetch_fault(regs)) {
835 +
836 +#ifdef CONFIG_PAX_EMUPLT
837 + case 2:
838 + case 3:
839 + return;
840 +#endif
841 +
842 + }
843 + pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
844 + do_group_exit(SIGKILL);
845 +#else
846 goto bad_area;
847 +#endif
848 +
849 + }
850 } else if (!cause) {
851 /* Allow reads even for write-only mappings */
852 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
853 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
854 index db3c541..a1acc89 100644
855 --- a/arch/arm/Kconfig
856 +++ b/arch/arm/Kconfig
857 @@ -1877,7 +1877,7 @@ config ALIGNMENT_TRAP
858
859 config UACCESS_WITH_MEMCPY
860 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
861 - depends on MMU
862 + depends on MMU && !PAX_MEMORY_UDEREF
863 default y if CPU_FEROCEON
864 help
865 Implement faster copy_to_user and clear_user methods for CPU
866 @@ -2141,6 +2141,7 @@ config XIP_PHYS_ADDR
867 config KEXEC
868 bool "Kexec system call (EXPERIMENTAL)"
869 depends on (!SMP || PM_SLEEP_SMP)
870 + depends on !GRKERNSEC_KMEM
871 help
872 kexec is a system call that implements the ability to shutdown your
873 current kernel, and to start another kernel. It is like a reboot
874 diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
875 index 9a92fd7..3502a80 100644
876 --- a/arch/arm/include/asm/atomic.h
877 +++ b/arch/arm/include/asm/atomic.h
878 @@ -18,17 +18,35 @@
879 #include <asm/barrier.h>
880 #include <asm/cmpxchg.h>
881
882 +#ifdef CONFIG_GENERIC_ATOMIC64
883 +#include <asm-generic/atomic64.h>
884 +#endif
885 +
886 #define ATOMIC_INIT(i) { (i) }
887
888 #ifdef __KERNEL__
889
890 +#define _ASM_EXTABLE(from, to) \
891 +" .pushsection __ex_table,\"a\"\n"\
892 +" .align 3\n" \
893 +" .long " #from ", " #to"\n" \
894 +" .popsection"
895 +
896 /*
897 * On ARM, ordinary assignment (str instruction) doesn't clear the local
898 * strex/ldrex monitor on some implementations. The reason we can use it for
899 * atomic_set() is the clrex or dummy strex done on every exception return.
900 */
901 #define atomic_read(v) (*(volatile int *)&(v)->counter)
902 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
903 +{
904 + return v->counter;
905 +}
906 #define atomic_set(v,i) (((v)->counter) = (i))
907 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
908 +{
909 + v->counter = i;
910 +}
911
912 #if __LINUX_ARM_ARCH__ >= 6
913
914 @@ -44,6 +62,36 @@ static inline void atomic_add(int i, atomic_t *v)
915
916 prefetchw(&v->counter);
917 __asm__ __volatile__("@ atomic_add\n"
918 +"1: ldrex %1, [%3]\n"
919 +" adds %0, %1, %4\n"
920 +
921 +#ifdef CONFIG_PAX_REFCOUNT
922 +" bvc 3f\n"
923 +"2: bkpt 0xf103\n"
924 +"3:\n"
925 +#endif
926 +
927 +" strex %1, %0, [%3]\n"
928 +" teq %1, #0\n"
929 +" bne 1b"
930 +
931 +#ifdef CONFIG_PAX_REFCOUNT
932 +"\n4:\n"
933 + _ASM_EXTABLE(2b, 4b)
934 +#endif
935 +
936 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
937 + : "r" (&v->counter), "Ir" (i)
938 + : "cc");
939 +}
940 +
941 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
942 +{
943 + unsigned long tmp;
944 + int result;
945 +
946 + prefetchw(&v->counter);
947 + __asm__ __volatile__("@ atomic_add_unchecked\n"
948 "1: ldrex %0, [%3]\n"
949 " add %0, %0, %4\n"
950 " strex %1, %0, [%3]\n"
951 @@ -63,6 +111,43 @@ static inline int atomic_add_return(int i, atomic_t *v)
952 prefetchw(&v->counter);
953
954 __asm__ __volatile__("@ atomic_add_return\n"
955 +"1: ldrex %1, [%3]\n"
956 +" adds %0, %1, %4\n"
957 +
958 +#ifdef CONFIG_PAX_REFCOUNT
959 +" bvc 3f\n"
960 +" mov %0, %1\n"
961 +"2: bkpt 0xf103\n"
962 +"3:\n"
963 +#endif
964 +
965 +" strex %1, %0, [%3]\n"
966 +" teq %1, #0\n"
967 +" bne 1b"
968 +
969 +#ifdef CONFIG_PAX_REFCOUNT
970 +"\n4:\n"
971 + _ASM_EXTABLE(2b, 4b)
972 +#endif
973 +
974 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
975 + : "r" (&v->counter), "Ir" (i)
976 + : "cc");
977 +
978 + smp_mb();
979 +
980 + return result;
981 +}
982 +
983 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
984 +{
985 + unsigned long tmp;
986 + int result;
987 +
988 + smp_mb();
989 + prefetchw(&v->counter);
990 +
991 + __asm__ __volatile__("@ atomic_add_return_unchecked\n"
992 "1: ldrex %0, [%3]\n"
993 " add %0, %0, %4\n"
994 " strex %1, %0, [%3]\n"
995 @@ -84,6 +169,36 @@ static inline void atomic_sub(int i, atomic_t *v)
996
997 prefetchw(&v->counter);
998 __asm__ __volatile__("@ atomic_sub\n"
999 +"1: ldrex %1, [%3]\n"
1000 +" subs %0, %1, %4\n"
1001 +
1002 +#ifdef CONFIG_PAX_REFCOUNT
1003 +" bvc 3f\n"
1004 +"2: bkpt 0xf103\n"
1005 +"3:\n"
1006 +#endif
1007 +
1008 +" strex %1, %0, [%3]\n"
1009 +" teq %1, #0\n"
1010 +" bne 1b"
1011 +
1012 +#ifdef CONFIG_PAX_REFCOUNT
1013 +"\n4:\n"
1014 + _ASM_EXTABLE(2b, 4b)
1015 +#endif
1016 +
1017 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1018 + : "r" (&v->counter), "Ir" (i)
1019 + : "cc");
1020 +}
1021 +
1022 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
1023 +{
1024 + unsigned long tmp;
1025 + int result;
1026 +
1027 + prefetchw(&v->counter);
1028 + __asm__ __volatile__("@ atomic_sub_unchecked\n"
1029 "1: ldrex %0, [%3]\n"
1030 " sub %0, %0, %4\n"
1031 " strex %1, %0, [%3]\n"
1032 @@ -103,11 +218,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1033 prefetchw(&v->counter);
1034
1035 __asm__ __volatile__("@ atomic_sub_return\n"
1036 -"1: ldrex %0, [%3]\n"
1037 -" sub %0, %0, %4\n"
1038 +"1: ldrex %1, [%3]\n"
1039 +" subs %0, %1, %4\n"
1040 +
1041 +#ifdef CONFIG_PAX_REFCOUNT
1042 +" bvc 3f\n"
1043 +" mov %0, %1\n"
1044 +"2: bkpt 0xf103\n"
1045 +"3:\n"
1046 +#endif
1047 +
1048 " strex %1, %0, [%3]\n"
1049 " teq %1, #0\n"
1050 " bne 1b"
1051 +
1052 +#ifdef CONFIG_PAX_REFCOUNT
1053 +"\n4:\n"
1054 + _ASM_EXTABLE(2b, 4b)
1055 +#endif
1056 +
1057 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1058 : "r" (&v->counter), "Ir" (i)
1059 : "cc");
1060 @@ -152,12 +281,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1061 __asm__ __volatile__ ("@ atomic_add_unless\n"
1062 "1: ldrex %0, [%4]\n"
1063 " teq %0, %5\n"
1064 -" beq 2f\n"
1065 -" add %1, %0, %6\n"
1066 +" beq 4f\n"
1067 +" adds %1, %0, %6\n"
1068 +
1069 +#ifdef CONFIG_PAX_REFCOUNT
1070 +" bvc 3f\n"
1071 +"2: bkpt 0xf103\n"
1072 +"3:\n"
1073 +#endif
1074 +
1075 " strex %2, %1, [%4]\n"
1076 " teq %2, #0\n"
1077 " bne 1b\n"
1078 -"2:"
1079 +"4:"
1080 +
1081 +#ifdef CONFIG_PAX_REFCOUNT
1082 + _ASM_EXTABLE(2b, 4b)
1083 +#endif
1084 +
1085 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1086 : "r" (&v->counter), "r" (u), "r" (a)
1087 : "cc");
1088 @@ -168,6 +309,28 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1089 return oldval;
1090 }
1091
1092 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1093 +{
1094 + unsigned long oldval, res;
1095 +
1096 + smp_mb();
1097 +
1098 + do {
1099 + __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1100 + "ldrex %1, [%3]\n"
1101 + "mov %0, #0\n"
1102 + "teq %1, %4\n"
1103 + "strexeq %0, %5, [%3]\n"
1104 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1105 + : "r" (&ptr->counter), "Ir" (old), "r" (new)
1106 + : "cc");
1107 + } while (res);
1108 +
1109 + smp_mb();
1110 +
1111 + return oldval;
1112 +}
1113 +
1114 #else /* ARM_ARCH_6 */
1115
1116 #ifdef CONFIG_SMP
1117 @@ -186,7 +349,17 @@ static inline int atomic_add_return(int i, atomic_t *v)
1118
1119 return val;
1120 }
1121 +
1122 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
1123 +{
1124 + return atomic_add_return(i, v);
1125 +}
1126 +
1127 #define atomic_add(i, v) (void) atomic_add_return(i, v)
1128 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
1129 +{
1130 + (void) atomic_add_return(i, v);
1131 +}
1132
1133 static inline int atomic_sub_return(int i, atomic_t *v)
1134 {
1135 @@ -201,6 +374,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1136 return val;
1137 }
1138 #define atomic_sub(i, v) (void) atomic_sub_return(i, v)
1139 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
1140 +{
1141 + (void) atomic_sub_return(i, v);
1142 +}
1143
1144 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1145 {
1146 @@ -216,6 +393,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1147 return ret;
1148 }
1149
1150 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1151 +{
1152 + return atomic_cmpxchg(v, old, new);
1153 +}
1154 +
1155 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1156 {
1157 int c, old;
1158 @@ -229,13 +411,33 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1159 #endif /* __LINUX_ARM_ARCH__ */
1160
1161 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1162 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1163 +{
1164 + return xchg(&v->counter, new);
1165 +}
1166
1167 #define atomic_inc(v) atomic_add(1, v)
1168 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1169 +{
1170 + atomic_add_unchecked(1, v);
1171 +}
1172 #define atomic_dec(v) atomic_sub(1, v)
1173 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1174 +{
1175 + atomic_sub_unchecked(1, v);
1176 +}
1177
1178 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1179 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1180 +{
1181 + return atomic_add_return_unchecked(1, v) == 0;
1182 +}
1183 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1184 #define atomic_inc_return(v) (atomic_add_return(1, v))
1185 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1186 +{
1187 + return atomic_add_return_unchecked(1, v);
1188 +}
1189 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1190 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1191
1192 @@ -251,6 +453,14 @@ typedef struct {
1193 long long counter;
1194 } atomic64_t;
1195
1196 +#ifdef CONFIG_PAX_REFCOUNT
1197 +typedef struct {
1198 + long long counter;
1199 +} atomic64_unchecked_t;
1200 +#else
1201 +typedef atomic64_t atomic64_unchecked_t;
1202 +#endif
1203 +
1204 #define ATOMIC64_INIT(i) { (i) }
1205
1206 #ifdef CONFIG_ARM_LPAE
1207 @@ -267,6 +477,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1208 return result;
1209 }
1210
1211 +static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1212 +{
1213 + long long result;
1214 +
1215 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1216 +" ldrd %0, %H0, [%1]"
1217 + : "=&r" (result)
1218 + : "r" (&v->counter), "Qo" (v->counter)
1219 + );
1220 +
1221 + return result;
1222 +}
1223 +
1224 static inline void atomic64_set(atomic64_t *v, long long i)
1225 {
1226 __asm__ __volatile__("@ atomic64_set\n"
1227 @@ -275,6 +498,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1228 : "r" (&v->counter), "r" (i)
1229 );
1230 }
1231 +
1232 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1233 +{
1234 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1235 +" strd %2, %H2, [%1]"
1236 + : "=Qo" (v->counter)
1237 + : "r" (&v->counter), "r" (i)
1238 + );
1239 +}
1240 #else
1241 static inline long long atomic64_read(const atomic64_t *v)
1242 {
1243 @@ -289,6 +521,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1244 return result;
1245 }
1246
1247 +static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1248 +{
1249 + long long result;
1250 +
1251 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1252 +" ldrexd %0, %H0, [%1]"
1253 + : "=&r" (result)
1254 + : "r" (&v->counter), "Qo" (v->counter)
1255 + );
1256 +
1257 + return result;
1258 +}
1259 +
1260 static inline void atomic64_set(atomic64_t *v, long long i)
1261 {
1262 long long tmp;
1263 @@ -303,6 +548,21 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1264 : "r" (&v->counter), "r" (i)
1265 : "cc");
1266 }
1267 +
1268 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1269 +{
1270 + long long tmp;
1271 +
1272 + prefetchw(&v->counter);
1273 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1274 +"1: ldrexd %0, %H0, [%2]\n"
1275 +" strexd %0, %3, %H3, [%2]\n"
1276 +" teq %0, #0\n"
1277 +" bne 1b"
1278 + : "=&r" (tmp), "=Qo" (v->counter)
1279 + : "r" (&v->counter), "r" (i)
1280 + : "cc");
1281 +}
1282 #endif
1283
1284 static inline void atomic64_add(long long i, atomic64_t *v)
1285 @@ -314,6 +574,37 @@ static inline void atomic64_add(long long i, atomic64_t *v)
1286 __asm__ __volatile__("@ atomic64_add\n"
1287 "1: ldrexd %0, %H0, [%3]\n"
1288 " adds %Q0, %Q0, %Q4\n"
1289 +" adcs %R0, %R0, %R4\n"
1290 +
1291 +#ifdef CONFIG_PAX_REFCOUNT
1292 +" bvc 3f\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 +
1311 +static inline void atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
1312 +{
1313 + long long result;
1314 + unsigned long tmp;
1315 +
1316 + prefetchw(&v->counter);
1317 + __asm__ __volatile__("@ atomic64_add_unchecked\n"
1318 +"1: ldrexd %0, %H0, [%3]\n"
1319 +" adds %Q0, %Q0, %Q4\n"
1320 " adc %R0, %R0, %R4\n"
1321 " strexd %1, %0, %H0, [%3]\n"
1322 " teq %1, #0\n"
1323 @@ -334,6 +625,44 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
1324 __asm__ __volatile__("@ atomic64_add_return\n"
1325 "1: ldrexd %0, %H0, [%3]\n"
1326 " adds %Q0, %Q0, %Q4\n"
1327 +" adcs %R0, %R0, %R4\n"
1328 +
1329 +#ifdef CONFIG_PAX_REFCOUNT
1330 +" bvc 3f\n"
1331 +" mov %0, %1\n"
1332 +" mov %H0, %H1\n"
1333 +"2: bkpt 0xf103\n"
1334 +"3:\n"
1335 +#endif
1336 +
1337 +" strexd %1, %0, %H0, [%3]\n"
1338 +" teq %1, #0\n"
1339 +" bne 1b"
1340 +
1341 +#ifdef CONFIG_PAX_REFCOUNT
1342 +"\n4:\n"
1343 + _ASM_EXTABLE(2b, 4b)
1344 +#endif
1345 +
1346 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1347 + : "r" (&v->counter), "r" (i)
1348 + : "cc");
1349 +
1350 + smp_mb();
1351 +
1352 + return result;
1353 +}
1354 +
1355 +static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
1356 +{
1357 + long long result;
1358 + unsigned long tmp;
1359 +
1360 + smp_mb();
1361 +
1362 + __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
1363 +"1: ldrexd %0, %H0, [%3]\n"
1364 +" adds %Q0, %Q0, %Q4\n"
1365 " adc %R0, %R0, %R4\n"
1366 " strexd %1, %0, %H0, [%3]\n"
1367 " teq %1, #0\n"
1368 @@ -356,6 +685,37 @@ static inline void atomic64_sub(long long i, atomic64_t *v)
1369 __asm__ __volatile__("@ atomic64_sub\n"
1370 "1: ldrexd %0, %H0, [%3]\n"
1371 " subs %Q0, %Q0, %Q4\n"
1372 +" sbcs %R0, %R0, %R4\n"
1373 +
1374 +#ifdef CONFIG_PAX_REFCOUNT
1375 +" bvc 3f\n"
1376 +"2: bkpt 0xf103\n"
1377 +"3:\n"
1378 +#endif
1379 +
1380 +" strexd %1, %0, %H0, [%3]\n"
1381 +" teq %1, #0\n"
1382 +" bne 1b"
1383 +
1384 +#ifdef CONFIG_PAX_REFCOUNT
1385 +"\n4:\n"
1386 + _ASM_EXTABLE(2b, 4b)
1387 +#endif
1388 +
1389 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1390 + : "r" (&v->counter), "r" (i)
1391 + : "cc");
1392 +}
1393 +
1394 +static inline void atomic64_sub_unchecked(long long i, atomic64_unchecked_t *v)
1395 +{
1396 + long long result;
1397 + unsigned long tmp;
1398 +
1399 + prefetchw(&v->counter);
1400 + __asm__ __volatile__("@ atomic64_sub_unchecked\n"
1401 +"1: ldrexd %0, %H0, [%3]\n"
1402 +" subs %Q0, %Q0, %Q4\n"
1403 " sbc %R0, %R0, %R4\n"
1404 " strexd %1, %0, %H0, [%3]\n"
1405 " teq %1, #0\n"
1406 @@ -376,16 +736,29 @@ static inline long long atomic64_sub_return(long long i, atomic64_t *v)
1407 __asm__ __volatile__("@ atomic64_sub_return\n"
1408 "1: ldrexd %0, %H0, [%3]\n"
1409 " subs %Q0, %Q0, %Q4\n"
1410 -" sbc %R0, %R0, %R4\n"
1411 +" sbcs %R0, %R0, %R4\n"
1412 +
1413 +#ifdef CONFIG_PAX_REFCOUNT
1414 +" bvc 3f\n"
1415 +" mov %0, %1\n"
1416 +" mov %H0, %H1\n"
1417 +"2: bkpt 0xf103\n"
1418 +"3:\n"
1419 +#endif
1420 +
1421 " strexd %1, %0, %H0, [%3]\n"
1422 " teq %1, #0\n"
1423 " bne 1b"
1424 +
1425 +#ifdef CONFIG_PAX_REFCOUNT
1426 +"\n4:\n"
1427 + _ASM_EXTABLE(2b, 4b)
1428 +#endif
1429 +
1430 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1431 : "r" (&v->counter), "r" (i)
1432 : "cc");
1433
1434 - smp_mb();
1435 -
1436 return result;
1437 }
1438
1439 @@ -415,6 +788,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1440 return oldval;
1441 }
1442
1443 +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1444 + long long new)
1445 +{
1446 + long long oldval;
1447 + unsigned long res;
1448 +
1449 + smp_mb();
1450 +
1451 + do {
1452 + __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1453 + "ldrexd %1, %H1, [%3]\n"
1454 + "mov %0, #0\n"
1455 + "teq %1, %4\n"
1456 + "teqeq %H1, %H4\n"
1457 + "strexdeq %0, %5, %H5, [%3]"
1458 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1459 + : "r" (&ptr->counter), "r" (old), "r" (new)
1460 + : "cc");
1461 + } while (res);
1462 +
1463 + smp_mb();
1464 +
1465 + return oldval;
1466 +}
1467 +
1468 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1469 {
1470 long long result;
1471 @@ -440,21 +838,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1472 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1473 {
1474 long long result;
1475 - unsigned long tmp;
1476 + u64 tmp;
1477
1478 smp_mb();
1479 prefetchw(&v->counter);
1480
1481 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1482 -"1: ldrexd %0, %H0, [%3]\n"
1483 -" subs %Q0, %Q0, #1\n"
1484 -" sbc %R0, %R0, #0\n"
1485 +"1: ldrexd %1, %H1, [%3]\n"
1486 +" subs %Q0, %Q1, #1\n"
1487 +" sbcs %R0, %R1, #0\n"
1488 +
1489 +#ifdef CONFIG_PAX_REFCOUNT
1490 +" bvc 3f\n"
1491 +" mov %Q0, %Q1\n"
1492 +" mov %R0, %R1\n"
1493 +"2: bkpt 0xf103\n"
1494 +"3:\n"
1495 +#endif
1496 +
1497 " teq %R0, #0\n"
1498 -" bmi 2f\n"
1499 +" bmi 4f\n"
1500 " strexd %1, %0, %H0, [%3]\n"
1501 " teq %1, #0\n"
1502 " bne 1b\n"
1503 -"2:"
1504 +"4:\n"
1505 +
1506 +#ifdef CONFIG_PAX_REFCOUNT
1507 + _ASM_EXTABLE(2b, 4b)
1508 +#endif
1509 +
1510 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1511 : "r" (&v->counter)
1512 : "cc");
1513 @@ -478,13 +890,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1514 " teq %0, %5\n"
1515 " teqeq %H0, %H5\n"
1516 " moveq %1, #0\n"
1517 -" beq 2f\n"
1518 +" beq 4f\n"
1519 " adds %Q0, %Q0, %Q6\n"
1520 -" adc %R0, %R0, %R6\n"
1521 +" adcs %R0, %R0, %R6\n"
1522 +
1523 +#ifdef CONFIG_PAX_REFCOUNT
1524 +" bvc 3f\n"
1525 +"2: bkpt 0xf103\n"
1526 +"3:\n"
1527 +#endif
1528 +
1529 " strexd %2, %0, %H0, [%4]\n"
1530 " teq %2, #0\n"
1531 " bne 1b\n"
1532 -"2:"
1533 +"4:\n"
1534 +
1535 +#ifdef CONFIG_PAX_REFCOUNT
1536 + _ASM_EXTABLE(2b, 4b)
1537 +#endif
1538 +
1539 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1540 : "r" (&v->counter), "r" (u), "r" (a)
1541 : "cc");
1542 @@ -497,10 +921,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1543
1544 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1545 #define atomic64_inc(v) atomic64_add(1LL, (v))
1546 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1547 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1548 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1549 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1550 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1551 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1552 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1553 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1554 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1555 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1556 diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1557 index 2f59f74..1594659 100644
1558 --- a/arch/arm/include/asm/barrier.h
1559 +++ b/arch/arm/include/asm/barrier.h
1560 @@ -63,7 +63,7 @@
1561 do { \
1562 compiletime_assert_atomic_type(*p); \
1563 smp_mb(); \
1564 - ACCESS_ONCE(*p) = (v); \
1565 + ACCESS_ONCE_RW(*p) = (v); \
1566 } while (0)
1567
1568 #define smp_load_acquire(p) \
1569 diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1570 index 75fe66b..ba3dee4 100644
1571 --- a/arch/arm/include/asm/cache.h
1572 +++ b/arch/arm/include/asm/cache.h
1573 @@ -4,8 +4,10 @@
1574 #ifndef __ASMARM_CACHE_H
1575 #define __ASMARM_CACHE_H
1576
1577 +#include <linux/const.h>
1578 +
1579 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1580 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1581 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1582
1583 /*
1584 * Memory returned by kmalloc() may be used for DMA, so we must make
1585 @@ -24,5 +26,6 @@
1586 #endif
1587
1588 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1589 +#define __read_only __attribute__ ((__section__(".data..read_only")))
1590
1591 #endif
1592 diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1593 index 8b8b616..d973d24 100644
1594 --- a/arch/arm/include/asm/cacheflush.h
1595 +++ b/arch/arm/include/asm/cacheflush.h
1596 @@ -116,7 +116,7 @@ struct cpu_cache_fns {
1597 void (*dma_unmap_area)(const void *, size_t, int);
1598
1599 void (*dma_flush_range)(const void *, const void *);
1600 -};
1601 +} __no_const;
1602
1603 /*
1604 * Select the calling method
1605 diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1606 index 5233151..87a71fa 100644
1607 --- a/arch/arm/include/asm/checksum.h
1608 +++ b/arch/arm/include/asm/checksum.h
1609 @@ -37,7 +37,19 @@ __wsum
1610 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1611
1612 __wsum
1613 -csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1614 +__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1615 +
1616 +static inline __wsum
1617 +csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1618 +{
1619 + __wsum ret;
1620 + pax_open_userland();
1621 + ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1622 + pax_close_userland();
1623 + return ret;
1624 +}
1625 +
1626 +
1627
1628 /*
1629 * Fold a partial checksum without adding pseudo headers
1630 diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1631 index abb2c37..96db950 100644
1632 --- a/arch/arm/include/asm/cmpxchg.h
1633 +++ b/arch/arm/include/asm/cmpxchg.h
1634 @@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1635
1636 #define xchg(ptr,x) \
1637 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1638 +#define xchg_unchecked(ptr,x) \
1639 + ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1640
1641 #include <asm-generic/cmpxchg-local.h>
1642
1643 diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1644 index 6ddbe44..b5e38b1 100644
1645 --- a/arch/arm/include/asm/domain.h
1646 +++ b/arch/arm/include/asm/domain.h
1647 @@ -48,18 +48,37 @@
1648 * Domain types
1649 */
1650 #define DOMAIN_NOACCESS 0
1651 -#define DOMAIN_CLIENT 1
1652 #ifdef CONFIG_CPU_USE_DOMAINS
1653 +#define DOMAIN_USERCLIENT 1
1654 +#define DOMAIN_KERNELCLIENT 1
1655 #define DOMAIN_MANAGER 3
1656 +#define DOMAIN_VECTORS DOMAIN_USER
1657 #else
1658 +
1659 +#ifdef CONFIG_PAX_KERNEXEC
1660 #define DOMAIN_MANAGER 1
1661 +#define DOMAIN_KERNEXEC 3
1662 +#else
1663 +#define DOMAIN_MANAGER 1
1664 +#endif
1665 +
1666 +#ifdef CONFIG_PAX_MEMORY_UDEREF
1667 +#define DOMAIN_USERCLIENT 0
1668 +#define DOMAIN_UDEREF 1
1669 +#define DOMAIN_VECTORS DOMAIN_KERNEL
1670 +#else
1671 +#define DOMAIN_USERCLIENT 1
1672 +#define DOMAIN_VECTORS DOMAIN_USER
1673 +#endif
1674 +#define DOMAIN_KERNELCLIENT 1
1675 +
1676 #endif
1677
1678 #define domain_val(dom,type) ((type) << (2*(dom)))
1679
1680 #ifndef __ASSEMBLY__
1681
1682 -#ifdef CONFIG_CPU_USE_DOMAINS
1683 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1684 static inline void set_domain(unsigned val)
1685 {
1686 asm volatile(
1687 @@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1688 isb();
1689 }
1690
1691 -#define modify_domain(dom,type) \
1692 - do { \
1693 - struct thread_info *thread = current_thread_info(); \
1694 - unsigned int domain = thread->cpu_domain; \
1695 - domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1696 - thread->cpu_domain = domain | domain_val(dom, type); \
1697 - set_domain(thread->cpu_domain); \
1698 - } while (0)
1699 -
1700 +extern void modify_domain(unsigned int dom, unsigned int type);
1701 #else
1702 static inline void set_domain(unsigned val) { }
1703 static inline void modify_domain(unsigned dom, unsigned type) { }
1704 diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1705 index f4b46d3..abc9b2b 100644
1706 --- a/arch/arm/include/asm/elf.h
1707 +++ b/arch/arm/include/asm/elf.h
1708 @@ -114,7 +114,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1709 the loader. We need to make sure that it is out of the way of the program
1710 that it will "exec", and that there is sufficient room for the brk. */
1711
1712 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1713 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1714 +
1715 +#ifdef CONFIG_PAX_ASLR
1716 +#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1717 +
1718 +#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1719 +#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1720 +#endif
1721
1722 /* When the program starts, a1 contains a pointer to a function to be
1723 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1724 @@ -124,10 +131,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1725 extern void elf_set_personality(const struct elf32_hdr *);
1726 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1727
1728 -struct mm_struct;
1729 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1730 -#define arch_randomize_brk arch_randomize_brk
1731 -
1732 #ifdef CONFIG_MMU
1733 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1734 struct linux_binprm;
1735 diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1736 index de53547..52b9a28 100644
1737 --- a/arch/arm/include/asm/fncpy.h
1738 +++ b/arch/arm/include/asm/fncpy.h
1739 @@ -81,7 +81,9 @@
1740 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1741 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1742 \
1743 + pax_open_kernel(); \
1744 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1745 + pax_close_kernel(); \
1746 flush_icache_range((unsigned long)(dest_buf), \
1747 (unsigned long)(dest_buf) + (size)); \
1748 \
1749 diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1750 index 53e69da..3fdc896 100644
1751 --- a/arch/arm/include/asm/futex.h
1752 +++ b/arch/arm/include/asm/futex.h
1753 @@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1754 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1755 return -EFAULT;
1756
1757 + pax_open_userland();
1758 +
1759 smp_mb();
1760 /* Prefetching cannot fault */
1761 prefetchw(uaddr);
1762 @@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1763 : "cc", "memory");
1764 smp_mb();
1765
1766 + pax_close_userland();
1767 +
1768 *uval = val;
1769 return ret;
1770 }
1771 @@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1772 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1773 return -EFAULT;
1774
1775 + pax_open_userland();
1776 +
1777 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1778 "1: " TUSER(ldr) " %1, [%4]\n"
1779 " teq %1, %2\n"
1780 @@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1781 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1782 : "cc", "memory");
1783
1784 + pax_close_userland();
1785 +
1786 *uval = val;
1787 return ret;
1788 }
1789 @@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1790 return -EFAULT;
1791
1792 pagefault_disable(); /* implies preempt_disable() */
1793 + pax_open_userland();
1794
1795 switch (op) {
1796 case FUTEX_OP_SET:
1797 @@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1798 ret = -ENOSYS;
1799 }
1800
1801 + pax_close_userland();
1802 pagefault_enable(); /* subsumes preempt_enable() */
1803
1804 if (!ret) {
1805 diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1806 index 83eb2f7..ed77159 100644
1807 --- a/arch/arm/include/asm/kmap_types.h
1808 +++ b/arch/arm/include/asm/kmap_types.h
1809 @@ -4,6 +4,6 @@
1810 /*
1811 * This is the "bare minimum". AIO seems to require this.
1812 */
1813 -#define KM_TYPE_NR 16
1814 +#define KM_TYPE_NR 17
1815
1816 #endif
1817 diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1818 index 9e614a1..3302cca 100644
1819 --- a/arch/arm/include/asm/mach/dma.h
1820 +++ b/arch/arm/include/asm/mach/dma.h
1821 @@ -22,7 +22,7 @@ struct dma_ops {
1822 int (*residue)(unsigned int, dma_t *); /* optional */
1823 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1824 const char *type;
1825 -};
1826 +} __do_const;
1827
1828 struct dma_struct {
1829 void *addr; /* single DMA address */
1830 diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1831 index f98c7f3..e5c626d 100644
1832 --- a/arch/arm/include/asm/mach/map.h
1833 +++ b/arch/arm/include/asm/mach/map.h
1834 @@ -23,17 +23,19 @@ struct map_desc {
1835
1836 /* types 0-3 are defined in asm/io.h */
1837 enum {
1838 - MT_UNCACHED = 4,
1839 - MT_CACHECLEAN,
1840 - MT_MINICLEAN,
1841 + MT_UNCACHED_RW = 4,
1842 + MT_CACHECLEAN_RO,
1843 + MT_MINICLEAN_RO,
1844 MT_LOW_VECTORS,
1845 MT_HIGH_VECTORS,
1846 - MT_MEMORY_RWX,
1847 + __MT_MEMORY_RWX,
1848 MT_MEMORY_RW,
1849 - MT_ROM,
1850 - MT_MEMORY_RWX_NONCACHED,
1851 + MT_MEMORY_RX,
1852 + MT_ROM_RX,
1853 + MT_MEMORY_RW_NONCACHED,
1854 + MT_MEMORY_RX_NONCACHED,
1855 MT_MEMORY_RW_DTCM,
1856 - MT_MEMORY_RWX_ITCM,
1857 + MT_MEMORY_RX_ITCM,
1858 MT_MEMORY_RW_SO,
1859 MT_MEMORY_DMA_READY,
1860 };
1861 diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1862 index f94784f..9a09a4a 100644
1863 --- a/arch/arm/include/asm/outercache.h
1864 +++ b/arch/arm/include/asm/outercache.h
1865 @@ -35,7 +35,7 @@ struct outer_cache_fns {
1866 #endif
1867 void (*set_debug)(unsigned long);
1868 void (*resume)(void);
1869 -};
1870 +} __no_const;
1871
1872 extern struct outer_cache_fns outer_cache;
1873
1874 diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1875 index 4355f0e..cd9168e 100644
1876 --- a/arch/arm/include/asm/page.h
1877 +++ b/arch/arm/include/asm/page.h
1878 @@ -23,6 +23,7 @@
1879
1880 #else
1881
1882 +#include <linux/compiler.h>
1883 #include <asm/glue.h>
1884
1885 /*
1886 @@ -114,7 +115,7 @@ struct cpu_user_fns {
1887 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1888 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1889 unsigned long vaddr, struct vm_area_struct *vma);
1890 -};
1891 +} __no_const;
1892
1893 #ifdef MULTI_USER
1894 extern struct cpu_user_fns cpu_user;
1895 diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1896 index 78a7793..e3dc06c 100644
1897 --- a/arch/arm/include/asm/pgalloc.h
1898 +++ b/arch/arm/include/asm/pgalloc.h
1899 @@ -17,6 +17,7 @@
1900 #include <asm/processor.h>
1901 #include <asm/cacheflush.h>
1902 #include <asm/tlbflush.h>
1903 +#include <asm/system_info.h>
1904
1905 #define check_pgt_cache() do { } while (0)
1906
1907 @@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1908 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1909 }
1910
1911 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1912 +{
1913 + pud_populate(mm, pud, pmd);
1914 +}
1915 +
1916 #else /* !CONFIG_ARM_LPAE */
1917
1918 /*
1919 @@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1920 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1921 #define pmd_free(mm, pmd) do { } while (0)
1922 #define pud_populate(mm,pmd,pte) BUG()
1923 +#define pud_populate_kernel(mm,pmd,pte) BUG()
1924
1925 #endif /* CONFIG_ARM_LPAE */
1926
1927 @@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1928 __free_page(pte);
1929 }
1930
1931 +static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1932 +{
1933 +#ifdef CONFIG_ARM_LPAE
1934 + pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1935 +#else
1936 + if (addr & SECTION_SIZE)
1937 + pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1938 + else
1939 + pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1940 +#endif
1941 + flush_pmd_entry(pmdp);
1942 +}
1943 +
1944 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1945 pmdval_t prot)
1946 {
1947 @@ -157,7 +177,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
1948 static inline void
1949 pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
1950 {
1951 - __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);
1952 + __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE | __supported_pmd_mask);
1953 }
1954 #define pmd_pgtable(pmd) pmd_page(pmd)
1955
1956 diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1957 index 5cfba15..f415e1a 100644
1958 --- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1959 +++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1960 @@ -20,12 +20,15 @@
1961 #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0)
1962 #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0)
1963 #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0)
1964 +#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* v7 */
1965 #define PMD_BIT4 (_AT(pmdval_t, 1) << 4)
1966 #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5)
1967 #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */
1968 +
1969 /*
1970 * - section
1971 */
1972 +#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1973 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1974 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1975 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1976 @@ -37,6 +40,7 @@
1977 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1978 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1979 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1980 +#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1981
1982 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1983 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1984 @@ -66,6 +70,7 @@
1985 * - extended small page/tiny page
1986 */
1987 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1988 +#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1989 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1990 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1991 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1992 diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1993 index 219ac88..73ec32a 100644
1994 --- a/arch/arm/include/asm/pgtable-2level.h
1995 +++ b/arch/arm/include/asm/pgtable-2level.h
1996 @@ -126,6 +126,9 @@
1997 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1998 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1999
2000 +/* Two-level page tables only have PXN in the PGD, not in the PTE. */
2001 +#define L_PTE_PXN (_AT(pteval_t, 0))
2002 +
2003 /*
2004 * These are the memory types, defined to be compatible with
2005 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
2006 diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
2007 index 626989f..9d67a33 100644
2008 --- a/arch/arm/include/asm/pgtable-3level-hwdef.h
2009 +++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
2010 @@ -75,6 +75,7 @@
2011 #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
2012 #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
2013 #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
2014 +#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */
2015 #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */
2016
2017 /*
2018 diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
2019 index 85c60ad..b0bbd7e 100644
2020 --- a/arch/arm/include/asm/pgtable-3level.h
2021 +++ b/arch/arm/include/asm/pgtable-3level.h
2022 @@ -82,6 +82,7 @@
2023 #define L_PTE_RDONLY (_AT(pteval_t, 1) << 7) /* AP[2] */
2024 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
2025 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
2026 +#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
2027 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
2028 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55) /* unused */
2029 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56) /* unused */
2030 @@ -95,6 +96,7 @@
2031 /*
2032 * To be used in assembly code with the upper page attributes.
2033 */
2034 +#define L_PTE_PXN_HIGH (1 << (53 - 32))
2035 #define L_PTE_XN_HIGH (1 << (54 - 32))
2036 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
2037
2038 diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
2039 index 5478e5d..f5b5cb3 100644
2040 --- a/arch/arm/include/asm/pgtable.h
2041 +++ b/arch/arm/include/asm/pgtable.h
2042 @@ -33,6 +33,9 @@
2043 #include <asm/pgtable-2level.h>
2044 #endif
2045
2046 +#define ktla_ktva(addr) (addr)
2047 +#define ktva_ktla(addr) (addr)
2048 +
2049 /*
2050 * Just any arbitrary offset to the start of the vmalloc VM area: the
2051 * current 8MB value just means that there will be a 8MB "hole" after the
2052 @@ -48,6 +51,9 @@
2053 #define LIBRARY_TEXT_START 0x0c000000
2054
2055 #ifndef __ASSEMBLY__
2056 +extern pteval_t __supported_pte_mask;
2057 +extern pmdval_t __supported_pmd_mask;
2058 +
2059 extern void __pte_error(const char *file, int line, pte_t);
2060 extern void __pmd_error(const char *file, int line, pmd_t);
2061 extern void __pgd_error(const char *file, int line, pgd_t);
2062 @@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2063 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2064 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2065
2066 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
2067 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2068 +
2069 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2070 +#include <asm/domain.h>
2071 +#include <linux/thread_info.h>
2072 +#include <linux/preempt.h>
2073 +
2074 +static inline int test_domain(int domain, int domaintype)
2075 +{
2076 + return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2077 +}
2078 +#endif
2079 +
2080 +#ifdef CONFIG_PAX_KERNEXEC
2081 +static inline unsigned long pax_open_kernel(void) {
2082 +#ifdef CONFIG_ARM_LPAE
2083 + /* TODO */
2084 +#else
2085 + preempt_disable();
2086 + BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2087 + modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2088 +#endif
2089 + return 0;
2090 +}
2091 +
2092 +static inline unsigned long pax_close_kernel(void) {
2093 +#ifdef CONFIG_ARM_LPAE
2094 + /* TODO */
2095 +#else
2096 + BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2097 + /* DOMAIN_MANAGER = "client" under KERNEXEC */
2098 + modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2099 + preempt_enable_no_resched();
2100 +#endif
2101 + return 0;
2102 +}
2103 +#else
2104 +static inline unsigned long pax_open_kernel(void) { return 0; }
2105 +static inline unsigned long pax_close_kernel(void) { return 0; }
2106 +#endif
2107 +
2108 /*
2109 * This is the lowest virtual address we can permit any user space
2110 * mapping to be mapped at. This is particularly important for
2111 @@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2112 /*
2113 * The pgprot_* and protection_map entries will be fixed up in runtime
2114 * to include the cachable and bufferable bits based on memory policy,
2115 - * as well as any architecture dependent bits like global/ASID and SMP
2116 - * shared mapping bits.
2117 + * as well as any architecture dependent bits like global/ASID, PXN,
2118 + * and SMP shared mapping bits.
2119 */
2120 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2121
2122 @@ -265,7 +313,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }
2123 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2124 {
2125 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2126 - L_PTE_NONE | L_PTE_VALID;
2127 + L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2128 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2129 return pte;
2130 }
2131 diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2132 index c4ae171..ea0c0c2 100644
2133 --- a/arch/arm/include/asm/psci.h
2134 +++ b/arch/arm/include/asm/psci.h
2135 @@ -29,7 +29,7 @@ struct psci_operations {
2136 int (*cpu_off)(struct psci_power_state state);
2137 int (*cpu_on)(unsigned long cpuid, unsigned long entry_point);
2138 int (*migrate)(unsigned long cpuid);
2139 -};
2140 +} __no_const;
2141
2142 extern struct psci_operations psci_ops;
2143 extern struct smp_operations psci_smp_ops;
2144 diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2145 index 2ec765c..beb1fe16 100644
2146 --- a/arch/arm/include/asm/smp.h
2147 +++ b/arch/arm/include/asm/smp.h
2148 @@ -113,7 +113,7 @@ struct smp_operations {
2149 int (*cpu_disable)(unsigned int cpu);
2150 #endif
2151 #endif
2152 -};
2153 +} __no_const;
2154
2155 struct of_cpu_method {
2156 const char *method;
2157 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2158 index f989d7c..e8aa7f0 100644
2159 --- a/arch/arm/include/asm/thread_info.h
2160 +++ b/arch/arm/include/asm/thread_info.h
2161 @@ -88,9 +88,9 @@ struct thread_info {
2162 .flags = 0, \
2163 .preempt_count = INIT_PREEMPT_COUNT, \
2164 .addr_limit = KERNEL_DS, \
2165 - .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2166 - domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2167 - domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2168 + .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2169 + domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2170 + domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2171 .restart_block = { \
2172 .fn = do_no_restart_syscall, \
2173 }, \
2174 @@ -158,7 +158,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2175 #define TIF_SYSCALL_AUDIT 9
2176 #define TIF_SYSCALL_TRACEPOINT 10
2177 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2178 -#define TIF_NOHZ 12 /* in adaptive nohz mode */
2179 +/* within 8 bits of TIF_SYSCALL_TRACE
2180 + * to meet flexible second operand requirements
2181 + */
2182 +#define TIF_GRSEC_SETXID 12
2183 +#define TIF_NOHZ 13 /* in adaptive nohz mode */
2184 #define TIF_USING_IWMMXT 17
2185 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2186 #define TIF_RESTORE_SIGMASK 20
2187 @@ -172,10 +176,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2188 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2189 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2190 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2191 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2192
2193 /* Checks for any syscall work in entry-common.S */
2194 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2195 - _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2196 + _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2197
2198 /*
2199 * Change these and you break ASM code in entry-common.S
2200 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2201 index 75d9579..b5b40e4 100644
2202 --- a/arch/arm/include/asm/uaccess.h
2203 +++ b/arch/arm/include/asm/uaccess.h
2204 @@ -18,6 +18,7 @@
2205 #include <asm/domain.h>
2206 #include <asm/unified.h>
2207 #include <asm/compiler.h>
2208 +#include <asm/pgtable.h>
2209
2210 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2211 #include <asm-generic/uaccess-unaligned.h>
2212 @@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2213 static inline void set_fs(mm_segment_t fs)
2214 {
2215 current_thread_info()->addr_limit = fs;
2216 - modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2217 + modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2218 }
2219
2220 #define segment_eq(a,b) ((a) == (b))
2221
2222 +#define __HAVE_ARCH_PAX_OPEN_USERLAND
2223 +#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2224 +
2225 +static inline void pax_open_userland(void)
2226 +{
2227 +
2228 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2229 + if (segment_eq(get_fs(), USER_DS)) {
2230 + BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2231 + modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2232 + }
2233 +#endif
2234 +
2235 +}
2236 +
2237 +static inline void pax_close_userland(void)
2238 +{
2239 +
2240 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2241 + if (segment_eq(get_fs(), USER_DS)) {
2242 + BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2243 + modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2244 + }
2245 +#endif
2246 +
2247 +}
2248 +
2249 #define __addr_ok(addr) ({ \
2250 unsigned long flag; \
2251 __asm__("cmp %2, %0; movlo %0, #0" \
2252 @@ -150,8 +178,12 @@ extern int __get_user_4(void *);
2253
2254 #define get_user(x,p) \
2255 ({ \
2256 + int __e; \
2257 might_fault(); \
2258 - __get_user_check(x,p); \
2259 + pax_open_userland(); \
2260 + __e = __get_user_check(x,p); \
2261 + pax_close_userland(); \
2262 + __e; \
2263 })
2264
2265 extern int __put_user_1(void *, unsigned int);
2266 @@ -196,8 +228,12 @@ extern int __put_user_8(void *, unsigned long long);
2267
2268 #define put_user(x,p) \
2269 ({ \
2270 + int __e; \
2271 might_fault(); \
2272 - __put_user_check(x,p); \
2273 + pax_open_userland(); \
2274 + __e = __put_user_check(x,p); \
2275 + pax_close_userland(); \
2276 + __e; \
2277 })
2278
2279 #else /* CONFIG_MMU */
2280 @@ -221,6 +257,7 @@ static inline void set_fs(mm_segment_t fs)
2281
2282 #endif /* CONFIG_MMU */
2283
2284 +#define access_ok_noprefault(type,addr,size) access_ok((type),(addr),(size))
2285 #define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
2286
2287 #define user_addr_max() \
2288 @@ -238,13 +275,17 @@ static inline void set_fs(mm_segment_t fs)
2289 #define __get_user(x,ptr) \
2290 ({ \
2291 long __gu_err = 0; \
2292 + pax_open_userland(); \
2293 __get_user_err((x),(ptr),__gu_err); \
2294 + pax_close_userland(); \
2295 __gu_err; \
2296 })
2297
2298 #define __get_user_error(x,ptr,err) \
2299 ({ \
2300 + pax_open_userland(); \
2301 __get_user_err((x),(ptr),err); \
2302 + pax_close_userland(); \
2303 (void) 0; \
2304 })
2305
2306 @@ -320,13 +361,17 @@ do { \
2307 #define __put_user(x,ptr) \
2308 ({ \
2309 long __pu_err = 0; \
2310 + pax_open_userland(); \
2311 __put_user_err((x),(ptr),__pu_err); \
2312 + pax_close_userland(); \
2313 __pu_err; \
2314 })
2315
2316 #define __put_user_error(x,ptr,err) \
2317 ({ \
2318 + pax_open_userland(); \
2319 __put_user_err((x),(ptr),err); \
2320 + pax_close_userland(); \
2321 (void) 0; \
2322 })
2323
2324 @@ -426,11 +471,44 @@ do { \
2325
2326
2327 #ifdef CONFIG_MMU
2328 -extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2329 -extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2330 +extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2331 +extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2332 +
2333 +static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2334 +{
2335 + unsigned long ret;
2336 +
2337 + check_object_size(to, n, false);
2338 + pax_open_userland();
2339 + ret = ___copy_from_user(to, from, n);
2340 + pax_close_userland();
2341 + return ret;
2342 +}
2343 +
2344 +static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2345 +{
2346 + unsigned long ret;
2347 +
2348 + check_object_size(from, n, true);
2349 + pax_open_userland();
2350 + ret = ___copy_to_user(to, from, n);
2351 + pax_close_userland();
2352 + return ret;
2353 +}
2354 +
2355 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2356 -extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2357 +extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2358 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2359 +
2360 +static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2361 +{
2362 + unsigned long ret;
2363 + pax_open_userland();
2364 + ret = ___clear_user(addr, n);
2365 + pax_close_userland();
2366 + return ret;
2367 +}
2368 +
2369 #else
2370 #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
2371 #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
2372 @@ -439,6 +517,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2373
2374 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2375 {
2376 + if ((long)n < 0)
2377 + return n;
2378 +
2379 if (access_ok(VERIFY_READ, from, n))
2380 n = __copy_from_user(to, from, n);
2381 else /* security hole - plug it */
2382 @@ -448,6 +529,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2383
2384 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2385 {
2386 + if ((long)n < 0)
2387 + return n;
2388 +
2389 if (access_ok(VERIFY_WRITE, to, n))
2390 n = __copy_to_user(to, from, n);
2391 return n;
2392 diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2393 index 5af0ed1..cea83883 100644
2394 --- a/arch/arm/include/uapi/asm/ptrace.h
2395 +++ b/arch/arm/include/uapi/asm/ptrace.h
2396 @@ -92,7 +92,7 @@
2397 * ARMv7 groups of PSR bits
2398 */
2399 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2400 -#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2401 +#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2402 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2403 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2404
2405 diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2406 index f7b450f..f5364c5 100644
2407 --- a/arch/arm/kernel/armksyms.c
2408 +++ b/arch/arm/kernel/armksyms.c
2409 @@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2410
2411 /* networking */
2412 EXPORT_SYMBOL(csum_partial);
2413 -EXPORT_SYMBOL(csum_partial_copy_from_user);
2414 +EXPORT_SYMBOL(__csum_partial_copy_from_user);
2415 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2416 EXPORT_SYMBOL(__csum_ipv6_magic);
2417
2418 @@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2419 #ifdef CONFIG_MMU
2420 EXPORT_SYMBOL(copy_page);
2421
2422 -EXPORT_SYMBOL(__copy_from_user);
2423 -EXPORT_SYMBOL(__copy_to_user);
2424 -EXPORT_SYMBOL(__clear_user);
2425 +EXPORT_SYMBOL(___copy_from_user);
2426 +EXPORT_SYMBOL(___copy_to_user);
2427 +EXPORT_SYMBOL(___clear_user);
2428
2429 EXPORT_SYMBOL(__get_user_1);
2430 EXPORT_SYMBOL(__get_user_2);
2431 diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2432 index 1879e8d..b2207fc 100644
2433 --- a/arch/arm/kernel/entry-armv.S
2434 +++ b/arch/arm/kernel/entry-armv.S
2435 @@ -47,6 +47,87 @@
2436 9997:
2437 .endm
2438
2439 + .macro pax_enter_kernel
2440 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2441 + @ make aligned space for saved DACR
2442 + sub sp, sp, #8
2443 + @ save regs
2444 + stmdb sp!, {r1, r2}
2445 + @ read DACR from cpu_domain into r1
2446 + mov r2, sp
2447 + @ assume 8K pages, since we have to split the immediate in two
2448 + bic r2, r2, #(0x1fc0)
2449 + bic r2, r2, #(0x3f)
2450 + ldr r1, [r2, #TI_CPU_DOMAIN]
2451 + @ store old DACR on stack
2452 + str r1, [sp, #8]
2453 +#ifdef CONFIG_PAX_KERNEXEC
2454 + @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2455 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2456 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2457 +#endif
2458 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2459 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2460 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2461 +#endif
2462 + @ write r1 to current_thread_info()->cpu_domain
2463 + str r1, [r2, #TI_CPU_DOMAIN]
2464 + @ write r1 to DACR
2465 + mcr p15, 0, r1, c3, c0, 0
2466 + @ instruction sync
2467 + instr_sync
2468 + @ restore regs
2469 + ldmia sp!, {r1, r2}
2470 +#endif
2471 + .endm
2472 +
2473 + .macro pax_open_userland
2474 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2475 + @ save regs
2476 + stmdb sp!, {r0, r1}
2477 + @ read DACR from cpu_domain into r1
2478 + mov r0, sp
2479 + @ assume 8K pages, since we have to split the immediate in two
2480 + bic r0, r0, #(0x1fc0)
2481 + bic r0, r0, #(0x3f)
2482 + ldr r1, [r0, #TI_CPU_DOMAIN]
2483 + @ set current DOMAIN_USER to DOMAIN_CLIENT
2484 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2485 + orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2486 + @ write r1 to current_thread_info()->cpu_domain
2487 + str r1, [r0, #TI_CPU_DOMAIN]
2488 + @ write r1 to DACR
2489 + mcr p15, 0, r1, c3, c0, 0
2490 + @ instruction sync
2491 + instr_sync
2492 + @ restore regs
2493 + ldmia sp!, {r0, r1}
2494 +#endif
2495 + .endm
2496 +
2497 + .macro pax_close_userland
2498 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2499 + @ save regs
2500 + stmdb sp!, {r0, r1}
2501 + @ read DACR from cpu_domain into r1
2502 + mov r0, sp
2503 + @ assume 8K pages, since we have to split the immediate in two
2504 + bic r0, r0, #(0x1fc0)
2505 + bic r0, r0, #(0x3f)
2506 + ldr r1, [r0, #TI_CPU_DOMAIN]
2507 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2508 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2509 + @ write r1 to current_thread_info()->cpu_domain
2510 + str r1, [r0, #TI_CPU_DOMAIN]
2511 + @ write r1 to DACR
2512 + mcr p15, 0, r1, c3, c0, 0
2513 + @ instruction sync
2514 + instr_sync
2515 + @ restore regs
2516 + ldmia sp!, {r0, r1}
2517 +#endif
2518 + .endm
2519 +
2520 .macro pabt_helper
2521 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2522 #ifdef MULTI_PABORT
2523 @@ -89,11 +170,15 @@
2524 * Invalid mode handlers
2525 */
2526 .macro inv_entry, reason
2527 +
2528 + pax_enter_kernel
2529 +
2530 sub sp, sp, #S_FRAME_SIZE
2531 ARM( stmib sp, {r1 - lr} )
2532 THUMB( stmia sp, {r0 - r12} )
2533 THUMB( str sp, [sp, #S_SP] )
2534 THUMB( str lr, [sp, #S_LR] )
2535 +
2536 mov r1, #\reason
2537 .endm
2538
2539 @@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
2540 .macro svc_entry, stack_hole=0
2541 UNWIND(.fnstart )
2542 UNWIND(.save {r0 - pc} )
2543 +
2544 + pax_enter_kernel
2545 +
2546 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2547 +
2548 #ifdef CONFIG_THUMB2_KERNEL
2549 SPFIX( str r0, [sp] ) @ temporarily saved
2550 SPFIX( mov r0, sp )
2551 @@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
2552 ldmia r0, {r3 - r5}
2553 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2554 mov r6, #-1 @ "" "" "" ""
2555 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2556 + @ offset sp by 8 as done in pax_enter_kernel
2557 + add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2558 +#else
2559 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2560 +#endif
2561 SPFIX( addeq r2, r2, #4 )
2562 str r3, [sp, #-4]! @ save the "real" r0 copied
2563 @ from the exception stack
2564 @@ -317,6 +411,9 @@ ENDPROC(__pabt_svc)
2565 .macro usr_entry
2566 UNWIND(.fnstart )
2567 UNWIND(.cantunwind ) @ don't unwind the user space
2568 +
2569 + pax_enter_kernel_user
2570 +
2571 sub sp, sp, #S_FRAME_SIZE
2572 ARM( stmib sp, {r1 - r12} )
2573 THUMB( stmia sp, {r0 - r12} )
2574 @@ -416,7 +513,9 @@ __und_usr:
2575 tst r3, #PSR_T_BIT @ Thumb mode?
2576 bne __und_usr_thumb
2577 sub r4, r2, #4 @ ARM instr at LR - 4
2578 + pax_open_userland
2579 1: ldrt r0, [r4]
2580 + pax_close_userland
2581 ARM_BE8(rev r0, r0) @ little endian instruction
2582
2583 @ r0 = 32-bit ARM instruction which caused the exception
2584 @@ -450,11 +549,15 @@ __und_usr_thumb:
2585 */
2586 .arch armv6t2
2587 #endif
2588 + pax_open_userland
2589 2: ldrht r5, [r4]
2590 + pax_close_userland
2591 ARM_BE8(rev16 r5, r5) @ little endian instruction
2592 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2593 blo __und_usr_fault_16 @ 16bit undefined instruction
2594 + pax_open_userland
2595 3: ldrht r0, [r2]
2596 + pax_close_userland
2597 ARM_BE8(rev16 r0, r0) @ little endian instruction
2598 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2599 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2600 @@ -484,7 +587,8 @@ ENDPROC(__und_usr)
2601 */
2602 .pushsection .fixup, "ax"
2603 .align 2
2604 -4: mov pc, r9
2605 +4: pax_close_userland
2606 + mov pc, r9
2607 .popsection
2608 .pushsection __ex_table,"a"
2609 .long 1b, 4b
2610 @@ -694,7 +798,7 @@ ENTRY(__switch_to)
2611 THUMB( str lr, [ip], #4 )
2612 ldr r4, [r2, #TI_TP_VALUE]
2613 ldr r5, [r2, #TI_TP_VALUE + 4]
2614 -#ifdef CONFIG_CPU_USE_DOMAINS
2615 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2616 ldr r6, [r2, #TI_CPU_DOMAIN]
2617 #endif
2618 switch_tls r1, r4, r5, r3, r7
2619 @@ -703,7 +807,7 @@ ENTRY(__switch_to)
2620 ldr r8, =__stack_chk_guard
2621 ldr r7, [r7, #TSK_STACK_CANARY]
2622 #endif
2623 -#ifdef CONFIG_CPU_USE_DOMAINS
2624 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2625 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2626 #endif
2627 mov r5, r0
2628 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2629 index a2dcafd..1048b5a 100644
2630 --- a/arch/arm/kernel/entry-common.S
2631 +++ b/arch/arm/kernel/entry-common.S
2632 @@ -10,18 +10,46 @@
2633
2634 #include <asm/unistd.h>
2635 #include <asm/ftrace.h>
2636 +#include <asm/domain.h>
2637 #include <asm/unwind.h>
2638
2639 +#include "entry-header.S"
2640 +
2641 #ifdef CONFIG_NEED_RET_TO_USER
2642 #include <mach/entry-macro.S>
2643 #else
2644 .macro arch_ret_to_user, tmp1, tmp2
2645 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2646 + @ save regs
2647 + stmdb sp!, {r1, r2}
2648 + @ read DACR from cpu_domain into r1
2649 + mov r2, sp
2650 + @ assume 8K pages, since we have to split the immediate in two
2651 + bic r2, r2, #(0x1fc0)
2652 + bic r2, r2, #(0x3f)
2653 + ldr r1, [r2, #TI_CPU_DOMAIN]
2654 +#ifdef CONFIG_PAX_KERNEXEC
2655 + @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2656 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2657 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2658 +#endif
2659 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2660 + @ set current DOMAIN_USER to DOMAIN_UDEREF
2661 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2662 + orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2663 +#endif
2664 + @ write r1 to current_thread_info()->cpu_domain
2665 + str r1, [r2, #TI_CPU_DOMAIN]
2666 + @ write r1 to DACR
2667 + mcr p15, 0, r1, c3, c0, 0
2668 + @ instruction sync
2669 + instr_sync
2670 + @ restore regs
2671 + ldmia sp!, {r1, r2}
2672 +#endif
2673 .endm
2674 #endif
2675
2676 -#include "entry-header.S"
2677 -
2678 -
2679 .align 5
2680 /*
2681 * This is the fast syscall return path. We do as little as
2682 @@ -411,6 +439,12 @@ ENTRY(vector_swi)
2683 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2684 #endif
2685
2686 + /*
2687 + * do this here to avoid a performance hit of wrapping the code above
2688 + * that directly dereferences userland to parse the SWI instruction
2689 + */
2690 + pax_enter_kernel_user
2691 +
2692 adr tbl, sys_call_table @ load syscall table pointer
2693
2694 #if defined(CONFIG_OABI_COMPAT)
2695 diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2696 index efb208d..d34bd02 100644
2697 --- a/arch/arm/kernel/entry-header.S
2698 +++ b/arch/arm/kernel/entry-header.S
2699 @@ -188,6 +188,60 @@
2700 msr cpsr_c, \rtemp @ switch back to the SVC mode
2701 .endm
2702
2703 + .macro pax_enter_kernel_user
2704 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2705 + @ save regs
2706 + stmdb sp!, {r0, r1}
2707 + @ read DACR from cpu_domain into r1
2708 + mov r0, sp
2709 + @ assume 8K pages, since we have to split the immediate in two
2710 + bic r0, r0, #(0x1fc0)
2711 + bic r0, r0, #(0x3f)
2712 + ldr r1, [r0, #TI_CPU_DOMAIN]
2713 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2714 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2715 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2716 +#endif
2717 +#ifdef CONFIG_PAX_KERNEXEC
2718 + @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2719 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2720 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2721 +#endif
2722 + @ write r1 to current_thread_info()->cpu_domain
2723 + str r1, [r0, #TI_CPU_DOMAIN]
2724 + @ write r1 to DACR
2725 + mcr p15, 0, r1, c3, c0, 0
2726 + @ instruction sync
2727 + instr_sync
2728 + @ restore regs
2729 + ldmia sp!, {r0, r1}
2730 +#endif
2731 + .endm
2732 +
2733 + .macro pax_exit_kernel
2734 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2735 + @ save regs
2736 + stmdb sp!, {r0, r1}
2737 + @ read old DACR from stack into r1
2738 + ldr r1, [sp, #(8 + S_SP)]
2739 + sub r1, r1, #8
2740 + ldr r1, [r1]
2741 +
2742 + @ write r1 to current_thread_info()->cpu_domain
2743 + mov r0, sp
2744 + @ assume 8K pages, since we have to split the immediate in two
2745 + bic r0, r0, #(0x1fc0)
2746 + bic r0, r0, #(0x3f)
2747 + str r1, [r0, #TI_CPU_DOMAIN]
2748 + @ write r1 to DACR
2749 + mcr p15, 0, r1, c3, c0, 0
2750 + @ instruction sync
2751 + instr_sync
2752 + @ restore regs
2753 + ldmia sp!, {r0, r1}
2754 +#endif
2755 + .endm
2756 +
2757 #ifndef CONFIG_THUMB2_KERNEL
2758 .macro svc_exit, rpsr, irq = 0
2759 .if \irq != 0
2760 @@ -207,6 +261,9 @@
2761 blne trace_hardirqs_off
2762 #endif
2763 .endif
2764 +
2765 + pax_exit_kernel
2766 +
2767 msr spsr_cxsf, \rpsr
2768 #if defined(CONFIG_CPU_V6)
2769 ldr r0, [sp]
2770 @@ -265,6 +322,9 @@
2771 blne trace_hardirqs_off
2772 #endif
2773 .endif
2774 +
2775 + pax_exit_kernel
2776 +
2777 ldr lr, [sp, #S_SP] @ top of the stack
2778 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2779 clrex @ clear the exclusive monitor
2780 diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2781 index 918875d..cd5fa27 100644
2782 --- a/arch/arm/kernel/fiq.c
2783 +++ b/arch/arm/kernel/fiq.c
2784 @@ -87,7 +87,10 @@ void set_fiq_handler(void *start, unsigned int length)
2785 void *base = vectors_page;
2786 unsigned offset = FIQ_OFFSET;
2787
2788 + pax_open_kernel();
2789 memcpy(base + offset, start, length);
2790 + pax_close_kernel();
2791 +
2792 if (!cache_is_vipt_nonaliasing())
2793 flush_icache_range((unsigned long)base + offset, offset +
2794 length);
2795 diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2796 index 591d6e4..8322a26 100644
2797 --- a/arch/arm/kernel/head.S
2798 +++ b/arch/arm/kernel/head.S
2799 @@ -437,7 +437,7 @@ __enable_mmu:
2800 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2801 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2802 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2803 - domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2804 + domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2805 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2806 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2807 #endif
2808 diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2809 index 45e4781..8eac93d 100644
2810 --- a/arch/arm/kernel/module.c
2811 +++ b/arch/arm/kernel/module.c
2812 @@ -38,12 +38,39 @@
2813 #endif
2814
2815 #ifdef CONFIG_MMU
2816 -void *module_alloc(unsigned long size)
2817 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2818 {
2819 + if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2820 + return NULL;
2821 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2822 - GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE,
2823 + GFP_KERNEL, prot, NUMA_NO_NODE,
2824 __builtin_return_address(0));
2825 }
2826 +
2827 +void *module_alloc(unsigned long size)
2828 +{
2829 +
2830 +#ifdef CONFIG_PAX_KERNEXEC
2831 + return __module_alloc(size, PAGE_KERNEL);
2832 +#else
2833 + return __module_alloc(size, PAGE_KERNEL_EXEC);
2834 +#endif
2835 +
2836 +}
2837 +
2838 +#ifdef CONFIG_PAX_KERNEXEC
2839 +void module_free_exec(struct module *mod, void *module_region)
2840 +{
2841 + module_free(mod, module_region);
2842 +}
2843 +EXPORT_SYMBOL(module_free_exec);
2844 +
2845 +void *module_alloc_exec(unsigned long size)
2846 +{
2847 + return __module_alloc(size, PAGE_KERNEL_EXEC);
2848 +}
2849 +EXPORT_SYMBOL(module_alloc_exec);
2850 +#endif
2851 #endif
2852
2853 int
2854 diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2855 index 07314af..c46655c 100644
2856 --- a/arch/arm/kernel/patch.c
2857 +++ b/arch/arm/kernel/patch.c
2858 @@ -18,6 +18,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2859 bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
2860 int size;
2861
2862 + pax_open_kernel();
2863 if (thumb2 && __opcode_is_thumb16(insn)) {
2864 *(u16 *)addr = __opcode_to_mem_thumb16(insn);
2865 size = sizeof(u16);
2866 @@ -39,6 +40,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2867 *(u32 *)addr = insn;
2868 size = sizeof(u32);
2869 }
2870 + pax_close_kernel();
2871
2872 flush_icache_range((uintptr_t)(addr),
2873 (uintptr_t)(addr) + size);
2874 diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2875 index 81ef686..f4130b8 100644
2876 --- a/arch/arm/kernel/process.c
2877 +++ b/arch/arm/kernel/process.c
2878 @@ -212,6 +212,7 @@ void machine_power_off(void)
2879
2880 if (pm_power_off)
2881 pm_power_off();
2882 + BUG();
2883 }
2884
2885 /*
2886 @@ -225,7 +226,7 @@ void machine_power_off(void)
2887 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2888 * to use. Implementing such co-ordination would be essentially impossible.
2889 */
2890 -void machine_restart(char *cmd)
2891 +__noreturn void machine_restart(char *cmd)
2892 {
2893 local_irq_disable();
2894 smp_send_stop();
2895 @@ -248,8 +249,8 @@ void __show_regs(struct pt_regs *regs)
2896
2897 show_regs_print_info(KERN_DEFAULT);
2898
2899 - print_symbol("PC is at %s\n", instruction_pointer(regs));
2900 - print_symbol("LR is at %s\n", regs->ARM_lr);
2901 + printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2902 + printk("LR is at %pA\n", (void *)regs->ARM_lr);
2903 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2904 "sp : %08lx ip : %08lx fp : %08lx\n",
2905 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2906 @@ -425,12 +426,6 @@ unsigned long get_wchan(struct task_struct *p)
2907 return 0;
2908 }
2909
2910 -unsigned long arch_randomize_brk(struct mm_struct *mm)
2911 -{
2912 - unsigned long range_end = mm->brk + 0x02000000;
2913 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2914 -}
2915 -
2916 #ifdef CONFIG_MMU
2917 #ifdef CONFIG_KUSER_HELPERS
2918 /*
2919 @@ -446,7 +441,7 @@ static struct vm_area_struct gate_vma = {
2920
2921 static int __init gate_vma_init(void)
2922 {
2923 - gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2924 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2925 return 0;
2926 }
2927 arch_initcall(gate_vma_init);
2928 @@ -472,41 +467,16 @@ int in_gate_area_no_mm(unsigned long addr)
2929
2930 const char *arch_vma_name(struct vm_area_struct *vma)
2931 {
2932 - return is_gate_vma(vma) ? "[vectors]" :
2933 - (vma->vm_mm && vma->vm_start == vma->vm_mm->context.sigpage) ?
2934 - "[sigpage]" : NULL;
2935 + return is_gate_vma(vma) ? "[vectors]" : NULL;
2936 }
2937
2938 -static struct page *signal_page;
2939 -extern struct page *get_signal_page(void);
2940 -
2941 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2942 {
2943 struct mm_struct *mm = current->mm;
2944 - unsigned long addr;
2945 - int ret;
2946 -
2947 - if (!signal_page)
2948 - signal_page = get_signal_page();
2949 - if (!signal_page)
2950 - return -ENOMEM;
2951
2952 down_write(&mm->mmap_sem);
2953 - addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
2954 - if (IS_ERR_VALUE(addr)) {
2955 - ret = addr;
2956 - goto up_fail;
2957 - }
2958 -
2959 - ret = install_special_mapping(mm, addr, PAGE_SIZE,
2960 - VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2961 - &signal_page);
2962 -
2963 - if (ret == 0)
2964 - mm->context.sigpage = addr;
2965 -
2966 - up_fail:
2967 + mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
2968 up_write(&mm->mmap_sem);
2969 - return ret;
2970 + return 0;
2971 }
2972 #endif
2973 diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
2974 index 4693188..4596c5e 100644
2975 --- a/arch/arm/kernel/psci.c
2976 +++ b/arch/arm/kernel/psci.c
2977 @@ -24,7 +24,7 @@
2978 #include <asm/opcodes-virt.h>
2979 #include <asm/psci.h>
2980
2981 -struct psci_operations psci_ops;
2982 +struct psci_operations psci_ops __read_only;
2983
2984 static int (*invoke_psci_fn)(u32, u32, u32, u32);
2985
2986 diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
2987 index 0dd3b79..b67388e 100644
2988 --- a/arch/arm/kernel/ptrace.c
2989 +++ b/arch/arm/kernel/ptrace.c
2990 @@ -908,7 +908,7 @@ enum ptrace_syscall_dir {
2991 PTRACE_SYSCALL_EXIT,
2992 };
2993
2994 -static int tracehook_report_syscall(struct pt_regs *regs,
2995 +static void tracehook_report_syscall(struct pt_regs *regs,
2996 enum ptrace_syscall_dir dir)
2997 {
2998 unsigned long ip;
2999 @@ -926,19 +926,29 @@ static int tracehook_report_syscall(struct pt_regs *regs,
3000 current_thread_info()->syscall = -1;
3001
3002 regs->ARM_ip = ip;
3003 - return current_thread_info()->syscall;
3004 }
3005
3006 +#ifdef CONFIG_GRKERNSEC_SETXID
3007 +extern void gr_delayed_cred_worker(void);
3008 +#endif
3009 +
3010 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3011 {
3012 current_thread_info()->syscall = scno;
3013
3014 +#ifdef CONFIG_GRKERNSEC_SETXID
3015 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3016 + gr_delayed_cred_worker();
3017 +#endif
3018 +
3019 /* Do the secure computing check first; failures should be fast. */
3020 if (secure_computing(scno) == -1)
3021 return -1;
3022
3023 if (test_thread_flag(TIF_SYSCALL_TRACE))
3024 - scno = tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);
3025 + tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);
3026 +
3027 + scno = current_thread_info()->syscall;
3028
3029 if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
3030 trace_sys_enter(regs, scno);
3031 diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3032 index 50e198c..a8b5f49 100644
3033 --- a/arch/arm/kernel/setup.c
3034 +++ b/arch/arm/kernel/setup.c
3035 @@ -103,21 +103,23 @@ EXPORT_SYMBOL(elf_hwcap);
3036 unsigned int elf_hwcap2 __read_mostly;
3037 EXPORT_SYMBOL(elf_hwcap2);
3038
3039 +pteval_t __supported_pte_mask __read_only;
3040 +pmdval_t __supported_pmd_mask __read_only;
3041
3042 #ifdef MULTI_CPU
3043 -struct processor processor __read_mostly;
3044 +struct processor processor __read_only;
3045 #endif
3046 #ifdef MULTI_TLB
3047 -struct cpu_tlb_fns cpu_tlb __read_mostly;
3048 +struct cpu_tlb_fns cpu_tlb __read_only;
3049 #endif
3050 #ifdef MULTI_USER
3051 -struct cpu_user_fns cpu_user __read_mostly;
3052 +struct cpu_user_fns cpu_user __read_only;
3053 #endif
3054 #ifdef MULTI_CACHE
3055 -struct cpu_cache_fns cpu_cache __read_mostly;
3056 +struct cpu_cache_fns cpu_cache __read_only;
3057 #endif
3058 #ifdef CONFIG_OUTER_CACHE
3059 -struct outer_cache_fns outer_cache __read_mostly;
3060 +struct outer_cache_fns outer_cache __read_only;
3061 EXPORT_SYMBOL(outer_cache);
3062 #endif
3063
3064 @@ -250,9 +252,13 @@ static int __get_cpu_architecture(void)
3065 asm("mrc p15, 0, %0, c0, c1, 4"
3066 : "=r" (mmfr0));
3067 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3068 - (mmfr0 & 0x000000f0) >= 0x00000030)
3069 + (mmfr0 & 0x000000f0) >= 0x00000030) {
3070 cpu_arch = CPU_ARCH_ARMv7;
3071 - else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3072 + if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3073 + __supported_pte_mask |= L_PTE_PXN;
3074 + __supported_pmd_mask |= PMD_PXNTABLE;
3075 + }
3076 + } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3077 (mmfr0 & 0x000000f0) == 0x00000020)
3078 cpu_arch = CPU_ARCH_ARMv6;
3079 else
3080 diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3081 index bd19834..e4d8c66 100644
3082 --- a/arch/arm/kernel/signal.c
3083 +++ b/arch/arm/kernel/signal.c
3084 @@ -24,8 +24,6 @@
3085
3086 extern const unsigned long sigreturn_codes[7];
3087
3088 -static unsigned long signal_return_offset;
3089 -
3090 #ifdef CONFIG_CRUNCH
3091 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3092 {
3093 @@ -396,8 +394,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3094 * except when the MPU has protected the vectors
3095 * page from PL0
3096 */
3097 - retcode = mm->context.sigpage + signal_return_offset +
3098 - (idx << 2) + thumb;
3099 + retcode = mm->context.sigpage + (idx << 2) + thumb;
3100 } else
3101 #endif
3102 {
3103 @@ -604,33 +601,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3104 } while (thread_flags & _TIF_WORK_MASK);
3105 return 0;
3106 }
3107 -
3108 -struct page *get_signal_page(void)
3109 -{
3110 - unsigned long ptr;
3111 - unsigned offset;
3112 - struct page *page;
3113 - void *addr;
3114 -
3115 - page = alloc_pages(GFP_KERNEL, 0);
3116 -
3117 - if (!page)
3118 - return NULL;
3119 -
3120 - addr = page_address(page);
3121 -
3122 - /* Give the signal return code some randomness */
3123 - offset = 0x200 + (get_random_int() & 0x7fc);
3124 - signal_return_offset = offset;
3125 -
3126 - /*
3127 - * Copy signal return handlers into the vector page, and
3128 - * set sigreturn to be a pointer to these.
3129 - */
3130 - memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3131 -
3132 - ptr = (unsigned long)addr + offset;
3133 - flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3134 -
3135 - return page;
3136 -}
3137 diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3138 index 7c4fada..8581286 100644
3139 --- a/arch/arm/kernel/smp.c
3140 +++ b/arch/arm/kernel/smp.c
3141 @@ -73,7 +73,7 @@ enum ipi_msg_type {
3142
3143 static DECLARE_COMPLETION(cpu_running);
3144
3145 -static struct smp_operations smp_ops;
3146 +static struct smp_operations smp_ops __read_only;
3147
3148 void __init smp_set_ops(struct smp_operations *ops)
3149 {
3150 diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3151 index 7a3be1d..b00c7de 100644
3152 --- a/arch/arm/kernel/tcm.c
3153 +++ b/arch/arm/kernel/tcm.c
3154 @@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3155 .virtual = ITCM_OFFSET,
3156 .pfn = __phys_to_pfn(ITCM_OFFSET),
3157 .length = 0,
3158 - .type = MT_MEMORY_RWX_ITCM,
3159 + .type = MT_MEMORY_RX_ITCM,
3160 }
3161 };
3162
3163 @@ -267,7 +267,9 @@ no_dtcm:
3164 start = &__sitcm_text;
3165 end = &__eitcm_text;
3166 ram = &__itcm_start;
3167 + pax_open_kernel();
3168 memcpy(start, ram, itcm_code_sz);
3169 + pax_close_kernel();
3170 pr_debug("CPU ITCM: copied code from %p - %p\n",
3171 start, end);
3172 itcm_present = true;
3173 diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3174 index abd2fc0..895dbb6 100644
3175 --- a/arch/arm/kernel/traps.c
3176 +++ b/arch/arm/kernel/traps.c
3177 @@ -62,7 +62,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3178 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3179 {
3180 #ifdef CONFIG_KALLSYMS
3181 - printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3182 + printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3183 #else
3184 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3185 #endif
3186 @@ -264,6 +264,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3187 static int die_owner = -1;
3188 static unsigned int die_nest_count;
3189
3190 +extern void gr_handle_kernel_exploit(void);
3191 +
3192 static unsigned long oops_begin(void)
3193 {
3194 int cpu;
3195 @@ -306,6 +308,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3196 panic("Fatal exception in interrupt");
3197 if (panic_on_oops)
3198 panic("Fatal exception");
3199 +
3200 + gr_handle_kernel_exploit();
3201 +
3202 if (signr)
3203 do_exit(signr);
3204 }
3205 @@ -643,7 +648,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
3206 * The user helper at 0xffff0fe0 must be used instead.
3207 * (see entry-armv.S for details)
3208 */
3209 + pax_open_kernel();
3210 *((unsigned int *)0xffff0ff0) = regs->ARM_r0;
3211 + pax_close_kernel();
3212 }
3213 return 0;
3214
3215 @@ -900,7 +907,11 @@ void __init early_trap_init(void *vectors_base)
3216 kuser_init(vectors_base);
3217
3218 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3219 - modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3220 +
3221 +#ifndef CONFIG_PAX_MEMORY_UDEREF
3222 + modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3223 +#endif
3224 +
3225 #else /* ifndef CONFIG_CPU_V7M */
3226 /*
3227 * on V7-M there is no need to copy the vector table to a dedicated
3228 diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3229 index 7bcee5c..e2f3249 100644
3230 --- a/arch/arm/kernel/vmlinux.lds.S
3231 +++ b/arch/arm/kernel/vmlinux.lds.S
3232 @@ -8,7 +8,11 @@
3233 #include <asm/thread_info.h>
3234 #include <asm/memory.h>
3235 #include <asm/page.h>
3236 -
3237 +
3238 +#ifdef CONFIG_PAX_KERNEXEC
3239 +#include <asm/pgtable.h>
3240 +#endif
3241 +
3242 #define PROC_INFO \
3243 . = ALIGN(4); \
3244 VMLINUX_SYMBOL(__proc_info_begin) = .; \
3245 @@ -34,7 +38,7 @@
3246 #endif
3247
3248 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3249 - defined(CONFIG_GENERIC_BUG)
3250 + defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3251 #define ARM_EXIT_KEEP(x) x
3252 #define ARM_EXIT_DISCARD(x)
3253 #else
3254 @@ -90,6 +94,11 @@ SECTIONS
3255 _text = .;
3256 HEAD_TEXT
3257 }
3258 +
3259 +#ifdef CONFIG_PAX_KERNEXEC
3260 + . = ALIGN(1<<SECTION_SHIFT);
3261 +#endif
3262 +
3263 .text : { /* Real text segment */
3264 _stext = .; /* Text and read-only data */
3265 __exception_text_start = .;
3266 @@ -112,6 +121,8 @@ SECTIONS
3267 ARM_CPU_KEEP(PROC_INFO)
3268 }
3269
3270 + _etext = .; /* End of text section */
3271 +
3272 RO_DATA(PAGE_SIZE)
3273
3274 . = ALIGN(4);
3275 @@ -142,7 +153,9 @@ SECTIONS
3276
3277 NOTES
3278
3279 - _etext = .; /* End of text and rodata section */
3280 +#ifdef CONFIG_PAX_KERNEXEC
3281 + . = ALIGN(1<<SECTION_SHIFT);
3282 +#endif
3283
3284 #ifndef CONFIG_XIP_KERNEL
3285 . = ALIGN(PAGE_SIZE);
3286 @@ -220,6 +233,11 @@ SECTIONS
3287 . = PAGE_OFFSET + TEXT_OFFSET;
3288 #else
3289 __init_end = .;
3290 +
3291 +#ifdef CONFIG_PAX_KERNEXEC
3292 + . = ALIGN(1<<SECTION_SHIFT);
3293 +#endif
3294 +
3295 . = ALIGN(THREAD_SIZE);
3296 __data_loc = .;
3297 #endif
3298 diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3299 index f0e50a0..8d5d36c 100644
3300 --- a/arch/arm/kvm/arm.c
3301 +++ b/arch/arm/kvm/arm.c
3302 @@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3303 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3304
3305 /* The VMID used in the VTTBR */
3306 -static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3307 +static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3308 static u8 kvm_next_vmid;
3309 static DEFINE_SPINLOCK(kvm_vmid_lock);
3310
3311 @@ -408,7 +408,7 @@ void force_vm_exit(const cpumask_t *mask)
3312 */
3313 static bool need_new_vmid_gen(struct kvm *kvm)
3314 {
3315 - return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3316 + return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3317 }
3318
3319 /**
3320 @@ -441,7 +441,7 @@ static void update_vttbr(struct kvm *kvm)
3321
3322 /* First user of a new VMID generation? */
3323 if (unlikely(kvm_next_vmid == 0)) {
3324 - atomic64_inc(&kvm_vmid_gen);
3325 + atomic64_inc_unchecked(&kvm_vmid_gen);
3326 kvm_next_vmid = 1;
3327
3328 /*
3329 @@ -458,7 +458,7 @@ static void update_vttbr(struct kvm *kvm)
3330 kvm_call_hyp(__kvm_flush_vm_context);
3331 }
3332
3333 - kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3334 + kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3335 kvm->arch.vmid = kvm_next_vmid;
3336 kvm_next_vmid++;
3337
3338 diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3339 index 14a0d98..7771a7d 100644
3340 --- a/arch/arm/lib/clear_user.S
3341 +++ b/arch/arm/lib/clear_user.S
3342 @@ -12,14 +12,14 @@
3343
3344 .text
3345
3346 -/* Prototype: int __clear_user(void *addr, size_t sz)
3347 +/* Prototype: int ___clear_user(void *addr, size_t sz)
3348 * Purpose : clear some user memory
3349 * Params : addr - user memory address to clear
3350 * : sz - number of bytes to clear
3351 * Returns : number of bytes NOT cleared
3352 */
3353 ENTRY(__clear_user_std)
3354 -WEAK(__clear_user)
3355 +WEAK(___clear_user)
3356 stmfd sp!, {r1, lr}
3357 mov r2, #0
3358 cmp r1, #4
3359 @@ -44,7 +44,7 @@ WEAK(__clear_user)
3360 USER( strnebt r2, [r0])
3361 mov r0, #0
3362 ldmfd sp!, {r1, pc}
3363 -ENDPROC(__clear_user)
3364 +ENDPROC(___clear_user)
3365 ENDPROC(__clear_user_std)
3366
3367 .pushsection .fixup,"ax"
3368 diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3369 index 66a477a..bee61d3 100644
3370 --- a/arch/arm/lib/copy_from_user.S
3371 +++ b/arch/arm/lib/copy_from_user.S
3372 @@ -16,7 +16,7 @@
3373 /*
3374 * Prototype:
3375 *
3376 - * size_t __copy_from_user(void *to, const void *from, size_t n)
3377 + * size_t ___copy_from_user(void *to, const void *from, size_t n)
3378 *
3379 * Purpose:
3380 *
3381 @@ -84,11 +84,11 @@
3382
3383 .text
3384
3385 -ENTRY(__copy_from_user)
3386 +ENTRY(___copy_from_user)
3387
3388 #include "copy_template.S"
3389
3390 -ENDPROC(__copy_from_user)
3391 +ENDPROC(___copy_from_user)
3392
3393 .pushsection .fixup,"ax"
3394 .align 0
3395 diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3396 index 6ee2f67..d1cce76 100644
3397 --- a/arch/arm/lib/copy_page.S
3398 +++ b/arch/arm/lib/copy_page.S
3399 @@ -10,6 +10,7 @@
3400 * ASM optimised string functions
3401 */
3402 #include <linux/linkage.h>
3403 +#include <linux/const.h>
3404 #include <asm/assembler.h>
3405 #include <asm/asm-offsets.h>
3406 #include <asm/cache.h>
3407 diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3408 index d066df6..df28194 100644
3409 --- a/arch/arm/lib/copy_to_user.S
3410 +++ b/arch/arm/lib/copy_to_user.S
3411 @@ -16,7 +16,7 @@
3412 /*
3413 * Prototype:
3414 *
3415 - * size_t __copy_to_user(void *to, const void *from, size_t n)
3416 + * size_t ___copy_to_user(void *to, const void *from, size_t n)
3417 *
3418 * Purpose:
3419 *
3420 @@ -88,11 +88,11 @@
3421 .text
3422
3423 ENTRY(__copy_to_user_std)
3424 -WEAK(__copy_to_user)
3425 +WEAK(___copy_to_user)
3426
3427 #include "copy_template.S"
3428
3429 -ENDPROC(__copy_to_user)
3430 +ENDPROC(___copy_to_user)
3431 ENDPROC(__copy_to_user_std)
3432
3433 .pushsection .fixup,"ax"
3434 diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3435 index 7d08b43..f7ca7ea 100644
3436 --- a/arch/arm/lib/csumpartialcopyuser.S
3437 +++ b/arch/arm/lib/csumpartialcopyuser.S
3438 @@ -57,8 +57,8 @@
3439 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3440 */
3441
3442 -#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3443 -#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3444 +#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3445 +#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3446
3447 #include "csumpartialcopygeneric.S"
3448
3449 diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3450 index 5306de3..aed6d03 100644
3451 --- a/arch/arm/lib/delay.c
3452 +++ b/arch/arm/lib/delay.c
3453 @@ -28,7 +28,7 @@
3454 /*
3455 * Default to the loop-based delay implementation.
3456 */
3457 -struct arm_delay_ops arm_delay_ops = {
3458 +struct arm_delay_ops arm_delay_ops __read_only = {
3459 .delay = __loop_delay,
3460 .const_udelay = __loop_const_udelay,
3461 .udelay = __loop_udelay,
3462 diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3463 index 3e58d71..029817c 100644
3464 --- a/arch/arm/lib/uaccess_with_memcpy.c
3465 +++ b/arch/arm/lib/uaccess_with_memcpy.c
3466 @@ -136,7 +136,7 @@ out:
3467 }
3468
3469 unsigned long
3470 -__copy_to_user(void __user *to, const void *from, unsigned long n)
3471 +___copy_to_user(void __user *to, const void *from, unsigned long n)
3472 {
3473 /*
3474 * This test is stubbed out of the main function above to keep
3475 @@ -190,7 +190,7 @@ out:
3476 return n;
3477 }
3478
3479 -unsigned long __clear_user(void __user *addr, unsigned long n)
3480 +unsigned long ___clear_user(void __user *addr, unsigned long n)
3481 {
3482 /* See rational for this in __copy_to_user() above. */
3483 if (n < 64)
3484 diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
3485 index f7a07a5..258e1f7 100644
3486 --- a/arch/arm/mach-at91/setup.c
3487 +++ b/arch/arm/mach-at91/setup.c
3488 @@ -81,7 +81,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
3489
3490 desc->pfn = __phys_to_pfn(base);
3491 desc->length = length;
3492 - desc->type = MT_MEMORY_RWX_NONCACHED;
3493 + desc->type = MT_MEMORY_RW_NONCACHED;
3494
3495 pr_info("AT91: sram at 0x%lx of 0x%x mapped at 0x%lx\n",
3496 base, length, desc->virtual);
3497 diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
3498 index 255f33a..507b157 100644
3499 --- a/arch/arm/mach-kirkwood/common.c
3500 +++ b/arch/arm/mach-kirkwood/common.c
3501 @@ -157,7 +157,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw)
3502 clk_gate_ops.disable(hw);
3503 }
3504
3505 -static struct clk_ops clk_gate_fn_ops;
3506 +static int clk_gate_fn_is_enabled(struct clk_hw *hw)
3507 +{
3508 + return clk_gate_ops.is_enabled(hw);
3509 +}
3510 +
3511 +static struct clk_ops clk_gate_fn_ops = {
3512 + .enable = clk_gate_fn_enable,
3513 + .disable = clk_gate_fn_disable,
3514 + .is_enabled = clk_gate_fn_is_enabled,
3515 +};
3516
3517 static struct clk __init *clk_register_gate_fn(struct device *dev,
3518 const char *name,
3519 @@ -191,14 +200,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev,
3520 gate_fn->fn_en = fn_en;
3521 gate_fn->fn_dis = fn_dis;
3522
3523 - /* ops is the gate ops, but with our enable/disable functions */
3524 - if (clk_gate_fn_ops.enable != clk_gate_fn_enable ||
3525 - clk_gate_fn_ops.disable != clk_gate_fn_disable) {
3526 - clk_gate_fn_ops = clk_gate_ops;
3527 - clk_gate_fn_ops.enable = clk_gate_fn_enable;
3528 - clk_gate_fn_ops.disable = clk_gate_fn_disable;
3529 - }
3530 -
3531 clk = clk_register(dev, &gate_fn->gate.hw);
3532
3533 if (IS_ERR(clk))
3534 diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3535 index aead77a..a2253fa 100644
3536 --- a/arch/arm/mach-omap2/board-n8x0.c
3537 +++ b/arch/arm/mach-omap2/board-n8x0.c
3538 @@ -568,7 +568,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3539 }
3540 #endif
3541
3542 -static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3543 +static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3544 .late_init = n8x0_menelaus_late_init,
3545 };
3546
3547 diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
3548 index 9fe8c94..c014a4d 100644
3549 --- a/arch/arm/mach-omap2/gpmc.c
3550 +++ b/arch/arm/mach-omap2/gpmc.c
3551 @@ -148,7 +148,6 @@ struct omap3_gpmc_regs {
3552 };
3553
3554 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
3555 -static struct irq_chip gpmc_irq_chip;
3556 static int gpmc_irq_start;
3557
3558 static struct resource gpmc_mem_root;
3559 @@ -727,6 +726,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
3560
3561 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
3562
3563 +static struct irq_chip gpmc_irq_chip = {
3564 + .name = "gpmc",
3565 + .irq_startup = gpmc_irq_noop_ret,
3566 + .irq_enable = gpmc_irq_enable,
3567 + .irq_disable = gpmc_irq_disable,
3568 + .irq_shutdown = gpmc_irq_noop,
3569 + .irq_ack = gpmc_irq_noop,
3570 + .irq_mask = gpmc_irq_noop,
3571 + .irq_unmask = gpmc_irq_noop,
3572 +
3573 +};
3574 +
3575 static int gpmc_setup_irq(void)
3576 {
3577 int i;
3578 @@ -741,15 +752,6 @@ static int gpmc_setup_irq(void)
3579 return gpmc_irq_start;
3580 }
3581
3582 - gpmc_irq_chip.name = "gpmc";
3583 - gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
3584 - gpmc_irq_chip.irq_enable = gpmc_irq_enable;
3585 - gpmc_irq_chip.irq_disable = gpmc_irq_disable;
3586 - gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
3587 - gpmc_irq_chip.irq_ack = gpmc_irq_noop;
3588 - gpmc_irq_chip.irq_mask = gpmc_irq_noop;
3589 - gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
3590 -
3591 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
3592 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
3593
3594 diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3595 index 667915d..2ee1219 100644
3596 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3597 +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3598 @@ -84,7 +84,7 @@ struct cpu_pm_ops {
3599 int (*finish_suspend)(unsigned long cpu_state);
3600 void (*resume)(void);
3601 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3602 -};
3603 +} __no_const;
3604
3605 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3606 static struct powerdomain *mpuss_pd;
3607 @@ -102,7 +102,7 @@ static void dummy_cpu_resume(void)
3608 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3609 {}
3610
3611 -struct cpu_pm_ops omap_pm_ops = {
3612 +static struct cpu_pm_ops omap_pm_ops __read_only = {
3613 .finish_suspend = default_finish_suspend,
3614 .resume = dummy_cpu_resume,
3615 .scu_prepare = dummy_scu_prepare,
3616 diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3617 index 693fe48..c15ea73 100644
3618 --- a/arch/arm/mach-omap2/omap-wakeupgen.c
3619 +++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3620 @@ -343,7 +343,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3621 return NOTIFY_OK;
3622 }
3623
3624 -static struct notifier_block __refdata irq_hotplug_notifier = {
3625 +static struct notifier_block irq_hotplug_notifier = {
3626 .notifier_call = irq_cpu_hotplug_notify,
3627 };
3628
3629 diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3630 index 01ef59d..32ae28a8 100644
3631 --- a/arch/arm/mach-omap2/omap_device.c
3632 +++ b/arch/arm/mach-omap2/omap_device.c
3633 @@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3634 struct platform_device __init *omap_device_build(const char *pdev_name,
3635 int pdev_id,
3636 struct omap_hwmod *oh,
3637 - void *pdata, int pdata_len)
3638 + const void *pdata, int pdata_len)
3639 {
3640 struct omap_hwmod *ohs[] = { oh };
3641
3642 @@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3643 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3644 int pdev_id,
3645 struct omap_hwmod **ohs,
3646 - int oh_cnt, void *pdata,
3647 + int oh_cnt, const void *pdata,
3648 int pdata_len)
3649 {
3650 int ret = -ENOMEM;
3651 diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3652 index 78c02b3..c94109a 100644
3653 --- a/arch/arm/mach-omap2/omap_device.h
3654 +++ b/arch/arm/mach-omap2/omap_device.h
3655 @@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3656 /* Core code interface */
3657
3658 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3659 - struct omap_hwmod *oh, void *pdata,
3660 + struct omap_hwmod *oh, const void *pdata,
3661 int pdata_len);
3662
3663 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3664 struct omap_hwmod **oh, int oh_cnt,
3665 - void *pdata, int pdata_len);
3666 + const void *pdata, int pdata_len);
3667
3668 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3669 struct omap_hwmod **ohs, int oh_cnt);
3670 diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3671 index 66c60fe..c78950d 100644
3672 --- a/arch/arm/mach-omap2/omap_hwmod.c
3673 +++ b/arch/arm/mach-omap2/omap_hwmod.c
3674 @@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
3675 int (*init_clkdm)(struct omap_hwmod *oh);
3676 void (*update_context_lost)(struct omap_hwmod *oh);
3677 int (*get_context_lost)(struct omap_hwmod *oh);
3678 -};
3679 +} __no_const;
3680
3681 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3682 -static struct omap_hwmod_soc_ops soc_ops;
3683 +static struct omap_hwmod_soc_ops soc_ops __read_only;
3684
3685 /* omap_hwmod_list contains all registered struct omap_hwmods */
3686 static LIST_HEAD(omap_hwmod_list);
3687 diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3688 index 95fee54..cfa9cf1 100644
3689 --- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3690 +++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3691 @@ -10,6 +10,7 @@
3692
3693 #include <linux/kernel.h>
3694 #include <linux/init.h>
3695 +#include <asm/pgtable.h>
3696
3697 #include "powerdomain.h"
3698
3699 @@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3700
3701 void __init am43xx_powerdomains_init(void)
3702 {
3703 - omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3704 + pax_open_kernel();
3705 + *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3706 + pax_close_kernel();
3707 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3708 pwrdm_register_pwrdms(powerdomains_am43xx);
3709 pwrdm_complete_init();
3710 diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3711 index d15c7bb..b2d1f0c 100644
3712 --- a/arch/arm/mach-omap2/wd_timer.c
3713 +++ b/arch/arm/mach-omap2/wd_timer.c
3714 @@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3715 struct omap_hwmod *oh;
3716 char *oh_name = "wd_timer2";
3717 char *dev_name = "omap_wdt";
3718 - struct omap_wd_timer_platform_data pdata;
3719 + static struct omap_wd_timer_platform_data pdata = {
3720 + .read_reset_sources = prm_read_reset_sources
3721 + };
3722
3723 if (!cpu_class_is_omap2() || of_have_populated_dt())
3724 return 0;
3725 @@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3726 return -EINVAL;
3727 }
3728
3729 - pdata.read_reset_sources = prm_read_reset_sources;
3730 -
3731 pdev = omap_device_build(dev_name, id, oh, &pdata,
3732 sizeof(struct omap_wd_timer_platform_data));
3733 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3734 diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3735 index b82dcae..44ee5b6 100644
3736 --- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3737 +++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3738 @@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3739 bool entered_lp2 = false;
3740
3741 if (tegra_pending_sgi())
3742 - ACCESS_ONCE(abort_flag) = true;
3743 + ACCESS_ONCE_RW(abort_flag) = true;
3744
3745 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3746
3747 diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3748 index 2dea8b5..6499da2 100644
3749 --- a/arch/arm/mach-ux500/setup.h
3750 +++ b/arch/arm/mach-ux500/setup.h
3751 @@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3752 .type = MT_DEVICE, \
3753 }
3754
3755 -#define __MEM_DEV_DESC(x, sz) { \
3756 - .virtual = IO_ADDRESS(x), \
3757 - .pfn = __phys_to_pfn(x), \
3758 - .length = sz, \
3759 - .type = MT_MEMORY_RWX, \
3760 -}
3761 -
3762 extern struct smp_operations ux500_smp_ops;
3763 extern void ux500_cpu_die(unsigned int cpu);
3764
3765 diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3766 index 5bf7c3c..571e67e 100644
3767 --- a/arch/arm/mm/Kconfig
3768 +++ b/arch/arm/mm/Kconfig
3769 @@ -446,6 +446,7 @@ config CPU_32v5
3770
3771 config CPU_32v6
3772 bool
3773 + select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3774 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3775
3776 config CPU_32v6K
3777 @@ -600,6 +601,7 @@ config CPU_CP15_MPU
3778
3779 config CPU_USE_DOMAINS
3780 bool
3781 + depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3782 help
3783 This option enables or disables the use of domain switching
3784 via the set_fs() function.
3785 @@ -799,6 +801,7 @@ config NEED_KUSER_HELPERS
3786 config KUSER_HELPERS
3787 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3788 default y
3789 + depends on !(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND
3790 help
3791 Warning: disabling this option may break user programs.
3792
3793 @@ -811,7 +814,7 @@ config KUSER_HELPERS
3794 See Documentation/arm/kernel_user_helpers.txt for details.
3795
3796 However, the fixed address nature of these helpers can be used
3797 - by ROP (return orientated programming) authors when creating
3798 + by ROP (Return Oriented Programming) authors when creating
3799 exploits.
3800
3801 If all of the binaries and libraries which run on your platform
3802 diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3803 index 9240364..a2b8cf3 100644
3804 --- a/arch/arm/mm/alignment.c
3805 +++ b/arch/arm/mm/alignment.c
3806 @@ -212,10 +212,12 @@ union offset_union {
3807 #define __get16_unaligned_check(ins,val,addr) \
3808 do { \
3809 unsigned int err = 0, v, a = addr; \
3810 + pax_open_userland(); \
3811 __get8_unaligned_check(ins,v,a,err); \
3812 val = v << ((BE) ? 8 : 0); \
3813 __get8_unaligned_check(ins,v,a,err); \
3814 val |= v << ((BE) ? 0 : 8); \
3815 + pax_close_userland(); \
3816 if (err) \
3817 goto fault; \
3818 } while (0)
3819 @@ -229,6 +231,7 @@ union offset_union {
3820 #define __get32_unaligned_check(ins,val,addr) \
3821 do { \
3822 unsigned int err = 0, v, a = addr; \
3823 + pax_open_userland(); \
3824 __get8_unaligned_check(ins,v,a,err); \
3825 val = v << ((BE) ? 24 : 0); \
3826 __get8_unaligned_check(ins,v,a,err); \
3827 @@ -237,6 +240,7 @@ union offset_union {
3828 val |= v << ((BE) ? 8 : 16); \
3829 __get8_unaligned_check(ins,v,a,err); \
3830 val |= v << ((BE) ? 0 : 24); \
3831 + pax_close_userland(); \
3832 if (err) \
3833 goto fault; \
3834 } while (0)
3835 @@ -250,6 +254,7 @@ union offset_union {
3836 #define __put16_unaligned_check(ins,val,addr) \
3837 do { \
3838 unsigned int err = 0, v = val, a = addr; \
3839 + pax_open_userland(); \
3840 __asm__( FIRST_BYTE_16 \
3841 ARM( "1: "ins" %1, [%2], #1\n" ) \
3842 THUMB( "1: "ins" %1, [%2]\n" ) \
3843 @@ -269,6 +274,7 @@ union offset_union {
3844 " .popsection\n" \
3845 : "=r" (err), "=&r" (v), "=&r" (a) \
3846 : "0" (err), "1" (v), "2" (a)); \
3847 + pax_close_userland(); \
3848 if (err) \
3849 goto fault; \
3850 } while (0)
3851 @@ -282,6 +288,7 @@ union offset_union {
3852 #define __put32_unaligned_check(ins,val,addr) \
3853 do { \
3854 unsigned int err = 0, v = val, a = addr; \
3855 + pax_open_userland(); \
3856 __asm__( FIRST_BYTE_32 \
3857 ARM( "1: "ins" %1, [%2], #1\n" ) \
3858 THUMB( "1: "ins" %1, [%2]\n" ) \
3859 @@ -311,6 +318,7 @@ union offset_union {
3860 " .popsection\n" \
3861 : "=r" (err), "=&r" (v), "=&r" (a) \
3862 : "0" (err), "1" (v), "2" (a)); \
3863 + pax_close_userland(); \
3864 if (err) \
3865 goto fault; \
3866 } while (0)
3867 diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3868 index 7abde2c..9df495f 100644
3869 --- a/arch/arm/mm/cache-l2x0.c
3870 +++ b/arch/arm/mm/cache-l2x0.c
3871 @@ -46,7 +46,7 @@ struct l2x0_of_data {
3872 void (*setup)(const struct device_node *, u32 *, u32 *);
3873 void (*save)(void);
3874 struct outer_cache_fns outer_cache;
3875 -};
3876 +} __do_const;
3877
3878 static bool of_init = false;
3879
3880 diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3881 index 6eb97b3..ac509f6 100644
3882 --- a/arch/arm/mm/context.c
3883 +++ b/arch/arm/mm/context.c
3884 @@ -43,7 +43,7 @@
3885 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3886
3887 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3888 -static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3889 +static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3890 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3891
3892 static DEFINE_PER_CPU(atomic64_t, active_asids);
3893 @@ -182,7 +182,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3894 {
3895 static u32 cur_idx = 1;
3896 u64 asid = atomic64_read(&mm->context.id);
3897 - u64 generation = atomic64_read(&asid_generation);
3898 + u64 generation = atomic64_read_unchecked(&asid_generation);
3899
3900 if (asid != 0 && is_reserved_asid(asid)) {
3901 /*
3902 @@ -203,7 +203,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3903 */
3904 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3905 if (asid == NUM_USER_ASIDS) {
3906 - generation = atomic64_add_return(ASID_FIRST_VERSION,
3907 + generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3908 &asid_generation);
3909 flush_context(cpu);
3910 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3911 @@ -234,14 +234,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3912 cpu_set_reserved_ttbr0();
3913
3914 asid = atomic64_read(&mm->context.id);
3915 - if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3916 + if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3917 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3918 goto switch_mm_fastpath;
3919
3920 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3921 /* Check that our ASID belongs to the current generation. */
3922 asid = atomic64_read(&mm->context.id);
3923 - if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3924 + if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3925 asid = new_context(mm, cpu);
3926 atomic64_set(&mm->context.id, asid);
3927 }
3928 diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3929 index eb8830a..5360ce7 100644
3930 --- a/arch/arm/mm/fault.c
3931 +++ b/arch/arm/mm/fault.c
3932 @@ -25,6 +25,7 @@
3933 #include <asm/system_misc.h>
3934 #include <asm/system_info.h>
3935 #include <asm/tlbflush.h>
3936 +#include <asm/sections.h>
3937
3938 #include "fault.h"
3939
3940 @@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3941 if (fixup_exception(regs))
3942 return;
3943
3944 +#ifdef CONFIG_PAX_MEMORY_UDEREF
3945 + if (addr < TASK_SIZE) {
3946 + if (current->signal->curr_ip)
3947 + 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),
3948 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3949 + else
3950 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3951 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3952 + }
3953 +#endif
3954 +
3955 +#ifdef CONFIG_PAX_KERNEXEC
3956 + if ((fsr & FSR_WRITE) &&
3957 + (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3958 + (MODULES_VADDR <= addr && addr < MODULES_END)))
3959 + {
3960 + if (current->signal->curr_ip)
3961 + 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),
3962 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3963 + else
3964 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3965 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3966 + }
3967 +#endif
3968 +
3969 /*
3970 * No handler, we'll have to terminate things with extreme prejudice.
3971 */
3972 @@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3973 }
3974 #endif
3975
3976 +#ifdef CONFIG_PAX_PAGEEXEC
3977 + if (fsr & FSR_LNX_PF) {
3978 + pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3979 + do_group_exit(SIGKILL);
3980 + }
3981 +#endif
3982 +
3983 tsk->thread.address = addr;
3984 tsk->thread.error_code = fsr;
3985 tsk->thread.trap_no = 14;
3986 @@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3987 }
3988 #endif /* CONFIG_MMU */
3989
3990 +#ifdef CONFIG_PAX_PAGEEXEC
3991 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3992 +{
3993 + long i;
3994 +
3995 + printk(KERN_ERR "PAX: bytes at PC: ");
3996 + for (i = 0; i < 20; i++) {
3997 + unsigned char c;
3998 + if (get_user(c, (__force unsigned char __user *)pc+i))
3999 + printk(KERN_CONT "?? ");
4000 + else
4001 + printk(KERN_CONT "%02x ", c);
4002 + }
4003 + printk("\n");
4004 +
4005 + printk(KERN_ERR "PAX: bytes at SP-4: ");
4006 + for (i = -1; i < 20; i++) {
4007 + unsigned long c;
4008 + if (get_user(c, (__force unsigned long __user *)sp+i))
4009 + printk(KERN_CONT "???????? ");
4010 + else
4011 + printk(KERN_CONT "%08lx ", c);
4012 + }
4013 + printk("\n");
4014 +}
4015 +#endif
4016 +
4017 /*
4018 * First Level Translation Fault Handler
4019 *
4020 @@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4021 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
4022 struct siginfo info;
4023
4024 +#ifdef CONFIG_PAX_MEMORY_UDEREF
4025 + if (addr < TASK_SIZE && is_domain_fault(fsr)) {
4026 + if (current->signal->curr_ip)
4027 + 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),
4028 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4029 + else
4030 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4031 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4032 + goto die;
4033 + }
4034 +#endif
4035 +
4036 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4037 return;
4038
4039 +die:
4040 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4041 inf->name, fsr, addr);
4042
4043 @@ -574,15 +647,98 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4044 ifsr_info[nr].name = name;
4045 }
4046
4047 +asmlinkage int sys_sigreturn(struct pt_regs *regs);
4048 +asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4049 +
4050 asmlinkage void __exception
4051 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4052 {
4053 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4054 struct siginfo info;
4055 + unsigned long pc = instruction_pointer(regs);
4056 +
4057 + if (user_mode(regs)) {
4058 + unsigned long sigpage = current->mm->context.sigpage;
4059 +
4060 + if (sigpage <= pc && pc < sigpage + 7*4) {
4061 + if (pc < sigpage + 3*4)
4062 + sys_sigreturn(regs);
4063 + else
4064 + sys_rt_sigreturn(regs);
4065 + return;
4066 + }
4067 + if (pc == 0xffff0f60UL) {
4068 + /*
4069 + * PaX: __kuser_cmpxchg64 emulation
4070 + */
4071 + // TODO
4072 + //regs->ARM_pc = regs->ARM_lr;
4073 + //return;
4074 + }
4075 + if (pc == 0xffff0fa0UL) {
4076 + /*
4077 + * PaX: __kuser_memory_barrier emulation
4078 + */
4079 + // dmb(); implied by the exception
4080 + regs->ARM_pc = regs->ARM_lr;
4081 + return;
4082 + }
4083 + if (pc == 0xffff0fc0UL) {
4084 + /*
4085 + * PaX: __kuser_cmpxchg emulation
4086 + */
4087 + // TODO
4088 + //long new;
4089 + //int op;
4090 +
4091 + //op = FUTEX_OP_SET << 28;
4092 + //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4093 + //regs->ARM_r0 = old != new;
4094 + //regs->ARM_pc = regs->ARM_lr;
4095 + //return;
4096 + }
4097 + if (pc == 0xffff0fe0UL) {
4098 + /*
4099 + * PaX: __kuser_get_tls emulation
4100 + */
4101 + regs->ARM_r0 = current_thread_info()->tp_value[0];
4102 + regs->ARM_pc = regs->ARM_lr;
4103 + return;
4104 + }
4105 + }
4106 +
4107 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4108 + else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4109 + if (current->signal->curr_ip)
4110 + 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),
4111 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4112 + pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4113 + else
4114 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4115 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4116 + pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4117 + goto die;
4118 + }
4119 +#endif
4120 +
4121 +#ifdef CONFIG_PAX_REFCOUNT
4122 + if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4123 + unsigned int bkpt;
4124 +
4125 + if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4126 + current->thread.error_code = ifsr;
4127 + current->thread.trap_no = 0;
4128 + pax_report_refcount_overflow(regs);
4129 + fixup_exception(regs);
4130 + return;
4131 + }
4132 + }
4133 +#endif
4134
4135 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4136 return;
4137
4138 +die:
4139 printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4140 inf->name, ifsr, addr);
4141
4142 diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4143 index cf08bdf..772656c 100644
4144 --- a/arch/arm/mm/fault.h
4145 +++ b/arch/arm/mm/fault.h
4146 @@ -3,6 +3,7 @@
4147
4148 /*
4149 * Fault status register encodings. We steal bit 31 for our own purposes.
4150 + * Set when the FSR value is from an instruction fault.
4151 */
4152 #define FSR_LNX_PF (1 << 31)
4153 #define FSR_WRITE (1 << 11)
4154 @@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4155 }
4156 #endif
4157
4158 +/* valid for LPAE and !LPAE */
4159 +static inline int is_xn_fault(unsigned int fsr)
4160 +{
4161 + return ((fsr_fs(fsr) & 0x3c) == 0xc);
4162 +}
4163 +
4164 +static inline int is_domain_fault(unsigned int fsr)
4165 +{
4166 + return ((fsr_fs(fsr) & 0xD) == 0x9);
4167 +}
4168 +
4169 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4170 unsigned long search_exception_table(unsigned long addr);
4171
4172 diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4173 index 2a77ba8..68e6a7a 100644
4174 --- a/arch/arm/mm/init.c
4175 +++ b/arch/arm/mm/init.c
4176 @@ -30,6 +30,8 @@
4177 #include <asm/setup.h>
4178 #include <asm/tlb.h>
4179 #include <asm/fixmap.h>
4180 +#include <asm/system_info.h>
4181 +#include <asm/cp15.h>
4182
4183 #include <asm/mach/arch.h>
4184 #include <asm/mach/map.h>
4185 @@ -627,7 +629,46 @@ void free_initmem(void)
4186 {
4187 #ifdef CONFIG_HAVE_TCM
4188 extern char __tcm_start, __tcm_end;
4189 +#endif
4190
4191 +#ifdef CONFIG_PAX_KERNEXEC
4192 + unsigned long addr;
4193 + pgd_t *pgd;
4194 + pud_t *pud;
4195 + pmd_t *pmd;
4196 + int cpu_arch = cpu_architecture();
4197 + unsigned int cr = get_cr();
4198 +
4199 + if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4200 + /* make pages tables, etc before .text NX */
4201 + for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4202 + pgd = pgd_offset_k(addr);
4203 + pud = pud_offset(pgd, addr);
4204 + pmd = pmd_offset(pud, addr);
4205 + __section_update(pmd, addr, PMD_SECT_XN);
4206 + }
4207 + /* make init NX */
4208 + for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4209 + pgd = pgd_offset_k(addr);
4210 + pud = pud_offset(pgd, addr);
4211 + pmd = pmd_offset(pud, addr);
4212 + __section_update(pmd, addr, PMD_SECT_XN);
4213 + }
4214 + /* make kernel code/rodata RX */
4215 + for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4216 + pgd = pgd_offset_k(addr);
4217 + pud = pud_offset(pgd, addr);
4218 + pmd = pmd_offset(pud, addr);
4219 +#ifdef CONFIG_ARM_LPAE
4220 + __section_update(pmd, addr, PMD_SECT_RDONLY);
4221 +#else
4222 + __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4223 +#endif
4224 + }
4225 + }
4226 +#endif
4227 +
4228 +#ifdef CONFIG_HAVE_TCM
4229 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4230 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4231 #endif
4232 diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4233 index f9c32ba..8540068 100644
4234 --- a/arch/arm/mm/ioremap.c
4235 +++ b/arch/arm/mm/ioremap.c
4236 @@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4237 unsigned int mtype;
4238
4239 if (cached)
4240 - mtype = MT_MEMORY_RWX;
4241 + mtype = MT_MEMORY_RX;
4242 else
4243 - mtype = MT_MEMORY_RWX_NONCACHED;
4244 + mtype = MT_MEMORY_RX_NONCACHED;
4245
4246 return __arm_ioremap_caller(phys_addr, size, mtype,
4247 __builtin_return_address(0));
4248 diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4249 index 5e85ed3..b10a7ed 100644
4250 --- a/arch/arm/mm/mmap.c
4251 +++ b/arch/arm/mm/mmap.c
4252 @@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4253 struct vm_area_struct *vma;
4254 int do_align = 0;
4255 int aliasing = cache_is_vipt_aliasing();
4256 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4257 struct vm_unmapped_area_info info;
4258
4259 /*
4260 @@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4261 if (len > TASK_SIZE)
4262 return -ENOMEM;
4263
4264 +#ifdef CONFIG_PAX_RANDMMAP
4265 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4266 +#endif
4267 +
4268 if (addr) {
4269 if (do_align)
4270 addr = COLOUR_ALIGN(addr, pgoff);
4271 @@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4272 addr = PAGE_ALIGN(addr);
4273
4274 vma = find_vma(mm, addr);
4275 - if (TASK_SIZE - len >= addr &&
4276 - (!vma || addr + len <= vma->vm_start))
4277 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4278 return addr;
4279 }
4280
4281 @@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4282 info.high_limit = TASK_SIZE;
4283 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4284 info.align_offset = pgoff << PAGE_SHIFT;
4285 + info.threadstack_offset = offset;
4286 return vm_unmapped_area(&info);
4287 }
4288
4289 @@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4290 unsigned long addr = addr0;
4291 int do_align = 0;
4292 int aliasing = cache_is_vipt_aliasing();
4293 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4294 struct vm_unmapped_area_info info;
4295
4296 /*
4297 @@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4298 return addr;
4299 }
4300
4301 +#ifdef CONFIG_PAX_RANDMMAP
4302 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4303 +#endif
4304 +
4305 /* requesting a specific address */
4306 if (addr) {
4307 if (do_align)
4308 @@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4309 else
4310 addr = PAGE_ALIGN(addr);
4311 vma = find_vma(mm, addr);
4312 - if (TASK_SIZE - len >= addr &&
4313 - (!vma || addr + len <= vma->vm_start))
4314 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4315 return addr;
4316 }
4317
4318 @@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4319 info.high_limit = mm->mmap_base;
4320 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4321 info.align_offset = pgoff << PAGE_SHIFT;
4322 + info.threadstack_offset = offset;
4323 addr = vm_unmapped_area(&info);
4324
4325 /*
4326 @@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4327 {
4328 unsigned long random_factor = 0UL;
4329
4330 +#ifdef CONFIG_PAX_RANDMMAP
4331 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4332 +#endif
4333 +
4334 /* 8 bits of randomness in 20 address space bits */
4335 if ((current->flags & PF_RANDOMIZE) &&
4336 !(current->personality & ADDR_NO_RANDOMIZE))
4337 @@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4338
4339 if (mmap_is_legacy()) {
4340 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4341 +
4342 +#ifdef CONFIG_PAX_RANDMMAP
4343 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4344 + mm->mmap_base += mm->delta_mmap;
4345 +#endif
4346 +
4347 mm->get_unmapped_area = arch_get_unmapped_area;
4348 } else {
4349 mm->mmap_base = mmap_base(random_factor);
4350 +
4351 +#ifdef CONFIG_PAX_RANDMMAP
4352 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4353 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4354 +#endif
4355 +
4356 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4357 }
4358 }
4359 diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4360 index b68c6b2..f66c492 100644
4361 --- a/arch/arm/mm/mmu.c
4362 +++ b/arch/arm/mm/mmu.c
4363 @@ -39,6 +39,22 @@
4364 #include "mm.h"
4365 #include "tcm.h"
4366
4367 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4368 +void modify_domain(unsigned int dom, unsigned int type)
4369 +{
4370 + struct thread_info *thread = current_thread_info();
4371 + unsigned int domain = thread->cpu_domain;
4372 + /*
4373 + * DOMAIN_MANAGER might be defined to some other value,
4374 + * use the arch-defined constant
4375 + */
4376 + domain &= ~domain_val(dom, 3);
4377 + thread->cpu_domain = domain | domain_val(dom, type);
4378 + set_domain(thread->cpu_domain);
4379 +}
4380 +EXPORT_SYMBOL(modify_domain);
4381 +#endif
4382 +
4383 /*
4384 * empty_zero_page is a special page that is used for
4385 * zero-initialized data and COW.
4386 @@ -235,7 +251,15 @@ __setup("noalign", noalign_setup);
4387 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4388 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4389
4390 -static struct mem_type mem_types[] = {
4391 +#ifdef CONFIG_PAX_KERNEXEC
4392 +#define L_PTE_KERNEXEC L_PTE_RDONLY
4393 +#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4394 +#else
4395 +#define L_PTE_KERNEXEC L_PTE_DIRTY
4396 +#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4397 +#endif
4398 +
4399 +static struct mem_type mem_types[] __read_only = {
4400 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4401 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4402 L_PTE_SHARED,
4403 @@ -264,19 +288,19 @@ static struct mem_type mem_types[] = {
4404 .prot_sect = PROT_SECT_DEVICE,
4405 .domain = DOMAIN_IO,
4406 },
4407 - [MT_UNCACHED] = {
4408 + [MT_UNCACHED_RW] = {
4409 .prot_pte = PROT_PTE_DEVICE,
4410 .prot_l1 = PMD_TYPE_TABLE,
4411 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4412 .domain = DOMAIN_IO,
4413 },
4414 - [MT_CACHECLEAN] = {
4415 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4416 + [MT_CACHECLEAN_RO] = {
4417 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4418 .domain = DOMAIN_KERNEL,
4419 },
4420 #ifndef CONFIG_ARM_LPAE
4421 - [MT_MINICLEAN] = {
4422 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4423 + [MT_MINICLEAN_RO] = {
4424 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4425 .domain = DOMAIN_KERNEL,
4426 },
4427 #endif
4428 @@ -284,15 +308,15 @@ static struct mem_type mem_types[] = {
4429 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4430 L_PTE_RDONLY,
4431 .prot_l1 = PMD_TYPE_TABLE,
4432 - .domain = DOMAIN_USER,
4433 + .domain = DOMAIN_VECTORS,
4434 },
4435 [MT_HIGH_VECTORS] = {
4436 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4437 L_PTE_USER | L_PTE_RDONLY,
4438 .prot_l1 = PMD_TYPE_TABLE,
4439 - .domain = DOMAIN_USER,
4440 + .domain = DOMAIN_VECTORS,
4441 },
4442 - [MT_MEMORY_RWX] = {
4443 + [__MT_MEMORY_RWX] = {
4444 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4445 .prot_l1 = PMD_TYPE_TABLE,
4446 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4447 @@ -305,17 +329,30 @@ static struct mem_type mem_types[] = {
4448 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4449 .domain = DOMAIN_KERNEL,
4450 },
4451 - [MT_ROM] = {
4452 - .prot_sect = PMD_TYPE_SECT,
4453 + [MT_MEMORY_RX] = {
4454 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4455 + .prot_l1 = PMD_TYPE_TABLE,
4456 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4457 + .domain = DOMAIN_KERNEL,
4458 + },
4459 + [MT_ROM_RX] = {
4460 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4461 .domain = DOMAIN_KERNEL,
4462 },
4463 - [MT_MEMORY_RWX_NONCACHED] = {
4464 + [MT_MEMORY_RW_NONCACHED] = {
4465 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4466 L_PTE_MT_BUFFERABLE,
4467 .prot_l1 = PMD_TYPE_TABLE,
4468 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4469 .domain = DOMAIN_KERNEL,
4470 },
4471 + [MT_MEMORY_RX_NONCACHED] = {
4472 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4473 + L_PTE_MT_BUFFERABLE,
4474 + .prot_l1 = PMD_TYPE_TABLE,
4475 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4476 + .domain = DOMAIN_KERNEL,
4477 + },
4478 [MT_MEMORY_RW_DTCM] = {
4479 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4480 L_PTE_XN,
4481 @@ -323,9 +360,10 @@ static struct mem_type mem_types[] = {
4482 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4483 .domain = DOMAIN_KERNEL,
4484 },
4485 - [MT_MEMORY_RWX_ITCM] = {
4486 - .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4487 + [MT_MEMORY_RX_ITCM] = {
4488 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4489 .prot_l1 = PMD_TYPE_TABLE,
4490 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4491 .domain = DOMAIN_KERNEL,
4492 },
4493 [MT_MEMORY_RW_SO] = {
4494 @@ -534,9 +572,14 @@ static void __init build_mem_type_table(void)
4495 * Mark cache clean areas and XIP ROM read only
4496 * from SVC mode and no access from userspace.
4497 */
4498 - mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4499 - mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4500 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4501 + mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4502 +#ifdef CONFIG_PAX_KERNEXEC
4503 + mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4504 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4505 + mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4506 +#endif
4507 + mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4508 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4509 #endif
4510
4511 if (is_smp()) {
4512 @@ -552,13 +595,17 @@ static void __init build_mem_type_table(void)
4513 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4514 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4515 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4516 - mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4517 - mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4518 + mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4519 + mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4520 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4521 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4522 + mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4523 + mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4524 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4525 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4526 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4527 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4528 + mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4529 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4530 + mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4531 }
4532 }
4533
4534 @@ -569,15 +616,20 @@ static void __init build_mem_type_table(void)
4535 if (cpu_arch >= CPU_ARCH_ARMv6) {
4536 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4537 /* Non-cacheable Normal is XCB = 001 */
4538 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4539 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4540 + PMD_SECT_BUFFERED;
4541 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4542 PMD_SECT_BUFFERED;
4543 } else {
4544 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4545 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4546 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4547 + PMD_SECT_TEX(1);
4548 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4549 PMD_SECT_TEX(1);
4550 }
4551 } else {
4552 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4553 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4554 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4555 }
4556
4557 #ifdef CONFIG_ARM_LPAE
4558 @@ -593,6 +645,8 @@ static void __init build_mem_type_table(void)
4559 vecs_pgprot |= PTE_EXT_AF;
4560 #endif
4561
4562 + user_pgprot |= __supported_pte_mask;
4563 +
4564 for (i = 0; i < 16; i++) {
4565 pteval_t v = pgprot_val(protection_map[i]);
4566 protection_map[i] = __pgprot(v | user_pgprot);
4567 @@ -610,21 +664,24 @@ static void __init build_mem_type_table(void)
4568
4569 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4570 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4571 - mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4572 - mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4573 + mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4574 + mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4575 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4576 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4577 + mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4578 + mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4579 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4580 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4581 - mem_types[MT_ROM].prot_sect |= cp->pmd;
4582 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4583 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4584 + mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4585
4586 switch (cp->pmd) {
4587 case PMD_SECT_WT:
4588 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4589 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4590 break;
4591 case PMD_SECT_WB:
4592 case PMD_SECT_WBWA:
4593 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4594 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4595 break;
4596 }
4597 pr_info("Memory policy: %sData cache %s\n",
4598 @@ -842,7 +899,7 @@ static void __init create_mapping(struct map_desc *md)
4599 return;
4600 }
4601
4602 - if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4603 + if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4604 md->virtual >= PAGE_OFFSET &&
4605 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4606 printk(KERN_WARNING "BUG: mapping for 0x%08llx"
4607 @@ -1257,18 +1314,15 @@ void __init arm_mm_memblock_reserve(void)
4608 * called function. This means you can't use any function or debugging
4609 * method which may touch any device, otherwise the kernel _will_ crash.
4610 */
4611 +
4612 +static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4613 +
4614 static void __init devicemaps_init(const struct machine_desc *mdesc)
4615 {
4616 struct map_desc map;
4617 unsigned long addr;
4618 - void *vectors;
4619
4620 - /*
4621 - * Allocate the vector page early.
4622 - */
4623 - vectors = early_alloc(PAGE_SIZE * 2);
4624 -
4625 - early_trap_init(vectors);
4626 + early_trap_init(&vectors);
4627
4628 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4629 pmd_clear(pmd_off_k(addr));
4630 @@ -1281,7 +1335,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4631 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4632 map.virtual = MODULES_VADDR;
4633 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4634 - map.type = MT_ROM;
4635 + map.type = MT_ROM_RX;
4636 create_mapping(&map);
4637 #endif
4638
4639 @@ -1292,14 +1346,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4640 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4641 map.virtual = FLUSH_BASE;
4642 map.length = SZ_1M;
4643 - map.type = MT_CACHECLEAN;
4644 + map.type = MT_CACHECLEAN_RO;
4645 create_mapping(&map);
4646 #endif
4647 #ifdef FLUSH_BASE_MINICACHE
4648 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4649 map.virtual = FLUSH_BASE_MINICACHE;
4650 map.length = SZ_1M;
4651 - map.type = MT_MINICLEAN;
4652 + map.type = MT_MINICLEAN_RO;
4653 create_mapping(&map);
4654 #endif
4655
4656 @@ -1308,7 +1362,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4657 * location (0xffff0000). If we aren't using high-vectors, also
4658 * create a mapping at the low-vectors virtual address.
4659 */
4660 - map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4661 + map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4662 map.virtual = 0xffff0000;
4663 map.length = PAGE_SIZE;
4664 #ifdef CONFIG_KUSER_HELPERS
4665 @@ -1365,8 +1419,10 @@ static void __init kmap_init(void)
4666 static void __init map_lowmem(void)
4667 {
4668 struct memblock_region *reg;
4669 +#ifndef CONFIG_PAX_KERNEXEC
4670 unsigned long kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4671 unsigned long kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4672 +#endif
4673
4674 /* Map all the lowmem memory banks. */
4675 for_each_memblock(memory, reg) {
4676 @@ -1379,11 +1435,48 @@ static void __init map_lowmem(void)
4677 if (start >= end)
4678 break;
4679
4680 +#ifdef CONFIG_PAX_KERNEXEC
4681 + map.pfn = __phys_to_pfn(start);
4682 + map.virtual = __phys_to_virt(start);
4683 + map.length = end - start;
4684 +
4685 + if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4686 + struct map_desc kernel;
4687 + struct map_desc initmap;
4688 +
4689 + /* when freeing initmem we will make this RW */
4690 + initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4691 + initmap.virtual = (unsigned long)__init_begin;
4692 + initmap.length = _sdata - __init_begin;
4693 + initmap.type = __MT_MEMORY_RWX;
4694 + create_mapping(&initmap);
4695 +
4696 + /* when freeing initmem we will make this RX */
4697 + kernel.pfn = __phys_to_pfn(__pa(_stext));
4698 + kernel.virtual = (unsigned long)_stext;
4699 + kernel.length = __init_begin - _stext;
4700 + kernel.type = __MT_MEMORY_RWX;
4701 + create_mapping(&kernel);
4702 +
4703 + if (map.virtual < (unsigned long)_stext) {
4704 + map.length = (unsigned long)_stext - map.virtual;
4705 + map.type = __MT_MEMORY_RWX;
4706 + create_mapping(&map);
4707 + }
4708 +
4709 + map.pfn = __phys_to_pfn(__pa(_sdata));
4710 + map.virtual = (unsigned long)_sdata;
4711 + map.length = end - __pa(_sdata);
4712 + }
4713 +
4714 + map.type = MT_MEMORY_RW;
4715 + create_mapping(&map);
4716 +#else
4717 if (end < kernel_x_start || start >= kernel_x_end) {
4718 map.pfn = __phys_to_pfn(start);
4719 map.virtual = __phys_to_virt(start);
4720 map.length = end - start;
4721 - map.type = MT_MEMORY_RWX;
4722 + map.type = __MT_MEMORY_RWX;
4723
4724 create_mapping(&map);
4725 } else {
4726 @@ -1400,7 +1493,7 @@ static void __init map_lowmem(void)
4727 map.pfn = __phys_to_pfn(kernel_x_start);
4728 map.virtual = __phys_to_virt(kernel_x_start);
4729 map.length = kernel_x_end - kernel_x_start;
4730 - map.type = MT_MEMORY_RWX;
4731 + map.type = __MT_MEMORY_RWX;
4732
4733 create_mapping(&map);
4734
4735 @@ -1413,6 +1506,7 @@ static void __init map_lowmem(void)
4736 create_mapping(&map);
4737 }
4738 }
4739 +#endif
4740 }
4741 }
4742
4743 diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4744 index 5b217f4..c23f40e 100644
4745 --- a/arch/arm/plat-iop/setup.c
4746 +++ b/arch/arm/plat-iop/setup.c
4747 @@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4748 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4749 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4750 .length = IOP3XX_PERIPHERAL_SIZE,
4751 - .type = MT_UNCACHED,
4752 + .type = MT_UNCACHED_RW,
4753 },
4754 };
4755
4756 diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4757 index a5bc92d..0bb4730 100644
4758 --- a/arch/arm/plat-omap/sram.c
4759 +++ b/arch/arm/plat-omap/sram.c
4760 @@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4761 * Looks like we need to preserve some bootloader code at the
4762 * beginning of SRAM for jumping to flash for reboot to work...
4763 */
4764 + pax_open_kernel();
4765 memset_io(omap_sram_base + omap_sram_skip, 0,
4766 omap_sram_size - omap_sram_skip);
4767 + pax_close_kernel();
4768 }
4769 diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
4770 index ce6d763..cfea917 100644
4771 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h
4772 +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
4773 @@ -47,7 +47,7 @@ struct samsung_dma_ops {
4774 int (*started)(unsigned ch);
4775 int (*flush)(unsigned ch);
4776 int (*stop)(unsigned ch);
4777 -};
4778 +} __no_const;
4779
4780 extern void *samsung_dmadev_get_ops(void);
4781 extern void *s3c_dma_get_ops(void);
4782 diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4783 index 66eb764..b529b84 100644
4784 --- a/arch/arm64/include/asm/barrier.h
4785 +++ b/arch/arm64/include/asm/barrier.h
4786 @@ -41,7 +41,7 @@
4787 do { \
4788 compiletime_assert_atomic_type(*p); \
4789 smp_mb(); \
4790 - ACCESS_ONCE(*p) = (v); \
4791 + ACCESS_ONCE_RW(*p) = (v); \
4792 } while (0)
4793
4794 #define smp_load_acquire(p) \
4795 diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4796 index 3bf8f4e..5dd5491 100644
4797 --- a/arch/arm64/include/asm/uaccess.h
4798 +++ b/arch/arm64/include/asm/uaccess.h
4799 @@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4800 flag; \
4801 })
4802
4803 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4804 #define access_ok(type, addr, size) __range_ok(addr, size)
4805 #define user_addr_max get_fs
4806
4807 diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4808 index c3a58a1..78fbf54 100644
4809 --- a/arch/avr32/include/asm/cache.h
4810 +++ b/arch/avr32/include/asm/cache.h
4811 @@ -1,8 +1,10 @@
4812 #ifndef __ASM_AVR32_CACHE_H
4813 #define __ASM_AVR32_CACHE_H
4814
4815 +#include <linux/const.h>
4816 +
4817 #define L1_CACHE_SHIFT 5
4818 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4819 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4820
4821 /*
4822 * Memory returned by kmalloc() may be used for DMA, so we must make
4823 diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4824 index d232888..87c8df1 100644
4825 --- a/arch/avr32/include/asm/elf.h
4826 +++ b/arch/avr32/include/asm/elf.h
4827 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4828 the loader. We need to make sure that it is out of the way of the program
4829 that it will "exec", and that there is sufficient room for the brk. */
4830
4831 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4832 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4833
4834 +#ifdef CONFIG_PAX_ASLR
4835 +#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4836 +
4837 +#define PAX_DELTA_MMAP_LEN 15
4838 +#define PAX_DELTA_STACK_LEN 15
4839 +#endif
4840
4841 /* This yields a mask that user programs can use to figure out what
4842 instruction set this CPU supports. This could be done in user space,
4843 diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4844 index 479330b..53717a8 100644
4845 --- a/arch/avr32/include/asm/kmap_types.h
4846 +++ b/arch/avr32/include/asm/kmap_types.h
4847 @@ -2,9 +2,9 @@
4848 #define __ASM_AVR32_KMAP_TYPES_H
4849
4850 #ifdef CONFIG_DEBUG_HIGHMEM
4851 -# define KM_TYPE_NR 29
4852 +# define KM_TYPE_NR 30
4853 #else
4854 -# define KM_TYPE_NR 14
4855 +# define KM_TYPE_NR 15
4856 #endif
4857
4858 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4859 diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4860 index 0eca933..eb78c7b 100644
4861 --- a/arch/avr32/mm/fault.c
4862 +++ b/arch/avr32/mm/fault.c
4863 @@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4864
4865 int exception_trace = 1;
4866
4867 +#ifdef CONFIG_PAX_PAGEEXEC
4868 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4869 +{
4870 + unsigned long i;
4871 +
4872 + printk(KERN_ERR "PAX: bytes at PC: ");
4873 + for (i = 0; i < 20; i++) {
4874 + unsigned char c;
4875 + if (get_user(c, (unsigned char *)pc+i))
4876 + printk(KERN_CONT "???????? ");
4877 + else
4878 + printk(KERN_CONT "%02x ", c);
4879 + }
4880 + printk("\n");
4881 +}
4882 +#endif
4883 +
4884 /*
4885 * This routine handles page faults. It determines the address and the
4886 * problem, and then passes it off to one of the appropriate routines.
4887 @@ -176,6 +193,16 @@ bad_area:
4888 up_read(&mm->mmap_sem);
4889
4890 if (user_mode(regs)) {
4891 +
4892 +#ifdef CONFIG_PAX_PAGEEXEC
4893 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4894 + if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4895 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4896 + do_group_exit(SIGKILL);
4897 + }
4898 + }
4899 +#endif
4900 +
4901 if (exception_trace && printk_ratelimit())
4902 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4903 "sp %08lx ecr %lu\n",
4904 diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4905 index 568885a..f8008df 100644
4906 --- a/arch/blackfin/include/asm/cache.h
4907 +++ b/arch/blackfin/include/asm/cache.h
4908 @@ -7,6 +7,7 @@
4909 #ifndef __ARCH_BLACKFIN_CACHE_H
4910 #define __ARCH_BLACKFIN_CACHE_H
4911
4912 +#include <linux/const.h>
4913 #include <linux/linkage.h> /* for asmlinkage */
4914
4915 /*
4916 @@ -14,7 +15,7 @@
4917 * Blackfin loads 32 bytes for cache
4918 */
4919 #define L1_CACHE_SHIFT 5
4920 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4921 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4922 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4923
4924 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4925 diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4926 index aea2718..3639a60 100644
4927 --- a/arch/cris/include/arch-v10/arch/cache.h
4928 +++ b/arch/cris/include/arch-v10/arch/cache.h
4929 @@ -1,8 +1,9 @@
4930 #ifndef _ASM_ARCH_CACHE_H
4931 #define _ASM_ARCH_CACHE_H
4932
4933 +#include <linux/const.h>
4934 /* Etrax 100LX have 32-byte cache-lines. */
4935 -#define L1_CACHE_BYTES 32
4936 #define L1_CACHE_SHIFT 5
4937 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4938
4939 #endif /* _ASM_ARCH_CACHE_H */
4940 diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
4941 index 7caf25d..ee65ac5 100644
4942 --- a/arch/cris/include/arch-v32/arch/cache.h
4943 +++ b/arch/cris/include/arch-v32/arch/cache.h
4944 @@ -1,11 +1,12 @@
4945 #ifndef _ASM_CRIS_ARCH_CACHE_H
4946 #define _ASM_CRIS_ARCH_CACHE_H
4947
4948 +#include <linux/const.h>
4949 #include <arch/hwregs/dma.h>
4950
4951 /* A cache-line is 32 bytes. */
4952 -#define L1_CACHE_BYTES 32
4953 #define L1_CACHE_SHIFT 5
4954 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4955
4956 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4957
4958 diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
4959 index b86329d..6709906 100644
4960 --- a/arch/frv/include/asm/atomic.h
4961 +++ b/arch/frv/include/asm/atomic.h
4962 @@ -186,6 +186,16 @@ static inline void atomic64_dec(atomic64_t *v)
4963 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
4964 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
4965
4966 +#define atomic64_read_unchecked(v) atomic64_read(v)
4967 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4968 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4969 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4970 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4971 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
4972 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4973 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
4974 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4975 +
4976 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
4977 {
4978 int c, old;
4979 diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
4980 index 2797163..c2a401d 100644
4981 --- a/arch/frv/include/asm/cache.h
4982 +++ b/arch/frv/include/asm/cache.h
4983 @@ -12,10 +12,11 @@
4984 #ifndef __ASM_CACHE_H
4985 #define __ASM_CACHE_H
4986
4987 +#include <linux/const.h>
4988
4989 /* bytes per L1 cache line */
4990 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
4991 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4992 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4993
4994 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
4995 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
4996 diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
4997 index 43901f2..0d8b865 100644
4998 --- a/arch/frv/include/asm/kmap_types.h
4999 +++ b/arch/frv/include/asm/kmap_types.h
5000 @@ -2,6 +2,6 @@
5001 #ifndef _ASM_KMAP_TYPES_H
5002 #define _ASM_KMAP_TYPES_H
5003
5004 -#define KM_TYPE_NR 17
5005 +#define KM_TYPE_NR 18
5006
5007 #endif
5008 diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5009 index 836f147..4cf23f5 100644
5010 --- a/arch/frv/mm/elf-fdpic.c
5011 +++ b/arch/frv/mm/elf-fdpic.c
5012 @@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5013 {
5014 struct vm_area_struct *vma;
5015 struct vm_unmapped_area_info info;
5016 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5017
5018 if (len > TASK_SIZE)
5019 return -ENOMEM;
5020 @@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5021 if (addr) {
5022 addr = PAGE_ALIGN(addr);
5023 vma = find_vma(current->mm, addr);
5024 - if (TASK_SIZE - len >= addr &&
5025 - (!vma || addr + len <= vma->vm_start))
5026 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5027 goto success;
5028 }
5029
5030 @@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5031 info.high_limit = (current->mm->start_stack - 0x00200000);
5032 info.align_mask = 0;
5033 info.align_offset = 0;
5034 + info.threadstack_offset = offset;
5035 addr = vm_unmapped_area(&info);
5036 if (!(addr & ~PAGE_MASK))
5037 goto success;
5038 diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5039 index f4ca594..adc72fd6 100644
5040 --- a/arch/hexagon/include/asm/cache.h
5041 +++ b/arch/hexagon/include/asm/cache.h
5042 @@ -21,9 +21,11 @@
5043 #ifndef __ASM_CACHE_H
5044 #define __ASM_CACHE_H
5045
5046 +#include <linux/const.h>
5047 +
5048 /* Bytes per L1 cache line */
5049 -#define L1_CACHE_SHIFT (5)
5050 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5051 +#define L1_CACHE_SHIFT 5
5052 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5053
5054 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
5055 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
5056 diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5057 index 12c3afe..b1abab2 100644
5058 --- a/arch/ia64/Kconfig
5059 +++ b/arch/ia64/Kconfig
5060 @@ -546,6 +546,7 @@ source "drivers/sn/Kconfig"
5061 config KEXEC
5062 bool "kexec system call"
5063 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5064 + depends on !GRKERNSEC_KMEM
5065 help
5066 kexec is a system call that implements the ability to shutdown your
5067 current kernel, and to start another kernel. It is like a reboot
5068 diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5069 index 6e6fe18..a6ae668 100644
5070 --- a/arch/ia64/include/asm/atomic.h
5071 +++ b/arch/ia64/include/asm/atomic.h
5072 @@ -208,6 +208,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5073 #define atomic64_inc(v) atomic64_add(1, (v))
5074 #define atomic64_dec(v) atomic64_sub(1, (v))
5075
5076 +#define atomic64_read_unchecked(v) atomic64_read(v)
5077 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5078 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5079 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5080 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5081 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
5082 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5083 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
5084 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5085 +
5086 /* Atomic operations are already serializing */
5087 #define smp_mb__before_atomic_dec() barrier()
5088 #define smp_mb__after_atomic_dec() barrier()
5089 diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5090 index d0a69aa..142f878 100644
5091 --- a/arch/ia64/include/asm/barrier.h
5092 +++ b/arch/ia64/include/asm/barrier.h
5093 @@ -64,7 +64,7 @@
5094 do { \
5095 compiletime_assert_atomic_type(*p); \
5096 barrier(); \
5097 - ACCESS_ONCE(*p) = (v); \
5098 + ACCESS_ONCE_RW(*p) = (v); \
5099 } while (0)
5100
5101 #define smp_load_acquire(p) \
5102 diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5103 index 988254a..e1ee885 100644
5104 --- a/arch/ia64/include/asm/cache.h
5105 +++ b/arch/ia64/include/asm/cache.h
5106 @@ -1,6 +1,7 @@
5107 #ifndef _ASM_IA64_CACHE_H
5108 #define _ASM_IA64_CACHE_H
5109
5110 +#include <linux/const.h>
5111
5112 /*
5113 * Copyright (C) 1998-2000 Hewlett-Packard Co
5114 @@ -9,7 +10,7 @@
5115
5116 /* Bytes per L1 (data) cache line. */
5117 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5118 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5119 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5120
5121 #ifdef CONFIG_SMP
5122 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5123 diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5124 index 5a83c5c..4d7f553 100644
5125 --- a/arch/ia64/include/asm/elf.h
5126 +++ b/arch/ia64/include/asm/elf.h
5127 @@ -42,6 +42,13 @@
5128 */
5129 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5130
5131 +#ifdef CONFIG_PAX_ASLR
5132 +#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5133 +
5134 +#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5135 +#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5136 +#endif
5137 +
5138 #define PT_IA_64_UNWIND 0x70000001
5139
5140 /* IA-64 relocations: */
5141 diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5142 index 5767cdf..7462574 100644
5143 --- a/arch/ia64/include/asm/pgalloc.h
5144 +++ b/arch/ia64/include/asm/pgalloc.h
5145 @@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5146 pgd_val(*pgd_entry) = __pa(pud);
5147 }
5148
5149 +static inline void
5150 +pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5151 +{
5152 + pgd_populate(mm, pgd_entry, pud);
5153 +}
5154 +
5155 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5156 {
5157 return quicklist_alloc(0, GFP_KERNEL, NULL);
5158 @@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5159 pud_val(*pud_entry) = __pa(pmd);
5160 }
5161
5162 +static inline void
5163 +pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5164 +{
5165 + pud_populate(mm, pud_entry, pmd);
5166 +}
5167 +
5168 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5169 {
5170 return quicklist_alloc(0, GFP_KERNEL, NULL);
5171 diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5172 index 7935115..c0eca6a 100644
5173 --- a/arch/ia64/include/asm/pgtable.h
5174 +++ b/arch/ia64/include/asm/pgtable.h
5175 @@ -12,7 +12,7 @@
5176 * David Mosberger-Tang <davidm@hpl.hp.com>
5177 */
5178
5179 -
5180 +#include <linux/const.h>
5181 #include <asm/mman.h>
5182 #include <asm/page.h>
5183 #include <asm/processor.h>
5184 @@ -142,6 +142,17 @@
5185 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5186 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5187 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5188 +
5189 +#ifdef CONFIG_PAX_PAGEEXEC
5190 +# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5191 +# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5192 +# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5193 +#else
5194 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
5195 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
5196 +# define PAGE_COPY_NOEXEC PAGE_COPY
5197 +#endif
5198 +
5199 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5200 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5201 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5202 diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5203 index 45698cd..e8e2dbc 100644
5204 --- a/arch/ia64/include/asm/spinlock.h
5205 +++ b/arch/ia64/include/asm/spinlock.h
5206 @@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5207 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5208
5209 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5210 - ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5211 + ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5212 }
5213
5214 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5215 diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5216 index 449c8c0..3d4b1e9 100644
5217 --- a/arch/ia64/include/asm/uaccess.h
5218 +++ b/arch/ia64/include/asm/uaccess.h
5219 @@ -70,6 +70,7 @@
5220 && ((segment).seg == KERNEL_DS.seg \
5221 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5222 })
5223 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5224 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5225
5226 /*
5227 @@ -240,12 +241,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5228 static inline unsigned long
5229 __copy_to_user (void __user *to, const void *from, unsigned long count)
5230 {
5231 + if (count > INT_MAX)
5232 + return count;
5233 +
5234 + if (!__builtin_constant_p(count))
5235 + check_object_size(from, count, true);
5236 +
5237 return __copy_user(to, (__force void __user *) from, count);
5238 }
5239
5240 static inline unsigned long
5241 __copy_from_user (void *to, const void __user *from, unsigned long count)
5242 {
5243 + if (count > INT_MAX)
5244 + return count;
5245 +
5246 + if (!__builtin_constant_p(count))
5247 + check_object_size(to, count, false);
5248 +
5249 return __copy_user((__force void __user *) to, from, count);
5250 }
5251
5252 @@ -255,10 +268,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5253 ({ \
5254 void __user *__cu_to = (to); \
5255 const void *__cu_from = (from); \
5256 - long __cu_len = (n); \
5257 + unsigned long __cu_len = (n); \
5258 \
5259 - if (__access_ok(__cu_to, __cu_len, get_fs())) \
5260 + if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5261 + if (!__builtin_constant_p(n)) \
5262 + check_object_size(__cu_from, __cu_len, true); \
5263 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5264 + } \
5265 __cu_len; \
5266 })
5267
5268 @@ -266,11 +282,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5269 ({ \
5270 void *__cu_to = (to); \
5271 const void __user *__cu_from = (from); \
5272 - long __cu_len = (n); \
5273 + unsigned long __cu_len = (n); \
5274 \
5275 __chk_user_ptr(__cu_from); \
5276 - if (__access_ok(__cu_from, __cu_len, get_fs())) \
5277 + if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5278 + if (!__builtin_constant_p(n)) \
5279 + check_object_size(__cu_to, __cu_len, false); \
5280 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5281 + } \
5282 __cu_len; \
5283 })
5284
5285 diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5286 index 24603be..948052d 100644
5287 --- a/arch/ia64/kernel/module.c
5288 +++ b/arch/ia64/kernel/module.c
5289 @@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
5290 void
5291 module_free (struct module *mod, void *module_region)
5292 {
5293 - if (mod && mod->arch.init_unw_table &&
5294 - module_region == mod->module_init) {
5295 + if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
5296 unw_remove_unwind_table(mod->arch.init_unw_table);
5297 mod->arch.init_unw_table = NULL;
5298 }
5299 @@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5300 }
5301
5302 static inline int
5303 +in_init_rx (const struct module *mod, uint64_t addr)
5304 +{
5305 + return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5306 +}
5307 +
5308 +static inline int
5309 +in_init_rw (const struct module *mod, uint64_t addr)
5310 +{
5311 + return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5312 +}
5313 +
5314 +static inline int
5315 in_init (const struct module *mod, uint64_t addr)
5316 {
5317 - return addr - (uint64_t) mod->module_init < mod->init_size;
5318 + return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5319 +}
5320 +
5321 +static inline int
5322 +in_core_rx (const struct module *mod, uint64_t addr)
5323 +{
5324 + return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5325 +}
5326 +
5327 +static inline int
5328 +in_core_rw (const struct module *mod, uint64_t addr)
5329 +{
5330 + return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5331 }
5332
5333 static inline int
5334 in_core (const struct module *mod, uint64_t addr)
5335 {
5336 - return addr - (uint64_t) mod->module_core < mod->core_size;
5337 + return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5338 }
5339
5340 static inline int
5341 @@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5342 break;
5343
5344 case RV_BDREL:
5345 - val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5346 + if (in_init_rx(mod, val))
5347 + val -= (uint64_t) mod->module_init_rx;
5348 + else if (in_init_rw(mod, val))
5349 + val -= (uint64_t) mod->module_init_rw;
5350 + else if (in_core_rx(mod, val))
5351 + val -= (uint64_t) mod->module_core_rx;
5352 + else if (in_core_rw(mod, val))
5353 + val -= (uint64_t) mod->module_core_rw;
5354 break;
5355
5356 case RV_LTV:
5357 @@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5358 * addresses have been selected...
5359 */
5360 uint64_t gp;
5361 - if (mod->core_size > MAX_LTOFF)
5362 + if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5363 /*
5364 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5365 * at the end of the module.
5366 */
5367 - gp = mod->core_size - MAX_LTOFF / 2;
5368 + gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5369 else
5370 - gp = mod->core_size / 2;
5371 - gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5372 + gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5373 + gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5374 mod->arch.gp = gp;
5375 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5376 }
5377 diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5378 index c39c3cd..3c77738 100644
5379 --- a/arch/ia64/kernel/palinfo.c
5380 +++ b/arch/ia64/kernel/palinfo.c
5381 @@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5382 return NOTIFY_OK;
5383 }
5384
5385 -static struct notifier_block __refdata palinfo_cpu_notifier =
5386 +static struct notifier_block palinfo_cpu_notifier =
5387 {
5388 .notifier_call = palinfo_cpu_callback,
5389 .priority = 0,
5390 diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5391 index 41e33f8..65180b2a 100644
5392 --- a/arch/ia64/kernel/sys_ia64.c
5393 +++ b/arch/ia64/kernel/sys_ia64.c
5394 @@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5395 unsigned long align_mask = 0;
5396 struct mm_struct *mm = current->mm;
5397 struct vm_unmapped_area_info info;
5398 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5399
5400 if (len > RGN_MAP_LIMIT)
5401 return -ENOMEM;
5402 @@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5403 if (REGION_NUMBER(addr) == RGN_HPAGE)
5404 addr = 0;
5405 #endif
5406 +
5407 +#ifdef CONFIG_PAX_RANDMMAP
5408 + if (mm->pax_flags & MF_PAX_RANDMMAP)
5409 + addr = mm->free_area_cache;
5410 + else
5411 +#endif
5412 +
5413 if (!addr)
5414 addr = TASK_UNMAPPED_BASE;
5415
5416 @@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5417 info.high_limit = TASK_SIZE;
5418 info.align_mask = align_mask;
5419 info.align_offset = 0;
5420 + info.threadstack_offset = offset;
5421 return vm_unmapped_area(&info);
5422 }
5423
5424 diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5425 index 84f8a52..7c76178 100644
5426 --- a/arch/ia64/kernel/vmlinux.lds.S
5427 +++ b/arch/ia64/kernel/vmlinux.lds.S
5428 @@ -192,7 +192,7 @@ SECTIONS {
5429 /* Per-cpu data: */
5430 . = ALIGN(PERCPU_PAGE_SIZE);
5431 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5432 - __phys_per_cpu_start = __per_cpu_load;
5433 + __phys_per_cpu_start = per_cpu_load;
5434 /*
5435 * ensure percpu data fits
5436 * into percpu page size
5437 diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5438 index 7225dad..2a7c8256 100644
5439 --- a/arch/ia64/mm/fault.c
5440 +++ b/arch/ia64/mm/fault.c
5441 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5442 return pte_present(pte);
5443 }
5444
5445 +#ifdef CONFIG_PAX_PAGEEXEC
5446 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5447 +{
5448 + unsigned long i;
5449 +
5450 + printk(KERN_ERR "PAX: bytes at PC: ");
5451 + for (i = 0; i < 8; i++) {
5452 + unsigned int c;
5453 + if (get_user(c, (unsigned int *)pc+i))
5454 + printk(KERN_CONT "???????? ");
5455 + else
5456 + printk(KERN_CONT "%08x ", c);
5457 + }
5458 + printk("\n");
5459 +}
5460 +#endif
5461 +
5462 # define VM_READ_BIT 0
5463 # define VM_WRITE_BIT 1
5464 # define VM_EXEC_BIT 2
5465 @@ -151,8 +168,21 @@ retry:
5466 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5467 goto bad_area;
5468
5469 - if ((vma->vm_flags & mask) != mask)
5470 + if ((vma->vm_flags & mask) != mask) {
5471 +
5472 +#ifdef CONFIG_PAX_PAGEEXEC
5473 + if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5474 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5475 + goto bad_area;
5476 +
5477 + up_read(&mm->mmap_sem);
5478 + pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5479 + do_group_exit(SIGKILL);
5480 + }
5481 +#endif
5482 +
5483 goto bad_area;
5484 + }
5485
5486 /*
5487 * If for any reason at all we couldn't handle the fault, make
5488 diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5489 index 76069c1..c2aa816 100644
5490 --- a/arch/ia64/mm/hugetlbpage.c
5491 +++ b/arch/ia64/mm/hugetlbpage.c
5492 @@ -149,6 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5493 unsigned long pgoff, unsigned long flags)
5494 {
5495 struct vm_unmapped_area_info info;
5496 + unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5497
5498 if (len > RGN_MAP_LIMIT)
5499 return -ENOMEM;
5500 @@ -172,6 +173,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5501 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5502 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5503 info.align_offset = 0;
5504 + info.threadstack_offset = offset;
5505 return vm_unmapped_area(&info);
5506 }
5507
5508 diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5509 index 25c3502..560dae7 100644
5510 --- a/arch/ia64/mm/init.c
5511 +++ b/arch/ia64/mm/init.c
5512 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5513 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5514 vma->vm_end = vma->vm_start + PAGE_SIZE;
5515 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5516 +
5517 +#ifdef CONFIG_PAX_PAGEEXEC
5518 + if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5519 + vma->vm_flags &= ~VM_EXEC;
5520 +
5521 +#ifdef CONFIG_PAX_MPROTECT
5522 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
5523 + vma->vm_flags &= ~VM_MAYEXEC;
5524 +#endif
5525 +
5526 + }
5527 +#endif
5528 +
5529 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5530 down_write(&current->mm->mmap_sem);
5531 if (insert_vm_struct(current->mm, vma)) {
5532 diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5533 index 40b3ee9..8c2c112 100644
5534 --- a/arch/m32r/include/asm/cache.h
5535 +++ b/arch/m32r/include/asm/cache.h
5536 @@ -1,8 +1,10 @@
5537 #ifndef _ASM_M32R_CACHE_H
5538 #define _ASM_M32R_CACHE_H
5539
5540 +#include <linux/const.h>
5541 +
5542 /* L1 cache line size */
5543 #define L1_CACHE_SHIFT 4
5544 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5545 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5546
5547 #endif /* _ASM_M32R_CACHE_H */
5548 diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5549 index 82abd15..d95ae5d 100644
5550 --- a/arch/m32r/lib/usercopy.c
5551 +++ b/arch/m32r/lib/usercopy.c
5552 @@ -14,6 +14,9 @@
5553 unsigned long
5554 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5555 {
5556 + if ((long)n < 0)
5557 + return n;
5558 +
5559 prefetch(from);
5560 if (access_ok(VERIFY_WRITE, to, n))
5561 __copy_user(to,from,n);
5562 @@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5563 unsigned long
5564 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5565 {
5566 + if ((long)n < 0)
5567 + return n;
5568 +
5569 prefetchw(to);
5570 if (access_ok(VERIFY_READ, from, n))
5571 __copy_user_zeroing(to,from,n);
5572 diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5573 index 0395c51..5f26031 100644
5574 --- a/arch/m68k/include/asm/cache.h
5575 +++ b/arch/m68k/include/asm/cache.h
5576 @@ -4,9 +4,11 @@
5577 #ifndef __ARCH_M68K_CACHE_H
5578 #define __ARCH_M68K_CACHE_H
5579
5580 +#include <linux/const.h>
5581 +
5582 /* bytes per L1 cache line */
5583 #define L1_CACHE_SHIFT 4
5584 -#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5585 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5586
5587 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5588
5589 diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5590 index 2d6f0de..de5f5ac 100644
5591 --- a/arch/metag/include/asm/barrier.h
5592 +++ b/arch/metag/include/asm/barrier.h
5593 @@ -89,7 +89,7 @@ static inline void fence(void)
5594 do { \
5595 compiletime_assert_atomic_type(*p); \
5596 smp_mb(); \
5597 - ACCESS_ONCE(*p) = (v); \
5598 + ACCESS_ONCE_RW(*p) = (v); \
5599 } while (0)
5600
5601 #define smp_load_acquire(p) \
5602 diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5603 index 3c52fa6..11b2ad8 100644
5604 --- a/arch/metag/mm/hugetlbpage.c
5605 +++ b/arch/metag/mm/hugetlbpage.c
5606 @@ -200,6 +200,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5607 info.high_limit = TASK_SIZE;
5608 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5609 info.align_offset = 0;
5610 + info.threadstack_offset = 0;
5611 return vm_unmapped_area(&info);
5612 }
5613
5614 diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5615 index 4efe96a..60e8699 100644
5616 --- a/arch/microblaze/include/asm/cache.h
5617 +++ b/arch/microblaze/include/asm/cache.h
5618 @@ -13,11 +13,12 @@
5619 #ifndef _ASM_MICROBLAZE_CACHE_H
5620 #define _ASM_MICROBLAZE_CACHE_H
5621
5622 +#include <linux/const.h>
5623 #include <asm/registers.h>
5624
5625 #define L1_CACHE_SHIFT 5
5626 /* word-granular cache in microblaze */
5627 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5628 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5629
5630 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5631
5632 diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5633 index 5cd695f..9a24ad0 100644
5634 --- a/arch/mips/Kconfig
5635 +++ b/arch/mips/Kconfig
5636 @@ -2395,6 +2395,7 @@ source "kernel/Kconfig.preempt"
5637
5638 config KEXEC
5639 bool "Kexec system call"
5640 + depends on !GRKERNSEC_KMEM
5641 help
5642 kexec is a system call that implements the ability to shutdown your
5643 current kernel, and to start another kernel. It is like a reboot
5644 diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5645 index 02f2444..506969c 100644
5646 --- a/arch/mips/cavium-octeon/dma-octeon.c
5647 +++ b/arch/mips/cavium-octeon/dma-octeon.c
5648 @@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5649 if (dma_release_from_coherent(dev, order, vaddr))
5650 return;
5651
5652 - swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5653 + swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5654 }
5655
5656 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5657 diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5658 index e8eb3d5..2e665d1 100644
5659 --- a/arch/mips/include/asm/atomic.h
5660 +++ b/arch/mips/include/asm/atomic.h
5661 @@ -21,15 +21,39 @@
5662 #include <asm/cmpxchg.h>
5663 #include <asm/war.h>
5664
5665 +#ifdef CONFIG_GENERIC_ATOMIC64
5666 +#include <asm-generic/atomic64.h>
5667 +#endif
5668 +
5669 #define ATOMIC_INIT(i) { (i) }
5670
5671 +#ifdef CONFIG_64BIT
5672 +#define _ASM_EXTABLE(from, to) \
5673 +" .section __ex_table,\"a\"\n" \
5674 +" .dword " #from ", " #to"\n" \
5675 +" .previous\n"
5676 +#else
5677 +#define _ASM_EXTABLE(from, to) \
5678 +" .section __ex_table,\"a\"\n" \
5679 +" .word " #from ", " #to"\n" \
5680 +" .previous\n"
5681 +#endif
5682 +
5683 /*
5684 * atomic_read - read atomic variable
5685 * @v: pointer of type atomic_t
5686 *
5687 * Atomically reads the value of @v.
5688 */
5689 -#define atomic_read(v) (*(volatile int *)&(v)->counter)
5690 +static inline int atomic_read(const atomic_t *v)
5691 +{
5692 + return (*(volatile const int *) &v->counter);
5693 +}
5694 +
5695 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5696 +{
5697 + return (*(volatile const int *) &v->counter);
5698 +}
5699
5700 /*
5701 * atomic_set - set atomic variable
5702 @@ -38,7 +62,15 @@
5703 *
5704 * Atomically sets the value of @v to @i.
5705 */
5706 -#define atomic_set(v, i) ((v)->counter = (i))
5707 +static inline void atomic_set(atomic_t *v, int i)
5708 +{
5709 + v->counter = i;
5710 +}
5711 +
5712 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5713 +{
5714 + v->counter = i;
5715 +}
5716
5717 /*
5718 * atomic_add - add integer to atomic variable
5719 @@ -47,7 +79,67 @@
5720 *
5721 * Atomically adds @i to @v.
5722 */
5723 -static __inline__ void atomic_add(int i, atomic_t * v)
5724 +static __inline__ void atomic_add(int i, atomic_t *v)
5725 +{
5726 + int temp;
5727 +
5728 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5729 + __asm__ __volatile__(
5730 + " .set mips3 \n"
5731 + "1: ll %0, %1 # atomic_add \n"
5732 +#ifdef CONFIG_PAX_REFCOUNT
5733 + /* Exception on overflow. */
5734 + "2: add %0, %2 \n"
5735 +#else
5736 + " addu %0, %2 \n"
5737 +#endif
5738 + " sc %0, %1 \n"
5739 + " beqzl %0, 1b \n"
5740 +#ifdef CONFIG_PAX_REFCOUNT
5741 + "3: \n"
5742 + _ASM_EXTABLE(2b, 3b)
5743 +#endif
5744 + " .set mips0 \n"
5745 + : "=&r" (temp), "+m" (v->counter)
5746 + : "Ir" (i));
5747 + } else if (kernel_uses_llsc) {
5748 + __asm__ __volatile__(
5749 + " .set mips3 \n"
5750 + "1: ll %0, %1 # atomic_add \n"
5751 +#ifdef CONFIG_PAX_REFCOUNT
5752 + /* Exception on overflow. */
5753 + "2: add %0, %2 \n"
5754 +#else
5755 + " addu %0, %2 \n"
5756 +#endif
5757 + " sc %0, %1 \n"
5758 + " beqz %0, 1b \n"
5759 +#ifdef CONFIG_PAX_REFCOUNT
5760 + "3: \n"
5761 + _ASM_EXTABLE(2b, 3b)
5762 +#endif
5763 + " .set mips0 \n"
5764 + : "=&r" (temp), "+m" (v->counter)
5765 + : "Ir" (i));
5766 + } else {
5767 + unsigned long flags;
5768 +
5769 + raw_local_irq_save(flags);
5770 + __asm__ __volatile__(
5771 +#ifdef CONFIG_PAX_REFCOUNT
5772 + /* Exception on overflow. */
5773 + "1: add %0, %1 \n"
5774 + "2: \n"
5775 + _ASM_EXTABLE(1b, 2b)
5776 +#else
5777 + " addu %0, %1 \n"
5778 +#endif
5779 + : "+r" (v->counter) : "Ir" (i));
5780 + raw_local_irq_restore(flags);
5781 + }
5782 +}
5783 +
5784 +static __inline__ void atomic_add_unchecked(int i, atomic_unchecked_t *v)
5785 {
5786 if (kernel_uses_llsc && R10000_LLSC_WAR) {
5787 int temp;
5788 @@ -90,7 +182,67 @@ static __inline__ void atomic_add(int i, atomic_t * v)
5789 *
5790 * Atomically subtracts @i from @v.
5791 */
5792 -static __inline__ void atomic_sub(int i, atomic_t * v)
5793 +static __inline__ void atomic_sub(int i, atomic_t *v)
5794 +{
5795 + int temp;
5796 +
5797 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5798 + __asm__ __volatile__(
5799 + " .set mips3 \n"
5800 + "1: ll %0, %1 # atomic64_sub \n"
5801 +#ifdef CONFIG_PAX_REFCOUNT
5802 + /* Exception on overflow. */
5803 + "2: sub %0, %2 \n"
5804 +#else
5805 + " subu %0, %2 \n"
5806 +#endif
5807 + " sc %0, %1 \n"
5808 + " beqzl %0, 1b \n"
5809 +#ifdef CONFIG_PAX_REFCOUNT
5810 + "3: \n"
5811 + _ASM_EXTABLE(2b, 3b)
5812 +#endif
5813 + " .set mips0 \n"
5814 + : "=&r" (temp), "+m" (v->counter)
5815 + : "Ir" (i));
5816 + } else if (kernel_uses_llsc) {
5817 + __asm__ __volatile__(
5818 + " .set mips3 \n"
5819 + "1: ll %0, %1 # atomic64_sub \n"
5820 +#ifdef CONFIG_PAX_REFCOUNT
5821 + /* Exception on overflow. */
5822 + "2: sub %0, %2 \n"
5823 +#else
5824 + " subu %0, %2 \n"
5825 +#endif
5826 + " sc %0, %1 \n"
5827 + " beqz %0, 1b \n"
5828 +#ifdef CONFIG_PAX_REFCOUNT
5829 + "3: \n"
5830 + _ASM_EXTABLE(2b, 3b)
5831 +#endif
5832 + " .set mips0 \n"
5833 + : "=&r" (temp), "+m" (v->counter)
5834 + : "Ir" (i));
5835 + } else {
5836 + unsigned long flags;
5837 +
5838 + raw_local_irq_save(flags);
5839 + __asm__ __volatile__(
5840 +#ifdef CONFIG_PAX_REFCOUNT
5841 + /* Exception on overflow. */
5842 + "1: sub %0, %1 \n"
5843 + "2: \n"
5844 + _ASM_EXTABLE(1b, 2b)
5845 +#else
5846 + " subu %0, %1 \n"
5847 +#endif
5848 + : "+r" (v->counter) : "Ir" (i));
5849 + raw_local_irq_restore(flags);
5850 + }
5851 +}
5852 +
5853 +static __inline__ void atomic_sub_unchecked(long i, atomic_unchecked_t *v)
5854 {
5855 if (kernel_uses_llsc && R10000_LLSC_WAR) {
5856 int temp;
5857 @@ -129,7 +281,93 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
5858 /*
5859 * Same as above, but return the result value
5860 */
5861 -static __inline__ int atomic_add_return(int i, atomic_t * v)
5862 +static __inline__ int atomic_add_return(int i, atomic_t *v)
5863 +{
5864 + int result;
5865 + int temp;
5866 +
5867 + smp_mb__before_llsc();
5868 +
5869 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5870 + __asm__ __volatile__(
5871 + " .set mips3 \n"
5872 + "1: ll %1, %2 # atomic_add_return \n"
5873 +#ifdef CONFIG_PAX_REFCOUNT
5874 + "2: add %0, %1, %3 \n"
5875 +#else
5876 + " addu %0, %1, %3 \n"
5877 +#endif
5878 + " sc %0, %2 \n"
5879 + " beqzl %0, 1b \n"
5880 +#ifdef CONFIG_PAX_REFCOUNT
5881 + " b 4f \n"
5882 + " .set noreorder \n"
5883 + "3: b 5f \n"
5884 + " move %0, %1 \n"
5885 + " .set reorder \n"
5886 + _ASM_EXTABLE(2b, 3b)
5887 +#endif
5888 + "4: addu %0, %1, %3 \n"
5889 +#ifdef CONFIG_PAX_REFCOUNT
5890 + "5: \n"
5891 +#endif
5892 + " .set mips0 \n"
5893 + : "=&r" (result), "=&r" (temp), "+m" (v->counter)
5894 + : "Ir" (i));
5895 + } else if (kernel_uses_llsc) {
5896 + __asm__ __volatile__(
5897 + " .set mips3 \n"
5898 + "1: ll %1, %2 # atomic_add_return \n"
5899 +#ifdef CONFIG_PAX_REFCOUNT
5900 + "2: add %0, %1, %3 \n"
5901 +#else
5902 + " addu %0, %1, %3 \n"
5903 +#endif
5904 + " sc %0, %2 \n"
5905 + " bnez %0, 4f \n"
5906 + " b 1b \n"
5907 +#ifdef CONFIG_PAX_REFCOUNT
5908 + " .set noreorder \n"
5909 + "3: b 5f \n"
5910 + " move %0, %1 \n"
5911 + " .set reorder \n"
5912 + _ASM_EXTABLE(2b, 3b)
5913 +#endif
5914 + "4: addu %0, %1, %3 \n"
5915 +#ifdef CONFIG_PAX_REFCOUNT
5916 + "5: \n"
5917 +#endif
5918 + " .set mips0 \n"
5919 + : "=&r" (result), "=&r" (temp), "+m" (v->counter)
5920 + : "Ir" (i));
5921 + } else {
5922 + unsigned long flags;
5923 +
5924 + raw_local_irq_save(flags);
5925 + __asm__ __volatile__(
5926 + " lw %0, %1 \n"
5927 +#ifdef CONFIG_PAX_REFCOUNT
5928 + /* Exception on overflow. */
5929 + "1: add %0, %2 \n"
5930 +#else
5931 + " addu %0, %2 \n"
5932 +#endif
5933 + " sw %0, %1 \n"
5934 +#ifdef CONFIG_PAX_REFCOUNT
5935 + /* Note: Dest reg is not modified on overflow */
5936 + "2: \n"
5937 + _ASM_EXTABLE(1b, 2b)
5938 +#endif
5939 + : "=&r" (result), "+m" (v->counter) : "Ir" (i));
5940 + raw_local_irq_restore(flags);
5941 + }
5942 +
5943 + smp_llsc_mb();
5944 +
5945 + return result;
5946 +}
5947 +
5948 +static __inline__ int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
5949 {
5950 int result;
5951
5952 @@ -178,7 +416,93 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
5953 return result;
5954 }
5955
5956 -static __inline__ int atomic_sub_return(int i, atomic_t * v)
5957 +static __inline__ int atomic_sub_return(int i, atomic_t *v)
5958 +{
5959 + int result;
5960 + int temp;
5961 +
5962 + smp_mb__before_llsc();
5963 +
5964 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
5965 + __asm__ __volatile__(
5966 + " .set mips3 \n"
5967 + "1: ll %1, %2 # atomic_sub_return \n"
5968 +#ifdef CONFIG_PAX_REFCOUNT
5969 + "2: sub %0, %1, %3 \n"
5970 +#else
5971 + " subu %0, %1, %3 \n"
5972 +#endif
5973 + " sc %0, %2 \n"
5974 + " beqzl %0, 1b \n"
5975 +#ifdef CONFIG_PAX_REFCOUNT
5976 + " b 4f \n"
5977 + " .set noreorder \n"
5978 + "3: b 5f \n"
5979 + " move %0, %1 \n"
5980 + " .set reorder \n"
5981 + _ASM_EXTABLE(2b, 3b)
5982 +#endif
5983 + "4: subu %0, %1, %3 \n"
5984 +#ifdef CONFIG_PAX_REFCOUNT
5985 + "5: \n"
5986 +#endif
5987 + " .set mips0 \n"
5988 + : "=&r" (result), "=&r" (temp), "=m" (v->counter)
5989 + : "Ir" (i), "m" (v->counter)
5990 + : "memory");
5991 + } else if (kernel_uses_llsc) {
5992 + __asm__ __volatile__(
5993 + " .set mips3 \n"
5994 + "1: ll %1, %2 # atomic_sub_return \n"
5995 +#ifdef CONFIG_PAX_REFCOUNT
5996 + "2: sub %0, %1, %3 \n"
5997 +#else
5998 + " subu %0, %1, %3 \n"
5999 +#endif
6000 + " sc %0, %2 \n"
6001 + " bnez %0, 4f \n"
6002 + " b 1b \n"
6003 +#ifdef CONFIG_PAX_REFCOUNT
6004 + " .set noreorder \n"
6005 + "3: b 5f \n"
6006 + " move %0, %1 \n"
6007 + " .set reorder \n"
6008 + _ASM_EXTABLE(2b, 3b)
6009 +#endif
6010 + "4: subu %0, %1, %3 \n"
6011 +#ifdef CONFIG_PAX_REFCOUNT
6012 + "5: \n"
6013 +#endif
6014 + " .set mips0 \n"
6015 + : "=&r" (result), "=&r" (temp), "+m" (v->counter)
6016 + : "Ir" (i));
6017 + } else {
6018 + unsigned long flags;
6019 +
6020 + raw_local_irq_save(flags);
6021 + __asm__ __volatile__(
6022 + " lw %0, %1 \n"
6023 +#ifdef CONFIG_PAX_REFCOUNT
6024 + /* Exception on overflow. */
6025 + "1: sub %0, %2 \n"
6026 +#else
6027 + " subu %0, %2 \n"
6028 +#endif
6029 + " sw %0, %1 \n"
6030 +#ifdef CONFIG_PAX_REFCOUNT
6031 + /* Note: Dest reg is not modified on overflow */
6032 + "2: \n"
6033 + _ASM_EXTABLE(1b, 2b)
6034 +#endif
6035 + : "=&r" (result), "+m" (v->counter) : "Ir" (i));
6036 + raw_local_irq_restore(flags);
6037 + }
6038 +
6039 + smp_llsc_mb();
6040 +
6041 + return result;
6042 +}
6043 +static __inline__ int atomic_sub_return_unchecked(int i, atomic_unchecked_t *v)
6044 {
6045 int result;
6046
6047 @@ -238,7 +562,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
6048 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6049 * The function returns the old value of @v minus @i.
6050 */
6051 -static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6052 +static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
6053 {
6054 int result;
6055
6056 @@ -295,8 +619,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6057 return result;
6058 }
6059
6060 -#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
6061 -#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
6062 +static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
6063 +{
6064 + return cmpxchg(&v->counter, old, new);
6065 +}
6066 +
6067 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
6068 + int new)
6069 +{
6070 + return cmpxchg(&(v->counter), old, new);
6071 +}
6072 +
6073 +static inline int atomic_xchg(atomic_t *v, int new)
6074 +{
6075 + return xchg(&v->counter, new);
6076 +}
6077 +
6078 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
6079 +{
6080 + return xchg(&(v->counter), new);
6081 +}
6082
6083 /**
6084 * __atomic_add_unless - add unless the number is a given value
6085 @@ -324,6 +666,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6086
6087 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6088 #define atomic_inc_return(v) atomic_add_return(1, (v))
6089 +static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6090 +{
6091 + return atomic_add_return_unchecked(1, v);
6092 +}
6093
6094 /*
6095 * atomic_sub_and_test - subtract value from variable and test result
6096 @@ -345,6 +691,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6097 * other cases.
6098 */
6099 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6100 +static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6101 +{
6102 + return atomic_add_return_unchecked(1, v) == 0;
6103 +}
6104
6105 /*
6106 * atomic_dec_and_test - decrement by 1 and test
6107 @@ -369,6 +719,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6108 * Atomically increments @v by 1.
6109 */
6110 #define atomic_inc(v) atomic_add(1, (v))
6111 +static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6112 +{
6113 + atomic_add_unchecked(1, v);
6114 +}
6115
6116 /*
6117 * atomic_dec - decrement and test
6118 @@ -377,6 +731,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6119 * Atomically decrements @v by 1.
6120 */
6121 #define atomic_dec(v) atomic_sub(1, (v))
6122 +static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6123 +{
6124 + atomic_sub_unchecked(1, v);
6125 +}
6126
6127 /*
6128 * atomic_add_negative - add and test if negative
6129 @@ -398,14 +756,30 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6130 * @v: pointer of type atomic64_t
6131 *
6132 */
6133 -#define atomic64_read(v) (*(volatile long *)&(v)->counter)
6134 +static inline long atomic64_read(const atomic64_t *v)
6135 +{
6136 + return (*(volatile const long *) &v->counter);
6137 +}
6138 +
6139 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6140 +{
6141 + return (*(volatile const long *) &v->counter);
6142 +}
6143
6144 /*
6145 * atomic64_set - set atomic variable
6146 * @v: pointer of type atomic64_t
6147 * @i: required value
6148 */
6149 -#define atomic64_set(v, i) ((v)->counter = (i))
6150 +static inline void atomic64_set(atomic64_t *v, long i)
6151 +{
6152 + v->counter = i;
6153 +}
6154 +
6155 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6156 +{
6157 + v->counter = i;
6158 +}
6159
6160 /*
6161 * atomic64_add - add integer to atomic variable
6162 @@ -414,7 +788,66 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6163 *
6164 * Atomically adds @i to @v.
6165 */
6166 -static __inline__ void atomic64_add(long i, atomic64_t * v)
6167 +static __inline__ void atomic64_add(long i, atomic64_t *v)
6168 +{
6169 + long temp;
6170 +
6171 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6172 + __asm__ __volatile__(
6173 + " .set mips3 \n"
6174 + "1: lld %0, %1 # atomic64_add \n"
6175 +#ifdef CONFIG_PAX_REFCOUNT
6176 + /* Exception on overflow. */
6177 + "2: dadd %0, %2 \n"
6178 +#else
6179 + " daddu %0, %2 \n"
6180 +#endif
6181 + " scd %0, %1 \n"
6182 + " beqzl %0, 1b \n"
6183 +#ifdef CONFIG_PAX_REFCOUNT
6184 + "3: \n"
6185 + _ASM_EXTABLE(2b, 3b)
6186 +#endif
6187 + " .set mips0 \n"
6188 + : "=&r" (temp), "+m" (v->counter)
6189 + : "Ir" (i));
6190 + } else if (kernel_uses_llsc) {
6191 + __asm__ __volatile__(
6192 + " .set mips3 \n"
6193 + "1: lld %0, %1 # atomic64_add \n"
6194 +#ifdef CONFIG_PAX_REFCOUNT
6195 + /* Exception on overflow. */
6196 + "2: dadd %0, %2 \n"
6197 +#else
6198 + " daddu %0, %2 \n"
6199 +#endif
6200 + " scd %0, %1 \n"
6201 + " beqz %0, 1b \n"
6202 +#ifdef CONFIG_PAX_REFCOUNT
6203 + "3: \n"
6204 + _ASM_EXTABLE(2b, 3b)
6205 +#endif
6206 + " .set mips0 \n"
6207 + : "=&r" (temp), "+m" (v->counter)
6208 + : "Ir" (i));
6209 + } else {
6210 + unsigned long flags;
6211 +
6212 + raw_local_irq_save(flags);
6213 + __asm__ __volatile__(
6214 +#ifdef CONFIG_PAX_REFCOUNT
6215 + /* Exception on overflow. */
6216 + "1: dadd %0, %1 \n"
6217 + "2: \n"
6218 + _ASM_EXTABLE(1b, 2b)
6219 +#else
6220 + " daddu %0, %1 \n"
6221 +#endif
6222 + : "+r" (v->counter) : "Ir" (i));
6223 + raw_local_irq_restore(flags);
6224 + }
6225 +}
6226 +static __inline__ void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
6227 {
6228 if (kernel_uses_llsc && R10000_LLSC_WAR) {
6229 long temp;
6230 @@ -457,7 +890,67 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
6231 *
6232 * Atomically subtracts @i from @v.
6233 */
6234 -static __inline__ void atomic64_sub(long i, atomic64_t * v)
6235 +static __inline__ void atomic64_sub(long i, atomic64_t *v)
6236 +{
6237 + long temp;
6238 +
6239 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6240 + __asm__ __volatile__(
6241 + " .set mips3 \n"
6242 + "1: lld %0, %1 # atomic64_sub \n"
6243 +#ifdef CONFIG_PAX_REFCOUNT
6244 + /* Exception on overflow. */
6245 + "2: dsub %0, %2 \n"
6246 +#else
6247 + " dsubu %0, %2 \n"
6248 +#endif
6249 + " scd %0, %1 \n"
6250 + " beqzl %0, 1b \n"
6251 +#ifdef CONFIG_PAX_REFCOUNT
6252 + "3: \n"
6253 + _ASM_EXTABLE(2b, 3b)
6254 +#endif
6255 + " .set mips0 \n"
6256 + : "=&r" (temp), "+m" (v->counter)
6257 + : "Ir" (i));
6258 + } else if (kernel_uses_llsc) {
6259 + __asm__ __volatile__(
6260 + " .set mips3 \n"
6261 + "1: lld %0, %1 # atomic64_sub \n"
6262 +#ifdef CONFIG_PAX_REFCOUNT
6263 + /* Exception on overflow. */
6264 + "2: dsub %0, %2 \n"
6265 +#else
6266 + " dsubu %0, %2 \n"
6267 +#endif
6268 + " scd %0, %1 \n"
6269 + " beqz %0, 1b \n"
6270 +#ifdef CONFIG_PAX_REFCOUNT
6271 + "3: \n"
6272 + _ASM_EXTABLE(2b, 3b)
6273 +#endif
6274 + " .set mips0 \n"
6275 + : "=&r" (temp), "+m" (v->counter)
6276 + : "Ir" (i));
6277 + } else {
6278 + unsigned long flags;
6279 +
6280 + raw_local_irq_save(flags);
6281 + __asm__ __volatile__(
6282 +#ifdef CONFIG_PAX_REFCOUNT
6283 + /* Exception on overflow. */
6284 + "1: dsub %0, %1 \n"
6285 + "2: \n"
6286 + _ASM_EXTABLE(1b, 2b)
6287 +#else
6288 + " dsubu %0, %1 \n"
6289 +#endif
6290 + : "+r" (v->counter) : "Ir" (i));
6291 + raw_local_irq_restore(flags);
6292 + }
6293 +}
6294 +
6295 +static __inline__ void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
6296 {
6297 if (kernel_uses_llsc && R10000_LLSC_WAR) {
6298 long temp;
6299 @@ -496,7 +989,93 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
6300 /*
6301 * Same as above, but return the result value
6302 */
6303 -static __inline__ long atomic64_add_return(long i, atomic64_t * v)
6304 +static __inline__ long atomic64_add_return(long i, atomic64_t *v)
6305 +{
6306 + long result;
6307 + long temp;
6308 +
6309 + smp_mb__before_llsc();
6310 +
6311 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6312 + __asm__ __volatile__(
6313 + " .set mips3 \n"
6314 + "1: lld %1, %2 # atomic64_add_return \n"
6315 +#ifdef CONFIG_PAX_REFCOUNT
6316 + "2: dadd %0, %1, %3 \n"
6317 +#else
6318 + " daddu %0, %1, %3 \n"
6319 +#endif
6320 + " scd %0, %2 \n"
6321 + " beqzl %0, 1b \n"
6322 +#ifdef CONFIG_PAX_REFCOUNT
6323 + " b 4f \n"
6324 + " .set noreorder \n"
6325 + "3: b 5f \n"
6326 + " move %0, %1 \n"
6327 + " .set reorder \n"
6328 + _ASM_EXTABLE(2b, 3b)
6329 +#endif
6330 + "4: daddu %0, %1, %3 \n"
6331 +#ifdef CONFIG_PAX_REFCOUNT
6332 + "5: \n"
6333 +#endif
6334 + " .set mips0 \n"
6335 + : "=&r" (result), "=&r" (temp), "+m" (v->counter)
6336 + : "Ir" (i));
6337 + } else if (kernel_uses_llsc) {
6338 + __asm__ __volatile__(
6339 + " .set mips3 \n"
6340 + "1: lld %1, %2 # atomic64_add_return \n"
6341 +#ifdef CONFIG_PAX_REFCOUNT
6342 + "2: dadd %0, %1, %3 \n"
6343 +#else
6344 + " daddu %0, %1, %3 \n"
6345 +#endif
6346 + " scd %0, %2 \n"
6347 + " bnez %0, 4f \n"
6348 + " b 1b \n"
6349 +#ifdef CONFIG_PAX_REFCOUNT
6350 + " .set noreorder \n"
6351 + "3: b 5f \n"
6352 + " move %0, %1 \n"
6353 + " .set reorder \n"
6354 + _ASM_EXTABLE(2b, 3b)
6355 +#endif
6356 + "4: daddu %0, %1, %3 \n"
6357 +#ifdef CONFIG_PAX_REFCOUNT
6358 + "5: \n"
6359 +#endif
6360 + " .set mips0 \n"
6361 + : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6362 + : "Ir" (i), "m" (v->counter)
6363 + : "memory");
6364 + } else {
6365 + unsigned long flags;
6366 +
6367 + raw_local_irq_save(flags);
6368 + __asm__ __volatile__(
6369 + " ld %0, %1 \n"
6370 +#ifdef CONFIG_PAX_REFCOUNT
6371 + /* Exception on overflow. */
6372 + "1: dadd %0, %2 \n"
6373 +#else
6374 + " daddu %0, %2 \n"
6375 +#endif
6376 + " sd %0, %1 \n"
6377 +#ifdef CONFIG_PAX_REFCOUNT
6378 + /* Note: Dest reg is not modified on overflow */
6379 + "2: \n"
6380 + _ASM_EXTABLE(1b, 2b)
6381 +#endif
6382 + : "=&r" (result), "+m" (v->counter) : "Ir" (i));
6383 + raw_local_irq_restore(flags);
6384 + }
6385 +
6386 + smp_llsc_mb();
6387 +
6388 + return result;
6389 +}
6390 +static __inline__ long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
6391 {
6392 long result;
6393
6394 @@ -546,7 +1125,97 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
6395 return result;
6396 }
6397
6398 -static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
6399 +static __inline__ long atomic64_sub_return(long i, atomic64_t *v)
6400 +{
6401 + long result;
6402 + long temp;
6403 +
6404 + smp_mb__before_llsc();
6405 +
6406 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6407 + long temp;
6408 +
6409 + __asm__ __volatile__(
6410 + " .set mips3 \n"
6411 + "1: lld %1, %2 # atomic64_sub_return \n"
6412 +#ifdef CONFIG_PAX_REFCOUNT
6413 + "2: dsub %0, %1, %3 \n"
6414 +#else
6415 + " dsubu %0, %1, %3 \n"
6416 +#endif
6417 + " scd %0, %2 \n"
6418 + " beqzl %0, 1b \n"
6419 +#ifdef CONFIG_PAX_REFCOUNT
6420 + " b 4f \n"
6421 + " .set noreorder \n"
6422 + "3: b 5f \n"
6423 + " move %0, %1 \n"
6424 + " .set reorder \n"
6425 + _ASM_EXTABLE(2b, 3b)
6426 +#endif
6427 + "4: dsubu %0, %1, %3 \n"
6428 +#ifdef CONFIG_PAX_REFCOUNT
6429 + "5: \n"
6430 +#endif
6431 + " .set mips0 \n"
6432 + : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6433 + : "Ir" (i), "m" (v->counter)
6434 + : "memory");
6435 + } else if (kernel_uses_llsc) {
6436 + __asm__ __volatile__(
6437 + " .set mips3 \n"
6438 + "1: lld %1, %2 # atomic64_sub_return \n"
6439 +#ifdef CONFIG_PAX_REFCOUNT
6440 + "2: dsub %0, %1, %3 \n"
6441 +#else
6442 + " dsubu %0, %1, %3 \n"
6443 +#endif
6444 + " scd %0, %2 \n"
6445 + " bnez %0, 4f \n"
6446 + " b 1b \n"
6447 +#ifdef CONFIG_PAX_REFCOUNT
6448 + " .set noreorder \n"
6449 + "3: b 5f \n"
6450 + " move %0, %1 \n"
6451 + " .set reorder \n"
6452 + _ASM_EXTABLE(2b, 3b)
6453 +#endif
6454 + "4: dsubu %0, %1, %3 \n"
6455 +#ifdef CONFIG_PAX_REFCOUNT
6456 + "5: \n"
6457 +#endif
6458 + " .set mips0 \n"
6459 + : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6460 + : "Ir" (i), "m" (v->counter)
6461 + : "memory");
6462 + } else {
6463 + unsigned long flags;
6464 +
6465 + raw_local_irq_save(flags);
6466 + __asm__ __volatile__(
6467 + " ld %0, %1 \n"
6468 +#ifdef CONFIG_PAX_REFCOUNT
6469 + /* Exception on overflow. */
6470 + "1: dsub %0, %2 \n"
6471 +#else
6472 + " dsubu %0, %2 \n"
6473 +#endif
6474 + " sd %0, %1 \n"
6475 +#ifdef CONFIG_PAX_REFCOUNT
6476 + /* Note: Dest reg is not modified on overflow */
6477 + "2: \n"
6478 + _ASM_EXTABLE(1b, 2b)
6479 +#endif
6480 + : "=&r" (result), "+m" (v->counter) : "Ir" (i));
6481 + raw_local_irq_restore(flags);
6482 + }
6483 +
6484 + smp_llsc_mb();
6485 +
6486 + return result;
6487 +}
6488 +
6489 +static __inline__ long atomic64_sub_return_unchecked(long i, atomic64_unchecked_t *v)
6490 {
6491 long result;
6492
6493 @@ -605,7 +1274,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
6494 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6495 * The function returns the old value of @v minus @i.
6496 */
6497 -static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6498 +static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6499 {
6500 long result;
6501
6502 @@ -662,9 +1331,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6503 return result;
6504 }
6505
6506 -#define atomic64_cmpxchg(v, o, n) \
6507 - ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6508 -#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6509 +static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6510 +{
6511 + return cmpxchg(&v->counter, old, new);
6512 +}
6513 +
6514 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6515 + long new)
6516 +{
6517 + return cmpxchg(&(v->counter), old, new);
6518 +}
6519 +
6520 +static inline long atomic64_xchg(atomic64_t *v, long new)
6521 +{
6522 + return xchg(&v->counter, new);
6523 +}
6524 +
6525 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6526 +{
6527 + return xchg(&(v->counter), new);
6528 +}
6529
6530 /**
6531 * atomic64_add_unless - add unless the number is a given value
6532 @@ -694,6 +1380,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6533
6534 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6535 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6536 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6537
6538 /*
6539 * atomic64_sub_and_test - subtract value from variable and test result
6540 @@ -715,6 +1402,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6541 * other cases.
6542 */
6543 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6544 +#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6545
6546 /*
6547 * atomic64_dec_and_test - decrement by 1 and test
6548 @@ -739,6 +1427,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6549 * Atomically increments @v by 1.
6550 */
6551 #define atomic64_inc(v) atomic64_add(1, (v))
6552 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6553
6554 /*
6555 * atomic64_dec - decrement and test
6556 @@ -747,6 +1436,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6557 * Atomically decrements @v by 1.
6558 */
6559 #define atomic64_dec(v) atomic64_sub(1, (v))
6560 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6561
6562 /*
6563 * atomic64_add_negative - add and test if negative
6564 diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6565 index e1aa4e4..670b68b 100644
6566 --- a/arch/mips/include/asm/barrier.h
6567 +++ b/arch/mips/include/asm/barrier.h
6568 @@ -184,7 +184,7 @@
6569 do { \
6570 compiletime_assert_atomic_type(*p); \
6571 smp_mb(); \
6572 - ACCESS_ONCE(*p) = (v); \
6573 + ACCESS_ONCE_RW(*p) = (v); \
6574 } while (0)
6575
6576 #define smp_load_acquire(p) \
6577 diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6578 index b4db69f..8f3b093 100644
6579 --- a/arch/mips/include/asm/cache.h
6580 +++ b/arch/mips/include/asm/cache.h
6581 @@ -9,10 +9,11 @@
6582 #ifndef _ASM_CACHE_H
6583 #define _ASM_CACHE_H
6584
6585 +#include <linux/const.h>
6586 #include <kmalloc.h>
6587
6588 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6589 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6590 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6591
6592 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6593 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6594 diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6595 index d414405..6bb4ba2 100644
6596 --- a/arch/mips/include/asm/elf.h
6597 +++ b/arch/mips/include/asm/elf.h
6598 @@ -398,13 +398,16 @@ extern const char *__elf_platform;
6599 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6600 #endif
6601
6602 +#ifdef CONFIG_PAX_ASLR
6603 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6604 +
6605 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6606 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6607 +#endif
6608 +
6609 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6610 struct linux_binprm;
6611 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6612 int uses_interp);
6613
6614 -struct mm_struct;
6615 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6616 -#define arch_randomize_brk arch_randomize_brk
6617 -
6618 #endif /* _ASM_ELF_H */
6619 diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6620 index c1f6afa..38cc6e9 100644
6621 --- a/arch/mips/include/asm/exec.h
6622 +++ b/arch/mips/include/asm/exec.h
6623 @@ -12,6 +12,6 @@
6624 #ifndef _ASM_EXEC_H
6625 #define _ASM_EXEC_H
6626
6627 -extern unsigned long arch_align_stack(unsigned long sp);
6628 +#define arch_align_stack(x) ((x) & ~0xfUL)
6629
6630 #endif /* _ASM_EXEC_H */
6631 diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6632 index 9e8ef59..1139d6b 100644
6633 --- a/arch/mips/include/asm/hw_irq.h
6634 +++ b/arch/mips/include/asm/hw_irq.h
6635 @@ -10,7 +10,7 @@
6636
6637 #include <linux/atomic.h>
6638
6639 -extern atomic_t irq_err_count;
6640 +extern atomic_unchecked_t irq_err_count;
6641
6642 /*
6643 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6644 diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6645 index 46dfc3c..a16b13a 100644
6646 --- a/arch/mips/include/asm/local.h
6647 +++ b/arch/mips/include/asm/local.h
6648 @@ -12,15 +12,25 @@ typedef struct
6649 atomic_long_t a;
6650 } local_t;
6651
6652 +typedef struct {
6653 + atomic_long_unchecked_t a;
6654 +} local_unchecked_t;
6655 +
6656 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6657
6658 #define local_read(l) atomic_long_read(&(l)->a)
6659 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6660 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6661 +#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6662
6663 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6664 +#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6665 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6666 +#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6667 #define local_inc(l) atomic_long_inc(&(l)->a)
6668 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6669 #define local_dec(l) atomic_long_dec(&(l)->a)
6670 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6671
6672 /*
6673 * Same as above, but return the result value
6674 @@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6675 return result;
6676 }
6677
6678 +static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6679 +{
6680 + unsigned long result;
6681 +
6682 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6683 + unsigned long temp;
6684 +
6685 + __asm__ __volatile__(
6686 + " .set mips3 \n"
6687 + "1:" __LL "%1, %2 # local_add_return \n"
6688 + " addu %0, %1, %3 \n"
6689 + __SC "%0, %2 \n"
6690 + " beqzl %0, 1b \n"
6691 + " addu %0, %1, %3 \n"
6692 + " .set mips0 \n"
6693 + : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6694 + : "Ir" (i), "m" (l->a.counter)
6695 + : "memory");
6696 + } else if (kernel_uses_llsc) {
6697 + unsigned long temp;
6698 +
6699 + __asm__ __volatile__(
6700 + " .set mips3 \n"
6701 + "1:" __LL "%1, %2 # local_add_return \n"
6702 + " addu %0, %1, %3 \n"
6703 + __SC "%0, %2 \n"
6704 + " beqz %0, 1b \n"
6705 + " addu %0, %1, %3 \n"
6706 + " .set mips0 \n"
6707 + : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6708 + : "Ir" (i), "m" (l->a.counter)
6709 + : "memory");
6710 + } else {
6711 + unsigned long flags;
6712 +
6713 + local_irq_save(flags);
6714 + result = l->a.counter;
6715 + result += i;
6716 + l->a.counter = result;
6717 + local_irq_restore(flags);
6718 + }
6719 +
6720 + return result;
6721 +}
6722 +
6723 static __inline__ long local_sub_return(long i, local_t * l)
6724 {
6725 unsigned long result;
6726 @@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6727
6728 #define local_cmpxchg(l, o, n) \
6729 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6730 +#define local_cmpxchg_unchecked(l, o, n) \
6731 + ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6732 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6733
6734 /**
6735 diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6736 index 5699ec3..95def83 100644
6737 --- a/arch/mips/include/asm/page.h
6738 +++ b/arch/mips/include/asm/page.h
6739 @@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6740 #ifdef CONFIG_CPU_MIPS32
6741 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6742 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6743 - #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6744 + #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6745 #else
6746 typedef struct { unsigned long long pte; } pte_t;
6747 #define pte_val(x) ((x).pte)
6748 diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6749 index b336037..5b874cc 100644
6750 --- a/arch/mips/include/asm/pgalloc.h
6751 +++ b/arch/mips/include/asm/pgalloc.h
6752 @@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6753 {
6754 set_pud(pud, __pud((unsigned long)pmd));
6755 }
6756 +
6757 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6758 +{
6759 + pud_populate(mm, pud, pmd);
6760 +}
6761 #endif
6762
6763 /*
6764 diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6765 index 008324d..f67c239 100644
6766 --- a/arch/mips/include/asm/pgtable.h
6767 +++ b/arch/mips/include/asm/pgtable.h
6768 @@ -20,6 +20,9 @@
6769 #include <asm/io.h>
6770 #include <asm/pgtable-bits.h>
6771
6772 +#define ktla_ktva(addr) (addr)
6773 +#define ktva_ktla(addr) (addr)
6774 +
6775 struct mm_struct;
6776 struct vm_area_struct;
6777
6778 diff --git a/arch/mips/include/asm/smtc_proc.h b/arch/mips/include/asm/smtc_proc.h
6779 index 25da651..ae2a259 100644
6780 --- a/arch/mips/include/asm/smtc_proc.h
6781 +++ b/arch/mips/include/asm/smtc_proc.h
6782 @@ -18,6 +18,6 @@ extern struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
6783
6784 /* Count of number of recoveries of "stolen" FPU access rights on 34K */
6785
6786 -extern atomic_t smtc_fpu_recoveries;
6787 +extern atomic_unchecked_t smtc_fpu_recoveries;
6788
6789 #endif /* __ASM_SMTC_PROC_H */
6790 diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6791 index d2d961d..a674df0 100644
6792 --- a/arch/mips/include/asm/thread_info.h
6793 +++ b/arch/mips/include/asm/thread_info.h
6794 @@ -105,6 +105,9 @@ static inline struct thread_info *current_thread_info(void)
6795 #define TIF_SECCOMP 4 /* secure computing */
6796 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6797 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6798 +/* li takes a 32bit immediate */
6799 +#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6800 +
6801 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6802 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6803 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6804 @@ -138,14 +141,16 @@ static inline struct thread_info *current_thread_info(void)
6805 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6806 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6807 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6808 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6809
6810 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6811 _TIF_SYSCALL_AUDIT | \
6812 - _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6813 + _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6814 + _TIF_GRSEC_SETXID)
6815
6816 /* work to do in syscall_trace_leave() */
6817 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6818 - _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6819 + _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6820
6821 /* work to do on interrupt/exception return */
6822 #define _TIF_WORK_MASK \
6823 @@ -153,7 +158,7 @@ static inline struct thread_info *current_thread_info(void)
6824 /* work to do on any return to u-space */
6825 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6826 _TIF_WORK_SYSCALL_EXIT | \
6827 - _TIF_SYSCALL_TRACEPOINT)
6828 + _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6829
6830 /*
6831 * We stash processor id into a COP0 register to retrieve it fast
6832 diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6833 index a109510..94ee3f6 100644
6834 --- a/arch/mips/include/asm/uaccess.h
6835 +++ b/arch/mips/include/asm/uaccess.h
6836 @@ -130,6 +130,7 @@ extern u64 __ua_limit;
6837 __ok == 0; \
6838 })
6839
6840 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6841 #define access_ok(type, addr, size) \
6842 likely(__access_ok((addr), (size), __access_mask))
6843
6844 diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6845 index 1188e00..41cf144 100644
6846 --- a/arch/mips/kernel/binfmt_elfn32.c
6847 +++ b/arch/mips/kernel/binfmt_elfn32.c
6848 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6849 #undef ELF_ET_DYN_BASE
6850 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6851
6852 +#ifdef CONFIG_PAX_ASLR
6853 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6854 +
6855 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6856 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6857 +#endif
6858 +
6859 #include <asm/processor.h>
6860 #include <linux/module.h>
6861 #include <linux/elfcore.h>
6862 diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6863 index 7faf5f2..f3d3cf4 100644
6864 --- a/arch/mips/kernel/binfmt_elfo32.c
6865 +++ b/arch/mips/kernel/binfmt_elfo32.c
6866 @@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6867 #undef ELF_ET_DYN_BASE
6868 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6869
6870 +#ifdef CONFIG_PAX_ASLR
6871 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6872 +
6873 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6874 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6875 +#endif
6876 +
6877 #include <asm/processor.h>
6878
6879 /*
6880 diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6881 index 2b91fe8..fe4f6b4 100644
6882 --- a/arch/mips/kernel/i8259.c
6883 +++ b/arch/mips/kernel/i8259.c
6884 @@ -205,7 +205,7 @@ spurious_8259A_irq:
6885 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6886 spurious_irq_mask |= irqmask;
6887 }
6888 - atomic_inc(&irq_err_count);
6889 + atomic_inc_unchecked(&irq_err_count);
6890 /*
6891 * Theoretically we do not have to handle this IRQ,
6892 * but in Linux this does not cause problems and is
6893 diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6894 index 44a1f79..2bd6aa3 100644
6895 --- a/arch/mips/kernel/irq-gt641xx.c
6896 +++ b/arch/mips/kernel/irq-gt641xx.c
6897 @@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6898 }
6899 }
6900
6901 - atomic_inc(&irq_err_count);
6902 + atomic_inc_unchecked(&irq_err_count);
6903 }
6904
6905 void __init gt641xx_irq_init(void)
6906 diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6907 index d1fea7a..2e591b0 100644
6908 --- a/arch/mips/kernel/irq.c
6909 +++ b/arch/mips/kernel/irq.c
6910 @@ -77,17 +77,17 @@ void ack_bad_irq(unsigned int irq)
6911 printk("unexpected IRQ # %d\n", irq);
6912 }
6913
6914 -atomic_t irq_err_count;
6915 +atomic_unchecked_t irq_err_count;
6916
6917 int arch_show_interrupts(struct seq_file *p, int prec)
6918 {
6919 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6920 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6921 return 0;
6922 }
6923
6924 asmlinkage void spurious_interrupt(void)
6925 {
6926 - atomic_inc(&irq_err_count);
6927 + atomic_inc_unchecked(&irq_err_count);
6928 }
6929
6930 void __init init_IRQ(void)
6931 @@ -110,7 +110,10 @@ void __init init_IRQ(void)
6932 #endif
6933 }
6934
6935 +
6936 #ifdef DEBUG_STACKOVERFLOW
6937 +extern void gr_handle_kernel_exploit(void);
6938 +
6939 static inline void check_stack_overflow(void)
6940 {
6941 unsigned long sp;
6942 @@ -126,6 +129,7 @@ static inline void check_stack_overflow(void)
6943 printk("do_IRQ: stack overflow: %ld\n",
6944 sp - sizeof(struct thread_info));
6945 dump_stack();
6946 + gr_handle_kernel_exploit();
6947 }
6948 }
6949 #else
6950 diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6951 index 60e39dc..b4829bf 100644
6952 --- a/arch/mips/kernel/process.c
6953 +++ b/arch/mips/kernel/process.c
6954 @@ -579,15 +579,3 @@ unsigned long get_wchan(struct task_struct *task)
6955 out:
6956 return pc;
6957 }
6958 -
6959 -/*
6960 - * Don't forget that the stack pointer must be aligned on a 8 bytes
6961 - * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6962 - */
6963 -unsigned long arch_align_stack(unsigned long sp)
6964 -{
6965 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6966 - sp -= get_random_int() & ~PAGE_MASK;
6967 -
6968 - return sp & ALMASK;
6969 -}
6970 diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6971 index f639ccd..e4b110d 100644
6972 --- a/arch/mips/kernel/ptrace.c
6973 +++ b/arch/mips/kernel/ptrace.c
6974 @@ -630,6 +630,10 @@ long arch_ptrace(struct task_struct *child, long request,
6975 return ret;
6976 }
6977
6978 +#ifdef CONFIG_GRKERNSEC_SETXID
6979 +extern void gr_delayed_cred_worker(void);
6980 +#endif
6981 +
6982 /*
6983 * Notification of system call entry/exit
6984 * - triggered by current->work.syscall_trace
6985 @@ -646,6 +650,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6986 tracehook_report_syscall_entry(regs))
6987 ret = -1;
6988
6989 +#ifdef CONFIG_GRKERNSEC_SETXID
6990 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6991 + gr_delayed_cred_worker();
6992 +#endif
6993 +
6994 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6995 trace_sys_enter(regs, regs->regs[2]);
6996
6997 diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6998 index 07fc524..b9d7f28 100644
6999 --- a/arch/mips/kernel/reset.c
7000 +++ b/arch/mips/kernel/reset.c
7001 @@ -13,6 +13,7 @@
7002 #include <linux/reboot.h>
7003
7004 #include <asm/reboot.h>
7005 +#include <asm/bug.h>
7006
7007 /*
7008 * Urgs ... Too many MIPS machines to handle this in a generic way.
7009 @@ -29,16 +30,19 @@ void machine_restart(char *command)
7010 {
7011 if (_machine_restart)
7012 _machine_restart(command);
7013 + BUG();
7014 }
7015
7016 void machine_halt(void)
7017 {
7018 if (_machine_halt)
7019 _machine_halt();
7020 + BUG();
7021 }
7022
7023 void machine_power_off(void)
7024 {
7025 if (pm_power_off)
7026 pm_power_off();
7027 + BUG();
7028 }
7029 diff --git a/arch/mips/kernel/smtc-proc.c b/arch/mips/kernel/smtc-proc.c
7030 index 38635a9..3fcd5e0 100644
7031 --- a/arch/mips/kernel/smtc-proc.c
7032 +++ b/arch/mips/kernel/smtc-proc.c
7033 @@ -31,7 +31,7 @@ unsigned long selfipis[NR_CPUS];
7034
7035 struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
7036
7037 -atomic_t smtc_fpu_recoveries;
7038 +atomic_unchecked_t smtc_fpu_recoveries;
7039
7040 static int smtc_proc_show(struct seq_file *m, void *v)
7041 {
7042 @@ -48,7 +48,7 @@ static int smtc_proc_show(struct seq_file *m, void *v)
7043 for(i = 0; i < NR_CPUS; i++)
7044 seq_printf(m, "%d: %ld\n", i, smtc_cpu_stats[i].selfipis);
7045 seq_printf(m, "%d Recoveries of \"stolen\" FPU\n",
7046 - atomic_read(&smtc_fpu_recoveries));
7047 + atomic_read_unchecked(&smtc_fpu_recoveries));
7048 return 0;
7049 }
7050
7051 @@ -73,7 +73,7 @@ void init_smtc_stats(void)
7052 smtc_cpu_stats[i].selfipis = 0;
7053 }
7054
7055 - atomic_set(&smtc_fpu_recoveries, 0);
7056 + atomic_set_unchecked(&smtc_fpu_recoveries, 0);
7057
7058 proc_create("smtc", 0444, NULL, &smtc_proc_fops);
7059 }
7060 diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
7061 index c1681d6..9f881d1 100644
7062 --- a/arch/mips/kernel/smtc.c
7063 +++ b/arch/mips/kernel/smtc.c
7064 @@ -1359,7 +1359,7 @@ void smtc_soft_dump(void)
7065 }
7066 smtc_ipi_qdump();
7067 printk("%d Recoveries of \"stolen\" FPU\n",
7068 - atomic_read(&smtc_fpu_recoveries));
7069 + atomic_read_unchecked(&smtc_fpu_recoveries));
7070 }
7071
7072
7073 diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
7074 index c24ad5f..9983ab2 100644
7075 --- a/arch/mips/kernel/sync-r4k.c
7076 +++ b/arch/mips/kernel/sync-r4k.c
7077 @@ -20,8 +20,8 @@
7078 #include <asm/mipsregs.h>
7079
7080 static atomic_t count_start_flag = ATOMIC_INIT(0);
7081 -static atomic_t count_count_start = ATOMIC_INIT(0);
7082 -static atomic_t count_count_stop = ATOMIC_INIT(0);
7083 +static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
7084 +static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
7085 static atomic_t count_reference = ATOMIC_INIT(0);
7086
7087 #define COUNTON 100
7088 @@ -68,13 +68,13 @@ void synchronise_count_master(int cpu)
7089
7090 for (i = 0; i < NR_LOOPS; i++) {
7091 /* slaves loop on '!= 2' */
7092 - while (atomic_read(&count_count_start) != 1)
7093 + while (atomic_read_unchecked(&count_count_start) != 1)
7094 mb();
7095 - atomic_set(&count_count_stop, 0);
7096 + atomic_set_unchecked(&count_count_stop, 0);
7097 smp_wmb();
7098
7099 /* this lets the slaves write their count register */
7100 - atomic_inc(&count_count_start);
7101 + atomic_inc_unchecked(&count_count_start);
7102
7103 /*
7104 * Everyone initialises count in the last loop:
7105 @@ -85,11 +85,11 @@ void synchronise_count_master(int cpu)
7106 /*
7107 * Wait for all slaves to leave the synchronization point:
7108 */
7109 - while (atomic_read(&count_count_stop) != 1)
7110 + while (atomic_read_unchecked(&count_count_stop) != 1)
7111 mb();
7112 - atomic_set(&count_count_start, 0);
7113 + atomic_set_unchecked(&count_count_start, 0);
7114 smp_wmb();
7115 - atomic_inc(&count_count_stop);
7116 + atomic_inc_unchecked(&count_count_stop);
7117 }
7118 /* Arrange for an interrupt in a short while */
7119 write_c0_compare(read_c0_count() + COUNTON);
7120 @@ -130,8 +130,8 @@ void synchronise_count_slave(int cpu)
7121 initcount = atomic_read(&count_reference);
7122
7123 for (i = 0; i < NR_LOOPS; i++) {
7124 - atomic_inc(&count_count_start);
7125 - while (atomic_read(&count_count_start) != 2)
7126 + atomic_inc_unchecked(&count_count_start);
7127 + while (atomic_read_unchecked(&count_count_start) != 2)
7128 mb();
7129
7130 /*
7131 @@ -140,8 +140,8 @@ void synchronise_count_slave(int cpu)
7132 if (i == NR_LOOPS-1)
7133 write_c0_count(initcount);
7134
7135 - atomic_inc(&count_count_stop);
7136 - while (atomic_read(&count_count_stop) != 2)
7137 + atomic_inc_unchecked(&count_count_stop);
7138 + while (atomic_read_unchecked(&count_count_stop) != 2)
7139 mb();
7140 }
7141 /* Arrange for an interrupt in a short while */
7142 diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
7143 index 8119ac2..b229939 100644
7144 --- a/arch/mips/kernel/traps.c
7145 +++ b/arch/mips/kernel/traps.c
7146 @@ -695,7 +695,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
7147 siginfo_t info;
7148
7149 prev_state = exception_enter();
7150 - die_if_kernel("Integer overflow", regs);
7151 + if (unlikely(!user_mode(regs))) {
7152 +
7153 +#ifdef CONFIG_PAX_REFCOUNT
7154 + if (fixup_exception(regs)) {
7155 + pax_report_refcount_overflow(regs);
7156 + exception_exit(prev_state);
7157 + return;
7158 + }
7159 +#endif
7160 +
7161 + die("Integer overflow", regs);
7162 + }
7163
7164 info.si_code = FPE_INTOVF;
7165 info.si_signo = SIGFPE;
7166 diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
7167 index becc42b..9e43d4b 100644
7168 --- a/arch/mips/mm/fault.c
7169 +++ b/arch/mips/mm/fault.c
7170 @@ -28,6 +28,23 @@
7171 #include <asm/highmem.h> /* For VMALLOC_END */
7172 #include <linux/kdebug.h>
7173
7174 +#ifdef CONFIG_PAX_PAGEEXEC
7175 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7176 +{
7177 + unsigned long i;
7178 +
7179 + printk(KERN_ERR "PAX: bytes at PC: ");
7180 + for (i = 0; i < 5; i++) {
7181 + unsigned int c;
7182 + if (get_user(c, (unsigned int *)pc+i))
7183 + printk(KERN_CONT "???????? ");
7184 + else
7185 + printk(KERN_CONT "%08x ", c);
7186 + }
7187 + printk("\n");
7188 +}
7189 +#endif
7190 +
7191 /*
7192 * This routine handles page faults. It determines the address,
7193 * and the problem, and then passes it off to one of the appropriate
7194 @@ -199,6 +216,14 @@ bad_area:
7195 bad_area_nosemaphore:
7196 /* User mode accesses just cause a SIGSEGV */
7197 if (user_mode(regs)) {
7198 +
7199 +#ifdef CONFIG_PAX_PAGEEXEC
7200 + if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
7201 + pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
7202 + do_group_exit(SIGKILL);
7203 + }
7204 +#endif
7205 +
7206 tsk->thread.cp0_badvaddr = address;
7207 tsk->thread.error_code = write;
7208 #if 0
7209 diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
7210 index f1baadd..5472dca 100644
7211 --- a/arch/mips/mm/mmap.c
7212 +++ b/arch/mips/mm/mmap.c
7213 @@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7214 struct vm_area_struct *vma;
7215 unsigned long addr = addr0;
7216 int do_color_align;
7217 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
7218 struct vm_unmapped_area_info info;
7219
7220 if (unlikely(len > TASK_SIZE))
7221 @@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7222 do_color_align = 1;
7223
7224 /* requesting a specific address */
7225 +
7226 +#ifdef CONFIG_PAX_RANDMMAP
7227 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
7228 +#endif
7229 +
7230 if (addr) {
7231 if (do_color_align)
7232 addr = COLOUR_ALIGN(addr, pgoff);
7233 @@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7234 addr = PAGE_ALIGN(addr);
7235
7236 vma = find_vma(mm, addr);
7237 - if (TASK_SIZE - len >= addr &&
7238 - (!vma || addr + len <= vma->vm_start))
7239 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
7240 return addr;
7241 }
7242
7243 info.length = len;
7244 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
7245 info.align_offset = pgoff << PAGE_SHIFT;
7246 + info.threadstack_offset = offset;
7247
7248 if (dir == DOWN) {
7249 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
7250 @@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7251 {
7252 unsigned long random_factor = 0UL;
7253
7254 +#ifdef CONFIG_PAX_RANDMMAP
7255 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7256 +#endif
7257 +
7258 if (current->flags & PF_RANDOMIZE) {
7259 random_factor = get_random_int();
7260 random_factor = random_factor << PAGE_SHIFT;
7261 @@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7262
7263 if (mmap_is_legacy()) {
7264 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7265 +
7266 +#ifdef CONFIG_PAX_RANDMMAP
7267 + if (mm->pax_flags & MF_PAX_RANDMMAP)
7268 + mm->mmap_base += mm->delta_mmap;
7269 +#endif
7270 +
7271 mm->get_unmapped_area = arch_get_unmapped_area;
7272 } else {
7273 mm->mmap_base = mmap_base(random_factor);
7274 +
7275 +#ifdef CONFIG_PAX_RANDMMAP
7276 + if (mm->pax_flags & MF_PAX_RANDMMAP)
7277 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7278 +#endif
7279 +
7280 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7281 }
7282 }
7283
7284 -static inline unsigned long brk_rnd(void)
7285 -{
7286 - unsigned long rnd = get_random_int();
7287 -
7288 - rnd = rnd << PAGE_SHIFT;
7289 - /* 8MB for 32bit, 256MB for 64bit */
7290 - if (TASK_IS_32BIT_ADDR)
7291 - rnd = rnd & 0x7ffffful;
7292 - else
7293 - rnd = rnd & 0xffffffful;
7294 -
7295 - return rnd;
7296 -}
7297 -
7298 -unsigned long arch_randomize_brk(struct mm_struct *mm)
7299 -{
7300 - unsigned long base = mm->brk;
7301 - unsigned long ret;
7302 -
7303 - ret = PAGE_ALIGN(base + brk_rnd());
7304 -
7305 - if (ret < mm->brk)
7306 - return mm->brk;
7307 -
7308 - return ret;
7309 -}
7310 -
7311 int __virt_addr_valid(const volatile void *kaddr)
7312 {
7313 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7314 diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
7315 index 59cccd9..f39ac2f 100644
7316 --- a/arch/mips/pci/pci-octeon.c
7317 +++ b/arch/mips/pci/pci-octeon.c
7318 @@ -327,8 +327,8 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn,
7319
7320
7321 static struct pci_ops octeon_pci_ops = {
7322 - octeon_read_config,
7323 - octeon_write_config,
7324 + .read = octeon_read_config,
7325 + .write = octeon_write_config,
7326 };
7327
7328 static struct resource octeon_pci_mem_resource = {
7329 diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
7330 index 5e36c33..eb4a17b 100644
7331 --- a/arch/mips/pci/pcie-octeon.c
7332 +++ b/arch/mips/pci/pcie-octeon.c
7333 @@ -1792,8 +1792,8 @@ static int octeon_dummy_write_config(struct pci_bus *bus, unsigned int devfn,
7334 }
7335
7336 static struct pci_ops octeon_pcie0_ops = {
7337 - octeon_pcie0_read_config,
7338 - octeon_pcie0_write_config,
7339 + .read = octeon_pcie0_read_config,
7340 + .write = octeon_pcie0_write_config,
7341 };
7342
7343 static struct resource octeon_pcie0_mem_resource = {
7344 @@ -1813,8 +1813,8 @@ static struct pci_controller octeon_pcie0_controller = {
7345 };
7346
7347 static struct pci_ops octeon_pcie1_ops = {
7348 - octeon_pcie1_read_config,
7349 - octeon_pcie1_write_config,
7350 + .read = octeon_pcie1_read_config,
7351 + .write = octeon_pcie1_write_config,
7352 };
7353
7354 static struct resource octeon_pcie1_mem_resource = {
7355 @@ -1834,8 +1834,8 @@ static struct pci_controller octeon_pcie1_controller = {
7356 };
7357
7358 static struct pci_ops octeon_dummy_ops = {
7359 - octeon_dummy_read_config,
7360 - octeon_dummy_write_config,
7361 + .read = octeon_dummy_read_config,
7362 + .write = octeon_dummy_write_config,
7363 };
7364
7365 static struct resource octeon_dummy_mem_resource = {
7366 diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7367 index a2358b4..7cead4f 100644
7368 --- a/arch/mips/sgi-ip27/ip27-nmi.c
7369 +++ b/arch/mips/sgi-ip27/ip27-nmi.c
7370 @@ -187,9 +187,9 @@ void
7371 cont_nmi_dump(void)
7372 {
7373 #ifndef REAL_NMI_SIGNAL
7374 - static atomic_t nmied_cpus = ATOMIC_INIT(0);
7375 + static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7376
7377 - atomic_inc(&nmied_cpus);
7378 + atomic_inc_unchecked(&nmied_cpus);
7379 #endif
7380 /*
7381 * Only allow 1 cpu to proceed
7382 @@ -233,7 +233,7 @@ cont_nmi_dump(void)
7383 udelay(10000);
7384 }
7385 #else
7386 - while (atomic_read(&nmied_cpus) != num_online_cpus());
7387 + while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7388 #endif
7389
7390 /*
7391 diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7392 index a046b30..6799527 100644
7393 --- a/arch/mips/sni/rm200.c
7394 +++ b/arch/mips/sni/rm200.c
7395 @@ -270,7 +270,7 @@ spurious_8259A_irq:
7396 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7397 spurious_irq_mask |= irqmask;
7398 }
7399 - atomic_inc(&irq_err_count);
7400 + atomic_inc_unchecked(&irq_err_count);
7401 /*
7402 * Theoretically we do not have to handle this IRQ,
7403 * but in Linux this does not cause problems and is
7404 diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7405 index 41e873b..34d33a7 100644
7406 --- a/arch/mips/vr41xx/common/icu.c
7407 +++ b/arch/mips/vr41xx/common/icu.c
7408 @@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7409
7410 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7411
7412 - atomic_inc(&irq_err_count);
7413 + atomic_inc_unchecked(&irq_err_count);
7414
7415 return -1;
7416 }
7417 diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7418 index ae0e4ee..e8f0692 100644
7419 --- a/arch/mips/vr41xx/common/irq.c
7420 +++ b/arch/mips/vr41xx/common/irq.c
7421 @@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7422 irq_cascade_t *cascade;
7423
7424 if (irq >= NR_IRQS) {
7425 - atomic_inc(&irq_err_count);
7426 + atomic_inc_unchecked(&irq_err_count);
7427 return;
7428 }
7429
7430 @@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7431 ret = cascade->get_irq(irq);
7432 irq = ret;
7433 if (ret < 0)
7434 - atomic_inc(&irq_err_count);
7435 + atomic_inc_unchecked(&irq_err_count);
7436 else
7437 irq_dispatch(irq);
7438 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7439 diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7440 index 967d144..db12197 100644
7441 --- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7442 +++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7443 @@ -11,12 +11,14 @@
7444 #ifndef _ASM_PROC_CACHE_H
7445 #define _ASM_PROC_CACHE_H
7446
7447 +#include <linux/const.h>
7448 +
7449 /* L1 cache */
7450
7451 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7452 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7453 -#define L1_CACHE_BYTES 16 /* bytes per entry */
7454 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7455 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7456 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7457
7458 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7459 diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7460 index bcb5df2..84fabd2 100644
7461 --- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7462 +++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7463 @@ -16,13 +16,15 @@
7464 #ifndef _ASM_PROC_CACHE_H
7465 #define _ASM_PROC_CACHE_H
7466
7467 +#include <linux/const.h>
7468 +
7469 /*
7470 * L1 cache
7471 */
7472 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7473 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7474 -#define L1_CACHE_BYTES 32 /* bytes per entry */
7475 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7476 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7477 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7478
7479 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7480 diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7481 index 4ce7a01..449202a 100644
7482 --- a/arch/openrisc/include/asm/cache.h
7483 +++ b/arch/openrisc/include/asm/cache.h
7484 @@ -19,11 +19,13 @@
7485 #ifndef __ASM_OPENRISC_CACHE_H
7486 #define __ASM_OPENRISC_CACHE_H
7487
7488 +#include <linux/const.h>
7489 +
7490 /* FIXME: How can we replace these with values from the CPU...
7491 * they shouldn't be hard-coded!
7492 */
7493
7494 -#define L1_CACHE_BYTES 16
7495 #define L1_CACHE_SHIFT 4
7496 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7497
7498 #endif /* __ASM_OPENRISC_CACHE_H */
7499 diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7500 index 472886c..00e7df9 100644
7501 --- a/arch/parisc/include/asm/atomic.h
7502 +++ b/arch/parisc/include/asm/atomic.h
7503 @@ -252,6 +252,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7504 return dec;
7505 }
7506
7507 +#define atomic64_read_unchecked(v) atomic64_read(v)
7508 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7509 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7510 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7511 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7512 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
7513 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7514 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
7515 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7516 +
7517 #endif /* !CONFIG_64BIT */
7518
7519
7520 diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7521 index 47f11c7..3420df2 100644
7522 --- a/arch/parisc/include/asm/cache.h
7523 +++ b/arch/parisc/include/asm/cache.h
7524 @@ -5,6 +5,7 @@
7525 #ifndef __ARCH_PARISC_CACHE_H
7526 #define __ARCH_PARISC_CACHE_H
7527
7528 +#include <linux/const.h>
7529
7530 /*
7531 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7532 @@ -15,13 +16,13 @@
7533 * just ruin performance.
7534 */
7535 #ifdef CONFIG_PA20
7536 -#define L1_CACHE_BYTES 64
7537 #define L1_CACHE_SHIFT 6
7538 #else
7539 -#define L1_CACHE_BYTES 32
7540 #define L1_CACHE_SHIFT 5
7541 #endif
7542
7543 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7544 +
7545 #ifndef __ASSEMBLY__
7546
7547 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7548 diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7549 index 3391d06..c23a2cc 100644
7550 --- a/arch/parisc/include/asm/elf.h
7551 +++ b/arch/parisc/include/asm/elf.h
7552 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7553
7554 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7555
7556 +#ifdef CONFIG_PAX_ASLR
7557 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
7558 +
7559 +#define PAX_DELTA_MMAP_LEN 16
7560 +#define PAX_DELTA_STACK_LEN 16
7561 +#endif
7562 +
7563 /* This yields a mask that user programs can use to figure out what
7564 instruction set this CPU supports. This could be done in user space,
7565 but it's not easy, and we've already done it here. */
7566 diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7567 index f213f5b..0af3e8e 100644
7568 --- a/arch/parisc/include/asm/pgalloc.h
7569 +++ b/arch/parisc/include/asm/pgalloc.h
7570 @@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7571 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7572 }
7573
7574 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7575 +{
7576 + pgd_populate(mm, pgd, pmd);
7577 +}
7578 +
7579 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7580 {
7581 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7582 @@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7583 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7584 #define pmd_free(mm, x) do { } while (0)
7585 #define pgd_populate(mm, pmd, pte) BUG()
7586 +#define pgd_populate_kernel(mm, pmd, pte) BUG()
7587
7588 #endif
7589
7590 diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7591 index 22b89d1..ce34230 100644
7592 --- a/arch/parisc/include/asm/pgtable.h
7593 +++ b/arch/parisc/include/asm/pgtable.h
7594 @@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7595 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7596 #define PAGE_COPY PAGE_EXECREAD
7597 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7598 +
7599 +#ifdef CONFIG_PAX_PAGEEXEC
7600 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7601 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7602 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7603 +#else
7604 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
7605 +# define PAGE_COPY_NOEXEC PAGE_COPY
7606 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
7607 +#endif
7608 +
7609 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7610 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7611 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7612 diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7613 index 4006964..fcb3cc2 100644
7614 --- a/arch/parisc/include/asm/uaccess.h
7615 +++ b/arch/parisc/include/asm/uaccess.h
7616 @@ -246,10 +246,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7617 const void __user *from,
7618 unsigned long n)
7619 {
7620 - int sz = __compiletime_object_size(to);
7621 + size_t sz = __compiletime_object_size(to);
7622 int ret = -EFAULT;
7623
7624 - if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7625 + if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7626 ret = __copy_from_user(to, from, n);
7627 else
7628 copy_from_user_overflow();
7629 diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7630 index 50dfafc..b9fc230 100644
7631 --- a/arch/parisc/kernel/module.c
7632 +++ b/arch/parisc/kernel/module.c
7633 @@ -98,16 +98,38 @@
7634
7635 /* three functions to determine where in the module core
7636 * or init pieces the location is */
7637 +static inline int in_init_rx(struct module *me, void *loc)
7638 +{
7639 + return (loc >= me->module_init_rx &&
7640 + loc < (me->module_init_rx + me->init_size_rx));
7641 +}
7642 +
7643 +static inline int in_init_rw(struct module *me, void *loc)
7644 +{
7645 + return (loc >= me->module_init_rw &&
7646 + loc < (me->module_init_rw + me->init_size_rw));
7647 +}
7648 +
7649 static inline int in_init(struct module *me, void *loc)
7650 {
7651 - return (loc >= me->module_init &&
7652 - loc <= (me->module_init + me->init_size));
7653 + return in_init_rx(me, loc) || in_init_rw(me, loc);
7654 +}
7655 +
7656 +static inline int in_core_rx(struct module *me, void *loc)
7657 +{
7658 + return (loc >= me->module_core_rx &&
7659 + loc < (me->module_core_rx + me->core_size_rx));
7660 +}
7661 +
7662 +static inline int in_core_rw(struct module *me, void *loc)
7663 +{
7664 + return (loc >= me->module_core_rw &&
7665 + loc < (me->module_core_rw + me->core_size_rw));
7666 }
7667
7668 static inline int in_core(struct module *me, void *loc)
7669 {
7670 - return (loc >= me->module_core &&
7671 - loc <= (me->module_core + me->core_size));
7672 + return in_core_rx(me, loc) || in_core_rw(me, loc);
7673 }
7674
7675 static inline int in_local(struct module *me, void *loc)
7676 @@ -371,13 +393,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7677 }
7678
7679 /* align things a bit */
7680 - me->core_size = ALIGN(me->core_size, 16);
7681 - me->arch.got_offset = me->core_size;
7682 - me->core_size += gots * sizeof(struct got_entry);
7683 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
7684 + me->arch.got_offset = me->core_size_rw;
7685 + me->core_size_rw += gots * sizeof(struct got_entry);
7686
7687 - me->core_size = ALIGN(me->core_size, 16);
7688 - me->arch.fdesc_offset = me->core_size;
7689 - me->core_size += fdescs * sizeof(Elf_Fdesc);
7690 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
7691 + me->arch.fdesc_offset = me->core_size_rw;
7692 + me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7693
7694 me->arch.got_max = gots;
7695 me->arch.fdesc_max = fdescs;
7696 @@ -395,7 +417,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7697
7698 BUG_ON(value == 0);
7699
7700 - got = me->module_core + me->arch.got_offset;
7701 + got = me->module_core_rw + me->arch.got_offset;
7702 for (i = 0; got[i].addr; i++)
7703 if (got[i].addr == value)
7704 goto out;
7705 @@ -413,7 +435,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7706 #ifdef CONFIG_64BIT
7707 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7708 {
7709 - Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7710 + Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7711
7712 if (!value) {
7713 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7714 @@ -431,7 +453,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7715
7716 /* Create new one */
7717 fdesc->addr = value;
7718 - fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7719 + fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7720 return (Elf_Addr)fdesc;
7721 }
7722 #endif /* CONFIG_64BIT */
7723 @@ -843,7 +865,7 @@ register_unwind_table(struct module *me,
7724
7725 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7726 end = table + sechdrs[me->arch.unwind_section].sh_size;
7727 - gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7728 + gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7729
7730 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7731 me->arch.unwind_section, table, end, gp);
7732 diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7733 index e1ffea2..46ed66e 100644
7734 --- a/arch/parisc/kernel/sys_parisc.c
7735 +++ b/arch/parisc/kernel/sys_parisc.c
7736 @@ -89,6 +89,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7737 unsigned long task_size = TASK_SIZE;
7738 int do_color_align, last_mmap;
7739 struct vm_unmapped_area_info info;
7740 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7741
7742 if (len > task_size)
7743 return -ENOMEM;
7744 @@ -106,6 +107,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7745 goto found_addr;
7746 }
7747
7748 +#ifdef CONFIG_PAX_RANDMMAP
7749 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7750 +#endif
7751 +
7752 if (addr) {
7753 if (do_color_align && last_mmap)
7754 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7755 @@ -124,6 +129,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7756 info.high_limit = mmap_upper_limit();
7757 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7758 info.align_offset = shared_align_offset(last_mmap, pgoff);
7759 + info.threadstack_offset = offset;
7760 addr = vm_unmapped_area(&info);
7761
7762 found_addr:
7763 @@ -143,6 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7764 unsigned long addr = addr0;
7765 int do_color_align, last_mmap;
7766 struct vm_unmapped_area_info info;
7767 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7768
7769 #ifdef CONFIG_64BIT
7770 /* This should only ever run for 32-bit processes. */
7771 @@ -167,6 +174,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7772 }
7773
7774 /* requesting a specific address */
7775 +#ifdef CONFIG_PAX_RANDMMAP
7776 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7777 +#endif
7778 +
7779 if (addr) {
7780 if (do_color_align && last_mmap)
7781 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7782 @@ -184,6 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7783 info.high_limit = mm->mmap_base;
7784 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7785 info.align_offset = shared_align_offset(last_mmap, pgoff);
7786 + info.threadstack_offset = offset;
7787 addr = vm_unmapped_area(&info);
7788 if (!(addr & ~PAGE_MASK))
7789 goto found_addr;
7790 @@ -249,6 +261,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7791 mm->mmap_legacy_base = mmap_legacy_base();
7792 mm->mmap_base = mmap_upper_limit();
7793
7794 +#ifdef CONFIG_PAX_RANDMMAP
7795 + if (mm->pax_flags & MF_PAX_RANDMMAP) {
7796 + mm->mmap_legacy_base += mm->delta_mmap;
7797 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7798 + }
7799 +#endif
7800 +
7801 if (mmap_is_legacy()) {
7802 mm->mmap_base = mm->mmap_legacy_base;
7803 mm->get_unmapped_area = arch_get_unmapped_area;
7804 diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7805 index 47ee620..1107387 100644
7806 --- a/arch/parisc/kernel/traps.c
7807 +++ b/arch/parisc/kernel/traps.c
7808 @@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7809
7810 down_read(&current->mm->mmap_sem);
7811 vma = find_vma(current->mm,regs->iaoq[0]);
7812 - if (vma && (regs->iaoq[0] >= vma->vm_start)
7813 - && (vma->vm_flags & VM_EXEC)) {
7814 -
7815 + if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7816 fault_address = regs->iaoq[0];
7817 fault_space = regs->iasq[0];
7818
7819 diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7820 index 3ca9c11..d163ef7 100644
7821 --- a/arch/parisc/mm/fault.c
7822 +++ b/arch/parisc/mm/fault.c
7823 @@ -15,6 +15,7 @@
7824 #include <linux/sched.h>
7825 #include <linux/interrupt.h>
7826 #include <linux/module.h>
7827 +#include <linux/unistd.h>
7828
7829 #include <asm/uaccess.h>
7830 #include <asm/traps.h>
7831 @@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7832 static unsigned long
7833 parisc_acctyp(unsigned long code, unsigned int inst)
7834 {
7835 - if (code == 6 || code == 16)
7836 + if (code == 6 || code == 7 || code == 16)
7837 return VM_EXEC;
7838
7839 switch (inst & 0xf0000000) {
7840 @@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7841 }
7842 #endif
7843
7844 +#ifdef CONFIG_PAX_PAGEEXEC
7845 +/*
7846 + * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7847 + *
7848 + * returns 1 when task should be killed
7849 + * 2 when rt_sigreturn trampoline was detected
7850 + * 3 when unpatched PLT trampoline was detected
7851 + */
7852 +static int pax_handle_fetch_fault(struct pt_regs *regs)
7853 +{
7854 +
7855 +#ifdef CONFIG_PAX_EMUPLT
7856 + int err;
7857 +
7858 + do { /* PaX: unpatched PLT emulation */
7859 + unsigned int bl, depwi;
7860 +
7861 + err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7862 + err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7863 +
7864 + if (err)
7865 + break;
7866 +
7867 + if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7868 + unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7869 +
7870 + err = get_user(ldw, (unsigned int *)addr);
7871 + err |= get_user(bv, (unsigned int *)(addr+4));
7872 + err |= get_user(ldw2, (unsigned int *)(addr+8));
7873 +
7874 + if (err)
7875 + break;
7876 +
7877 + if (ldw == 0x0E801096U &&
7878 + bv == 0xEAC0C000U &&
7879 + ldw2 == 0x0E881095U)
7880 + {
7881 + unsigned int resolver, map;
7882 +
7883 + err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7884 + err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7885 + if (err)
7886 + break;
7887 +
7888 + regs->gr[20] = instruction_pointer(regs)+8;
7889 + regs->gr[21] = map;
7890 + regs->gr[22] = resolver;
7891 + regs->iaoq[0] = resolver | 3UL;
7892 + regs->iaoq[1] = regs->iaoq[0] + 4;
7893 + return 3;
7894 + }
7895 + }
7896 + } while (0);
7897 +#endif
7898 +
7899 +#ifdef CONFIG_PAX_EMUTRAMP
7900 +
7901 +#ifndef CONFIG_PAX_EMUSIGRT
7902 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7903 + return 1;
7904 +#endif
7905 +
7906 + do { /* PaX: rt_sigreturn emulation */
7907 + unsigned int ldi1, ldi2, bel, nop;
7908 +
7909 + err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7910 + err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7911 + err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7912 + err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7913 +
7914 + if (err)
7915 + break;
7916 +
7917 + if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7918 + ldi2 == 0x3414015AU &&
7919 + bel == 0xE4008200U &&
7920 + nop == 0x08000240U)
7921 + {
7922 + regs->gr[25] = (ldi1 & 2) >> 1;
7923 + regs->gr[20] = __NR_rt_sigreturn;
7924 + regs->gr[31] = regs->iaoq[1] + 16;
7925 + regs->sr[0] = regs->iasq[1];
7926 + regs->iaoq[0] = 0x100UL;
7927 + regs->iaoq[1] = regs->iaoq[0] + 4;
7928 + regs->iasq[0] = regs->sr[2];
7929 + regs->iasq[1] = regs->sr[2];
7930 + return 2;
7931 + }
7932 + } while (0);
7933 +#endif
7934 +
7935 + return 1;
7936 +}
7937 +
7938 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7939 +{
7940 + unsigned long i;
7941 +
7942 + printk(KERN_ERR "PAX: bytes at PC: ");
7943 + for (i = 0; i < 5; i++) {
7944 + unsigned int c;
7945 + if (get_user(c, (unsigned int *)pc+i))
7946 + printk(KERN_CONT "???????? ");
7947 + else
7948 + printk(KERN_CONT "%08x ", c);
7949 + }
7950 + printk("\n");
7951 +}
7952 +#endif
7953 +
7954 int fixup_exception(struct pt_regs *regs)
7955 {
7956 const struct exception_table_entry *fix;
7957 @@ -234,8 +345,33 @@ retry:
7958
7959 good_area:
7960
7961 - if ((vma->vm_flags & acc_type) != acc_type)
7962 + if ((vma->vm_flags & acc_type) != acc_type) {
7963 +
7964 +#ifdef CONFIG_PAX_PAGEEXEC
7965 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7966 + (address & ~3UL) == instruction_pointer(regs))
7967 + {
7968 + up_read(&mm->mmap_sem);
7969 + switch (pax_handle_fetch_fault(regs)) {
7970 +
7971 +#ifdef CONFIG_PAX_EMUPLT
7972 + case 3:
7973 + return;
7974 +#endif
7975 +
7976 +#ifdef CONFIG_PAX_EMUTRAMP
7977 + case 2:
7978 + return;
7979 +#endif
7980 +
7981 + }
7982 + pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7983 + do_group_exit(SIGKILL);
7984 + }
7985 +#endif
7986 +
7987 goto bad_area;
7988 + }
7989
7990 /*
7991 * If for any reason at all we couldn't handle the fault, make
7992 diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7993 index e099899..457d6a8 100644
7994 --- a/arch/powerpc/Kconfig
7995 +++ b/arch/powerpc/Kconfig
7996 @@ -397,6 +397,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7997 config KEXEC
7998 bool "kexec system call"
7999 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
8000 + depends on !GRKERNSEC_KMEM
8001 help
8002 kexec is a system call that implements the ability to shutdown your
8003 current kernel, and to start another kernel. It is like a reboot
8004 diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
8005 index e3b1d41..8e81edf 100644
8006 --- a/arch/powerpc/include/asm/atomic.h
8007 +++ b/arch/powerpc/include/asm/atomic.h
8008 @@ -523,6 +523,16 @@ static __inline__ long atomic64_inc_not_zero(atomic64_t *v)
8009 return t1;
8010 }
8011
8012 +#define atomic64_read_unchecked(v) atomic64_read(v)
8013 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
8014 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
8015 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
8016 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
8017 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
8018 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
8019 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
8020 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
8021 +
8022 #endif /* __powerpc64__ */
8023
8024 #endif /* __KERNEL__ */
8025 diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8026 index f89da80..7f5b05a 100644
8027 --- a/arch/powerpc/include/asm/barrier.h
8028 +++ b/arch/powerpc/include/asm/barrier.h
8029 @@ -73,7 +73,7 @@
8030 do { \
8031 compiletime_assert_atomic_type(*p); \
8032 __lwsync(); \
8033 - ACCESS_ONCE(*p) = (v); \
8034 + ACCESS_ONCE_RW(*p) = (v); \
8035 } while (0)
8036
8037 #define smp_load_acquire(p) \
8038 diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8039 index ed0afc1..0332825 100644
8040 --- a/arch/powerpc/include/asm/cache.h
8041 +++ b/arch/powerpc/include/asm/cache.h
8042 @@ -3,6 +3,7 @@
8043
8044 #ifdef __KERNEL__
8045
8046 +#include <linux/const.h>
8047
8048 /* bytes per L1 cache line */
8049 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8050 @@ -22,7 +23,7 @@
8051 #define L1_CACHE_SHIFT 7
8052 #endif
8053
8054 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8055 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8056
8057 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8058
8059 diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8060 index 935b5e7..7001d2d 100644
8061 --- a/arch/powerpc/include/asm/elf.h
8062 +++ b/arch/powerpc/include/asm/elf.h
8063 @@ -28,8 +28,19 @@
8064 the loader. We need to make sure that it is out of the way of the program
8065 that it will "exec", and that there is sufficient room for the brk. */
8066
8067 -extern unsigned long randomize_et_dyn(unsigned long base);
8068 -#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
8069 +#define ELF_ET_DYN_BASE (0x20000000)
8070 +
8071 +#ifdef CONFIG_PAX_ASLR
8072 +#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8073 +
8074 +#ifdef __powerpc64__
8075 +#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8076 +#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8077 +#else
8078 +#define PAX_DELTA_MMAP_LEN 15
8079 +#define PAX_DELTA_STACK_LEN 15
8080 +#endif
8081 +#endif
8082
8083 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8084
8085 @@ -127,10 +138,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8086 (0x7ff >> (PAGE_SHIFT - 12)) : \
8087 (0x3ffff >> (PAGE_SHIFT - 12)))
8088
8089 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8090 -#define arch_randomize_brk arch_randomize_brk
8091 -
8092 -
8093 #ifdef CONFIG_SPU_BASE
8094 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8095 #define NT_SPU 1
8096 diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8097 index 8196e9c..d83a9f3 100644
8098 --- a/arch/powerpc/include/asm/exec.h
8099 +++ b/arch/powerpc/include/asm/exec.h
8100 @@ -4,6 +4,6 @@
8101 #ifndef _ASM_POWERPC_EXEC_H
8102 #define _ASM_POWERPC_EXEC_H
8103
8104 -extern unsigned long arch_align_stack(unsigned long sp);
8105 +#define arch_align_stack(x) ((x) & ~0xfUL)
8106
8107 #endif /* _ASM_POWERPC_EXEC_H */
8108 diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8109 index 5acabbd..7ea14fa 100644
8110 --- a/arch/powerpc/include/asm/kmap_types.h
8111 +++ b/arch/powerpc/include/asm/kmap_types.h
8112 @@ -10,7 +10,7 @@
8113 * 2 of the License, or (at your option) any later version.
8114 */
8115
8116 -#define KM_TYPE_NR 16
8117 +#define KM_TYPE_NR 17
8118
8119 #endif /* __KERNEL__ */
8120 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8121 diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8122 index b8da913..60b608a 100644
8123 --- a/arch/powerpc/include/asm/local.h
8124 +++ b/arch/powerpc/include/asm/local.h
8125 @@ -9,15 +9,26 @@ typedef struct
8126 atomic_long_t a;
8127 } local_t;
8128
8129 +typedef struct
8130 +{
8131 + atomic_long_unchecked_t a;
8132 +} local_unchecked_t;
8133 +
8134 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8135
8136 #define local_read(l) atomic_long_read(&(l)->a)
8137 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8138 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8139 +#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8140
8141 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8142 +#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8143 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8144 +#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8145 #define local_inc(l) atomic_long_inc(&(l)->a)
8146 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8147 #define local_dec(l) atomic_long_dec(&(l)->a)
8148 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8149
8150 static __inline__ long local_add_return(long a, local_t *l)
8151 {
8152 @@ -35,6 +46,7 @@ static __inline__ long local_add_return(long a, local_t *l)
8153
8154 return t;
8155 }
8156 +#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
8157
8158 #define local_add_negative(a, l) (local_add_return((a), (l)) < 0)
8159
8160 @@ -54,6 +66,7 @@ static __inline__ long local_sub_return(long a, local_t *l)
8161
8162 return t;
8163 }
8164 +#define local_sub_return_unchecked(i, l) atomic_long_sub_return_unchecked((i), (&(l)->a))
8165
8166 static __inline__ long local_inc_return(local_t *l)
8167 {
8168 @@ -101,6 +114,8 @@ static __inline__ long local_dec_return(local_t *l)
8169
8170 #define local_cmpxchg(l, o, n) \
8171 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8172 +#define local_cmpxchg_unchecked(l, o, n) \
8173 + (cmpxchg_local(&((l)->a.counter), (o), (n)))
8174 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8175
8176 /**
8177 diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8178 index 8565c25..2865190 100644
8179 --- a/arch/powerpc/include/asm/mman.h
8180 +++ b/arch/powerpc/include/asm/mman.h
8181 @@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8182 }
8183 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8184
8185 -static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8186 +static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8187 {
8188 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8189 }
8190 diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8191 index 32e4e21..62afb12 100644
8192 --- a/arch/powerpc/include/asm/page.h
8193 +++ b/arch/powerpc/include/asm/page.h
8194 @@ -230,8 +230,9 @@ extern long long virt_phys_offset;
8195 * and needs to be executable. This means the whole heap ends
8196 * up being executable.
8197 */
8198 -#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8199 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8200 +#define VM_DATA_DEFAULT_FLAGS32 \
8201 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8202 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8203
8204 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8205 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8206 @@ -259,6 +260,9 @@ extern long long virt_phys_offset;
8207 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8208 #endif
8209
8210 +#define ktla_ktva(addr) (addr)
8211 +#define ktva_ktla(addr) (addr)
8212 +
8213 #ifndef CONFIG_PPC_BOOK3S_64
8214 /*
8215 * Use the top bit of the higher-level page table entries to indicate whether
8216 diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8217 index 88693ce..ac6f9ab 100644
8218 --- a/arch/powerpc/include/asm/page_64.h
8219 +++ b/arch/powerpc/include/asm/page_64.h
8220 @@ -153,15 +153,18 @@ do { \
8221 * stack by default, so in the absence of a PT_GNU_STACK program header
8222 * we turn execute permission off.
8223 */
8224 -#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8225 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8226 +#define VM_STACK_DEFAULT_FLAGS32 \
8227 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8228 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8229
8230 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8231 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8232
8233 +#ifndef CONFIG_PAX_PAGEEXEC
8234 #define VM_STACK_DEFAULT_FLAGS \
8235 (is_32bit_task() ? \
8236 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8237 +#endif
8238
8239 #include <asm-generic/getorder.h>
8240
8241 diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8242 index 4b0be20..c15a27d 100644
8243 --- a/arch/powerpc/include/asm/pgalloc-64.h
8244 +++ b/arch/powerpc/include/asm/pgalloc-64.h
8245 @@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8246 #ifndef CONFIG_PPC_64K_PAGES
8247
8248 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8249 +#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8250
8251 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8252 {
8253 @@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8254 pud_set(pud, (unsigned long)pmd);
8255 }
8256
8257 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8258 +{
8259 + pud_populate(mm, pud, pmd);
8260 +}
8261 +
8262 #define pmd_populate(mm, pmd, pte_page) \
8263 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8264 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8265 @@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8266 #endif
8267
8268 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8269 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8270
8271 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8272 pte_t *pte)
8273 diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8274 index 3ebb188..e17dddf 100644
8275 --- a/arch/powerpc/include/asm/pgtable.h
8276 +++ b/arch/powerpc/include/asm/pgtable.h
8277 @@ -2,6 +2,7 @@
8278 #define _ASM_POWERPC_PGTABLE_H
8279 #ifdef __KERNEL__
8280
8281 +#include <linux/const.h>
8282 #ifndef __ASSEMBLY__
8283 #include <linux/mmdebug.h>
8284 #include <asm/processor.h> /* For TASK_SIZE */
8285 diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8286 index 4aad413..85d86bf 100644
8287 --- a/arch/powerpc/include/asm/pte-hash32.h
8288 +++ b/arch/powerpc/include/asm/pte-hash32.h
8289 @@ -21,6 +21,7 @@
8290 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
8291 #define _PAGE_USER 0x004 /* usermode access allowed */
8292 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8293 +#define _PAGE_EXEC _PAGE_GUARDED
8294 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8295 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8296 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8297 diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8298 index e5d2e0b..9ac74b1 100644
8299 --- a/arch/powerpc/include/asm/reg.h
8300 +++ b/arch/powerpc/include/asm/reg.h
8301 @@ -249,6 +249,7 @@
8302 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8303 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8304 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8305 +#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8306 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8307 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8308 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8309 diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8310 index ff51046..b982dd4 100644
8311 --- a/arch/powerpc/include/asm/smp.h
8312 +++ b/arch/powerpc/include/asm/smp.h
8313 @@ -51,7 +51,7 @@ struct smp_ops_t {
8314 int (*cpu_disable)(void);
8315 void (*cpu_die)(unsigned int nr);
8316 int (*cpu_bootable)(unsigned int nr);
8317 -};
8318 +} __no_const;
8319
8320 extern void smp_send_debugger_break(void);
8321 extern void start_secondary_resume(void);
8322 diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8323 index b034ecd..af7e31f 100644
8324 --- a/arch/powerpc/include/asm/thread_info.h
8325 +++ b/arch/powerpc/include/asm/thread_info.h
8326 @@ -107,6 +107,8 @@ static inline struct thread_info *current_thread_info(void)
8327 #if defined(CONFIG_PPC64)
8328 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8329 #endif
8330 +/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8331 +#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8332
8333 /* as above, but as bit values */
8334 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8335 @@ -125,9 +127,10 @@ static inline struct thread_info *current_thread_info(void)
8336 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8337 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8338 #define _TIF_NOHZ (1<<TIF_NOHZ)
8339 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8340 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8341 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8342 - _TIF_NOHZ)
8343 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
8344
8345 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8346 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8347 diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8348 index 9485b43..3bd3c16 100644
8349 --- a/arch/powerpc/include/asm/uaccess.h
8350 +++ b/arch/powerpc/include/asm/uaccess.h
8351 @@ -58,6 +58,7 @@
8352
8353 #endif
8354
8355 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8356 #define access_ok(type, addr, size) \
8357 (__chk_user_ptr(addr), \
8358 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8359 @@ -318,52 +319,6 @@ do { \
8360 extern unsigned long __copy_tofrom_user(void __user *to,
8361 const void __user *from, unsigned long size);
8362
8363 -#ifndef __powerpc64__
8364 -
8365 -static inline unsigned long copy_from_user(void *to,
8366 - const void __user *from, unsigned long n)
8367 -{
8368 - unsigned long over;
8369 -
8370 - if (access_ok(VERIFY_READ, from, n))
8371 - return __copy_tofrom_user((__force void __user *)to, from, n);
8372 - if ((unsigned long)from < TASK_SIZE) {
8373 - over = (unsigned long)from + n - TASK_SIZE;
8374 - return __copy_tofrom_user((__force void __user *)to, from,
8375 - n - over) + over;
8376 - }
8377 - return n;
8378 -}
8379 -
8380 -static inline unsigned long copy_to_user(void __user *to,
8381 - const void *from, unsigned long n)
8382 -{
8383 - unsigned long over;
8384 -
8385 - if (access_ok(VERIFY_WRITE, to, n))
8386 - return __copy_tofrom_user(to, (__force void __user *)from, n);
8387 - if ((unsigned long)to < TASK_SIZE) {
8388 - over = (unsigned long)to + n - TASK_SIZE;
8389 - return __copy_tofrom_user(to, (__force void __user *)from,
8390 - n - over) + over;
8391 - }
8392 - return n;
8393 -}
8394 -
8395 -#else /* __powerpc64__ */
8396 -
8397 -#define __copy_in_user(to, from, size) \
8398 - __copy_tofrom_user((to), (from), (size))
8399 -
8400 -extern unsigned long copy_from_user(void *to, const void __user *from,
8401 - unsigned long n);
8402 -extern unsigned long copy_to_user(void __user *to, const void *from,
8403 - unsigned long n);
8404 -extern unsigned long copy_in_user(void __user *to, const void __user *from,
8405 - unsigned long n);
8406 -
8407 -#endif /* __powerpc64__ */
8408 -
8409 static inline unsigned long __copy_from_user_inatomic(void *to,
8410 const void __user *from, unsigned long n)
8411 {
8412 @@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8413 if (ret == 0)
8414 return 0;
8415 }
8416 +
8417 + if (!__builtin_constant_p(n))
8418 + check_object_size(to, n, false);
8419 +
8420 return __copy_tofrom_user((__force void __user *)to, from, n);
8421 }
8422
8423 @@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8424 if (ret == 0)
8425 return 0;
8426 }
8427 +
8428 + if (!__builtin_constant_p(n))
8429 + check_object_size(from, n, true);
8430 +
8431 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8432 }
8433
8434 @@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8435 return __copy_to_user_inatomic(to, from, size);
8436 }
8437
8438 +#ifndef __powerpc64__
8439 +
8440 +static inline unsigned long __must_check copy_from_user(void *to,
8441 + const void __user *from, unsigned long n)
8442 +{
8443 + unsigned long over;
8444 +
8445 + if ((long)n < 0)
8446 + return n;
8447 +
8448 + if (access_ok(VERIFY_READ, from, n)) {
8449 + if (!__builtin_constant_p(n))
8450 + check_object_size(to, n, false);
8451 + return __copy_tofrom_user((__force void __user *)to, from, n);
8452 + }
8453 + if ((unsigned long)from < TASK_SIZE) {
8454 + over = (unsigned long)from + n - TASK_SIZE;
8455 + if (!__builtin_constant_p(n - over))
8456 + check_object_size(to, n - over, false);
8457 + return __copy_tofrom_user((__force void __user *)to, from,
8458 + n - over) + over;
8459 + }
8460 + return n;
8461 +}
8462 +
8463 +static inline unsigned long __must_check copy_to_user(void __user *to,
8464 + const void *from, unsigned long n)
8465 +{
8466 + unsigned long over;
8467 +
8468 + if ((long)n < 0)
8469 + return n;
8470 +
8471 + if (access_ok(VERIFY_WRITE, to, n)) {
8472 + if (!__builtin_constant_p(n))
8473 + check_object_size(from, n, true);
8474 + return __copy_tofrom_user(to, (__force void __user *)from, n);
8475 + }
8476 + if ((unsigned long)to < TASK_SIZE) {
8477 + over = (unsigned long)to + n - TASK_SIZE;
8478 + if (!__builtin_constant_p(n))
8479 + check_object_size(from, n - over, true);
8480 + return __copy_tofrom_user(to, (__force void __user *)from,
8481 + n - over) + over;
8482 + }
8483 + return n;
8484 +}
8485 +
8486 +#else /* __powerpc64__ */
8487 +
8488 +#define __copy_in_user(to, from, size) \
8489 + __copy_tofrom_user((to), (from), (size))
8490 +
8491 +static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8492 +{
8493 + if ((long)n < 0 || n > INT_MAX)
8494 + return n;
8495 +
8496 + if (!__builtin_constant_p(n))
8497 + check_object_size(to, n, false);
8498 +
8499 + if (likely(access_ok(VERIFY_READ, from, n)))
8500 + n = __copy_from_user(to, from, n);
8501 + else
8502 + memset(to, 0, n);
8503 + return n;
8504 +}
8505 +
8506 +static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8507 +{
8508 + if ((long)n < 0 || n > INT_MAX)
8509 + return n;
8510 +
8511 + if (likely(access_ok(VERIFY_WRITE, to, n))) {
8512 + if (!__builtin_constant_p(n))
8513 + check_object_size(from, n, true);
8514 + n = __copy_to_user(to, from, n);
8515 + }
8516 + return n;
8517 +}
8518 +
8519 +extern unsigned long copy_in_user(void __user *to, const void __user *from,
8520 + unsigned long n);
8521 +
8522 +#endif /* __powerpc64__ */
8523 +
8524 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8525
8526 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8527 diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8528 index fcc9a89..07be2bb 100644
8529 --- a/arch/powerpc/kernel/Makefile
8530 +++ b/arch/powerpc/kernel/Makefile
8531 @@ -26,6 +26,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8532 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8533 endif
8534
8535 +CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8536 +
8537 obj-y := cputable.o ptrace.o syscalls.o \
8538 irq.o align.o signal_32.o pmc.o vdso.o \
8539 process.o systbl.o idle.o \
8540 diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8541 index c1bee3c..5b42583 100644
8542 --- a/arch/powerpc/kernel/exceptions-64e.S
8543 +++ b/arch/powerpc/kernel/exceptions-64e.S
8544 @@ -1010,6 +1010,7 @@ storage_fault_common:
8545 std r14,_DAR(r1)
8546 std r15,_DSISR(r1)
8547 addi r3,r1,STACK_FRAME_OVERHEAD
8548 + bl .save_nvgprs
8549 mr r4,r14
8550 mr r5,r15
8551 ld r14,PACA_EXGEN+EX_R14(r13)
8552 @@ -1018,8 +1019,7 @@ storage_fault_common:
8553 cmpdi r3,0
8554 bne- 1f
8555 b .ret_from_except_lite
8556 -1: bl .save_nvgprs
8557 - mr r5,r3
8558 +1: mr r5,r3
8559 addi r3,r1,STACK_FRAME_OVERHEAD
8560 ld r4,_DAR(r1)
8561 bl .bad_page_fault
8562 diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8563 index 3afd391..18f9e36 100644
8564 --- a/arch/powerpc/kernel/exceptions-64s.S
8565 +++ b/arch/powerpc/kernel/exceptions-64s.S
8566 @@ -1587,10 +1587,10 @@ handle_page_fault:
8567 11: ld r4,_DAR(r1)
8568 ld r5,_DSISR(r1)
8569 addi r3,r1,STACK_FRAME_OVERHEAD
8570 + bl .save_nvgprs
8571 bl .do_page_fault
8572 cmpdi r3,0
8573 beq+ 12f
8574 - bl .save_nvgprs
8575 mr r5,r3
8576 addi r3,r1,STACK_FRAME_OVERHEAD
8577 lwz r4,_DAR(r1)
8578 diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8579 index ca1cd74..6f0241a 100644
8580 --- a/arch/powerpc/kernel/irq.c
8581 +++ b/arch/powerpc/kernel/irq.c
8582 @@ -447,6 +447,8 @@ void migrate_irqs(void)
8583 }
8584 #endif
8585
8586 +extern void gr_handle_kernel_exploit(void);
8587 +
8588 static inline void check_stack_overflow(void)
8589 {
8590 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8591 @@ -459,6 +461,7 @@ static inline void check_stack_overflow(void)
8592 printk("do_IRQ: stack overflow: %ld\n",
8593 sp - sizeof(struct thread_info));
8594 dump_stack();
8595 + gr_handle_kernel_exploit();
8596 }
8597 #endif
8598 }
8599 diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8600 index 6cff040..74ac5d1 100644
8601 --- a/arch/powerpc/kernel/module_32.c
8602 +++ b/arch/powerpc/kernel/module_32.c
8603 @@ -161,7 +161,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8604 me->arch.core_plt_section = i;
8605 }
8606 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8607 - printk("Module doesn't contain .plt or .init.plt sections.\n");
8608 + printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
8609 return -ENOEXEC;
8610 }
8611
8612 @@ -191,11 +191,16 @@ static uint32_t do_plt_call(void *location,
8613
8614 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8615 /* Init, or core PLT? */
8616 - if (location >= mod->module_core
8617 - && location < mod->module_core + mod->core_size)
8618 + if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8619 + (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8620 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8621 - else
8622 + else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8623 + (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8624 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8625 + else {
8626 + printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8627 + return ~0UL;
8628 + }
8629
8630 /* Find this entry, or if that fails, the next avail. entry */
8631 while (entry->jump[0]) {
8632 @@ -299,7 +304,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8633 }
8634 #ifdef CONFIG_DYNAMIC_FTRACE
8635 module->arch.tramp =
8636 - do_plt_call(module->module_core,
8637 + do_plt_call(module->module_core_rx,
8638 (unsigned long)ftrace_caller,
8639 sechdrs, module);
8640 #endif
8641 diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8642 index 31d0215..206af70 100644
8643 --- a/arch/powerpc/kernel/process.c
8644 +++ b/arch/powerpc/kernel/process.c
8645 @@ -1031,8 +1031,8 @@ void show_regs(struct pt_regs * regs)
8646 * Lookup NIP late so we have the best change of getting the
8647 * above info out without failing
8648 */
8649 - printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8650 - printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8651 + printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8652 + printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8653 #endif
8654 show_stack(current, (unsigned long *) regs->gpr[1]);
8655 if (!user_mode(regs))
8656 @@ -1554,10 +1554,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8657 newsp = stack[0];
8658 ip = stack[STACK_FRAME_LR_SAVE];
8659 if (!firstframe || ip != lr) {
8660 - printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8661 + printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8662 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8663 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
8664 - printk(" (%pS)",
8665 + printk(" (%pA)",
8666 (void *)current->ret_stack[curr_frame].ret);
8667 curr_frame--;
8668 }
8669 @@ -1577,7 +1577,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8670 struct pt_regs *regs = (struct pt_regs *)
8671 (sp + STACK_FRAME_OVERHEAD);
8672 lr = regs->link;
8673 - printk("--- Exception: %lx at %pS\n LR = %pS\n",
8674 + printk("--- Exception: %lx at %pA\n LR = %pA\n",
8675 regs->trap, (void *)regs->nip, (void *)lr);
8676 firstframe = 1;
8677 }
8678 @@ -1613,58 +1613,3 @@ void notrace __ppc64_runlatch_off(void)
8679 mtspr(SPRN_CTRLT, ctrl);
8680 }
8681 #endif /* CONFIG_PPC64 */
8682 -
8683 -unsigned long arch_align_stack(unsigned long sp)
8684 -{
8685 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8686 - sp -= get_random_int() & ~PAGE_MASK;
8687 - return sp & ~0xf;
8688 -}
8689 -
8690 -static inline unsigned long brk_rnd(void)
8691 -{
8692 - unsigned long rnd = 0;
8693 -
8694 - /* 8MB for 32bit, 1GB for 64bit */
8695 - if (is_32bit_task())
8696 - rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8697 - else
8698 - rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8699 -
8700 - return rnd << PAGE_SHIFT;
8701 -}
8702 -
8703 -unsigned long arch_randomize_brk(struct mm_struct *mm)
8704 -{
8705 - unsigned long base = mm->brk;
8706 - unsigned long ret;
8707 -
8708 -#ifdef CONFIG_PPC_STD_MMU_64
8709 - /*
8710 - * If we are using 1TB segments and we are allowed to randomise
8711 - * the heap, we can put it above 1TB so it is backed by a 1TB
8712 - * segment. Otherwise the heap will be in the bottom 1TB
8713 - * which always uses 256MB segments and this may result in a
8714 - * performance penalty.
8715 - */
8716 - if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
8717 - base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
8718 -#endif
8719 -
8720 - ret = PAGE_ALIGN(base + brk_rnd());
8721 -
8722 - if (ret < mm->brk)
8723 - return mm->brk;
8724 -
8725 - return ret;
8726 -}
8727 -
8728 -unsigned long randomize_et_dyn(unsigned long base)
8729 -{
8730 - unsigned long ret = PAGE_ALIGN(base + brk_rnd());
8731 -
8732 - if (ret < base)
8733 - return base;
8734 -
8735 - return ret;
8736 -}
8737 diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
8738 index 2e3d2bf..35df241 100644
8739 --- a/arch/powerpc/kernel/ptrace.c
8740 +++ b/arch/powerpc/kernel/ptrace.c
8741 @@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
8742 return ret;
8743 }
8744
8745 +#ifdef CONFIG_GRKERNSEC_SETXID
8746 +extern void gr_delayed_cred_worker(void);
8747 +#endif
8748 +
8749 /*
8750 * We must return the syscall number to actually look up in the table.
8751 * This can be -1L to skip running any syscall at all.
8752 @@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
8753
8754 secure_computing_strict(regs->gpr[0]);
8755
8756 +#ifdef CONFIG_GRKERNSEC_SETXID
8757 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
8758 + gr_delayed_cred_worker();
8759 +#endif
8760 +
8761 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
8762 tracehook_report_syscall_entry(regs))
8763 /*
8764 @@ -1808,6 +1817,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
8765 {
8766 int step;
8767
8768 +#ifdef CONFIG_GRKERNSEC_SETXID
8769 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
8770 + gr_delayed_cred_worker();
8771 +#endif
8772 +
8773 audit_syscall_exit(regs);
8774
8775 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
8776 diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
8777 index 4e47db6..6dcc96e 100644
8778 --- a/arch/powerpc/kernel/signal_32.c
8779 +++ b/arch/powerpc/kernel/signal_32.c
8780 @@ -1013,7 +1013,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
8781 /* Save user registers on the stack */
8782 frame = &rt_sf->uc.uc_mcontext;
8783 addr = frame;
8784 - if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
8785 + if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
8786 sigret = 0;
8787 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
8788 } else {
8789 diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
8790 index d501dc4..e5a0de0 100644
8791 --- a/arch/powerpc/kernel/signal_64.c
8792 +++ b/arch/powerpc/kernel/signal_64.c
8793 @@ -760,7 +760,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
8794 current->thread.fp_state.fpscr = 0;
8795
8796 /* Set up to return from userspace. */
8797 - if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
8798 + if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
8799 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
8800 } else {
8801 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
8802 diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
8803 index 1bd7ca2..9b78c2f 100644
8804 --- a/arch/powerpc/kernel/traps.c
8805 +++ b/arch/powerpc/kernel/traps.c
8806 @@ -142,6 +142,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
8807 return flags;
8808 }
8809
8810 +extern void gr_handle_kernel_exploit(void);
8811 +
8812 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
8813 int signr)
8814 {
8815 @@ -191,6 +193,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
8816 panic("Fatal exception in interrupt");
8817 if (panic_on_oops)
8818 panic("Fatal exception");
8819 +
8820 + gr_handle_kernel_exploit();
8821 +
8822 do_exit(signr);
8823 }
8824
8825 diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
8826 index ce74c33..0803371 100644
8827 --- a/arch/powerpc/kernel/vdso.c
8828 +++ b/arch/powerpc/kernel/vdso.c
8829 @@ -35,6 +35,7 @@
8830 #include <asm/vdso.h>
8831 #include <asm/vdso_datapage.h>
8832 #include <asm/setup.h>
8833 +#include <asm/mman.h>
8834
8835 #undef DEBUG
8836
8837 @@ -221,7 +222,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
8838 vdso_base = VDSO32_MBASE;
8839 #endif
8840
8841 - current->mm->context.vdso_base = 0;
8842 + current->mm->context.vdso_base = ~0UL;
8843
8844 /* vDSO has a problem and was disabled, just don't "enable" it for the
8845 * process
8846 @@ -241,7 +242,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
8847 vdso_base = get_unmapped_area(NULL, vdso_base,
8848 (vdso_pages << PAGE_SHIFT) +
8849 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
8850 - 0, 0);
8851 + 0, MAP_PRIVATE | MAP_EXECUTABLE);
8852 if (IS_ERR_VALUE(vdso_base)) {
8853 rc = vdso_base;
8854 goto fail_mmapsem;
8855 diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
8856 index 3cf541a..ab2d825 100644
8857 --- a/arch/powerpc/kvm/powerpc.c
8858 +++ b/arch/powerpc/kvm/powerpc.c
8859 @@ -1153,7 +1153,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
8860 }
8861 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
8862
8863 -int kvm_arch_init(void *opaque)
8864 +int kvm_arch_init(const void *opaque)
8865 {
8866 return 0;
8867 }
8868 diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
8869 index 5eea6f3..5d10396 100644
8870 --- a/arch/powerpc/lib/usercopy_64.c
8871 +++ b/arch/powerpc/lib/usercopy_64.c
8872 @@ -9,22 +9,6 @@
8873 #include <linux/module.h>
8874 #include <asm/uaccess.h>
8875
8876 -unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
8877 -{
8878 - if (likely(access_ok(VERIFY_READ, from, n)))
8879 - n = __copy_from_user(to, from, n);
8880 - else
8881 - memset(to, 0, n);
8882 - return n;
8883 -}
8884 -
8885 -unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
8886 -{
8887 - if (likely(access_ok(VERIFY_WRITE, to, n)))
8888 - n = __copy_to_user(to, from, n);
8889 - return n;
8890 -}
8891 -
8892 unsigned long copy_in_user(void __user *to, const void __user *from,
8893 unsigned long n)
8894 {
8895 @@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
8896 return n;
8897 }
8898
8899 -EXPORT_SYMBOL(copy_from_user);
8900 -EXPORT_SYMBOL(copy_to_user);
8901 EXPORT_SYMBOL(copy_in_user);
8902
8903 diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
8904 index 51ab9e7..7d3c78b 100644
8905 --- a/arch/powerpc/mm/fault.c
8906 +++ b/arch/powerpc/mm/fault.c
8907 @@ -33,6 +33,10 @@
8908 #include <linux/magic.h>
8909 #include <linux/ratelimit.h>
8910 #include <linux/context_tracking.h>
8911 +#include <linux/slab.h>
8912 +#include <linux/pagemap.h>
8913 +#include <linux/compiler.h>
8914 +#include <linux/unistd.h>
8915
8916 #include <asm/firmware.h>
8917 #include <asm/page.h>
8918 @@ -69,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
8919 }
8920 #endif
8921
8922 +#ifdef CONFIG_PAX_PAGEEXEC
8923 +/*
8924 + * PaX: decide what to do with offenders (regs->nip = fault address)
8925 + *
8926 + * returns 1 when task should be killed
8927 + */
8928 +static int pax_handle_fetch_fault(struct pt_regs *regs)
8929 +{
8930 + return 1;
8931 +}
8932 +
8933 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
8934 +{
8935 + unsigned long i;
8936 +
8937 + printk(KERN_ERR "PAX: bytes at PC: ");
8938 + for (i = 0; i < 5; i++) {
8939 + unsigned int c;
8940 + if (get_user(c, (unsigned int __user *)pc+i))
8941 + printk(KERN_CONT "???????? ");
8942 + else
8943 + printk(KERN_CONT "%08x ", c);
8944 + }
8945 + printk("\n");
8946 +}
8947 +#endif
8948 +
8949 /*
8950 * Check whether the instruction at regs->nip is a store using
8951 * an update addressing form which will update r1.
8952 @@ -216,7 +247,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
8953 * indicate errors in DSISR but can validly be set in SRR1.
8954 */
8955 if (trap == 0x400)
8956 - error_code &= 0x48200000;
8957 + error_code &= 0x58200000;
8958 else
8959 is_write = error_code & DSISR_ISSTORE;
8960 #else
8961 @@ -378,7 +409,7 @@ good_area:
8962 * "undefined". Of those that can be set, this is the only
8963 * one which seems bad.
8964 */
8965 - if (error_code & 0x10000000)
8966 + if (error_code & DSISR_GUARDED)
8967 /* Guarded storage error. */
8968 goto bad_area;
8969 #endif /* CONFIG_8xx */
8970 @@ -393,7 +424,7 @@ good_area:
8971 * processors use the same I/D cache coherency mechanism
8972 * as embedded.
8973 */
8974 - if (error_code & DSISR_PROTFAULT)
8975 + if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
8976 goto bad_area;
8977 #endif /* CONFIG_PPC_STD_MMU */
8978
8979 @@ -483,6 +514,23 @@ bad_area:
8980 bad_area_nosemaphore:
8981 /* User mode accesses cause a SIGSEGV */
8982 if (user_mode(regs)) {
8983 +
8984 +#ifdef CONFIG_PAX_PAGEEXEC
8985 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
8986 +#ifdef CONFIG_PPC_STD_MMU
8987 + if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
8988 +#else
8989 + if (is_exec && regs->nip == address) {
8990 +#endif
8991 + switch (pax_handle_fetch_fault(regs)) {
8992 + }
8993 +
8994 + pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
8995 + do_group_exit(SIGKILL);
8996 + }
8997 + }
8998 +#endif
8999 +
9000 _exception(SIGSEGV, regs, code, address);
9001 goto bail;
9002 }
9003 diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9004 index cb8bdbe..cde4bc7 100644
9005 --- a/arch/powerpc/mm/mmap.c
9006 +++ b/arch/powerpc/mm/mmap.c
9007 @@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9008 return sysctl_legacy_va_layout;
9009 }
9010
9011 -static unsigned long mmap_rnd(void)
9012 +static unsigned long mmap_rnd(struct mm_struct *mm)
9013 {
9014 unsigned long rnd = 0;
9015
9016 +#ifdef CONFIG_PAX_RANDMMAP
9017 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9018 +#endif
9019 +
9020 if (current->flags & PF_RANDOMIZE) {
9021 /* 8MB for 32bit, 1GB for 64bit */
9022 if (is_32bit_task())
9023 @@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9024 return rnd << PAGE_SHIFT;
9025 }
9026
9027 -static inline unsigned long mmap_base(void)
9028 +static inline unsigned long mmap_base(struct mm_struct *mm)
9029 {
9030 unsigned long gap = rlimit(RLIMIT_STACK);
9031
9032 @@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9033 else if (gap > MAX_GAP)
9034 gap = MAX_GAP;
9035
9036 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9037 + return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9038 }
9039
9040 /*
9041 @@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9042 */
9043 if (mmap_is_legacy()) {
9044 mm->mmap_base = TASK_UNMAPPED_BASE;
9045 +
9046 +#ifdef CONFIG_PAX_RANDMMAP
9047 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9048 + mm->mmap_base += mm->delta_mmap;
9049 +#endif
9050 +
9051 mm->get_unmapped_area = arch_get_unmapped_area;
9052 } else {
9053 - mm->mmap_base = mmap_base();
9054 + mm->mmap_base = mmap_base(mm);
9055 +
9056 +#ifdef CONFIG_PAX_RANDMMAP
9057 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9058 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9059 +#endif
9060 +
9061 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9062 }
9063 }
9064 diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9065 index b0c75cc..ef7fb93 100644
9066 --- a/arch/powerpc/mm/slice.c
9067 +++ b/arch/powerpc/mm/slice.c
9068 @@ -103,7 +103,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9069 if ((mm->task_size - len) < addr)
9070 return 0;
9071 vma = find_vma(mm, addr);
9072 - return (!vma || (addr + len) <= vma->vm_start);
9073 + return check_heap_stack_gap(vma, addr, len, 0);
9074 }
9075
9076 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9077 @@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9078 info.align_offset = 0;
9079
9080 addr = TASK_UNMAPPED_BASE;
9081 +
9082 +#ifdef CONFIG_PAX_RANDMMAP
9083 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9084 + addr += mm->delta_mmap;
9085 +#endif
9086 +
9087 while (addr < TASK_SIZE) {
9088 info.low_limit = addr;
9089 if (!slice_scan_available(addr, available, 1, &addr))
9090 @@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9091 if (fixed && addr > (mm->task_size - len))
9092 return -ENOMEM;
9093
9094 +#ifdef CONFIG_PAX_RANDMMAP
9095 + if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9096 + addr = 0;
9097 +#endif
9098 +
9099 /* If hint, make sure it matches our alignment restrictions */
9100 if (!fixed && addr) {
9101 addr = _ALIGN_UP(addr, 1ul << pshift);
9102 diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9103 index 4278acf..67fd0e6 100644
9104 --- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9105 +++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9106 @@ -400,8 +400,8 @@ static int scc_pciex_write_config(struct pci_bus *bus, unsigned int devfn,
9107 }
9108
9109 static struct pci_ops scc_pciex_pci_ops = {
9110 - scc_pciex_read_config,
9111 - scc_pciex_write_config,
9112 + .read = scc_pciex_read_config,
9113 + .write = scc_pciex_write_config,
9114 };
9115
9116 static void pciex_clear_intr_all(unsigned int __iomem *base)
9117 diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9118 index 9098692..3d54cd1 100644
9119 --- a/arch/powerpc/platforms/cell/spufs/file.c
9120 +++ b/arch/powerpc/platforms/cell/spufs/file.c
9121 @@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9122 return VM_FAULT_NOPAGE;
9123 }
9124
9125 -static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9126 +static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9127 unsigned long address,
9128 - void *buf, int len, int write)
9129 + void *buf, size_t len, int write)
9130 {
9131 struct spu_context *ctx = vma->vm_file->private_data;
9132 unsigned long offset = address - vma->vm_start;
9133 diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9134 index 1d47061..0714963 100644
9135 --- a/arch/s390/include/asm/atomic.h
9136 +++ b/arch/s390/include/asm/atomic.h
9137 @@ -412,6 +412,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9138 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9139 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9140
9141 +#define atomic64_read_unchecked(v) atomic64_read(v)
9142 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9143 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9144 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9145 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9146 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
9147 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9148 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
9149 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9150 +
9151 #define smp_mb__before_atomic_dec() smp_mb()
9152 #define smp_mb__after_atomic_dec() smp_mb()
9153 #define smp_mb__before_atomic_inc() smp_mb()
9154 diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9155 index 578680f..0eb3b11 100644
9156 --- a/arch/s390/include/asm/barrier.h
9157 +++ b/arch/s390/include/asm/barrier.h
9158 @@ -36,7 +36,7 @@
9159 do { \
9160 compiletime_assert_atomic_type(*p); \
9161 barrier(); \
9162 - ACCESS_ONCE(*p) = (v); \
9163 + ACCESS_ONCE_RW(*p) = (v); \
9164 } while (0)
9165
9166 #define smp_load_acquire(p) \
9167 diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9168 index 4d7ccac..d03d0ad 100644
9169 --- a/arch/s390/include/asm/cache.h
9170 +++ b/arch/s390/include/asm/cache.h
9171 @@ -9,8 +9,10 @@
9172 #ifndef __ARCH_S390_CACHE_H
9173 #define __ARCH_S390_CACHE_H
9174
9175 -#define L1_CACHE_BYTES 256
9176 +#include <linux/const.h>
9177 +
9178 #define L1_CACHE_SHIFT 8
9179 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9180 #define NET_SKB_PAD 32
9181
9182 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9183 diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9184 index 78f4f87..598ce39 100644
9185 --- a/arch/s390/include/asm/elf.h
9186 +++ b/arch/s390/include/asm/elf.h
9187 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
9188 the loader. We need to make sure that it is out of the way of the program
9189 that it will "exec", and that there is sufficient room for the brk. */
9190
9191 -extern unsigned long randomize_et_dyn(unsigned long base);
9192 -#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
9193 +#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9194 +
9195 +#ifdef CONFIG_PAX_ASLR
9196 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9197 +
9198 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9199 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9200 +#endif
9201
9202 /* This yields a mask that user programs can use to figure out what
9203 instruction set this CPU supports. */
9204 @@ -222,9 +228,6 @@ struct linux_binprm;
9205 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9206 int arch_setup_additional_pages(struct linux_binprm *, int);
9207
9208 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9209 -#define arch_randomize_brk arch_randomize_brk
9210 -
9211 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa);
9212
9213 #endif
9214 diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9215 index c4a93d6..4d2a9b4 100644
9216 --- a/arch/s390/include/asm/exec.h
9217 +++ b/arch/s390/include/asm/exec.h
9218 @@ -7,6 +7,6 @@
9219 #ifndef __ASM_EXEC_H
9220 #define __ASM_EXEC_H
9221
9222 -extern unsigned long arch_align_stack(unsigned long sp);
9223 +#define arch_align_stack(x) ((x) & ~0xfUL)
9224
9225 #endif /* __ASM_EXEC_H */
9226 diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9227 index 1be64a1..086839d1 100644
9228 --- a/arch/s390/include/asm/uaccess.h
9229 +++ b/arch/s390/include/asm/uaccess.h
9230 @@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9231 __range_ok((unsigned long)(addr), (size)); \
9232 })
9233
9234 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9235 #define access_ok(type, addr, size) __access_ok(addr, size)
9236
9237 /*
9238 @@ -245,6 +246,10 @@ static inline unsigned long __must_check
9239 copy_to_user(void __user *to, const void *from, unsigned long n)
9240 {
9241 might_fault();
9242 +
9243 + if ((long)n < 0)
9244 + return n;
9245 +
9246 return __copy_to_user(to, from, n);
9247 }
9248
9249 @@ -273,10 +278,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9250 static inline unsigned long __must_check
9251 copy_from_user(void *to, const void __user *from, unsigned long n)
9252 {
9253 - unsigned int sz = __compiletime_object_size(to);
9254 + size_t sz = __compiletime_object_size(to);
9255
9256 might_fault();
9257 - if (unlikely(sz != -1 && sz < n)) {
9258 +
9259 + if ((long)n < 0)
9260 + return n;
9261 +
9262 + if (unlikely(sz != (size_t)-1 && sz < n)) {
9263 copy_from_user_overflow();
9264 return n;
9265 }
9266 diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9267 index b89b591..fd9609d 100644
9268 --- a/arch/s390/kernel/module.c
9269 +++ b/arch/s390/kernel/module.c
9270 @@ -169,11 +169,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9271
9272 /* Increase core size by size of got & plt and set start
9273 offsets for got and plt. */
9274 - me->core_size = ALIGN(me->core_size, 4);
9275 - me->arch.got_offset = me->core_size;
9276 - me->core_size += me->arch.got_size;
9277 - me->arch.plt_offset = me->core_size;
9278 - me->core_size += me->arch.plt_size;
9279 + me->core_size_rw = ALIGN(me->core_size_rw, 4);
9280 + me->arch.got_offset = me->core_size_rw;
9281 + me->core_size_rw += me->arch.got_size;
9282 + me->arch.plt_offset = me->core_size_rx;
9283 + me->core_size_rx += me->arch.plt_size;
9284 return 0;
9285 }
9286
9287 @@ -289,7 +289,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9288 if (info->got_initialized == 0) {
9289 Elf_Addr *gotent;
9290
9291 - gotent = me->module_core + me->arch.got_offset +
9292 + gotent = me->module_core_rw + me->arch.got_offset +
9293 info->got_offset;
9294 *gotent = val;
9295 info->got_initialized = 1;
9296 @@ -312,7 +312,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9297 rc = apply_rela_bits(loc, val, 0, 64, 0);
9298 else if (r_type == R_390_GOTENT ||
9299 r_type == R_390_GOTPLTENT) {
9300 - val += (Elf_Addr) me->module_core - loc;
9301 + val += (Elf_Addr) me->module_core_rw - loc;
9302 rc = apply_rela_bits(loc, val, 1, 32, 1);
9303 }
9304 break;
9305 @@ -325,7 +325,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9306 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9307 if (info->plt_initialized == 0) {
9308 unsigned int *ip;
9309 - ip = me->module_core + me->arch.plt_offset +
9310 + ip = me->module_core_rx + me->arch.plt_offset +
9311 info->plt_offset;
9312 #ifndef CONFIG_64BIT
9313 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9314 @@ -350,7 +350,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9315 val - loc + 0xffffUL < 0x1ffffeUL) ||
9316 (r_type == R_390_PLT32DBL &&
9317 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9318 - val = (Elf_Addr) me->module_core +
9319 + val = (Elf_Addr) me->module_core_rx +
9320 me->arch.plt_offset +
9321 info->plt_offset;
9322 val += rela->r_addend - loc;
9323 @@ -372,7 +372,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9324 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9325 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9326 val = val + rela->r_addend -
9327 - ((Elf_Addr) me->module_core + me->arch.got_offset);
9328 + ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9329 if (r_type == R_390_GOTOFF16)
9330 rc = apply_rela_bits(loc, val, 0, 16, 0);
9331 else if (r_type == R_390_GOTOFF32)
9332 @@ -382,7 +382,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9333 break;
9334 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9335 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9336 - val = (Elf_Addr) me->module_core + me->arch.got_offset +
9337 + val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9338 rela->r_addend - loc;
9339 if (r_type == R_390_GOTPC)
9340 rc = apply_rela_bits(loc, val, 1, 32, 0);
9341 diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9342 index dd14532..1dfc145 100644
9343 --- a/arch/s390/kernel/process.c
9344 +++ b/arch/s390/kernel/process.c
9345 @@ -242,37 +242,3 @@ unsigned long get_wchan(struct task_struct *p)
9346 }
9347 return 0;
9348 }
9349 -
9350 -unsigned long arch_align_stack(unsigned long sp)
9351 -{
9352 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9353 - sp -= get_random_int() & ~PAGE_MASK;
9354 - return sp & ~0xf;
9355 -}
9356 -
9357 -static inline unsigned long brk_rnd(void)
9358 -{
9359 - /* 8MB for 32bit, 1GB for 64bit */
9360 - if (is_32bit_task())
9361 - return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9362 - else
9363 - return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9364 -}
9365 -
9366 -unsigned long arch_randomize_brk(struct mm_struct *mm)
9367 -{
9368 - unsigned long ret;
9369 -
9370 - ret = PAGE_ALIGN(mm->brk + brk_rnd());
9371 - return (ret > mm->brk) ? ret : mm->brk;
9372 -}
9373 -
9374 -unsigned long randomize_et_dyn(unsigned long base)
9375 -{
9376 - unsigned long ret;
9377 -
9378 - if (!(current->flags & PF_RANDOMIZE))
9379 - return base;
9380 - ret = PAGE_ALIGN(base + brk_rnd());
9381 - return (ret > base) ? ret : base;
9382 -}
9383 diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9384 index 9b436c2..54fbf0a 100644
9385 --- a/arch/s390/mm/mmap.c
9386 +++ b/arch/s390/mm/mmap.c
9387 @@ -95,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9388 */
9389 if (mmap_is_legacy()) {
9390 mm->mmap_base = mmap_base_legacy();
9391 +
9392 +#ifdef CONFIG_PAX_RANDMMAP
9393 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9394 + mm->mmap_base += mm->delta_mmap;
9395 +#endif
9396 +
9397 mm->get_unmapped_area = arch_get_unmapped_area;
9398 } else {
9399 mm->mmap_base = mmap_base();
9400 +
9401 +#ifdef CONFIG_PAX_RANDMMAP
9402 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9403 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9404 +#endif
9405 +
9406 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9407 }
9408 }
9409 @@ -170,9 +182,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9410 */
9411 if (mmap_is_legacy()) {
9412 mm->mmap_base = mmap_base_legacy();
9413 +
9414 +#ifdef CONFIG_PAX_RANDMMAP
9415 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9416 + mm->mmap_base += mm->delta_mmap;
9417 +#endif
9418 +
9419 mm->get_unmapped_area = s390_get_unmapped_area;
9420 } else {
9421 mm->mmap_base = mmap_base();
9422 +
9423 +#ifdef CONFIG_PAX_RANDMMAP
9424 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9425 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9426 +#endif
9427 +
9428 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9429 }
9430 }
9431 diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9432 index ae3d59f..f65f075 100644
9433 --- a/arch/score/include/asm/cache.h
9434 +++ b/arch/score/include/asm/cache.h
9435 @@ -1,7 +1,9 @@
9436 #ifndef _ASM_SCORE_CACHE_H
9437 #define _ASM_SCORE_CACHE_H
9438
9439 +#include <linux/const.h>
9440 +
9441 #define L1_CACHE_SHIFT 4
9442 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9443 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9444
9445 #endif /* _ASM_SCORE_CACHE_H */
9446 diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9447 index f9f3cd5..58ff438 100644
9448 --- a/arch/score/include/asm/exec.h
9449 +++ b/arch/score/include/asm/exec.h
9450 @@ -1,6 +1,6 @@
9451 #ifndef _ASM_SCORE_EXEC_H
9452 #define _ASM_SCORE_EXEC_H
9453
9454 -extern unsigned long arch_align_stack(unsigned long sp);
9455 +#define arch_align_stack(x) (x)
9456
9457 #endif /* _ASM_SCORE_EXEC_H */
9458 diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9459 index a1519ad3..e8ac1ff 100644
9460 --- a/arch/score/kernel/process.c
9461 +++ b/arch/score/kernel/process.c
9462 @@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9463
9464 return task_pt_regs(task)->cp0_epc;
9465 }
9466 -
9467 -unsigned long arch_align_stack(unsigned long sp)
9468 -{
9469 - return sp;
9470 -}
9471 diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9472 index ef9e555..331bd29 100644
9473 --- a/arch/sh/include/asm/cache.h
9474 +++ b/arch/sh/include/asm/cache.h
9475 @@ -9,10 +9,11 @@
9476 #define __ASM_SH_CACHE_H
9477 #ifdef __KERNEL__
9478
9479 +#include <linux/const.h>
9480 #include <linux/init.h>
9481 #include <cpu/cache.h>
9482
9483 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9484 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9485
9486 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9487
9488 diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9489 index 6777177..cb5e44f 100644
9490 --- a/arch/sh/mm/mmap.c
9491 +++ b/arch/sh/mm/mmap.c
9492 @@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9493 struct mm_struct *mm = current->mm;
9494 struct vm_area_struct *vma;
9495 int do_colour_align;
9496 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9497 struct vm_unmapped_area_info info;
9498
9499 if (flags & MAP_FIXED) {
9500 @@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9501 if (filp || (flags & MAP_SHARED))
9502 do_colour_align = 1;
9503
9504 +#ifdef CONFIG_PAX_RANDMMAP
9505 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9506 +#endif
9507 +
9508 if (addr) {
9509 if (do_colour_align)
9510 addr = COLOUR_ALIGN(addr, pgoff);
9511 @@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9512 addr = PAGE_ALIGN(addr);
9513
9514 vma = find_vma(mm, addr);
9515 - if (TASK_SIZE - len >= addr &&
9516 - (!vma || addr + len <= vma->vm_start))
9517 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9518 return addr;
9519 }
9520
9521 info.flags = 0;
9522 info.length = len;
9523 - info.low_limit = TASK_UNMAPPED_BASE;
9524 + info.low_limit = mm->mmap_base;
9525 info.high_limit = TASK_SIZE;
9526 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9527 info.align_offset = pgoff << PAGE_SHIFT;
9528 @@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9529 struct mm_struct *mm = current->mm;
9530 unsigned long addr = addr0;
9531 int do_colour_align;
9532 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9533 struct vm_unmapped_area_info info;
9534
9535 if (flags & MAP_FIXED) {
9536 @@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9537 if (filp || (flags & MAP_SHARED))
9538 do_colour_align = 1;
9539
9540 +#ifdef CONFIG_PAX_RANDMMAP
9541 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9542 +#endif
9543 +
9544 /* requesting a specific address */
9545 if (addr) {
9546 if (do_colour_align)
9547 @@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9548 addr = PAGE_ALIGN(addr);
9549
9550 vma = find_vma(mm, addr);
9551 - if (TASK_SIZE - len >= addr &&
9552 - (!vma || addr + len <= vma->vm_start))
9553 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9554 return addr;
9555 }
9556
9557 @@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9558 VM_BUG_ON(addr != -ENOMEM);
9559 info.flags = 0;
9560 info.low_limit = TASK_UNMAPPED_BASE;
9561 +
9562 +#ifdef CONFIG_PAX_RANDMMAP
9563 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9564 + info.low_limit += mm->delta_mmap;
9565 +#endif
9566 +
9567 info.high_limit = TASK_SIZE;
9568 addr = vm_unmapped_area(&info);
9569 }
9570 diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9571 index be56a24..443328f 100644
9572 --- a/arch/sparc/include/asm/atomic_64.h
9573 +++ b/arch/sparc/include/asm/atomic_64.h
9574 @@ -14,18 +14,40 @@
9575 #define ATOMIC64_INIT(i) { (i) }
9576
9577 #define atomic_read(v) (*(volatile int *)&(v)->counter)
9578 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9579 +{
9580 + return v->counter;
9581 +}
9582 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
9583 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9584 +{
9585 + return v->counter;
9586 +}
9587
9588 #define atomic_set(v, i) (((v)->counter) = i)
9589 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9590 +{
9591 + v->counter = i;
9592 +}
9593 #define atomic64_set(v, i) (((v)->counter) = i)
9594 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9595 +{
9596 + v->counter = i;
9597 +}
9598
9599 extern void atomic_add(int, atomic_t *);
9600 +extern void atomic_add_unchecked(int, atomic_unchecked_t *);
9601 extern void atomic64_add(long, atomic64_t *);
9602 +extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
9603 extern void atomic_sub(int, atomic_t *);
9604 +extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
9605 extern void atomic64_sub(long, atomic64_t *);
9606 +extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
9607
9608 extern int atomic_add_ret(int, atomic_t *);
9609 +extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
9610 extern long atomic64_add_ret(long, atomic64_t *);
9611 +extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
9612 extern int atomic_sub_ret(int, atomic_t *);
9613 extern long atomic64_sub_ret(long, atomic64_t *);
9614
9615 @@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
9616 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
9617
9618 #define atomic_inc_return(v) atomic_add_ret(1, v)
9619 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9620 +{
9621 + return atomic_add_ret_unchecked(1, v);
9622 +}
9623 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
9624 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9625 +{
9626 + return atomic64_add_ret_unchecked(1, v);
9627 +}
9628
9629 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
9630 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
9631
9632 #define atomic_add_return(i, v) atomic_add_ret(i, v)
9633 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
9634 +{
9635 + return atomic_add_ret_unchecked(i, v);
9636 +}
9637 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
9638 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
9639 +{
9640 + return atomic64_add_ret_unchecked(i, v);
9641 +}
9642
9643 /*
9644 * atomic_inc_and_test - increment and test
9645 @@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
9646 * other cases.
9647 */
9648 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9649 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9650 +{
9651 + return atomic_inc_return_unchecked(v) == 0;
9652 +}
9653 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9654
9655 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
9656 @@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
9657 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
9658
9659 #define atomic_inc(v) atomic_add(1, v)
9660 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9661 +{
9662 + atomic_add_unchecked(1, v);
9663 +}
9664 #define atomic64_inc(v) atomic64_add(1, v)
9665 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9666 +{
9667 + atomic64_add_unchecked(1, v);
9668 +}
9669
9670 #define atomic_dec(v) atomic_sub(1, v)
9671 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9672 +{
9673 + atomic_sub_unchecked(1, v);
9674 +}
9675 #define atomic64_dec(v) atomic64_sub(1, v)
9676 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9677 +{
9678 + atomic64_sub_unchecked(1, v);
9679 +}
9680
9681 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
9682 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
9683
9684 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9685 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9686 +{
9687 + return cmpxchg(&v->counter, old, new);
9688 +}
9689 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9690 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9691 +{
9692 + return xchg(&v->counter, new);
9693 +}
9694
9695 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9696 {
9697 - int c, old;
9698 + int c, old, new;
9699 c = atomic_read(v);
9700 for (;;) {
9701 - if (unlikely(c == (u)))
9702 + if (unlikely(c == u))
9703 break;
9704 - old = atomic_cmpxchg((v), c, c + (a));
9705 +
9706 + asm volatile("addcc %2, %0, %0\n"
9707 +
9708 +#ifdef CONFIG_PAX_REFCOUNT
9709 + "tvs %%icc, 6\n"
9710 +#endif
9711 +
9712 + : "=r" (new)
9713 + : "0" (c), "ir" (a)
9714 + : "cc");
9715 +
9716 + old = atomic_cmpxchg(v, c, new);
9717 if (likely(old == c))
9718 break;
9719 c = old;
9720 @@ -88,20 +165,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9721 #define atomic64_cmpxchg(v, o, n) \
9722 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
9723 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
9724 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
9725 +{
9726 + return xchg(&v->counter, new);
9727 +}
9728
9729 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
9730 {
9731 - long c, old;
9732 + long c, old, new;
9733 c = atomic64_read(v);
9734 for (;;) {
9735 - if (unlikely(c == (u)))
9736 + if (unlikely(c == u))
9737 break;
9738 - old = atomic64_cmpxchg((v), c, c + (a));
9739 +
9740 + asm volatile("addcc %2, %0, %0\n"
9741 +
9742 +#ifdef CONFIG_PAX_REFCOUNT
9743 + "tvs %%xcc, 6\n"
9744 +#endif
9745 +
9746 + : "=r" (new)
9747 + : "0" (c), "ir" (a)
9748 + : "cc");
9749 +
9750 + old = atomic64_cmpxchg(v, c, new);
9751 if (likely(old == c))
9752 break;
9753 c = old;
9754 }
9755 - return c != (u);
9756 + return c != u;
9757 }
9758
9759 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9760 diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
9761 index b5aad96..99d7465 100644
9762 --- a/arch/sparc/include/asm/barrier_64.h
9763 +++ b/arch/sparc/include/asm/barrier_64.h
9764 @@ -57,7 +57,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
9765 do { \
9766 compiletime_assert_atomic_type(*p); \
9767 barrier(); \
9768 - ACCESS_ONCE(*p) = (v); \
9769 + ACCESS_ONCE_RW(*p) = (v); \
9770 } while (0)
9771
9772 #define smp_load_acquire(p) \
9773 diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
9774 index 5bb6991..5c2132e 100644
9775 --- a/arch/sparc/include/asm/cache.h
9776 +++ b/arch/sparc/include/asm/cache.h
9777 @@ -7,10 +7,12 @@
9778 #ifndef _SPARC_CACHE_H
9779 #define _SPARC_CACHE_H
9780
9781 +#include <linux/const.h>
9782 +
9783 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
9784
9785 #define L1_CACHE_SHIFT 5
9786 -#define L1_CACHE_BYTES 32
9787 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9788
9789 #ifdef CONFIG_SPARC32
9790 #define SMP_CACHE_BYTES_SHIFT 5
9791 diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
9792 index a24e41f..47677ff 100644
9793 --- a/arch/sparc/include/asm/elf_32.h
9794 +++ b/arch/sparc/include/asm/elf_32.h
9795 @@ -114,6 +114,13 @@ typedef struct {
9796
9797 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
9798
9799 +#ifdef CONFIG_PAX_ASLR
9800 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
9801 +
9802 +#define PAX_DELTA_MMAP_LEN 16
9803 +#define PAX_DELTA_STACK_LEN 16
9804 +#endif
9805 +
9806 /* This yields a mask that user programs can use to figure out what
9807 instruction set this cpu supports. This can NOT be done in userspace
9808 on Sparc. */
9809 diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
9810 index 370ca1e..d4f4a98 100644
9811 --- a/arch/sparc/include/asm/elf_64.h
9812 +++ b/arch/sparc/include/asm/elf_64.h
9813 @@ -189,6 +189,13 @@ typedef struct {
9814 #define ELF_ET_DYN_BASE 0x0000010000000000UL
9815 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
9816
9817 +#ifdef CONFIG_PAX_ASLR
9818 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
9819 +
9820 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
9821 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
9822 +#endif
9823 +
9824 extern unsigned long sparc64_elf_hwcap;
9825 #define ELF_HWCAP sparc64_elf_hwcap
9826
9827 diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
9828 index 9b1c36d..209298b 100644
9829 --- a/arch/sparc/include/asm/pgalloc_32.h
9830 +++ b/arch/sparc/include/asm/pgalloc_32.h
9831 @@ -33,6 +33,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
9832 }
9833
9834 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
9835 +#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
9836
9837 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
9838 unsigned long address)
9839 diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
9840 index bcfe063..b333142 100644
9841 --- a/arch/sparc/include/asm/pgalloc_64.h
9842 +++ b/arch/sparc/include/asm/pgalloc_64.h
9843 @@ -26,6 +26,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
9844 }
9845
9846 #define pud_populate(MM, PUD, PMD) pud_set(PUD, PMD)
9847 +#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
9848
9849 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
9850 {
9851 diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
9852 index 59ba6f6..4518128 100644
9853 --- a/arch/sparc/include/asm/pgtable.h
9854 +++ b/arch/sparc/include/asm/pgtable.h
9855 @@ -5,4 +5,8 @@
9856 #else
9857 #include <asm/pgtable_32.h>
9858 #endif
9859 +
9860 +#define ktla_ktva(addr) (addr)
9861 +#define ktva_ktla(addr) (addr)
9862 +
9863 #endif
9864 diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
9865 index 502f632..da1917f 100644
9866 --- a/arch/sparc/include/asm/pgtable_32.h
9867 +++ b/arch/sparc/include/asm/pgtable_32.h
9868 @@ -50,6 +50,9 @@ extern unsigned long calc_highpages(void);
9869 #define PAGE_SHARED SRMMU_PAGE_SHARED
9870 #define PAGE_COPY SRMMU_PAGE_COPY
9871 #define PAGE_READONLY SRMMU_PAGE_RDONLY
9872 +#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
9873 +#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
9874 +#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
9875 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
9876
9877 /* Top-level page directory - dummy used by init-mm.
9878 @@ -62,18 +65,18 @@ extern unsigned long ptr_in_current_pgd;
9879
9880 /* xwr */
9881 #define __P000 PAGE_NONE
9882 -#define __P001 PAGE_READONLY
9883 -#define __P010 PAGE_COPY
9884 -#define __P011 PAGE_COPY
9885 +#define __P001 PAGE_READONLY_NOEXEC
9886 +#define __P010 PAGE_COPY_NOEXEC
9887 +#define __P011 PAGE_COPY_NOEXEC
9888 #define __P100 PAGE_READONLY
9889 #define __P101 PAGE_READONLY
9890 #define __P110 PAGE_COPY
9891 #define __P111 PAGE_COPY
9892
9893 #define __S000 PAGE_NONE
9894 -#define __S001 PAGE_READONLY
9895 -#define __S010 PAGE_SHARED
9896 -#define __S011 PAGE_SHARED
9897 +#define __S001 PAGE_READONLY_NOEXEC
9898 +#define __S010 PAGE_SHARED_NOEXEC
9899 +#define __S011 PAGE_SHARED_NOEXEC
9900 #define __S100 PAGE_READONLY
9901 #define __S101 PAGE_READONLY
9902 #define __S110 PAGE_SHARED
9903 diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
9904 index 79da178..c2eede8 100644
9905 --- a/arch/sparc/include/asm/pgtsrmmu.h
9906 +++ b/arch/sparc/include/asm/pgtsrmmu.h
9907 @@ -115,6 +115,11 @@
9908 SRMMU_EXEC | SRMMU_REF)
9909 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
9910 SRMMU_EXEC | SRMMU_REF)
9911 +
9912 +#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
9913 +#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
9914 +#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
9915 +
9916 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
9917 SRMMU_DIRTY | SRMMU_REF)
9918
9919 diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
9920 index 9689176..63c18ea 100644
9921 --- a/arch/sparc/include/asm/spinlock_64.h
9922 +++ b/arch/sparc/include/asm/spinlock_64.h
9923 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
9924
9925 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
9926
9927 -static void inline arch_read_lock(arch_rwlock_t *lock)
9928 +static inline void arch_read_lock(arch_rwlock_t *lock)
9929 {
9930 unsigned long tmp1, tmp2;
9931
9932 __asm__ __volatile__ (
9933 "1: ldsw [%2], %0\n"
9934 " brlz,pn %0, 2f\n"
9935 -"4: add %0, 1, %1\n"
9936 +"4: addcc %0, 1, %1\n"
9937 +
9938 +#ifdef CONFIG_PAX_REFCOUNT
9939 +" tvs %%icc, 6\n"
9940 +#endif
9941 +
9942 " cas [%2], %0, %1\n"
9943 " cmp %0, %1\n"
9944 " bne,pn %%icc, 1b\n"
9945 @@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
9946 " .previous"
9947 : "=&r" (tmp1), "=&r" (tmp2)
9948 : "r" (lock)
9949 - : "memory");
9950 + : "memory", "cc");
9951 }
9952
9953 -static int inline arch_read_trylock(arch_rwlock_t *lock)
9954 +static inline int arch_read_trylock(arch_rwlock_t *lock)
9955 {
9956 int tmp1, tmp2;
9957
9958 @@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
9959 "1: ldsw [%2], %0\n"
9960 " brlz,a,pn %0, 2f\n"
9961 " mov 0, %0\n"
9962 -" add %0, 1, %1\n"
9963 +" addcc %0, 1, %1\n"
9964 +
9965 +#ifdef CONFIG_PAX_REFCOUNT
9966 +" tvs %%icc, 6\n"
9967 +#endif
9968 +
9969 " cas [%2], %0, %1\n"
9970 " cmp %0, %1\n"
9971 " bne,pn %%icc, 1b\n"
9972 @@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
9973 return tmp1;
9974 }
9975
9976 -static void inline arch_read_unlock(arch_rwlock_t *lock)
9977 +static inline void arch_read_unlock(arch_rwlock_t *lock)
9978 {
9979 unsigned long tmp1, tmp2;
9980
9981 __asm__ __volatile__(
9982 "1: lduw [%2], %0\n"
9983 -" sub %0, 1, %1\n"
9984 +" subcc %0, 1, %1\n"
9985 +
9986 +#ifdef CONFIG_PAX_REFCOUNT
9987 +" tvs %%icc, 6\n"
9988 +#endif
9989 +
9990 " cas [%2], %0, %1\n"
9991 " cmp %0, %1\n"
9992 " bne,pn %%xcc, 1b\n"
9993 @@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
9994 : "memory");
9995 }
9996
9997 -static void inline arch_write_lock(arch_rwlock_t *lock)
9998 +static inline void arch_write_lock(arch_rwlock_t *lock)
9999 {
10000 unsigned long mask, tmp1, tmp2;
10001
10002 @@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10003 : "memory");
10004 }
10005
10006 -static void inline arch_write_unlock(arch_rwlock_t *lock)
10007 +static inline void arch_write_unlock(arch_rwlock_t *lock)
10008 {
10009 __asm__ __volatile__(
10010 " stw %%g0, [%0]"
10011 @@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10012 : "memory");
10013 }
10014
10015 -static int inline arch_write_trylock(arch_rwlock_t *lock)
10016 +static inline int arch_write_trylock(arch_rwlock_t *lock)
10017 {
10018 unsigned long mask, tmp1, tmp2, result;
10019
10020 diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10021 index 96efa7a..16858bf 100644
10022 --- a/arch/sparc/include/asm/thread_info_32.h
10023 +++ b/arch/sparc/include/asm/thread_info_32.h
10024 @@ -49,6 +49,8 @@ struct thread_info {
10025 unsigned long w_saved;
10026
10027 struct restart_block restart_block;
10028 +
10029 + unsigned long lowest_stack;
10030 };
10031
10032 /*
10033 diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10034 index a5f01ac..703b554 100644
10035 --- a/arch/sparc/include/asm/thread_info_64.h
10036 +++ b/arch/sparc/include/asm/thread_info_64.h
10037 @@ -63,6 +63,8 @@ struct thread_info {
10038 struct pt_regs *kern_una_regs;
10039 unsigned int kern_una_insn;
10040
10041 + unsigned long lowest_stack;
10042 +
10043 unsigned long fpregs[0] __attribute__ ((aligned(64)));
10044 };
10045
10046 @@ -188,12 +190,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10047 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10048 /* flag bit 4 is available */
10049 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10050 -/* flag bit 6 is available */
10051 +#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10052 #define TIF_32BIT 7 /* 32-bit binary */
10053 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10054 #define TIF_SECCOMP 9 /* secure computing */
10055 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10056 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10057 +
10058 /* NOTE: Thread flags >= 12 should be ones we have no interest
10059 * in using in assembly, else we can't use the mask as
10060 * an immediate value in instructions such as andcc.
10061 @@ -213,12 +216,18 @@ register struct thread_info *current_thread_info_reg asm("g6");
10062 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10063 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10064 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10065 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10066
10067 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10068 _TIF_DO_NOTIFY_RESUME_MASK | \
10069 _TIF_NEED_RESCHED)
10070 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10071
10072 +#define _TIF_WORK_SYSCALL \
10073 + (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10074 + _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10075 +
10076 +
10077 /*
10078 * Thread-synchronous status.
10079 *
10080 diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10081 index 0167d26..767bb0c 100644
10082 --- a/arch/sparc/include/asm/uaccess.h
10083 +++ b/arch/sparc/include/asm/uaccess.h
10084 @@ -1,5 +1,6 @@
10085 #ifndef ___ASM_SPARC_UACCESS_H
10086 #define ___ASM_SPARC_UACCESS_H
10087 +
10088 #if defined(__sparc__) && defined(__arch64__)
10089 #include <asm/uaccess_64.h>
10090 #else
10091 diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10092 index 53a28dd..50c38c3 100644
10093 --- a/arch/sparc/include/asm/uaccess_32.h
10094 +++ b/arch/sparc/include/asm/uaccess_32.h
10095 @@ -250,27 +250,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
10096
10097 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10098 {
10099 - if (n && __access_ok((unsigned long) to, n))
10100 + if ((long)n < 0)
10101 + return n;
10102 +
10103 + if (n && __access_ok((unsigned long) to, n)) {
10104 + if (!__builtin_constant_p(n))
10105 + check_object_size(from, n, true);
10106 return __copy_user(to, (__force void __user *) from, n);
10107 - else
10108 + } else
10109 return n;
10110 }
10111
10112 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10113 {
10114 + if ((long)n < 0)
10115 + return n;
10116 +
10117 + if (!__builtin_constant_p(n))
10118 + check_object_size(from, n, true);
10119 +
10120 return __copy_user(to, (__force void __user *) from, n);
10121 }
10122
10123 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10124 {
10125 - if (n && __access_ok((unsigned long) from, n))
10126 + if ((long)n < 0)
10127 + return n;
10128 +
10129 + if (n && __access_ok((unsigned long) from, n)) {
10130 + if (!__builtin_constant_p(n))
10131 + check_object_size(to, n, false);
10132 return __copy_user((__force void __user *) to, from, n);
10133 - else
10134 + } else
10135 return n;
10136 }
10137
10138 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10139 {
10140 + if ((long)n < 0)
10141 + return n;
10142 +
10143 return __copy_user((__force void __user *) to, from, n);
10144 }
10145
10146 diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10147 index ad7e178..c9e7423 100644
10148 --- a/arch/sparc/include/asm/uaccess_64.h
10149 +++ b/arch/sparc/include/asm/uaccess_64.h
10150 @@ -10,6 +10,7 @@
10151 #include <linux/compiler.h>
10152 #include <linux/string.h>
10153 #include <linux/thread_info.h>
10154 +#include <linux/kernel.h>
10155 #include <asm/asi.h>
10156 #include <asm/spitfire.h>
10157 #include <asm-generic/uaccess-unaligned.h>
10158 @@ -214,8 +215,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
10159 static inline unsigned long __must_check
10160 copy_from_user(void *to, const void __user *from, unsigned long size)
10161 {
10162 - unsigned long ret = ___copy_from_user(to, from, size);
10163 + unsigned long ret;
10164
10165 + if ((long)size < 0 || size > INT_MAX)
10166 + return size;
10167 +
10168 + if (!__builtin_constant_p(size))
10169 + check_object_size(to, size, false);
10170 +
10171 + ret = ___copy_from_user(to, from, size);
10172 if (unlikely(ret))
10173 ret = copy_from_user_fixup(to, from, size);
10174
10175 @@ -231,8 +239,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
10176 static inline unsigned long __must_check
10177 copy_to_user(void __user *to, const void *from, unsigned long size)
10178 {
10179 - unsigned long ret = ___copy_to_user(to, from, size);
10180 + unsigned long ret;
10181
10182 + if ((long)size < 0 || size > INT_MAX)
10183 + return size;
10184 +
10185 + if (!__builtin_constant_p(size))
10186 + check_object_size(from, size, true);
10187 +
10188 + ret = ___copy_to_user(to, from, size);
10189 if (unlikely(ret))
10190 ret = copy_to_user_fixup(to, from, size);
10191 return ret;
10192 diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10193 index d15cc17..d0ae796 100644
10194 --- a/arch/sparc/kernel/Makefile
10195 +++ b/arch/sparc/kernel/Makefile
10196 @@ -4,7 +4,7 @@
10197 #
10198
10199 asflags-y := -ansi
10200 -ccflags-y := -Werror
10201 +#ccflags-y := -Werror
10202
10203 extra-y := head_$(BITS).o
10204
10205 diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10206 index 510baec..9ff2607 100644
10207 --- a/arch/sparc/kernel/process_32.c
10208 +++ b/arch/sparc/kernel/process_32.c
10209 @@ -115,14 +115,14 @@ void show_regs(struct pt_regs *r)
10210
10211 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10212 r->psr, r->pc, r->npc, r->y, print_tainted());
10213 - printk("PC: <%pS>\n", (void *) r->pc);
10214 + printk("PC: <%pA>\n", (void *) r->pc);
10215 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10216 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10217 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10218 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10219 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10220 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10221 - printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10222 + printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10223
10224 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10225 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10226 @@ -159,7 +159,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10227 rw = (struct reg_window32 *) fp;
10228 pc = rw->ins[7];
10229 printk("[%08lx : ", pc);
10230 - printk("%pS ] ", (void *) pc);
10231 + printk("%pA ] ", (void *) pc);
10232 fp = rw->ins[6];
10233 } while (++count < 16);
10234 printk("\n");
10235 diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10236 index d7b4967..2edf827 100644
10237 --- a/arch/sparc/kernel/process_64.c
10238 +++ b/arch/sparc/kernel/process_64.c
10239 @@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10240 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10241 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10242 if (regs->tstate & TSTATE_PRIV)
10243 - printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10244 + printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10245 }
10246
10247 void show_regs(struct pt_regs *regs)
10248 @@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10249
10250 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10251 regs->tpc, regs->tnpc, regs->y, print_tainted());
10252 - printk("TPC: <%pS>\n", (void *) regs->tpc);
10253 + printk("TPC: <%pA>\n", (void *) regs->tpc);
10254 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10255 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10256 regs->u_regs[3]);
10257 @@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10258 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10259 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10260 regs->u_regs[15]);
10261 - printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10262 + printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10263 show_regwindow(regs);
10264 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10265 }
10266 @@ -272,7 +272,7 @@ void arch_trigger_all_cpu_backtrace(void)
10267 ((tp && tp->task) ? tp->task->pid : -1));
10268
10269 if (gp->tstate & TSTATE_PRIV) {
10270 - printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10271 + printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10272 (void *) gp->tpc,
10273 (void *) gp->o7,
10274 (void *) gp->i7,
10275 diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10276 index 79cc0d1..ec62734 100644
10277 --- a/arch/sparc/kernel/prom_common.c
10278 +++ b/arch/sparc/kernel/prom_common.c
10279 @@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10280
10281 unsigned int prom_early_allocated __initdata;
10282
10283 -static struct of_pdt_ops prom_sparc_ops __initdata = {
10284 +static struct of_pdt_ops prom_sparc_ops __initconst = {
10285 .nextprop = prom_common_nextprop,
10286 .getproplen = prom_getproplen,
10287 .getproperty = prom_getproperty,
10288 diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10289 index c13c9f2..d572c34 100644
10290 --- a/arch/sparc/kernel/ptrace_64.c
10291 +++ b/arch/sparc/kernel/ptrace_64.c
10292 @@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10293 return ret;
10294 }
10295
10296 +#ifdef CONFIG_GRKERNSEC_SETXID
10297 +extern void gr_delayed_cred_worker(void);
10298 +#endif
10299 +
10300 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10301 {
10302 int ret = 0;
10303 @@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10304 if (test_thread_flag(TIF_NOHZ))
10305 user_exit();
10306
10307 +#ifdef CONFIG_GRKERNSEC_SETXID
10308 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10309 + gr_delayed_cred_worker();
10310 +#endif
10311 +
10312 if (test_thread_flag(TIF_SYSCALL_TRACE))
10313 ret = tracehook_report_syscall_entry(regs);
10314
10315 @@ -1093,6 +1102,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10316 if (test_thread_flag(TIF_NOHZ))
10317 user_exit();
10318
10319 +#ifdef CONFIG_GRKERNSEC_SETXID
10320 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10321 + gr_delayed_cred_worker();
10322 +#endif
10323 +
10324 audit_syscall_exit(regs);
10325
10326 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10327 diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10328 index 745a363..b5566b1 100644
10329 --- a/arch/sparc/kernel/smp_64.c
10330 +++ b/arch/sparc/kernel/smp_64.c
10331 @@ -868,8 +868,8 @@ extern unsigned long xcall_flush_dcache_page_cheetah;
10332 extern unsigned long xcall_flush_dcache_page_spitfire;
10333
10334 #ifdef CONFIG_DEBUG_DCFLUSH
10335 -extern atomic_t dcpage_flushes;
10336 -extern atomic_t dcpage_flushes_xcall;
10337 +extern atomic_unchecked_t dcpage_flushes;
10338 +extern atomic_unchecked_t dcpage_flushes_xcall;
10339 #endif
10340
10341 static inline void __local_flush_dcache_page(struct page *page)
10342 @@ -893,7 +893,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10343 return;
10344
10345 #ifdef CONFIG_DEBUG_DCFLUSH
10346 - atomic_inc(&dcpage_flushes);
10347 + atomic_inc_unchecked(&dcpage_flushes);
10348 #endif
10349
10350 this_cpu = get_cpu();
10351 @@ -917,7 +917,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10352 xcall_deliver(data0, __pa(pg_addr),
10353 (u64) pg_addr, cpumask_of(cpu));
10354 #ifdef CONFIG_DEBUG_DCFLUSH
10355 - atomic_inc(&dcpage_flushes_xcall);
10356 + atomic_inc_unchecked(&dcpage_flushes_xcall);
10357 #endif
10358 }
10359 }
10360 @@ -936,7 +936,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10361 preempt_disable();
10362
10363 #ifdef CONFIG_DEBUG_DCFLUSH
10364 - atomic_inc(&dcpage_flushes);
10365 + atomic_inc_unchecked(&dcpage_flushes);
10366 #endif
10367 data0 = 0;
10368 pg_addr = page_address(page);
10369 @@ -953,7 +953,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10370 xcall_deliver(data0, __pa(pg_addr),
10371 (u64) pg_addr, cpu_online_mask);
10372 #ifdef CONFIG_DEBUG_DCFLUSH
10373 - atomic_inc(&dcpage_flushes_xcall);
10374 + atomic_inc_unchecked(&dcpage_flushes_xcall);
10375 #endif
10376 }
10377 __local_flush_dcache_page(page);
10378 diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10379 index 3a8d184..49498a8 100644
10380 --- a/arch/sparc/kernel/sys_sparc_32.c
10381 +++ b/arch/sparc/kernel/sys_sparc_32.c
10382 @@ -52,7 +52,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10383 if (len > TASK_SIZE - PAGE_SIZE)
10384 return -ENOMEM;
10385 if (!addr)
10386 - addr = TASK_UNMAPPED_BASE;
10387 + addr = current->mm->mmap_base;
10388
10389 info.flags = 0;
10390 info.length = len;
10391 diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10392 index beb0b5a..5a153f7 100644
10393 --- a/arch/sparc/kernel/sys_sparc_64.c
10394 +++ b/arch/sparc/kernel/sys_sparc_64.c
10395 @@ -88,13 +88,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10396 struct vm_area_struct * vma;
10397 unsigned long task_size = TASK_SIZE;
10398 int do_color_align;
10399 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10400 struct vm_unmapped_area_info info;
10401
10402 if (flags & MAP_FIXED) {
10403 /* We do not accept a shared mapping if it would violate
10404 * cache aliasing constraints.
10405 */
10406 - if ((flags & MAP_SHARED) &&
10407 + if ((filp || (flags & MAP_SHARED)) &&
10408 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10409 return -EINVAL;
10410 return addr;
10411 @@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10412 if (filp || (flags & MAP_SHARED))
10413 do_color_align = 1;
10414
10415 +#ifdef CONFIG_PAX_RANDMMAP
10416 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10417 +#endif
10418 +
10419 if (addr) {
10420 if (do_color_align)
10421 addr = COLOR_ALIGN(addr, pgoff);
10422 @@ -116,22 +121,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10423 addr = PAGE_ALIGN(addr);
10424
10425 vma = find_vma(mm, addr);
10426 - if (task_size - len >= addr &&
10427 - (!vma || addr + len <= vma->vm_start))
10428 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10429 return addr;
10430 }
10431
10432 info.flags = 0;
10433 info.length = len;
10434 - info.low_limit = TASK_UNMAPPED_BASE;
10435 + info.low_limit = mm->mmap_base;
10436 info.high_limit = min(task_size, VA_EXCLUDE_START);
10437 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10438 info.align_offset = pgoff << PAGE_SHIFT;
10439 + info.threadstack_offset = offset;
10440 addr = vm_unmapped_area(&info);
10441
10442 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10443 VM_BUG_ON(addr != -ENOMEM);
10444 info.low_limit = VA_EXCLUDE_END;
10445 +
10446 +#ifdef CONFIG_PAX_RANDMMAP
10447 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10448 + info.low_limit += mm->delta_mmap;
10449 +#endif
10450 +
10451 info.high_limit = task_size;
10452 addr = vm_unmapped_area(&info);
10453 }
10454 @@ -149,6 +160,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10455 unsigned long task_size = STACK_TOP32;
10456 unsigned long addr = addr0;
10457 int do_color_align;
10458 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10459 struct vm_unmapped_area_info info;
10460
10461 /* This should only ever run for 32-bit processes. */
10462 @@ -158,7 +170,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10463 /* We do not accept a shared mapping if it would violate
10464 * cache aliasing constraints.
10465 */
10466 - if ((flags & MAP_SHARED) &&
10467 + if ((filp || (flags & MAP_SHARED)) &&
10468 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10469 return -EINVAL;
10470 return addr;
10471 @@ -171,6 +183,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10472 if (filp || (flags & MAP_SHARED))
10473 do_color_align = 1;
10474
10475 +#ifdef CONFIG_PAX_RANDMMAP
10476 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10477 +#endif
10478 +
10479 /* requesting a specific address */
10480 if (addr) {
10481 if (do_color_align)
10482 @@ -179,8 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10483 addr = PAGE_ALIGN(addr);
10484
10485 vma = find_vma(mm, addr);
10486 - if (task_size - len >= addr &&
10487 - (!vma || addr + len <= vma->vm_start))
10488 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10489 return addr;
10490 }
10491
10492 @@ -190,6 +205,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10493 info.high_limit = mm->mmap_base;
10494 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10495 info.align_offset = pgoff << PAGE_SHIFT;
10496 + info.threadstack_offset = offset;
10497 addr = vm_unmapped_area(&info);
10498
10499 /*
10500 @@ -202,6 +218,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10501 VM_BUG_ON(addr != -ENOMEM);
10502 info.flags = 0;
10503 info.low_limit = TASK_UNMAPPED_BASE;
10504 +
10505 +#ifdef CONFIG_PAX_RANDMMAP
10506 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10507 + info.low_limit += mm->delta_mmap;
10508 +#endif
10509 +
10510 info.high_limit = STACK_TOP32;
10511 addr = vm_unmapped_area(&info);
10512 }
10513 @@ -258,10 +280,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10514 EXPORT_SYMBOL(get_fb_unmapped_area);
10515
10516 /* Essentially the same as PowerPC. */
10517 -static unsigned long mmap_rnd(void)
10518 +static unsigned long mmap_rnd(struct mm_struct *mm)
10519 {
10520 unsigned long rnd = 0UL;
10521
10522 +#ifdef CONFIG_PAX_RANDMMAP
10523 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10524 +#endif
10525 +
10526 if (current->flags & PF_RANDOMIZE) {
10527 unsigned long val = get_random_int();
10528 if (test_thread_flag(TIF_32BIT))
10529 @@ -274,7 +300,7 @@ static unsigned long mmap_rnd(void)
10530
10531 void arch_pick_mmap_layout(struct mm_struct *mm)
10532 {
10533 - unsigned long random_factor = mmap_rnd();
10534 + unsigned long random_factor = mmap_rnd(mm);
10535 unsigned long gap;
10536
10537 /*
10538 @@ -287,6 +313,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10539 gap == RLIM_INFINITY ||
10540 sysctl_legacy_va_layout) {
10541 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10542 +
10543 +#ifdef CONFIG_PAX_RANDMMAP
10544 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10545 + mm->mmap_base += mm->delta_mmap;
10546 +#endif
10547 +
10548 mm->get_unmapped_area = arch_get_unmapped_area;
10549 } else {
10550 /* We know it's 32-bit */
10551 @@ -298,6 +330,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10552 gap = (task_size / 6 * 5);
10553
10554 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10555 +
10556 +#ifdef CONFIG_PAX_RANDMMAP
10557 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10558 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10559 +#endif
10560 +
10561 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10562 }
10563 }
10564 diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10565 index 33a17e7..d87fb1f 100644
10566 --- a/arch/sparc/kernel/syscalls.S
10567 +++ b/arch/sparc/kernel/syscalls.S
10568 @@ -52,7 +52,7 @@ sys32_rt_sigreturn:
10569 #endif
10570 .align 32
10571 1: ldx [%g6 + TI_FLAGS], %l5
10572 - andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10573 + andcc %l5, _TIF_WORK_SYSCALL, %g0
10574 be,pt %icc, rtrap
10575 nop
10576 call syscall_trace_leave
10577 @@ -184,7 +184,7 @@ linux_sparc_syscall32:
10578
10579 srl %i3, 0, %o3 ! IEU0
10580 srl %i2, 0, %o2 ! IEU0 Group
10581 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10582 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10583 bne,pn %icc, linux_syscall_trace32 ! CTI
10584 mov %i0, %l5 ! IEU1
10585 5: call %l7 ! CTI Group brk forced
10586 @@ -208,7 +208,7 @@ linux_sparc_syscall:
10587
10588 mov %i3, %o3 ! IEU1
10589 mov %i4, %o4 ! IEU0 Group
10590 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10591 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10592 bne,pn %icc, linux_syscall_trace ! CTI Group
10593 mov %i0, %l5 ! IEU0
10594 2: call %l7 ! CTI Group brk forced
10595 @@ -223,7 +223,7 @@ ret_sys_call:
10596
10597 cmp %o0, -ERESTART_RESTARTBLOCK
10598 bgeu,pn %xcc, 1f
10599 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10600 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10601 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10602
10603 2:
10604 diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10605 index 6629829..036032d 100644
10606 --- a/arch/sparc/kernel/traps_32.c
10607 +++ b/arch/sparc/kernel/traps_32.c
10608 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10609 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10610 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10611
10612 +extern void gr_handle_kernel_exploit(void);
10613 +
10614 void die_if_kernel(char *str, struct pt_regs *regs)
10615 {
10616 static int die_counter;
10617 @@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
10618 count++ < 30 &&
10619 (((unsigned long) rw) >= PAGE_OFFSET) &&
10620 !(((unsigned long) rw) & 0x7)) {
10621 - printk("Caller[%08lx]: %pS\n", rw->ins[7],
10622 + printk("Caller[%08lx]: %pA\n", rw->ins[7],
10623 (void *) rw->ins[7]);
10624 rw = (struct reg_window32 *)rw->ins[6];
10625 }
10626 }
10627 printk("Instruction DUMP:");
10628 instruction_dump ((unsigned long *) regs->pc);
10629 - if(regs->psr & PSR_PS)
10630 + if(regs->psr & PSR_PS) {
10631 + gr_handle_kernel_exploit();
10632 do_exit(SIGKILL);
10633 + }
10634 do_exit(SIGSEGV);
10635 }
10636
10637 diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10638 index 4ced92f..965eeed 100644
10639 --- a/arch/sparc/kernel/traps_64.c
10640 +++ b/arch/sparc/kernel/traps_64.c
10641 @@ -77,7 +77,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10642 i + 1,
10643 p->trapstack[i].tstate, p->trapstack[i].tpc,
10644 p->trapstack[i].tnpc, p->trapstack[i].tt);
10645 - printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10646 + printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10647 }
10648 }
10649
10650 @@ -97,6 +97,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10651
10652 lvl -= 0x100;
10653 if (regs->tstate & TSTATE_PRIV) {
10654 +
10655 +#ifdef CONFIG_PAX_REFCOUNT
10656 + if (lvl == 6)
10657 + pax_report_refcount_overflow(regs);
10658 +#endif
10659 +
10660 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10661 die_if_kernel(buffer, regs);
10662 }
10663 @@ -115,11 +121,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10664 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10665 {
10666 char buffer[32];
10667 -
10668 +
10669 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10670 0, lvl, SIGTRAP) == NOTIFY_STOP)
10671 return;
10672
10673 +#ifdef CONFIG_PAX_REFCOUNT
10674 + if (lvl == 6)
10675 + pax_report_refcount_overflow(regs);
10676 +#endif
10677 +
10678 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10679
10680 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
10681 @@ -1149,7 +1160,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
10682 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
10683 printk("%s" "ERROR(%d): ",
10684 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
10685 - printk("TPC<%pS>\n", (void *) regs->tpc);
10686 + printk("TPC<%pA>\n", (void *) regs->tpc);
10687 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
10688 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
10689 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
10690 @@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10691 smp_processor_id(),
10692 (type & 0x1) ? 'I' : 'D',
10693 regs->tpc);
10694 - printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
10695 + printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
10696 panic("Irrecoverable Cheetah+ parity error.");
10697 }
10698
10699 @@ -1764,7 +1775,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10700 smp_processor_id(),
10701 (type & 0x1) ? 'I' : 'D',
10702 regs->tpc);
10703 - printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
10704 + printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
10705 }
10706
10707 struct sun4v_error_entry {
10708 @@ -1837,8 +1848,8 @@ struct sun4v_error_entry {
10709 /*0x38*/u64 reserved_5;
10710 };
10711
10712 -static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10713 -static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10714 +static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10715 +static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10716
10717 static const char *sun4v_err_type_to_str(u8 type)
10718 {
10719 @@ -1930,7 +1941,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
10720 }
10721
10722 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
10723 - int cpu, const char *pfx, atomic_t *ocnt)
10724 + int cpu, const char *pfx, atomic_unchecked_t *ocnt)
10725 {
10726 u64 *raw_ptr = (u64 *) ent;
10727 u32 attrs;
10728 @@ -1988,8 +1999,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
10729
10730 show_regs(regs);
10731
10732 - if ((cnt = atomic_read(ocnt)) != 0) {
10733 - atomic_set(ocnt, 0);
10734 + if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
10735 + atomic_set_unchecked(ocnt, 0);
10736 wmb();
10737 printk("%s: Queue overflowed %d times.\n",
10738 pfx, cnt);
10739 @@ -2046,7 +2057,7 @@ out:
10740 */
10741 void sun4v_resum_overflow(struct pt_regs *regs)
10742 {
10743 - atomic_inc(&sun4v_resum_oflow_cnt);
10744 + atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
10745 }
10746
10747 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
10748 @@ -2099,7 +2110,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
10749 /* XXX Actually even this can make not that much sense. Perhaps
10750 * XXX we should just pull the plug and panic directly from here?
10751 */
10752 - atomic_inc(&sun4v_nonresum_oflow_cnt);
10753 + atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
10754 }
10755
10756 unsigned long sun4v_err_itlb_vaddr;
10757 @@ -2114,9 +2125,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
10758
10759 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
10760 regs->tpc, tl);
10761 - printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
10762 + printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
10763 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
10764 - printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
10765 + printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
10766 (void *) regs->u_regs[UREG_I7]);
10767 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
10768 "pte[%lx] error[%lx]\n",
10769 @@ -2138,9 +2149,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
10770
10771 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
10772 regs->tpc, tl);
10773 - printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
10774 + printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
10775 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
10776 - printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
10777 + printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
10778 (void *) regs->u_regs[UREG_I7]);
10779 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
10780 "pte[%lx] error[%lx]\n",
10781 @@ -2359,13 +2370,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10782 fp = (unsigned long)sf->fp + STACK_BIAS;
10783 }
10784
10785 - printk(" [%016lx] %pS\n", pc, (void *) pc);
10786 + printk(" [%016lx] %pA\n", pc, (void *) pc);
10787 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
10788 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
10789 int index = tsk->curr_ret_stack;
10790 if (tsk->ret_stack && index >= graph) {
10791 pc = tsk->ret_stack[index - graph].ret;
10792 - printk(" [%016lx] %pS\n", pc, (void *) pc);
10793 + printk(" [%016lx] %pA\n", pc, (void *) pc);
10794 graph++;
10795 }
10796 }
10797 @@ -2383,6 +2394,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
10798 return (struct reg_window *) (fp + STACK_BIAS);
10799 }
10800
10801 +extern void gr_handle_kernel_exploit(void);
10802 +
10803 void die_if_kernel(char *str, struct pt_regs *regs)
10804 {
10805 static int die_counter;
10806 @@ -2411,7 +2424,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
10807 while (rw &&
10808 count++ < 30 &&
10809 kstack_valid(tp, (unsigned long) rw)) {
10810 - printk("Caller[%016lx]: %pS\n", rw->ins[7],
10811 + printk("Caller[%016lx]: %pA\n", rw->ins[7],
10812 (void *) rw->ins[7]);
10813
10814 rw = kernel_stack_up(rw);
10815 @@ -2424,8 +2437,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
10816 }
10817 user_instruction_dump ((unsigned int __user *) regs->tpc);
10818 }
10819 - if (regs->tstate & TSTATE_PRIV)
10820 + if (regs->tstate & TSTATE_PRIV) {
10821 + gr_handle_kernel_exploit();
10822 do_exit(SIGKILL);
10823 + }
10824 do_exit(SIGSEGV);
10825 }
10826 EXPORT_SYMBOL(die_if_kernel);
10827 diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
10828 index 35ab8b6..9046547 100644
10829 --- a/arch/sparc/kernel/unaligned_64.c
10830 +++ b/arch/sparc/kernel/unaligned_64.c
10831 @@ -295,7 +295,7 @@ static void log_unaligned(struct pt_regs *regs)
10832 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
10833
10834 if (__ratelimit(&ratelimit)) {
10835 - printk("Kernel unaligned access at TPC[%lx] %pS\n",
10836 + printk("Kernel unaligned access at TPC[%lx] %pA\n",
10837 regs->tpc, (void *) regs->tpc);
10838 }
10839 }
10840 diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
10841 index dbe119b..089c7c1 100644
10842 --- a/arch/sparc/lib/Makefile
10843 +++ b/arch/sparc/lib/Makefile
10844 @@ -2,7 +2,7 @@
10845 #
10846
10847 asflags-y := -ansi -DST_DIV0=0x02
10848 -ccflags-y := -Werror
10849 +#ccflags-y := -Werror
10850
10851 lib-$(CONFIG_SPARC32) += ashrdi3.o
10852 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
10853 diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
10854 index 85c233d..68500e0 100644
10855 --- a/arch/sparc/lib/atomic_64.S
10856 +++ b/arch/sparc/lib/atomic_64.S
10857 @@ -17,7 +17,12 @@
10858 ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
10859 BACKOFF_SETUP(%o2)
10860 1: lduw [%o1], %g1
10861 - add %g1, %o0, %g7
10862 + addcc %g1, %o0, %g7
10863 +
10864 +#ifdef CONFIG_PAX_REFCOUNT
10865 + tvs %icc, 6
10866 +#endif
10867 +
10868 cas [%o1], %g1, %g7
10869 cmp %g1, %g7
10870 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10871 @@ -27,10 +32,28 @@ ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
10872 2: BACKOFF_SPIN(%o2, %o3, 1b)
10873 ENDPROC(atomic_add)
10874
10875 +ENTRY(atomic_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10876 + BACKOFF_SETUP(%o2)
10877 +1: lduw [%o1], %g1
10878 + add %g1, %o0, %g7
10879 + cas [%o1], %g1, %g7
10880 + cmp %g1, %g7
10881 + bne,pn %icc, 2f
10882 + nop
10883 + retl
10884 + nop
10885 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10886 +ENDPROC(atomic_add_unchecked)
10887 +
10888 ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10889 BACKOFF_SETUP(%o2)
10890 1: lduw [%o1], %g1
10891 - sub %g1, %o0, %g7
10892 + subcc %g1, %o0, %g7
10893 +
10894 +#ifdef CONFIG_PAX_REFCOUNT
10895 + tvs %icc, 6
10896 +#endif
10897 +
10898 cas [%o1], %g1, %g7
10899 cmp %g1, %g7
10900 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10901 @@ -40,10 +63,28 @@ ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10902 2: BACKOFF_SPIN(%o2, %o3, 1b)
10903 ENDPROC(atomic_sub)
10904
10905 +ENTRY(atomic_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
10906 + BACKOFF_SETUP(%o2)
10907 +1: lduw [%o1], %g1
10908 + sub %g1, %o0, %g7
10909 + cas [%o1], %g1, %g7
10910 + cmp %g1, %g7
10911 + bne,pn %icc, 2f
10912 + nop
10913 + retl
10914 + nop
10915 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10916 +ENDPROC(atomic_sub_unchecked)
10917 +
10918 ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10919 BACKOFF_SETUP(%o2)
10920 1: lduw [%o1], %g1
10921 - add %g1, %o0, %g7
10922 + addcc %g1, %o0, %g7
10923 +
10924 +#ifdef CONFIG_PAX_REFCOUNT
10925 + tvs %icc, 6
10926 +#endif
10927 +
10928 cas [%o1], %g1, %g7
10929 cmp %g1, %g7
10930 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10931 @@ -53,10 +94,29 @@ ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10932 2: BACKOFF_SPIN(%o2, %o3, 1b)
10933 ENDPROC(atomic_add_ret)
10934
10935 +ENTRY(atomic_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10936 + BACKOFF_SETUP(%o2)
10937 +1: lduw [%o1], %g1
10938 + addcc %g1, %o0, %g7
10939 + cas [%o1], %g1, %g7
10940 + cmp %g1, %g7
10941 + bne,pn %icc, 2f
10942 + add %g7, %o0, %g7
10943 + sra %g7, 0, %o0
10944 + retl
10945 + nop
10946 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10947 +ENDPROC(atomic_add_ret_unchecked)
10948 +
10949 ENTRY(atomic_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
10950 BACKOFF_SETUP(%o2)
10951 1: lduw [%o1], %g1
10952 - sub %g1, %o0, %g7
10953 + subcc %g1, %o0, %g7
10954 +
10955 +#ifdef CONFIG_PAX_REFCOUNT
10956 + tvs %icc, 6
10957 +#endif
10958 +
10959 cas [%o1], %g1, %g7
10960 cmp %g1, %g7
10961 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10962 @@ -69,7 +129,12 @@ ENDPROC(atomic_sub_ret)
10963 ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
10964 BACKOFF_SETUP(%o2)
10965 1: ldx [%o1], %g1
10966 - add %g1, %o0, %g7
10967 + addcc %g1, %o0, %g7
10968 +
10969 +#ifdef CONFIG_PAX_REFCOUNT
10970 + tvs %xcc, 6
10971 +#endif
10972 +
10973 casx [%o1], %g1, %g7
10974 cmp %g1, %g7
10975 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10976 @@ -79,10 +144,28 @@ ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
10977 2: BACKOFF_SPIN(%o2, %o3, 1b)
10978 ENDPROC(atomic64_add)
10979
10980 +ENTRY(atomic64_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10981 + BACKOFF_SETUP(%o2)
10982 +1: ldx [%o1], %g1
10983 + addcc %g1, %o0, %g7
10984 + casx [%o1], %g1, %g7
10985 + cmp %g1, %g7
10986 + bne,pn %xcc, 2f
10987 + nop
10988 + retl
10989 + nop
10990 +2: BACKOFF_SPIN(%o2, %o3, 1b)
10991 +ENDPROC(atomic64_add_unchecked)
10992 +
10993 ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10994 BACKOFF_SETUP(%o2)
10995 1: ldx [%o1], %g1
10996 - sub %g1, %o0, %g7
10997 + subcc %g1, %o0, %g7
10998 +
10999 +#ifdef CONFIG_PAX_REFCOUNT
11000 + tvs %xcc, 6
11001 +#endif
11002 +
11003 casx [%o1], %g1, %g7
11004 cmp %g1, %g7
11005 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
11006 @@ -92,10 +175,28 @@ ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
11007 2: BACKOFF_SPIN(%o2, %o3, 1b)
11008 ENDPROC(atomic64_sub)
11009
11010 +ENTRY(atomic64_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
11011 + BACKOFF_SETUP(%o2)
11012 +1: ldx [%o1], %g1
11013 + subcc %g1, %o0, %g7
11014 + casx [%o1], %g1, %g7
11015 + cmp %g1, %g7
11016 + bne,pn %xcc, 2f
11017 + nop
11018 + retl
11019 + nop
11020 +2: BACKOFF_SPIN(%o2, %o3, 1b)
11021 +ENDPROC(atomic64_sub_unchecked)
11022 +
11023 ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
11024 BACKOFF_SETUP(%o2)
11025 1: ldx [%o1], %g1
11026 - add %g1, %o0, %g7
11027 + addcc %g1, %o0, %g7
11028 +
11029 +#ifdef CONFIG_PAX_REFCOUNT
11030 + tvs %xcc, 6
11031 +#endif
11032 +
11033 casx [%o1], %g1, %g7
11034 cmp %g1, %g7
11035 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
11036 @@ -105,10 +206,29 @@ ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
11037 2: BACKOFF_SPIN(%o2, %o3, 1b)
11038 ENDPROC(atomic64_add_ret)
11039
11040 +ENTRY(atomic64_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
11041 + BACKOFF_SETUP(%o2)
11042 +1: ldx [%o1], %g1
11043 + addcc %g1, %o0, %g7
11044 + casx [%o1], %g1, %g7
11045 + cmp %g1, %g7
11046 + bne,pn %xcc, 2f
11047 + add %g7, %o0, %g7
11048 + mov %g7, %o0
11049 + retl
11050 + nop
11051 +2: BACKOFF_SPIN(%o2, %o3, 1b)
11052 +ENDPROC(atomic64_add_ret_unchecked)
11053 +
11054 ENTRY(atomic64_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
11055 BACKOFF_SETUP(%o2)
11056 1: ldx [%o1], %g1
11057 - sub %g1, %o0, %g7
11058 + subcc %g1, %o0, %g7
11059 +
11060 +#ifdef CONFIG_PAX_REFCOUNT
11061 + tvs %xcc, 6
11062 +#endif
11063 +
11064 casx [%o1], %g1, %g7
11065 cmp %g1, %g7
11066 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
11067 diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11068 index 323335b..ed85ea2 100644
11069 --- a/arch/sparc/lib/ksyms.c
11070 +++ b/arch/sparc/lib/ksyms.c
11071 @@ -100,12 +100,18 @@ EXPORT_SYMBOL(__clear_user);
11072
11073 /* Atomic counter implementation. */
11074 EXPORT_SYMBOL(atomic_add);
11075 +EXPORT_SYMBOL(atomic_add_unchecked);
11076 EXPORT_SYMBOL(atomic_add_ret);
11077 +EXPORT_SYMBOL(atomic_add_ret_unchecked);
11078 EXPORT_SYMBOL(atomic_sub);
11079 +EXPORT_SYMBOL(atomic_sub_unchecked);
11080 EXPORT_SYMBOL(atomic_sub_ret);
11081 EXPORT_SYMBOL(atomic64_add);
11082 +EXPORT_SYMBOL(atomic64_add_unchecked);
11083 EXPORT_SYMBOL(atomic64_add_ret);
11084 +EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11085 EXPORT_SYMBOL(atomic64_sub);
11086 +EXPORT_SYMBOL(atomic64_sub_unchecked);
11087 EXPORT_SYMBOL(atomic64_sub_ret);
11088 EXPORT_SYMBOL(atomic64_dec_if_positive);
11089
11090 diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11091 index 30c3ecc..736f015 100644
11092 --- a/arch/sparc/mm/Makefile
11093 +++ b/arch/sparc/mm/Makefile
11094 @@ -2,7 +2,7 @@
11095 #
11096
11097 asflags-y := -ansi
11098 -ccflags-y := -Werror
11099 +#ccflags-y := -Werror
11100
11101 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11102 obj-y += fault_$(BITS).o
11103 diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11104 index 59dbd46..1dd7f5e 100644
11105 --- a/arch/sparc/mm/fault_32.c
11106 +++ b/arch/sparc/mm/fault_32.c
11107 @@ -21,6 +21,9 @@
11108 #include <linux/perf_event.h>
11109 #include <linux/interrupt.h>
11110 #include <linux/kdebug.h>
11111 +#include <linux/slab.h>
11112 +#include <linux/pagemap.h>
11113 +#include <linux/compiler.h>
11114
11115 #include <asm/page.h>
11116 #include <asm/pgtable.h>
11117 @@ -159,6 +162,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11118 return safe_compute_effective_address(regs, insn);
11119 }
11120
11121 +#ifdef CONFIG_PAX_PAGEEXEC
11122 +#ifdef CONFIG_PAX_DLRESOLVE
11123 +static void pax_emuplt_close(struct vm_area_struct *vma)
11124 +{
11125 + vma->vm_mm->call_dl_resolve = 0UL;
11126 +}
11127 +
11128 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11129 +{
11130 + unsigned int *kaddr;
11131 +
11132 + vmf->page = alloc_page(GFP_HIGHUSER);
11133 + if (!vmf->page)
11134 + return VM_FAULT_OOM;
11135 +
11136 + kaddr = kmap(vmf->page);
11137 + memset(kaddr, 0, PAGE_SIZE);
11138 + kaddr[0] = 0x9DE3BFA8U; /* save */
11139 + flush_dcache_page(vmf->page);
11140 + kunmap(vmf->page);
11141 + return VM_FAULT_MAJOR;
11142 +}
11143 +
11144 +static const struct vm_operations_struct pax_vm_ops = {
11145 + .close = pax_emuplt_close,
11146 + .fault = pax_emuplt_fault
11147 +};
11148 +
11149 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11150 +{
11151 + int ret;
11152 +
11153 + INIT_LIST_HEAD(&vma->anon_vma_chain);
11154 + vma->vm_mm = current->mm;
11155 + vma->vm_start = addr;
11156 + vma->vm_end = addr + PAGE_SIZE;
11157 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11158 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11159 + vma->vm_ops = &pax_vm_ops;
11160 +
11161 + ret = insert_vm_struct(current->mm, vma);
11162 + if (ret)
11163 + return ret;
11164 +
11165 + ++current->mm->total_vm;
11166 + return 0;
11167 +}
11168 +#endif
11169 +
11170 +/*
11171 + * PaX: decide what to do with offenders (regs->pc = fault address)
11172 + *
11173 + * returns 1 when task should be killed
11174 + * 2 when patched PLT trampoline was detected
11175 + * 3 when unpatched PLT trampoline was detected
11176 + */
11177 +static int pax_handle_fetch_fault(struct pt_regs *regs)
11178 +{
11179 +
11180 +#ifdef CONFIG_PAX_EMUPLT
11181 + int err;
11182 +
11183 + do { /* PaX: patched PLT emulation #1 */
11184 + unsigned int sethi1, sethi2, jmpl;
11185 +
11186 + err = get_user(sethi1, (unsigned int *)regs->pc);
11187 + err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11188 + err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11189 +
11190 + if (err)
11191 + break;
11192 +
11193 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11194 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
11195 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
11196 + {
11197 + unsigned int addr;
11198 +
11199 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11200 + addr = regs->u_regs[UREG_G1];
11201 + addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11202 + regs->pc = addr;
11203 + regs->npc = addr+4;
11204 + return 2;
11205 + }
11206 + } while (0);
11207 +
11208 + do { /* PaX: patched PLT emulation #2 */
11209 + unsigned int ba;
11210 +
11211 + err = get_user(ba, (unsigned int *)regs->pc);
11212 +
11213 + if (err)
11214 + break;
11215 +
11216 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11217 + unsigned int addr;
11218 +
11219 + if ((ba & 0xFFC00000U) == 0x30800000U)
11220 + addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11221 + else
11222 + addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11223 + regs->pc = addr;
11224 + regs->npc = addr+4;
11225 + return 2;
11226 + }
11227 + } while (0);
11228 +
11229 + do { /* PaX: patched PLT emulation #3 */
11230 + unsigned int sethi, bajmpl, nop;
11231 +
11232 + err = get_user(sethi, (unsigned int *)regs->pc);
11233 + err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11234 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
11235 +
11236 + if (err)
11237 + break;
11238 +
11239 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11240 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11241 + nop == 0x01000000U)
11242 + {
11243 + unsigned int addr;
11244 +
11245 + addr = (sethi & 0x003FFFFFU) << 10;
11246 + regs->u_regs[UREG_G1] = addr;
11247 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11248 + addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11249 + else
11250 + addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11251 + regs->pc = addr;
11252 + regs->npc = addr+4;
11253 + return 2;
11254 + }
11255 + } while (0);
11256 +
11257 + do { /* PaX: unpatched PLT emulation step 1 */
11258 + unsigned int sethi, ba, nop;
11259 +
11260 + err = get_user(sethi, (unsigned int *)regs->pc);
11261 + err |= get_user(ba, (unsigned int *)(regs->pc+4));
11262 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
11263 +
11264 + if (err)
11265 + break;
11266 +
11267 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11268 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11269 + nop == 0x01000000U)
11270 + {
11271 + unsigned int addr, save, call;
11272 +
11273 + if ((ba & 0xFFC00000U) == 0x30800000U)
11274 + addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11275 + else
11276 + addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11277 +
11278 + err = get_user(save, (unsigned int *)addr);
11279 + err |= get_user(call, (unsigned int *)(addr+4));
11280 + err |= get_user(nop, (unsigned int *)(addr+8));
11281 + if (err)
11282 + break;
11283 +
11284 +#ifdef CONFIG_PAX_DLRESOLVE
11285 + if (save == 0x9DE3BFA8U &&
11286 + (call & 0xC0000000U) == 0x40000000U &&
11287 + nop == 0x01000000U)
11288 + {
11289 + struct vm_area_struct *vma;
11290 + unsigned long call_dl_resolve;
11291 +
11292 + down_read(&current->mm->mmap_sem);
11293 + call_dl_resolve = current->mm->call_dl_resolve;
11294 + up_read(&current->mm->mmap_sem);
11295 + if (likely(call_dl_resolve))
11296 + goto emulate;
11297 +
11298 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11299 +
11300 + down_write(&current->mm->mmap_sem);
11301 + if (current->mm->call_dl_resolve) {
11302 + call_dl_resolve = current->mm->call_dl_resolve;
11303 + up_write(&current->mm->mmap_sem);
11304 + if (vma)
11305 + kmem_cache_free(vm_area_cachep, vma);
11306 + goto emulate;
11307 + }
11308 +
11309 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11310 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11311 + up_write(&current->mm->mmap_sem);
11312 + if (vma)
11313 + kmem_cache_free(vm_area_cachep, vma);
11314 + return 1;
11315 + }
11316 +
11317 + if (pax_insert_vma(vma, call_dl_resolve)) {
11318 + up_write(&current->mm->mmap_sem);
11319 + kmem_cache_free(vm_area_cachep, vma);
11320 + return 1;
11321 + }
11322 +
11323 + current->mm->call_dl_resolve = call_dl_resolve;
11324 + up_write(&current->mm->mmap_sem);
11325 +
11326 +emulate:
11327 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11328 + regs->pc = call_dl_resolve;
11329 + regs->npc = addr+4;
11330 + return 3;
11331 + }
11332 +#endif
11333 +
11334 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11335 + if ((save & 0xFFC00000U) == 0x05000000U &&
11336 + (call & 0xFFFFE000U) == 0x85C0A000U &&
11337 + nop == 0x01000000U)
11338 + {
11339 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11340 + regs->u_regs[UREG_G2] = addr + 4;
11341 + addr = (save & 0x003FFFFFU) << 10;
11342 + addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11343 + regs->pc = addr;
11344 + regs->npc = addr+4;
11345 + return 3;
11346 + }
11347 + }
11348 + } while (0);
11349 +
11350 + do { /* PaX: unpatched PLT emulation step 2 */
11351 + unsigned int save, call, nop;
11352 +
11353 + err = get_user(save, (unsigned int *)(regs->pc-4));
11354 + err |= get_user(call, (unsigned int *)regs->pc);
11355 + err |= get_user(nop, (unsigned int *)(regs->pc+4));
11356 + if (err)
11357 + break;
11358 +
11359 + if (save == 0x9DE3BFA8U &&
11360 + (call & 0xC0000000U) == 0x40000000U &&
11361 + nop == 0x01000000U)
11362 + {
11363 + unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11364 +
11365 + regs->u_regs[UREG_RETPC] = regs->pc;
11366 + regs->pc = dl_resolve;
11367 + regs->npc = dl_resolve+4;
11368 + return 3;
11369 + }
11370 + } while (0);
11371 +#endif
11372 +
11373 + return 1;
11374 +}
11375 +
11376 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11377 +{
11378 + unsigned long i;
11379 +
11380 + printk(KERN_ERR "PAX: bytes at PC: ");
11381 + for (i = 0; i < 8; i++) {
11382 + unsigned int c;
11383 + if (get_user(c, (unsigned int *)pc+i))
11384 + printk(KERN_CONT "???????? ");
11385 + else
11386 + printk(KERN_CONT "%08x ", c);
11387 + }
11388 + printk("\n");
11389 +}
11390 +#endif
11391 +
11392 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11393 int text_fault)
11394 {
11395 @@ -229,6 +503,24 @@ good_area:
11396 if (!(vma->vm_flags & VM_WRITE))
11397 goto bad_area;
11398 } else {
11399 +
11400 +#ifdef CONFIG_PAX_PAGEEXEC
11401 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11402 + up_read(&mm->mmap_sem);
11403 + switch (pax_handle_fetch_fault(regs)) {
11404 +
11405 +#ifdef CONFIG_PAX_EMUPLT
11406 + case 2:
11407 + case 3:
11408 + return;
11409 +#endif
11410 +
11411 + }
11412 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11413 + do_group_exit(SIGKILL);
11414 + }
11415 +#endif
11416 +
11417 /* Allow reads even for write-only mappings */
11418 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11419 goto bad_area;
11420 diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11421 index 4ced3fc..234f1e4 100644
11422 --- a/arch/sparc/mm/fault_64.c
11423 +++ b/arch/sparc/mm/fault_64.c
11424 @@ -22,6 +22,9 @@
11425 #include <linux/kdebug.h>
11426 #include <linux/percpu.h>
11427 #include <linux/context_tracking.h>
11428 +#include <linux/slab.h>
11429 +#include <linux/pagemap.h>
11430 +#include <linux/compiler.h>
11431
11432 #include <asm/page.h>
11433 #include <asm/pgtable.h>
11434 @@ -75,7 +78,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11435 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11436 regs->tpc);
11437 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11438 - printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11439 + printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11440 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11441 dump_stack();
11442 unhandled_fault(regs->tpc, current, regs);
11443 @@ -281,6 +284,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11444 show_regs(regs);
11445 }
11446
11447 +#ifdef CONFIG_PAX_PAGEEXEC
11448 +#ifdef CONFIG_PAX_DLRESOLVE
11449 +static void pax_emuplt_close(struct vm_area_struct *vma)
11450 +{
11451 + vma->vm_mm->call_dl_resolve = 0UL;
11452 +}
11453 +
11454 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11455 +{
11456 + unsigned int *kaddr;
11457 +
11458 + vmf->page = alloc_page(GFP_HIGHUSER);
11459 + if (!vmf->page)
11460 + return VM_FAULT_OOM;
11461 +
11462 + kaddr = kmap(vmf->page);
11463 + memset(kaddr, 0, PAGE_SIZE);
11464 + kaddr[0] = 0x9DE3BFA8U; /* save */
11465 + flush_dcache_page(vmf->page);
11466 + kunmap(vmf->page);
11467 + return VM_FAULT_MAJOR;
11468 +}
11469 +
11470 +static const struct vm_operations_struct pax_vm_ops = {
11471 + .close = pax_emuplt_close,
11472 + .fault = pax_emuplt_fault
11473 +};
11474 +
11475 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11476 +{
11477 + int ret;
11478 +
11479 + INIT_LIST_HEAD(&vma->anon_vma_chain);
11480 + vma->vm_mm = current->mm;
11481 + vma->vm_start = addr;
11482 + vma->vm_end = addr + PAGE_SIZE;
11483 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11484 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11485 + vma->vm_ops = &pax_vm_ops;
11486 +
11487 + ret = insert_vm_struct(current->mm, vma);
11488 + if (ret)
11489 + return ret;
11490 +
11491 + ++current->mm->total_vm;
11492 + return 0;
11493 +}
11494 +#endif
11495 +
11496 +/*
11497 + * PaX: decide what to do with offenders (regs->tpc = fault address)
11498 + *
11499 + * returns 1 when task should be killed
11500 + * 2 when patched PLT trampoline was detected
11501 + * 3 when unpatched PLT trampoline was detected
11502 + */
11503 +static int pax_handle_fetch_fault(struct pt_regs *regs)
11504 +{
11505 +
11506 +#ifdef CONFIG_PAX_EMUPLT
11507 + int err;
11508 +
11509 + do { /* PaX: patched PLT emulation #1 */
11510 + unsigned int sethi1, sethi2, jmpl;
11511 +
11512 + err = get_user(sethi1, (unsigned int *)regs->tpc);
11513 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11514 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11515 +
11516 + if (err)
11517 + break;
11518 +
11519 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11520 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
11521 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
11522 + {
11523 + unsigned long addr;
11524 +
11525 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11526 + addr = regs->u_regs[UREG_G1];
11527 + addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11528 +
11529 + if (test_thread_flag(TIF_32BIT))
11530 + addr &= 0xFFFFFFFFUL;
11531 +
11532 + regs->tpc = addr;
11533 + regs->tnpc = addr+4;
11534 + return 2;
11535 + }
11536 + } while (0);
11537 +
11538 + do { /* PaX: patched PLT emulation #2 */
11539 + unsigned int ba;
11540 +
11541 + err = get_user(ba, (unsigned int *)regs->tpc);
11542 +
11543 + if (err)
11544 + break;
11545 +
11546 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11547 + unsigned long addr;
11548 +
11549 + if ((ba & 0xFFC00000U) == 0x30800000U)
11550 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11551 + else
11552 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11553 +
11554 + if (test_thread_flag(TIF_32BIT))
11555 + addr &= 0xFFFFFFFFUL;
11556 +
11557 + regs->tpc = addr;
11558 + regs->tnpc = addr+4;
11559 + return 2;
11560 + }
11561 + } while (0);
11562 +
11563 + do { /* PaX: patched PLT emulation #3 */
11564 + unsigned int sethi, bajmpl, nop;
11565 +
11566 + err = get_user(sethi, (unsigned int *)regs->tpc);
11567 + err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11568 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11569 +
11570 + if (err)
11571 + break;
11572 +
11573 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11574 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11575 + nop == 0x01000000U)
11576 + {
11577 + unsigned long addr;
11578 +
11579 + addr = (sethi & 0x003FFFFFU) << 10;
11580 + regs->u_regs[UREG_G1] = addr;
11581 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11582 + addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11583 + else
11584 + addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11585 +
11586 + if (test_thread_flag(TIF_32BIT))
11587 + addr &= 0xFFFFFFFFUL;
11588 +
11589 + regs->tpc = addr;
11590 + regs->tnpc = addr+4;
11591 + return 2;
11592 + }
11593 + } while (0);
11594 +
11595 + do { /* PaX: patched PLT emulation #4 */
11596 + unsigned int sethi, mov1, call, mov2;
11597 +
11598 + err = get_user(sethi, (unsigned int *)regs->tpc);
11599 + err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11600 + err |= get_user(call, (unsigned int *)(regs->tpc+8));
11601 + err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11602 +
11603 + if (err)
11604 + break;
11605 +
11606 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11607 + mov1 == 0x8210000FU &&
11608 + (call & 0xC0000000U) == 0x40000000U &&
11609 + mov2 == 0x9E100001U)
11610 + {
11611 + unsigned long addr;
11612 +
11613 + regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11614 + addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11615 +
11616 + if (test_thread_flag(TIF_32BIT))
11617 + addr &= 0xFFFFFFFFUL;
11618 +
11619 + regs->tpc = addr;
11620 + regs->tnpc = addr+4;
11621 + return 2;
11622 + }
11623 + } while (0);
11624 +
11625 + do { /* PaX: patched PLT emulation #5 */
11626 + unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11627 +
11628 + err = get_user(sethi, (unsigned int *)regs->tpc);
11629 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11630 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11631 + err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11632 + err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11633 + err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11634 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11635 + err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11636 +
11637 + if (err)
11638 + break;
11639 +
11640 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11641 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
11642 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11643 + (or1 & 0xFFFFE000U) == 0x82106000U &&
11644 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
11645 + sllx == 0x83287020U &&
11646 + jmpl == 0x81C04005U &&
11647 + nop == 0x01000000U)
11648 + {
11649 + unsigned long addr;
11650 +
11651 + regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11652 + regs->u_regs[UREG_G1] <<= 32;
11653 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11654 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11655 + regs->tpc = addr;
11656 + regs->tnpc = addr+4;
11657 + return 2;
11658 + }
11659 + } while (0);
11660 +
11661 + do { /* PaX: patched PLT emulation #6 */
11662 + unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11663 +
11664 + err = get_user(sethi, (unsigned int *)regs->tpc);
11665 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11666 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11667 + err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11668 + err |= get_user(or, (unsigned int *)(regs->tpc+16));
11669 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11670 + err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11671 +
11672 + if (err)
11673 + break;
11674 +
11675 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11676 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
11677 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11678 + sllx == 0x83287020U &&
11679 + (or & 0xFFFFE000U) == 0x8A116000U &&
11680 + jmpl == 0x81C04005U &&
11681 + nop == 0x01000000U)
11682 + {
11683 + unsigned long addr;
11684 +
11685 + regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11686 + regs->u_regs[UREG_G1] <<= 32;
11687 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11688 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11689 + regs->tpc = addr;
11690 + regs->tnpc = addr+4;
11691 + return 2;
11692 + }
11693 + } while (0);
11694 +
11695 + do { /* PaX: unpatched PLT emulation step 1 */
11696 + unsigned int sethi, ba, nop;
11697 +
11698 + err = get_user(sethi, (unsigned int *)regs->tpc);
11699 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11700 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11701 +
11702 + if (err)
11703 + break;
11704 +
11705 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11706 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11707 + nop == 0x01000000U)
11708 + {
11709 + unsigned long addr;
11710 + unsigned int save, call;
11711 + unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11712 +
11713 + if ((ba & 0xFFC00000U) == 0x30800000U)
11714 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11715 + else
11716 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11717 +
11718 + if (test_thread_flag(TIF_32BIT))
11719 + addr &= 0xFFFFFFFFUL;
11720 +
11721 + err = get_user(save, (unsigned int *)addr);
11722 + err |= get_user(call, (unsigned int *)(addr+4));
11723 + err |= get_user(nop, (unsigned int *)(addr+8));
11724 + if (err)
11725 + break;
11726 +
11727 +#ifdef CONFIG_PAX_DLRESOLVE
11728 + if (save == 0x9DE3BFA8U &&
11729 + (call & 0xC0000000U) == 0x40000000U &&
11730 + nop == 0x01000000U)
11731 + {
11732 + struct vm_area_struct *vma;
11733 + unsigned long call_dl_resolve;
11734 +
11735 + down_read(&current->mm->mmap_sem);
11736 + call_dl_resolve = current->mm->call_dl_resolve;
11737 + up_read(&current->mm->mmap_sem);
11738 + if (likely(call_dl_resolve))
11739 + goto emulate;
11740 +
11741 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11742 +
11743 + down_write(&current->mm->mmap_sem);
11744 + if (current->mm->call_dl_resolve) {
11745 + call_dl_resolve = current->mm->call_dl_resolve;
11746 + up_write(&current->mm->mmap_sem);
11747 + if (vma)
11748 + kmem_cache_free(vm_area_cachep, vma);
11749 + goto emulate;
11750 + }
11751 +
11752 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11753 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11754 + up_write(&current->mm->mmap_sem);
11755 + if (vma)
11756 + kmem_cache_free(vm_area_cachep, vma);
11757 + return 1;
11758 + }
11759 +
11760 + if (pax_insert_vma(vma, call_dl_resolve)) {
11761 + up_write(&current->mm->mmap_sem);
11762 + kmem_cache_free(vm_area_cachep, vma);
11763 + return 1;
11764 + }
11765 +
11766 + current->mm->call_dl_resolve = call_dl_resolve;
11767 + up_write(&current->mm->mmap_sem);
11768 +
11769 +emulate:
11770 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11771 + regs->tpc = call_dl_resolve;
11772 + regs->tnpc = addr+4;
11773 + return 3;
11774 + }
11775 +#endif
11776 +
11777 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11778 + if ((save & 0xFFC00000U) == 0x05000000U &&
11779 + (call & 0xFFFFE000U) == 0x85C0A000U &&
11780 + nop == 0x01000000U)
11781 + {
11782 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11783 + regs->u_regs[UREG_G2] = addr + 4;
11784 + addr = (save & 0x003FFFFFU) << 10;
11785 + addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11786 +
11787 + if (test_thread_flag(TIF_32BIT))
11788 + addr &= 0xFFFFFFFFUL;
11789 +
11790 + regs->tpc = addr;
11791 + regs->tnpc = addr+4;
11792 + return 3;
11793 + }
11794 +
11795 + /* PaX: 64-bit PLT stub */
11796 + err = get_user(sethi1, (unsigned int *)addr);
11797 + err |= get_user(sethi2, (unsigned int *)(addr+4));
11798 + err |= get_user(or1, (unsigned int *)(addr+8));
11799 + err |= get_user(or2, (unsigned int *)(addr+12));
11800 + err |= get_user(sllx, (unsigned int *)(addr+16));
11801 + err |= get_user(add, (unsigned int *)(addr+20));
11802 + err |= get_user(jmpl, (unsigned int *)(addr+24));
11803 + err |= get_user(nop, (unsigned int *)(addr+28));
11804 + if (err)
11805 + break;
11806 +
11807 + if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
11808 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11809 + (or1 & 0xFFFFE000U) == 0x88112000U &&
11810 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
11811 + sllx == 0x89293020U &&
11812 + add == 0x8A010005U &&
11813 + jmpl == 0x89C14000U &&
11814 + nop == 0x01000000U)
11815 + {
11816 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11817 + regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11818 + regs->u_regs[UREG_G4] <<= 32;
11819 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11820 + regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
11821 + regs->u_regs[UREG_G4] = addr + 24;
11822 + addr = regs->u_regs[UREG_G5];
11823 + regs->tpc = addr;
11824 + regs->tnpc = addr+4;
11825 + return 3;
11826 + }
11827 + }
11828 + } while (0);
11829 +
11830 +#ifdef CONFIG_PAX_DLRESOLVE
11831 + do { /* PaX: unpatched PLT emulation step 2 */
11832 + unsigned int save, call, nop;
11833 +
11834 + err = get_user(save, (unsigned int *)(regs->tpc-4));
11835 + err |= get_user(call, (unsigned int *)regs->tpc);
11836 + err |= get_user(nop, (unsigned int *)(regs->tpc+4));
11837 + if (err)
11838 + break;
11839 +
11840 + if (save == 0x9DE3BFA8U &&
11841 + (call & 0xC0000000U) == 0x40000000U &&
11842 + nop == 0x01000000U)
11843 + {
11844 + unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11845 +
11846 + if (test_thread_flag(TIF_32BIT))
11847 + dl_resolve &= 0xFFFFFFFFUL;
11848 +
11849 + regs->u_regs[UREG_RETPC] = regs->tpc;
11850 + regs->tpc = dl_resolve;
11851 + regs->tnpc = dl_resolve+4;
11852 + return 3;
11853 + }
11854 + } while (0);
11855 +#endif
11856 +
11857 + do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
11858 + unsigned int sethi, ba, nop;
11859 +
11860 + err = get_user(sethi, (unsigned int *)regs->tpc);
11861 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11862 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11863 +
11864 + if (err)
11865 + break;
11866 +
11867 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11868 + (ba & 0xFFF00000U) == 0x30600000U &&
11869 + nop == 0x01000000U)
11870 + {
11871 + unsigned long addr;
11872 +
11873 + addr = (sethi & 0x003FFFFFU) << 10;
11874 + regs->u_regs[UREG_G1] = addr;
11875 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11876 +
11877 + if (test_thread_flag(TIF_32BIT))
11878 + addr &= 0xFFFFFFFFUL;
11879 +
11880 + regs->tpc = addr;
11881 + regs->tnpc = addr+4;
11882 + return 2;
11883 + }
11884 + } while (0);
11885 +
11886 +#endif
11887 +
11888 + return 1;
11889 +}
11890 +
11891 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11892 +{
11893 + unsigned long i;
11894 +
11895 + printk(KERN_ERR "PAX: bytes at PC: ");
11896 + for (i = 0; i < 8; i++) {
11897 + unsigned int c;
11898 + if (get_user(c, (unsigned int *)pc+i))
11899 + printk(KERN_CONT "???????? ");
11900 + else
11901 + printk(KERN_CONT "%08x ", c);
11902 + }
11903 + printk("\n");
11904 +}
11905 +#endif
11906 +
11907 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
11908 {
11909 enum ctx_state prev_state = exception_enter();
11910 @@ -352,6 +815,29 @@ retry:
11911 if (!vma)
11912 goto bad_area;
11913
11914 +#ifdef CONFIG_PAX_PAGEEXEC
11915 + /* PaX: detect ITLB misses on non-exec pages */
11916 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
11917 + !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
11918 + {
11919 + if (address != regs->tpc)
11920 + goto good_area;
11921 +
11922 + up_read(&mm->mmap_sem);
11923 + switch (pax_handle_fetch_fault(regs)) {
11924 +
11925 +#ifdef CONFIG_PAX_EMUPLT
11926 + case 2:
11927 + case 3:
11928 + return;
11929 +#endif
11930 +
11931 + }
11932 + pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
11933 + do_group_exit(SIGKILL);
11934 + }
11935 +#endif
11936 +
11937 /* Pure DTLB misses do not tell us whether the fault causing
11938 * load/store/atomic was a write or not, it only says that there
11939 * was no match. So in such a case we (carefully) read the
11940 diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
11941 index d329537..2c3746a 100644
11942 --- a/arch/sparc/mm/hugetlbpage.c
11943 +++ b/arch/sparc/mm/hugetlbpage.c
11944 @@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
11945 unsigned long addr,
11946 unsigned long len,
11947 unsigned long pgoff,
11948 - unsigned long flags)
11949 + unsigned long flags,
11950 + unsigned long offset)
11951 {
11952 + struct mm_struct *mm = current->mm;
11953 unsigned long task_size = TASK_SIZE;
11954 struct vm_unmapped_area_info info;
11955
11956 @@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
11957
11958 info.flags = 0;
11959 info.length = len;
11960 - info.low_limit = TASK_UNMAPPED_BASE;
11961 + info.low_limit = mm->mmap_base;
11962 info.high_limit = min(task_size, VA_EXCLUDE_START);
11963 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
11964 info.align_offset = 0;
11965 + info.threadstack_offset = offset;
11966 addr = vm_unmapped_area(&info);
11967
11968 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
11969 VM_BUG_ON(addr != -ENOMEM);
11970 info.low_limit = VA_EXCLUDE_END;
11971 +
11972 +#ifdef CONFIG_PAX_RANDMMAP
11973 + if (mm->pax_flags & MF_PAX_RANDMMAP)
11974 + info.low_limit += mm->delta_mmap;
11975 +#endif
11976 +
11977 info.high_limit = task_size;
11978 addr = vm_unmapped_area(&info);
11979 }
11980 @@ -55,7 +64,8 @@ static unsigned long
11981 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11982 const unsigned long len,
11983 const unsigned long pgoff,
11984 - const unsigned long flags)
11985 + const unsigned long flags,
11986 + const unsigned long offset)
11987 {
11988 struct mm_struct *mm = current->mm;
11989 unsigned long addr = addr0;
11990 @@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11991 info.high_limit = mm->mmap_base;
11992 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
11993 info.align_offset = 0;
11994 + info.threadstack_offset = offset;
11995 addr = vm_unmapped_area(&info);
11996
11997 /*
11998 @@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11999 VM_BUG_ON(addr != -ENOMEM);
12000 info.flags = 0;
12001 info.low_limit = TASK_UNMAPPED_BASE;
12002 +
12003 +#ifdef CONFIG_PAX_RANDMMAP
12004 + if (mm->pax_flags & MF_PAX_RANDMMAP)
12005 + info.low_limit += mm->delta_mmap;
12006 +#endif
12007 +
12008 info.high_limit = STACK_TOP32;
12009 addr = vm_unmapped_area(&info);
12010 }
12011 @@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12012 struct mm_struct *mm = current->mm;
12013 struct vm_area_struct *vma;
12014 unsigned long task_size = TASK_SIZE;
12015 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12016
12017 if (test_thread_flag(TIF_32BIT))
12018 task_size = STACK_TOP32;
12019 @@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12020 return addr;
12021 }
12022
12023 +#ifdef CONFIG_PAX_RANDMMAP
12024 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12025 +#endif
12026 +
12027 if (addr) {
12028 addr = ALIGN(addr, HPAGE_SIZE);
12029 vma = find_vma(mm, addr);
12030 - if (task_size - len >= addr &&
12031 - (!vma || addr + len <= vma->vm_start))
12032 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12033 return addr;
12034 }
12035 if (mm->get_unmapped_area == arch_get_unmapped_area)
12036 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12037 - pgoff, flags);
12038 + pgoff, flags, offset);
12039 else
12040 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12041 - pgoff, flags);
12042 + pgoff, flags, offset);
12043 }
12044
12045 pte_t *huge_pte_alloc(struct mm_struct *mm,
12046 diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12047 index ed3c969..42fe48d 100644
12048 --- a/arch/sparc/mm/init_64.c
12049 +++ b/arch/sparc/mm/init_64.c
12050 @@ -188,9 +188,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12051 int num_kernel_image_mappings;
12052
12053 #ifdef CONFIG_DEBUG_DCFLUSH
12054 -atomic_t dcpage_flushes = ATOMIC_INIT(0);
12055 +atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12056 #ifdef CONFIG_SMP
12057 -atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12058 +atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12059 #endif
12060 #endif
12061
12062 @@ -198,7 +198,7 @@ inline void flush_dcache_page_impl(struct page *page)
12063 {
12064 BUG_ON(tlb_type == hypervisor);
12065 #ifdef CONFIG_DEBUG_DCFLUSH
12066 - atomic_inc(&dcpage_flushes);
12067 + atomic_inc_unchecked(&dcpage_flushes);
12068 #endif
12069
12070 #ifdef DCACHE_ALIASING_POSSIBLE
12071 @@ -466,10 +466,10 @@ void mmu_info(struct seq_file *m)
12072
12073 #ifdef CONFIG_DEBUG_DCFLUSH
12074 seq_printf(m, "DCPageFlushes\t: %d\n",
12075 - atomic_read(&dcpage_flushes));
12076 + atomic_read_unchecked(&dcpage_flushes));
12077 #ifdef CONFIG_SMP
12078 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12079 - atomic_read(&dcpage_flushes_xcall));
12080 + atomic_read_unchecked(&dcpage_flushes_xcall));
12081 #endif /* CONFIG_SMP */
12082 #endif /* CONFIG_DEBUG_DCFLUSH */
12083 }
12084 diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12085 index 85258ca..df97c79 100644
12086 --- a/arch/tile/Kconfig
12087 +++ b/arch/tile/Kconfig
12088 @@ -190,6 +190,7 @@ source "kernel/Kconfig.hz"
12089
12090 config KEXEC
12091 bool "kexec system call"
12092 + depends on !GRKERNSEC_KMEM
12093 ---help---
12094 kexec is a system call that implements the ability to shutdown your
12095 current kernel, and to start another kernel. It is like a reboot
12096 diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12097 index ad220ee..2f537b3 100644
12098 --- a/arch/tile/include/asm/atomic_64.h
12099 +++ b/arch/tile/include/asm/atomic_64.h
12100 @@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12101
12102 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12103
12104 +#define atomic64_read_unchecked(v) atomic64_read(v)
12105 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12106 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12107 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12108 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12109 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
12110 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12111 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
12112 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12113 +
12114 /* Atomic dec and inc don't implement barrier, so provide them if needed. */
12115 #define smp_mb__before_atomic_dec() smp_mb()
12116 #define smp_mb__after_atomic_dec() smp_mb()
12117 diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12118 index 6160761..00cac88 100644
12119 --- a/arch/tile/include/asm/cache.h
12120 +++ b/arch/tile/include/asm/cache.h
12121 @@ -15,11 +15,12 @@
12122 #ifndef _ASM_TILE_CACHE_H
12123 #define _ASM_TILE_CACHE_H
12124
12125 +#include <linux/const.h>
12126 #include <arch/chip.h>
12127
12128 /* bytes per L1 data cache line */
12129 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12130 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12131 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12132
12133 /* bytes per L2 cache line */
12134 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12135 diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12136 index b6cde32..c0cb736 100644
12137 --- a/arch/tile/include/asm/uaccess.h
12138 +++ b/arch/tile/include/asm/uaccess.h
12139 @@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12140 const void __user *from,
12141 unsigned long n)
12142 {
12143 - int sz = __compiletime_object_size(to);
12144 + size_t sz = __compiletime_object_size(to);
12145
12146 - if (likely(sz == -1 || sz >= n))
12147 + if (likely(sz == (size_t)-1 || sz >= n))
12148 n = _copy_from_user(to, from, n);
12149 else
12150 copy_from_user_overflow();
12151 diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12152 index e514899..f8743c4 100644
12153 --- a/arch/tile/mm/hugetlbpage.c
12154 +++ b/arch/tile/mm/hugetlbpage.c
12155 @@ -207,6 +207,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12156 info.high_limit = TASK_SIZE;
12157 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12158 info.align_offset = 0;
12159 + info.threadstack_offset = 0;
12160 return vm_unmapped_area(&info);
12161 }
12162
12163 @@ -224,6 +225,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12164 info.high_limit = current->mm->mmap_base;
12165 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12166 info.align_offset = 0;
12167 + info.threadstack_offset = 0;
12168 addr = vm_unmapped_area(&info);
12169
12170 /*
12171 diff --git a/arch/um/Makefile b/arch/um/Makefile
12172 index 36e658a..71a5c5a 100644
12173 --- a/arch/um/Makefile
12174 +++ b/arch/um/Makefile
12175 @@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12176 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12177 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12178
12179 +ifdef CONSTIFY_PLUGIN
12180 +USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12181 +endif
12182 +
12183 #This will adjust *FLAGS accordingly to the platform.
12184 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12185
12186 diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12187 index 19e1bdd..3665b77 100644
12188 --- a/arch/um/include/asm/cache.h
12189 +++ b/arch/um/include/asm/cache.h
12190 @@ -1,6 +1,7 @@
12191 #ifndef __UM_CACHE_H
12192 #define __UM_CACHE_H
12193
12194 +#include <linux/const.h>
12195
12196 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12197 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12198 @@ -12,6 +13,6 @@
12199 # define L1_CACHE_SHIFT 5
12200 #endif
12201
12202 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12203 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12204
12205 #endif
12206 diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12207 index 2e0a6b1..a64d0f5 100644
12208 --- a/arch/um/include/asm/kmap_types.h
12209 +++ b/arch/um/include/asm/kmap_types.h
12210 @@ -8,6 +8,6 @@
12211
12212 /* No more #include "asm/arch/kmap_types.h" ! */
12213
12214 -#define KM_TYPE_NR 14
12215 +#define KM_TYPE_NR 15
12216
12217 #endif
12218 diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12219 index 5ff53d9..5850cdf 100644
12220 --- a/arch/um/include/asm/page.h
12221 +++ b/arch/um/include/asm/page.h
12222 @@ -14,6 +14,9 @@
12223 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12224 #define PAGE_MASK (~(PAGE_SIZE-1))
12225
12226 +#define ktla_ktva(addr) (addr)
12227 +#define ktva_ktla(addr) (addr)
12228 +
12229 #ifndef __ASSEMBLY__
12230
12231 struct page;
12232 diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12233 index 0032f92..cd151e0 100644
12234 --- a/arch/um/include/asm/pgtable-3level.h
12235 +++ b/arch/um/include/asm/pgtable-3level.h
12236 @@ -58,6 +58,7 @@
12237 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12238 #define pud_populate(mm, pud, pmd) \
12239 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12240 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12241
12242 #ifdef CONFIG_64BIT
12243 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12244 diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12245 index f17bca8..48adb87 100644
12246 --- a/arch/um/kernel/process.c
12247 +++ b/arch/um/kernel/process.c
12248 @@ -356,22 +356,6 @@ int singlestepping(void * t)
12249 return 2;
12250 }
12251
12252 -/*
12253 - * Only x86 and x86_64 have an arch_align_stack().
12254 - * All other arches have "#define arch_align_stack(x) (x)"
12255 - * in their asm/exec.h
12256 - * As this is included in UML from asm-um/system-generic.h,
12257 - * we can use it to behave as the subarch does.
12258 - */
12259 -#ifndef arch_align_stack
12260 -unsigned long arch_align_stack(unsigned long sp)
12261 -{
12262 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12263 - sp -= get_random_int() % 8192;
12264 - return sp & ~0xf;
12265 -}
12266 -#endif
12267 -
12268 unsigned long get_wchan(struct task_struct *p)
12269 {
12270 unsigned long stack_page, sp, ip;
12271 diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12272 index ad8f795..2c7eec6 100644
12273 --- a/arch/unicore32/include/asm/cache.h
12274 +++ b/arch/unicore32/include/asm/cache.h
12275 @@ -12,8 +12,10 @@
12276 #ifndef __UNICORE_CACHE_H__
12277 #define __UNICORE_CACHE_H__
12278
12279 -#define L1_CACHE_SHIFT (5)
12280 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12281 +#include <linux/const.h>
12282 +
12283 +#define L1_CACHE_SHIFT 5
12284 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12285
12286 /*
12287 * Memory returned by kmalloc() may be used for DMA, so we must make
12288 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12289 index 6b8b429..7b21fe4 100644
12290 --- a/arch/x86/Kconfig
12291 +++ b/arch/x86/Kconfig
12292 @@ -127,7 +127,7 @@ config X86
12293 select RTC_LIB
12294 select HAVE_DEBUG_STACKOVERFLOW
12295 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12296 - select HAVE_CC_STACKPROTECTOR
12297 + select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12298 select GENERIC_CPU_AUTOPROBE
12299 select HAVE_ARCH_AUDITSYSCALL
12300
12301 @@ -251,7 +251,7 @@ config X86_HT
12302
12303 config X86_32_LAZY_GS
12304 def_bool y
12305 - depends on X86_32 && !CC_STACKPROTECTOR
12306 + depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12307
12308 config ARCH_HWEIGHT_CFLAGS
12309 string
12310 @@ -545,6 +545,7 @@ config SCHED_OMIT_FRAME_POINTER
12311
12312 menuconfig HYPERVISOR_GUEST
12313 bool "Linux guest support"
12314 + depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12315 ---help---
12316 Say Y here to enable options for running Linux under various hyper-
12317 visors. This option enables basic hypervisor detection and platform
12318 @@ -1054,6 +1055,7 @@ choice
12319
12320 config NOHIGHMEM
12321 bool "off"
12322 + depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12323 ---help---
12324 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12325 However, the address space of 32-bit x86 processors is only 4
12326 @@ -1090,6 +1092,7 @@ config NOHIGHMEM
12327
12328 config HIGHMEM4G
12329 bool "4GB"
12330 + depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12331 ---help---
12332 Select this if you have a 32-bit processor and between 1 and 4
12333 gigabytes of physical RAM.
12334 @@ -1142,7 +1145,7 @@ config PAGE_OFFSET
12335 hex
12336 default 0xB0000000 if VMSPLIT_3G_OPT
12337 default 0x80000000 if VMSPLIT_2G
12338 - default 0x78000000 if VMSPLIT_2G_OPT
12339 + default 0x70000000 if VMSPLIT_2G_OPT
12340 default 0x40000000 if VMSPLIT_1G
12341 default 0xC0000000
12342 depends on X86_32
12343 @@ -1555,6 +1558,7 @@ source kernel/Kconfig.hz
12344
12345 config KEXEC
12346 bool "kexec system call"
12347 + depends on !GRKERNSEC_KMEM
12348 ---help---
12349 kexec is a system call that implements the ability to shutdown your
12350 current kernel, and to start another kernel. It is like a reboot
12351 @@ -1706,7 +1710,9 @@ config X86_NEED_RELOCS
12352
12353 config PHYSICAL_ALIGN
12354 hex "Alignment value to which kernel should be aligned"
12355 - default "0x200000"
12356 + default "0x1000000"
12357 + range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12358 + range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12359 range 0x2000 0x1000000 if X86_32
12360 range 0x200000 0x1000000 if X86_64
12361 ---help---
12362 @@ -1789,6 +1795,7 @@ config COMPAT_VDSO
12363 def_bool n
12364 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12365 depends on X86_32 || IA32_EMULATION
12366 + depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12367 ---help---
12368 Certain buggy versions of glibc will crash if they are
12369 presented with a 32-bit vDSO that is not mapped at the address
12370 diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12371 index 6983314..54ad7e8 100644
12372 --- a/arch/x86/Kconfig.cpu
12373 +++ b/arch/x86/Kconfig.cpu
12374 @@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12375
12376 config X86_F00F_BUG
12377 def_bool y
12378 - depends on M586MMX || M586TSC || M586 || M486
12379 + depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12380
12381 config X86_INVD_BUG
12382 def_bool y
12383 @@ -327,7 +327,7 @@ config X86_INVD_BUG
12384
12385 config X86_ALIGNMENT_16
12386 def_bool y
12387 - depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12388 + depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12389
12390 config X86_INTEL_USERCOPY
12391 def_bool y
12392 @@ -369,7 +369,7 @@ config X86_CMPXCHG64
12393 # generates cmov.
12394 config X86_CMOV
12395 def_bool y
12396 - depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12397 + depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12398
12399 config X86_MINIMUM_CPU_FAMILY
12400 int
12401 diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12402 index 61bd2ad..50b625d 100644
12403 --- a/arch/x86/Kconfig.debug
12404 +++ b/arch/x86/Kconfig.debug
12405 @@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12406 config DEBUG_RODATA
12407 bool "Write protect kernel read-only data structures"
12408 default y
12409 - depends on DEBUG_KERNEL
12410 + depends on DEBUG_KERNEL && BROKEN
12411 ---help---
12412 Mark the kernel read-only data as write-protected in the pagetables,
12413 in order to catch accidental (and incorrect) writes to such const
12414 @@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12415
12416 config DEBUG_SET_MODULE_RONX
12417 bool "Set loadable kernel module data as NX and text as RO"
12418 - depends on MODULES
12419 + depends on MODULES && BROKEN
12420 ---help---
12421 This option helps catch unintended modifications to loadable
12422 kernel module's text and read-only data. It also prevents execution
12423 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12424 index 33f71b0..c2cefa2 100644
12425 --- a/arch/x86/Makefile
12426 +++ b/arch/x86/Makefile
12427 @@ -71,9 +71,6 @@ ifeq ($(CONFIG_X86_32),y)
12428 # CPU-specific tuning. Anything which can be shared with UML should go here.
12429 include $(srctree)/arch/x86/Makefile_32.cpu
12430 KBUILD_CFLAGS += $(cflags-y)
12431 -
12432 - # temporary until string.h is fixed
12433 - KBUILD_CFLAGS += -ffreestanding
12434 else
12435 BITS := 64
12436 UTS_MACHINE := x86_64
12437 @@ -114,6 +111,9 @@ else
12438 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12439 endif
12440
12441 +# temporary until string.h is fixed
12442 +KBUILD_CFLAGS += -ffreestanding
12443 +
12444 # Make sure compiler does not have buggy stack-protector support.
12445 ifdef CONFIG_CC_STACKPROTECTOR
12446 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12447 @@ -271,3 +271,12 @@ define archhelp
12448 echo ' FDINITRD=file initrd for the booted kernel'
12449 echo ' kvmconfig - Enable additional options for guest kernel support'
12450 endef
12451 +
12452 +define OLD_LD
12453 +
12454 +*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12455 +*** Please upgrade your binutils to 2.18 or newer
12456 +endef
12457 +
12458 +archprepare:
12459 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12460 diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12461 index dbe8dd2..2f0a98f 100644
12462 --- a/arch/x86/boot/Makefile
12463 +++ b/arch/x86/boot/Makefile
12464 @@ -52,6 +52,9 @@ $(obj)/cpustr.h: $(obj)/mkcpustr FORCE
12465 # ---------------------------------------------------------------------------
12466
12467 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12468 +ifdef CONSTIFY_PLUGIN
12469 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12470 +endif
12471 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12472 GCOV_PROFILE := n
12473
12474 diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12475 index 878e4b9..20537ab 100644
12476 --- a/arch/x86/boot/bitops.h
12477 +++ b/arch/x86/boot/bitops.h
12478 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12479 u8 v;
12480 const u32 *p = (const u32 *)addr;
12481
12482 - asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12483 + asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12484 return v;
12485 }
12486
12487 @@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12488
12489 static inline void set_bit(int nr, void *addr)
12490 {
12491 - asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12492 + asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12493 }
12494
12495 #endif /* BOOT_BITOPS_H */
12496 diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12497 index bd49ec6..94c7f58 100644
12498 --- a/arch/x86/boot/boot.h
12499 +++ b/arch/x86/boot/boot.h
12500 @@ -84,7 +84,7 @@ static inline void io_delay(void)
12501 static inline u16 ds(void)
12502 {
12503 u16 seg;
12504 - asm("movw %%ds,%0" : "=rm" (seg));
12505 + asm volatile("movw %%ds,%0" : "=rm" (seg));
12506 return seg;
12507 }
12508
12509 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12510 index 0fcd913..3bb5c42 100644
12511 --- a/arch/x86/boot/compressed/Makefile
12512 +++ b/arch/x86/boot/compressed/Makefile
12513 @@ -16,6 +16,9 @@ KBUILD_CFLAGS += $(cflags-y)
12514 KBUILD_CFLAGS += -mno-mmx -mno-sse
12515 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12516 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12517 +ifdef CONSTIFY_PLUGIN
12518 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12519 +endif
12520
12521 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12522 GCOV_PROFILE := n
12523 diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12524 index a53440e..c3dbf1e 100644
12525 --- a/arch/x86/boot/compressed/efi_stub_32.S
12526 +++ b/arch/x86/boot/compressed/efi_stub_32.S
12527 @@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12528 * parameter 2, ..., param n. To make things easy, we save the return
12529 * address of efi_call_phys in a global variable.
12530 */
12531 - popl %ecx
12532 - movl %ecx, saved_return_addr(%edx)
12533 - /* get the function pointer into ECX*/
12534 - popl %ecx
12535 - movl %ecx, efi_rt_function_ptr(%edx)
12536 + popl saved_return_addr(%edx)
12537 + popl efi_rt_function_ptr(%edx)
12538
12539 /*
12540 * 3. Call the physical function.
12541 */
12542 - call *%ecx
12543 + call *efi_rt_function_ptr(%edx)
12544
12545 /*
12546 * 4. Balance the stack. And because EAX contain the return value,
12547 @@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12548 1: popl %edx
12549 subl $1b, %edx
12550
12551 - movl efi_rt_function_ptr(%edx), %ecx
12552 - pushl %ecx
12553 + pushl efi_rt_function_ptr(%edx)
12554
12555 /*
12556 * 10. Push the saved return address onto the stack and return.
12557 */
12558 - movl saved_return_addr(%edx), %ecx
12559 - pushl %ecx
12560 - ret
12561 + jmpl *saved_return_addr(%edx)
12562 ENDPROC(efi_call_phys)
12563 .previous
12564
12565 diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12566 index cbed140..5f2ca57 100644
12567 --- a/arch/x86/boot/compressed/head_32.S
12568 +++ b/arch/x86/boot/compressed/head_32.S
12569 @@ -140,10 +140,10 @@ preferred_addr:
12570 addl %eax, %ebx
12571 notl %eax
12572 andl %eax, %ebx
12573 - cmpl $LOAD_PHYSICAL_ADDR, %ebx
12574 + cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12575 jge 1f
12576 #endif
12577 - movl $LOAD_PHYSICAL_ADDR, %ebx
12578 + movl $____LOAD_PHYSICAL_ADDR, %ebx
12579 1:
12580
12581 /* Target address to relocate to for decompression */
12582 diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12583 index 0d558ee..58f257e 100644
12584 --- a/arch/x86/boot/compressed/head_64.S
12585 +++ b/arch/x86/boot/compressed/head_64.S
12586 @@ -94,10 +94,10 @@ ENTRY(startup_32)
12587 addl %eax, %ebx
12588 notl %eax
12589 andl %eax, %ebx
12590 - cmpl $LOAD_PHYSICAL_ADDR, %ebx
12591 + cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12592 jge 1f
12593 #endif
12594 - movl $LOAD_PHYSICAL_ADDR, %ebx
12595 + movl $____LOAD_PHYSICAL_ADDR, %ebx
12596 1:
12597
12598 /* Target address to relocate to for decompression */
12599 @@ -322,10 +322,10 @@ preferred_addr:
12600 addq %rax, %rbp
12601 notq %rax
12602 andq %rax, %rbp
12603 - cmpq $LOAD_PHYSICAL_ADDR, %rbp
12604 + cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12605 jge 1f
12606 #endif
12607 - movq $LOAD_PHYSICAL_ADDR, %rbp
12608 + movq $____LOAD_PHYSICAL_ADDR, %rbp
12609 1:
12610
12611 /* Target address to relocate to for decompression */
12612 @@ -431,8 +431,8 @@ gdt:
12613 .long gdt
12614 .word 0
12615 .quad 0x0000000000000000 /* NULL descriptor */
12616 - .quad 0x00af9a000000ffff /* __KERNEL_CS */
12617 - .quad 0x00cf92000000ffff /* __KERNEL_DS */
12618 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
12619 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
12620 .quad 0x0080890000000000 /* TS descriptor */
12621 .quad 0x0000000000000000 /* TS continued */
12622 gdt_end:
12623 diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12624 index 57ab74d..7c52182 100644
12625 --- a/arch/x86/boot/compressed/misc.c
12626 +++ b/arch/x86/boot/compressed/misc.c
12627 @@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12628 * Calculate the delta between where vmlinux was linked to load
12629 * and where it was actually loaded.
12630 */
12631 - delta = min_addr - LOAD_PHYSICAL_ADDR;
12632 + delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12633 if (!delta) {
12634 debug_putstr("No relocation needed... ");
12635 return;
12636 @@ -312,7 +312,7 @@ static void parse_elf(void *output)
12637 Elf32_Ehdr ehdr;
12638 Elf32_Phdr *phdrs, *phdr;
12639 #endif
12640 - void *dest;
12641 + void *dest, *prev;
12642 int i;
12643
12644 memcpy(&ehdr, output, sizeof(ehdr));
12645 @@ -339,13 +339,16 @@ static void parse_elf(void *output)
12646 case PT_LOAD:
12647 #ifdef CONFIG_RELOCATABLE
12648 dest = output;
12649 - dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12650 + dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12651 #else
12652 dest = (void *)(phdr->p_paddr);
12653 #endif
12654 memcpy(dest,
12655 output + phdr->p_offset,
12656 phdr->p_filesz);
12657 + if (i)
12658 + memset(prev, 0xff, dest - prev);
12659 + prev = dest + phdr->p_filesz;
12660 break;
12661 default: /* Ignore other PT_* */ break;
12662 }
12663 @@ -395,7 +398,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12664 error("Destination address too large");
12665 #endif
12666 #ifndef CONFIG_RELOCATABLE
12667 - if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12668 + if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12669 error("Wrong destination address");
12670 #endif
12671
12672 diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12673 index 1fd7d57..0f7d096 100644
12674 --- a/arch/x86/boot/cpucheck.c
12675 +++ b/arch/x86/boot/cpucheck.c
12676 @@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12677 u32 ecx = MSR_K7_HWCR;
12678 u32 eax, edx;
12679
12680 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12681 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12682 eax &= ~(1 << 15);
12683 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12684 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12685
12686 get_cpuflags(); /* Make sure it really did something */
12687 err = check_cpuflags();
12688 @@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12689 u32 ecx = MSR_VIA_FCR;
12690 u32 eax, edx;
12691
12692 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12693 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12694 eax |= (1<<1)|(1<<7);
12695 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12696 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12697
12698 set_bit(X86_FEATURE_CX8, cpu.flags);
12699 err = check_cpuflags();
12700 @@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12701 u32 eax, edx;
12702 u32 level = 1;
12703
12704 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12705 - asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12706 - asm("cpuid"
12707 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12708 + asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12709 + asm volatile("cpuid"
12710 : "+a" (level), "=d" (cpu.flags[0])
12711 : : "ecx", "ebx");
12712 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12713 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12714
12715 err = check_cpuflags();
12716 } else if (err == 0x01 &&
12717 diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12718 index 84c2234..3ef6360 100644
12719 --- a/arch/x86/boot/header.S
12720 +++ b/arch/x86/boot/header.S
12721 @@ -420,10 +420,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12722 # single linked list of
12723 # struct setup_data
12724
12725 -pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12726 +pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12727
12728 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12729 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12730 +#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12731 +#else
12732 #define VO_INIT_SIZE (VO__end - VO__text)
12733 +#endif
12734 #if ZO_INIT_SIZE > VO_INIT_SIZE
12735 #define INIT_SIZE ZO_INIT_SIZE
12736 #else
12737 diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12738 index db75d07..8e6d0af 100644
12739 --- a/arch/x86/boot/memory.c
12740 +++ b/arch/x86/boot/memory.c
12741 @@ -19,7 +19,7 @@
12742
12743 static int detect_memory_e820(void)
12744 {
12745 - int count = 0;
12746 + unsigned int count = 0;
12747 struct biosregs ireg, oreg;
12748 struct e820entry *desc = boot_params.e820_map;
12749 static struct e820entry buf; /* static so it is zeroed */
12750 diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
12751 index ba3e100..6501b8f 100644
12752 --- a/arch/x86/boot/video-vesa.c
12753 +++ b/arch/x86/boot/video-vesa.c
12754 @@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
12755
12756 boot_params.screen_info.vesapm_seg = oreg.es;
12757 boot_params.screen_info.vesapm_off = oreg.di;
12758 + boot_params.screen_info.vesapm_size = oreg.cx;
12759 }
12760
12761 /*
12762 diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
12763 index 43eda28..5ab5fdb 100644
12764 --- a/arch/x86/boot/video.c
12765 +++ b/arch/x86/boot/video.c
12766 @@ -96,7 +96,7 @@ static void store_mode_params(void)
12767 static unsigned int get_entry(void)
12768 {
12769 char entry_buf[4];
12770 - int i, len = 0;
12771 + unsigned int i, len = 0;
12772 int key;
12773 unsigned int v;
12774
12775 diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
12776 index 9105655..41779c1 100644
12777 --- a/arch/x86/crypto/aes-x86_64-asm_64.S
12778 +++ b/arch/x86/crypto/aes-x86_64-asm_64.S
12779 @@ -8,6 +8,8 @@
12780 * including this sentence is retained in full.
12781 */
12782
12783 +#include <asm/alternative-asm.h>
12784 +
12785 .extern crypto_ft_tab
12786 .extern crypto_it_tab
12787 .extern crypto_fl_tab
12788 @@ -70,6 +72,8 @@
12789 je B192; \
12790 leaq 32(r9),r9;
12791
12792 +#define ret pax_force_retaddr; ret
12793 +
12794 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
12795 movq r1,r2; \
12796 movq r3,r4; \
12797 diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
12798 index 477e9d7..c92c7d8 100644
12799 --- a/arch/x86/crypto/aesni-intel_asm.S
12800 +++ b/arch/x86/crypto/aesni-intel_asm.S
12801 @@ -31,6 +31,7 @@
12802
12803 #include <linux/linkage.h>
12804 #include <asm/inst.h>
12805 +#include <asm/alternative-asm.h>
12806
12807 #ifdef __x86_64__
12808 .data
12809 @@ -205,7 +206,7 @@ enc: .octa 0x2
12810 * num_initial_blocks = b mod 4
12811 * encrypt the initial num_initial_blocks blocks and apply ghash on
12812 * the ciphertext
12813 -* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12814 +* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12815 * are clobbered
12816 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
12817 */
12818 @@ -214,8 +215,8 @@ enc: .octa 0x2
12819 .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
12820 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
12821 mov arg7, %r10 # %r10 = AAD
12822 - mov arg8, %r12 # %r12 = aadLen
12823 - mov %r12, %r11
12824 + mov arg8, %r15 # %r15 = aadLen
12825 + mov %r15, %r11
12826 pxor %xmm\i, %xmm\i
12827 _get_AAD_loop\num_initial_blocks\operation:
12828 movd (%r10), \TMP1
12829 @@ -223,15 +224,15 @@ _get_AAD_loop\num_initial_blocks\operation:
12830 psrldq $4, %xmm\i
12831 pxor \TMP1, %xmm\i
12832 add $4, %r10
12833 - sub $4, %r12
12834 + sub $4, %r15
12835 jne _get_AAD_loop\num_initial_blocks\operation
12836 cmp $16, %r11
12837 je _get_AAD_loop2_done\num_initial_blocks\operation
12838 - mov $16, %r12
12839 + mov $16, %r15
12840 _get_AAD_loop2\num_initial_blocks\operation:
12841 psrldq $4, %xmm\i
12842 - sub $4, %r12
12843 - cmp %r11, %r12
12844 + sub $4, %r15
12845 + cmp %r11, %r15
12846 jne _get_AAD_loop2\num_initial_blocks\operation
12847 _get_AAD_loop2_done\num_initial_blocks\operation:
12848 movdqa SHUF_MASK(%rip), %xmm14
12849 @@ -443,7 +444,7 @@ _initial_blocks_done\num_initial_blocks\operation:
12850 * num_initial_blocks = b mod 4
12851 * encrypt the initial num_initial_blocks blocks and apply ghash on
12852 * the ciphertext
12853 -* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12854 +* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12855 * are clobbered
12856 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
12857 */
12858 @@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
12859 .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
12860 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
12861 mov arg7, %r10 # %r10 = AAD
12862 - mov arg8, %r12 # %r12 = aadLen
12863 - mov %r12, %r11
12864 + mov arg8, %r15 # %r15 = aadLen
12865 + mov %r15, %r11
12866 pxor %xmm\i, %xmm\i
12867 _get_AAD_loop\num_initial_blocks\operation:
12868 movd (%r10), \TMP1
12869 @@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
12870 psrldq $4, %xmm\i
12871 pxor \TMP1, %xmm\i
12872 add $4, %r10
12873 - sub $4, %r12
12874 + sub $4, %r15
12875 jne _get_AAD_loop\num_initial_blocks\operation
12876 cmp $16, %r11
12877 je _get_AAD_loop2_done\num_initial_blocks\operation
12878 - mov $16, %r12
12879 + mov $16, %r15
12880 _get_AAD_loop2\num_initial_blocks\operation:
12881 psrldq $4, %xmm\i
12882 - sub $4, %r12
12883 - cmp %r11, %r12
12884 + sub $4, %r15
12885 + cmp %r11, %r15
12886 jne _get_AAD_loop2\num_initial_blocks\operation
12887 _get_AAD_loop2_done\num_initial_blocks\operation:
12888 movdqa SHUF_MASK(%rip), %xmm14
12889 @@ -1269,7 +1270,7 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
12890 *
12891 *****************************************************************************/
12892 ENTRY(aesni_gcm_dec)
12893 - push %r12
12894 + push %r15
12895 push %r13
12896 push %r14
12897 mov %rsp, %r14
12898 @@ -1279,8 +1280,8 @@ ENTRY(aesni_gcm_dec)
12899 */
12900 sub $VARIABLE_OFFSET, %rsp
12901 and $~63, %rsp # align rsp to 64 bytes
12902 - mov %arg6, %r12
12903 - movdqu (%r12), %xmm13 # %xmm13 = HashKey
12904 + mov %arg6, %r15
12905 + movdqu (%r15), %xmm13 # %xmm13 = HashKey
12906 movdqa SHUF_MASK(%rip), %xmm2
12907 PSHUFB_XMM %xmm2, %xmm13
12908
12909 @@ -1308,10 +1309,10 @@ ENTRY(aesni_gcm_dec)
12910 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
12911 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
12912 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
12913 - mov %r13, %r12
12914 - and $(3<<4), %r12
12915 + mov %r13, %r15
12916 + and $(3<<4), %r15
12917 jz _initial_num_blocks_is_0_decrypt
12918 - cmp $(2<<4), %r12
12919 + cmp $(2<<4), %r15
12920 jb _initial_num_blocks_is_1_decrypt
12921 je _initial_num_blocks_is_2_decrypt
12922 _initial_num_blocks_is_3_decrypt:
12923 @@ -1361,16 +1362,16 @@ _zero_cipher_left_decrypt:
12924 sub $16, %r11
12925 add %r13, %r11
12926 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
12927 - lea SHIFT_MASK+16(%rip), %r12
12928 - sub %r13, %r12
12929 + lea SHIFT_MASK+16(%rip), %r15
12930 + sub %r13, %r15
12931 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
12932 # (%r13 is the number of bytes in plaintext mod 16)
12933 - movdqu (%r12), %xmm2 # get the appropriate shuffle mask
12934 + movdqu (%r15), %xmm2 # get the appropriate shuffle mask
12935 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
12936
12937 movdqa %xmm1, %xmm2
12938 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
12939 - movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
12940 + movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
12941 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
12942 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
12943 pand %xmm1, %xmm2
12944 @@ -1399,9 +1400,9 @@ _less_than_8_bytes_left_decrypt:
12945 sub $1, %r13
12946 jne _less_than_8_bytes_left_decrypt
12947 _multiple_of_16_bytes_decrypt:
12948 - mov arg8, %r12 # %r13 = aadLen (number of bytes)
12949 - shl $3, %r12 # convert into number of bits
12950 - movd %r12d, %xmm15 # len(A) in %xmm15
12951 + mov arg8, %r15 # %r13 = aadLen (number of bytes)
12952 + shl $3, %r15 # convert into number of bits
12953 + movd %r15d, %xmm15 # len(A) in %xmm15
12954 shl $3, %arg4 # len(C) in bits (*128)
12955 MOVQ_R64_XMM %arg4, %xmm1
12956 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
12957 @@ -1440,7 +1441,8 @@ _return_T_done_decrypt:
12958 mov %r14, %rsp
12959 pop %r14
12960 pop %r13
12961 - pop %r12
12962 + pop %r15
12963 + pax_force_retaddr
12964 ret
12965 ENDPROC(aesni_gcm_dec)
12966
12967 @@ -1529,7 +1531,7 @@ ENDPROC(aesni_gcm_dec)
12968 * poly = x^128 + x^127 + x^126 + x^121 + 1
12969 ***************************************************************************/
12970 ENTRY(aesni_gcm_enc)
12971 - push %r12
12972 + push %r15
12973 push %r13
12974 push %r14
12975 mov %rsp, %r14
12976 @@ -1539,8 +1541,8 @@ ENTRY(aesni_gcm_enc)
12977 #
12978 sub $VARIABLE_OFFSET, %rsp
12979 and $~63, %rsp
12980 - mov %arg6, %r12
12981 - movdqu (%r12), %xmm13
12982 + mov %arg6, %r15
12983 + movdqu (%r15), %xmm13
12984 movdqa SHUF_MASK(%rip), %xmm2
12985 PSHUFB_XMM %xmm2, %xmm13
12986
12987 @@ -1564,13 +1566,13 @@ ENTRY(aesni_gcm_enc)
12988 movdqa %xmm13, HashKey(%rsp)
12989 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
12990 and $-16, %r13
12991 - mov %r13, %r12
12992 + mov %r13, %r15
12993
12994 # Encrypt first few blocks
12995
12996 - and $(3<<4), %r12
12997 + and $(3<<4), %r15
12998 jz _initial_num_blocks_is_0_encrypt
12999 - cmp $(2<<4), %r12
13000 + cmp $(2<<4), %r15
13001 jb _initial_num_blocks_is_1_encrypt
13002 je _initial_num_blocks_is_2_encrypt
13003 _initial_num_blocks_is_3_encrypt:
13004 @@ -1623,14 +1625,14 @@ _zero_cipher_left_encrypt:
13005 sub $16, %r11
13006 add %r13, %r11
13007 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13008 - lea SHIFT_MASK+16(%rip), %r12
13009 - sub %r13, %r12
13010 + lea SHIFT_MASK+16(%rip), %r15
13011 + sub %r13, %r15
13012 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13013 # (%r13 is the number of bytes in plaintext mod 16)
13014 - movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13015 + movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13016 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13017 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13018 - movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13019 + movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13020 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13021 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13022 movdqa SHUF_MASK(%rip), %xmm10
13023 @@ -1663,9 +1665,9 @@ _less_than_8_bytes_left_encrypt:
13024 sub $1, %r13
13025 jne _less_than_8_bytes_left_encrypt
13026 _multiple_of_16_bytes_encrypt:
13027 - mov arg8, %r12 # %r12 = addLen (number of bytes)
13028 - shl $3, %r12
13029 - movd %r12d, %xmm15 # len(A) in %xmm15
13030 + mov arg8, %r15 # %r15 = addLen (number of bytes)
13031 + shl $3, %r15
13032 + movd %r15d, %xmm15 # len(A) in %xmm15
13033 shl $3, %arg4 # len(C) in bits (*128)
13034 MOVQ_R64_XMM %arg4, %xmm1
13035 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13036 @@ -1704,7 +1706,8 @@ _return_T_done_encrypt:
13037 mov %r14, %rsp
13038 pop %r14
13039 pop %r13
13040 - pop %r12
13041 + pop %r15
13042 + pax_force_retaddr
13043 ret
13044 ENDPROC(aesni_gcm_enc)
13045
13046 @@ -1722,6 +1725,7 @@ _key_expansion_256a:
13047 pxor %xmm1, %xmm0
13048 movaps %xmm0, (TKEYP)
13049 add $0x10, TKEYP
13050 + pax_force_retaddr
13051 ret
13052 ENDPROC(_key_expansion_128)
13053 ENDPROC(_key_expansion_256a)
13054 @@ -1748,6 +1752,7 @@ _key_expansion_192a:
13055 shufps $0b01001110, %xmm2, %xmm1
13056 movaps %xmm1, 0x10(TKEYP)
13057 add $0x20, TKEYP
13058 + pax_force_retaddr
13059 ret
13060 ENDPROC(_key_expansion_192a)
13061
13062 @@ -1768,6 +1773,7 @@ _key_expansion_192b:
13063
13064 movaps %xmm0, (TKEYP)
13065 add $0x10, TKEYP
13066 + pax_force_retaddr
13067 ret
13068 ENDPROC(_key_expansion_192b)
13069
13070 @@ -1781,6 +1787,7 @@ _key_expansion_256b:
13071 pxor %xmm1, %xmm2
13072 movaps %xmm2, (TKEYP)
13073 add $0x10, TKEYP
13074 + pax_force_retaddr
13075 ret
13076 ENDPROC(_key_expansion_256b)
13077
13078 @@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
13079 #ifndef __x86_64__
13080 popl KEYP
13081 #endif
13082 + pax_force_retaddr
13083 ret
13084 ENDPROC(aesni_set_key)
13085
13086 @@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
13087 popl KLEN
13088 popl KEYP
13089 #endif
13090 + pax_force_retaddr
13091 ret
13092 ENDPROC(aesni_enc)
13093
13094 @@ -1974,6 +1983,7 @@ _aesni_enc1:
13095 AESENC KEY STATE
13096 movaps 0x70(TKEYP), KEY
13097 AESENCLAST KEY STATE
13098 + pax_force_retaddr
13099 ret
13100 ENDPROC(_aesni_enc1)
13101
13102 @@ -2083,6 +2093,7 @@ _aesni_enc4:
13103 AESENCLAST KEY STATE2
13104 AESENCLAST KEY STATE3
13105 AESENCLAST KEY STATE4
13106 + pax_force_retaddr
13107 ret
13108 ENDPROC(_aesni_enc4)
13109
13110 @@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
13111 popl KLEN
13112 popl KEYP
13113 #endif
13114 + pax_force_retaddr
13115 ret
13116 ENDPROC(aesni_dec)
13117
13118 @@ -2164,6 +2176,7 @@ _aesni_dec1:
13119 AESDEC KEY STATE
13120 movaps 0x70(TKEYP), KEY
13121 AESDECLAST KEY STATE
13122 + pax_force_retaddr
13123 ret
13124 ENDPROC(_aesni_dec1)
13125
13126 @@ -2273,6 +2286,7 @@ _aesni_dec4:
13127 AESDECLAST KEY STATE2
13128 AESDECLAST KEY STATE3
13129 AESDECLAST KEY STATE4
13130 + pax_force_retaddr
13131 ret
13132 ENDPROC(_aesni_dec4)
13133
13134 @@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
13135 popl KEYP
13136 popl LEN
13137 #endif
13138 + pax_force_retaddr
13139 ret
13140 ENDPROC(aesni_ecb_enc)
13141
13142 @@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
13143 popl KEYP
13144 popl LEN
13145 #endif
13146 + pax_force_retaddr
13147 ret
13148 ENDPROC(aesni_ecb_dec)
13149
13150 @@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
13151 popl LEN
13152 popl IVP
13153 #endif
13154 + pax_force_retaddr
13155 ret
13156 ENDPROC(aesni_cbc_enc)
13157
13158 @@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
13159 popl LEN
13160 popl IVP
13161 #endif
13162 + pax_force_retaddr
13163 ret
13164 ENDPROC(aesni_cbc_dec)
13165
13166 @@ -2550,6 +2568,7 @@ _aesni_inc_init:
13167 mov $1, TCTR_LOW
13168 MOVQ_R64_XMM TCTR_LOW INC
13169 MOVQ_R64_XMM CTR TCTR_LOW
13170 + pax_force_retaddr
13171 ret
13172 ENDPROC(_aesni_inc_init)
13173
13174 @@ -2579,6 +2598,7 @@ _aesni_inc:
13175 .Linc_low:
13176 movaps CTR, IV
13177 PSHUFB_XMM BSWAP_MASK IV
13178 + pax_force_retaddr
13179 ret
13180 ENDPROC(_aesni_inc)
13181
13182 @@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
13183 .Lctr_enc_ret:
13184 movups IV, (IVP)
13185 .Lctr_enc_just_ret:
13186 + pax_force_retaddr
13187 ret
13188 ENDPROC(aesni_ctr_enc)
13189
13190 @@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
13191 pxor INC, STATE4
13192 movdqu STATE4, 0x70(OUTP)
13193
13194 + pax_force_retaddr
13195 ret
13196 ENDPROC(aesni_xts_crypt8)
13197
13198 diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13199 index 246c670..466e2d6 100644
13200 --- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13201 +++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13202 @@ -21,6 +21,7 @@
13203 */
13204
13205 #include <linux/linkage.h>
13206 +#include <asm/alternative-asm.h>
13207
13208 .file "blowfish-x86_64-asm.S"
13209 .text
13210 @@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13211 jnz .L__enc_xor;
13212
13213 write_block();
13214 + pax_force_retaddr
13215 ret;
13216 .L__enc_xor:
13217 xor_block();
13218 + pax_force_retaddr
13219 ret;
13220 ENDPROC(__blowfish_enc_blk)
13221
13222 @@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13223
13224 movq %r11, %rbp;
13225
13226 + pax_force_retaddr
13227 ret;
13228 ENDPROC(blowfish_dec_blk)
13229
13230 @@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13231
13232 popq %rbx;
13233 popq %rbp;
13234 + pax_force_retaddr
13235 ret;
13236
13237 .L__enc_xor4:
13238 @@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13239
13240 popq %rbx;
13241 popq %rbp;
13242 + pax_force_retaddr
13243 ret;
13244 ENDPROC(__blowfish_enc_blk_4way)
13245
13246 @@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13247 popq %rbx;
13248 popq %rbp;
13249
13250 + pax_force_retaddr
13251 ret;
13252 ENDPROC(blowfish_dec_blk_4way)
13253 diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13254 index ce71f92..1dce7ec 100644
13255 --- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13256 +++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13257 @@ -16,6 +16,7 @@
13258 */
13259
13260 #include <linux/linkage.h>
13261 +#include <asm/alternative-asm.h>
13262
13263 #define CAMELLIA_TABLE_BYTE_LEN 272
13264
13265 @@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13266 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13267 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13268 %rcx, (%r9));
13269 + pax_force_retaddr
13270 ret;
13271 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13272
13273 @@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13274 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13275 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13276 %rax, (%r9));
13277 + pax_force_retaddr
13278 ret;
13279 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13280
13281 @@ -780,6 +783,7 @@ __camellia_enc_blk16:
13282 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13283 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13284
13285 + pax_force_retaddr
13286 ret;
13287
13288 .align 8
13289 @@ -865,6 +869,7 @@ __camellia_dec_blk16:
13290 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13291 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13292
13293 + pax_force_retaddr
13294 ret;
13295
13296 .align 8
13297 @@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13298 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13299 %xmm8, %rsi);
13300
13301 + pax_force_retaddr
13302 ret;
13303 ENDPROC(camellia_ecb_enc_16way)
13304
13305 @@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13306 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13307 %xmm8, %rsi);
13308
13309 + pax_force_retaddr
13310 ret;
13311 ENDPROC(camellia_ecb_dec_16way)
13312
13313 @@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13314 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13315 %xmm8, %rsi);
13316
13317 + pax_force_retaddr
13318 ret;
13319 ENDPROC(camellia_cbc_dec_16way)
13320
13321 @@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13322 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13323 %xmm8, %rsi);
13324
13325 + pax_force_retaddr
13326 ret;
13327 ENDPROC(camellia_ctr_16way)
13328
13329 @@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13330 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13331 %xmm8, %rsi);
13332
13333 + pax_force_retaddr
13334 ret;
13335 ENDPROC(camellia_xts_crypt_16way)
13336
13337 diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13338 index 0e0b886..5a3123c 100644
13339 --- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13340 +++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13341 @@ -11,6 +11,7 @@
13342 */
13343
13344 #include <linux/linkage.h>
13345 +#include <asm/alternative-asm.h>
13346
13347 #define CAMELLIA_TABLE_BYTE_LEN 272
13348
13349 @@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13350 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13351 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13352 %rcx, (%r9));
13353 + pax_force_retaddr
13354 ret;
13355 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13356
13357 @@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13358 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13359 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13360 %rax, (%r9));
13361 + pax_force_retaddr
13362 ret;
13363 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13364
13365 @@ -820,6 +823,7 @@ __camellia_enc_blk32:
13366 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13367 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13368
13369 + pax_force_retaddr
13370 ret;
13371
13372 .align 8
13373 @@ -905,6 +909,7 @@ __camellia_dec_blk32:
13374 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13375 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13376
13377 + pax_force_retaddr
13378 ret;
13379
13380 .align 8
13381 @@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13382
13383 vzeroupper;
13384
13385 + pax_force_retaddr
13386 ret;
13387 ENDPROC(camellia_ecb_enc_32way)
13388
13389 @@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13390
13391 vzeroupper;
13392
13393 + pax_force_retaddr
13394 ret;
13395 ENDPROC(camellia_ecb_dec_32way)
13396
13397 @@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13398
13399 vzeroupper;
13400
13401 + pax_force_retaddr
13402 ret;
13403 ENDPROC(camellia_cbc_dec_32way)
13404
13405 @@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13406
13407 vzeroupper;
13408
13409 + pax_force_retaddr
13410 ret;
13411 ENDPROC(camellia_ctr_32way)
13412
13413 @@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13414
13415 vzeroupper;
13416
13417 + pax_force_retaddr
13418 ret;
13419 ENDPROC(camellia_xts_crypt_32way)
13420
13421 diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13422 index 310319c..db3d7b5 100644
13423 --- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13424 +++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13425 @@ -21,6 +21,7 @@
13426 */
13427
13428 #include <linux/linkage.h>
13429 +#include <asm/alternative-asm.h>
13430
13431 .file "camellia-x86_64-asm_64.S"
13432 .text
13433 @@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13434 enc_outunpack(mov, RT1);
13435
13436 movq RRBP, %rbp;
13437 + pax_force_retaddr
13438 ret;
13439
13440 .L__enc_xor:
13441 enc_outunpack(xor, RT1);
13442
13443 movq RRBP, %rbp;
13444 + pax_force_retaddr
13445 ret;
13446 ENDPROC(__camellia_enc_blk)
13447
13448 @@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13449 dec_outunpack();
13450
13451 movq RRBP, %rbp;
13452 + pax_force_retaddr
13453 ret;
13454 ENDPROC(camellia_dec_blk)
13455
13456 @@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13457
13458 movq RRBP, %rbp;
13459 popq %rbx;
13460 + pax_force_retaddr
13461 ret;
13462
13463 .L__enc2_xor:
13464 @@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13465
13466 movq RRBP, %rbp;
13467 popq %rbx;
13468 + pax_force_retaddr
13469 ret;
13470 ENDPROC(__camellia_enc_blk_2way)
13471
13472 @@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13473
13474 movq RRBP, %rbp;
13475 movq RXOR, %rbx;
13476 + pax_force_retaddr
13477 ret;
13478 ENDPROC(camellia_dec_blk_2way)
13479 diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13480 index c35fd5d..2d8c7db 100644
13481 --- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13482 +++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13483 @@ -24,6 +24,7 @@
13484 */
13485
13486 #include <linux/linkage.h>
13487 +#include <asm/alternative-asm.h>
13488
13489 .file "cast5-avx-x86_64-asm_64.S"
13490
13491 @@ -281,6 +282,7 @@ __cast5_enc_blk16:
13492 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13493 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13494
13495 + pax_force_retaddr
13496 ret;
13497 ENDPROC(__cast5_enc_blk16)
13498
13499 @@ -352,6 +354,7 @@ __cast5_dec_blk16:
13500 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13501 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13502
13503 + pax_force_retaddr
13504 ret;
13505
13506 .L__skip_dec:
13507 @@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13508 vmovdqu RR4, (6*4*4)(%r11);
13509 vmovdqu RL4, (7*4*4)(%r11);
13510
13511 + pax_force_retaddr
13512 ret;
13513 ENDPROC(cast5_ecb_enc_16way)
13514
13515 @@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13516 vmovdqu RR4, (6*4*4)(%r11);
13517 vmovdqu RL4, (7*4*4)(%r11);
13518
13519 + pax_force_retaddr
13520 ret;
13521 ENDPROC(cast5_ecb_dec_16way)
13522
13523 @@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13524 * %rdx: src
13525 */
13526
13527 - pushq %r12;
13528 + pushq %r14;
13529
13530 movq %rsi, %r11;
13531 - movq %rdx, %r12;
13532 + movq %rdx, %r14;
13533
13534 vmovdqu (0*16)(%rdx), RL1;
13535 vmovdqu (1*16)(%rdx), RR1;
13536 @@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13537 call __cast5_dec_blk16;
13538
13539 /* xor with src */
13540 - vmovq (%r12), RX;
13541 + vmovq (%r14), RX;
13542 vpshufd $0x4f, RX, RX;
13543 vpxor RX, RR1, RR1;
13544 - vpxor 0*16+8(%r12), RL1, RL1;
13545 - vpxor 1*16+8(%r12), RR2, RR2;
13546 - vpxor 2*16+8(%r12), RL2, RL2;
13547 - vpxor 3*16+8(%r12), RR3, RR3;
13548 - vpxor 4*16+8(%r12), RL3, RL3;
13549 - vpxor 5*16+8(%r12), RR4, RR4;
13550 - vpxor 6*16+8(%r12), RL4, RL4;
13551 + vpxor 0*16+8(%r14), RL1, RL1;
13552 + vpxor 1*16+8(%r14), RR2, RR2;
13553 + vpxor 2*16+8(%r14), RL2, RL2;
13554 + vpxor 3*16+8(%r14), RR3, RR3;
13555 + vpxor 4*16+8(%r14), RL3, RL3;
13556 + vpxor 5*16+8(%r14), RR4, RR4;
13557 + vpxor 6*16+8(%r14), RL4, RL4;
13558
13559 vmovdqu RR1, (0*16)(%r11);
13560 vmovdqu RL1, (1*16)(%r11);
13561 @@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13562 vmovdqu RR4, (6*16)(%r11);
13563 vmovdqu RL4, (7*16)(%r11);
13564
13565 - popq %r12;
13566 + popq %r14;
13567
13568 + pax_force_retaddr
13569 ret;
13570 ENDPROC(cast5_cbc_dec_16way)
13571
13572 @@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13573 * %rcx: iv (big endian, 64bit)
13574 */
13575
13576 - pushq %r12;
13577 + pushq %r14;
13578
13579 movq %rsi, %r11;
13580 - movq %rdx, %r12;
13581 + movq %rdx, %r14;
13582
13583 vpcmpeqd RTMP, RTMP, RTMP;
13584 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13585 @@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13586 call __cast5_enc_blk16;
13587
13588 /* dst = src ^ iv */
13589 - vpxor (0*16)(%r12), RR1, RR1;
13590 - vpxor (1*16)(%r12), RL1, RL1;
13591 - vpxor (2*16)(%r12), RR2, RR2;
13592 - vpxor (3*16)(%r12), RL2, RL2;
13593 - vpxor (4*16)(%r12), RR3, RR3;
13594 - vpxor (5*16)(%r12), RL3, RL3;
13595 - vpxor (6*16)(%r12), RR4, RR4;
13596 - vpxor (7*16)(%r12), RL4, RL4;
13597 + vpxor (0*16)(%r14), RR1, RR1;
13598 + vpxor (1*16)(%r14), RL1, RL1;
13599 + vpxor (2*16)(%r14), RR2, RR2;
13600 + vpxor (3*16)(%r14), RL2, RL2;
13601 + vpxor (4*16)(%r14), RR3, RR3;
13602 + vpxor (5*16)(%r14), RL3, RL3;
13603 + vpxor (6*16)(%r14), RR4, RR4;
13604 + vpxor (7*16)(%r14), RL4, RL4;
13605 vmovdqu RR1, (0*16)(%r11);
13606 vmovdqu RL1, (1*16)(%r11);
13607 vmovdqu RR2, (2*16)(%r11);
13608 @@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13609 vmovdqu RR4, (6*16)(%r11);
13610 vmovdqu RL4, (7*16)(%r11);
13611
13612 - popq %r12;
13613 + popq %r14;
13614
13615 + pax_force_retaddr
13616 ret;
13617 ENDPROC(cast5_ctr_16way)
13618 diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13619 index e3531f8..e123f35 100644
13620 --- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13621 +++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13622 @@ -24,6 +24,7 @@
13623 */
13624
13625 #include <linux/linkage.h>
13626 +#include <asm/alternative-asm.h>
13627 #include "glue_helper-asm-avx.S"
13628
13629 .file "cast6-avx-x86_64-asm_64.S"
13630 @@ -295,6 +296,7 @@ __cast6_enc_blk8:
13631 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13632 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13633
13634 + pax_force_retaddr
13635 ret;
13636 ENDPROC(__cast6_enc_blk8)
13637
13638 @@ -340,6 +342,7 @@ __cast6_dec_blk8:
13639 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13640 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13641
13642 + pax_force_retaddr
13643 ret;
13644 ENDPROC(__cast6_dec_blk8)
13645
13646 @@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13647
13648 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13649
13650 + pax_force_retaddr
13651 ret;
13652 ENDPROC(cast6_ecb_enc_8way)
13653
13654 @@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13655
13656 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13657
13658 + pax_force_retaddr
13659 ret;
13660 ENDPROC(cast6_ecb_dec_8way)
13661
13662 @@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13663 * %rdx: src
13664 */
13665
13666 - pushq %r12;
13667 + pushq %r14;
13668
13669 movq %rsi, %r11;
13670 - movq %rdx, %r12;
13671 + movq %rdx, %r14;
13672
13673 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13674
13675 call __cast6_dec_blk8;
13676
13677 - store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13678 + store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13679
13680 - popq %r12;
13681 + popq %r14;
13682
13683 + pax_force_retaddr
13684 ret;
13685 ENDPROC(cast6_cbc_dec_8way)
13686
13687 @@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13688 * %rcx: iv (little endian, 128bit)
13689 */
13690
13691 - pushq %r12;
13692 + pushq %r14;
13693
13694 movq %rsi, %r11;
13695 - movq %rdx, %r12;
13696 + movq %rdx, %r14;
13697
13698 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13699 RD2, RX, RKR, RKM);
13700
13701 call __cast6_enc_blk8;
13702
13703 - store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13704 + store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13705
13706 - popq %r12;
13707 + popq %r14;
13708
13709 + pax_force_retaddr
13710 ret;
13711 ENDPROC(cast6_ctr_8way)
13712
13713 @@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13714 /* dst <= regs xor IVs(in dst) */
13715 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13716
13717 + pax_force_retaddr
13718 ret;
13719 ENDPROC(cast6_xts_enc_8way)
13720
13721 @@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13722 /* dst <= regs xor IVs(in dst) */
13723 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13724
13725 + pax_force_retaddr
13726 ret;
13727 ENDPROC(cast6_xts_dec_8way)
13728 diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13729 index dbc4339..de6e120 100644
13730 --- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13731 +++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13732 @@ -45,6 +45,7 @@
13733
13734 #include <asm/inst.h>
13735 #include <linux/linkage.h>
13736 +#include <asm/alternative-asm.h>
13737
13738 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13739
13740 @@ -312,6 +313,7 @@ do_return:
13741 popq %rsi
13742 popq %rdi
13743 popq %rbx
13744 + pax_force_retaddr
13745 ret
13746
13747 ################################################################
13748 diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13749 index 185fad4..ff4cd36 100644
13750 --- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
13751 +++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13752 @@ -18,6 +18,7 @@
13753
13754 #include <linux/linkage.h>
13755 #include <asm/inst.h>
13756 +#include <asm/alternative-asm.h>
13757
13758 .data
13759
13760 @@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
13761 psrlq $1, T2
13762 pxor T2, T1
13763 pxor T1, DATA
13764 + pax_force_retaddr
13765 ret
13766 ENDPROC(__clmul_gf128mul_ble)
13767
13768 @@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
13769 call __clmul_gf128mul_ble
13770 PSHUFB_XMM BSWAP DATA
13771 movups DATA, (%rdi)
13772 + pax_force_retaddr
13773 ret
13774 ENDPROC(clmul_ghash_mul)
13775
13776 @@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
13777 PSHUFB_XMM BSWAP DATA
13778 movups DATA, (%rdi)
13779 .Lupdate_just_ret:
13780 + pax_force_retaddr
13781 ret
13782 ENDPROC(clmul_ghash_update)
13783 diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
13784 index 9279e0b..c4b3d2c 100644
13785 --- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
13786 +++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
13787 @@ -1,4 +1,5 @@
13788 #include <linux/linkage.h>
13789 +#include <asm/alternative-asm.h>
13790
13791 # enter salsa20_encrypt_bytes
13792 ENTRY(salsa20_encrypt_bytes)
13793 @@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
13794 add %r11,%rsp
13795 mov %rdi,%rax
13796 mov %rsi,%rdx
13797 + pax_force_retaddr
13798 ret
13799 # bytesatleast65:
13800 ._bytesatleast65:
13801 @@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
13802 add %r11,%rsp
13803 mov %rdi,%rax
13804 mov %rsi,%rdx
13805 + pax_force_retaddr
13806 ret
13807 ENDPROC(salsa20_keysetup)
13808
13809 @@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
13810 add %r11,%rsp
13811 mov %rdi,%rax
13812 mov %rsi,%rdx
13813 + pax_force_retaddr
13814 ret
13815 ENDPROC(salsa20_ivsetup)
13816 diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13817 index 2f202f4..d9164d6 100644
13818 --- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13819 +++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13820 @@ -24,6 +24,7 @@
13821 */
13822
13823 #include <linux/linkage.h>
13824 +#include <asm/alternative-asm.h>
13825 #include "glue_helper-asm-avx.S"
13826
13827 .file "serpent-avx-x86_64-asm_64.S"
13828 @@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
13829 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13830 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13831
13832 + pax_force_retaddr
13833 ret;
13834 ENDPROC(__serpent_enc_blk8_avx)
13835
13836 @@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
13837 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13838 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13839
13840 + pax_force_retaddr
13841 ret;
13842 ENDPROC(__serpent_dec_blk8_avx)
13843
13844 @@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
13845
13846 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13847
13848 + pax_force_retaddr
13849 ret;
13850 ENDPROC(serpent_ecb_enc_8way_avx)
13851
13852 @@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
13853
13854 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13855
13856 + pax_force_retaddr
13857 ret;
13858 ENDPROC(serpent_ecb_dec_8way_avx)
13859
13860 @@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
13861
13862 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13863
13864 + pax_force_retaddr
13865 ret;
13866 ENDPROC(serpent_cbc_dec_8way_avx)
13867
13868 @@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
13869
13870 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13871
13872 + pax_force_retaddr
13873 ret;
13874 ENDPROC(serpent_ctr_8way_avx)
13875
13876 @@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
13877 /* dst <= regs xor IVs(in dst) */
13878 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13879
13880 + pax_force_retaddr
13881 ret;
13882 ENDPROC(serpent_xts_enc_8way_avx)
13883
13884 @@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
13885 /* dst <= regs xor IVs(in dst) */
13886 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13887
13888 + pax_force_retaddr
13889 ret;
13890 ENDPROC(serpent_xts_dec_8way_avx)
13891 diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
13892 index b222085..abd483c 100644
13893 --- a/arch/x86/crypto/serpent-avx2-asm_64.S
13894 +++ b/arch/x86/crypto/serpent-avx2-asm_64.S
13895 @@ -15,6 +15,7 @@
13896 */
13897
13898 #include <linux/linkage.h>
13899 +#include <asm/alternative-asm.h>
13900 #include "glue_helper-asm-avx2.S"
13901
13902 .file "serpent-avx2-asm_64.S"
13903 @@ -610,6 +611,7 @@ __serpent_enc_blk16:
13904 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13905 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13906
13907 + pax_force_retaddr
13908 ret;
13909 ENDPROC(__serpent_enc_blk16)
13910
13911 @@ -664,6 +666,7 @@ __serpent_dec_blk16:
13912 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13913 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13914
13915 + pax_force_retaddr
13916 ret;
13917 ENDPROC(__serpent_dec_blk16)
13918
13919 @@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
13920
13921 vzeroupper;
13922
13923 + pax_force_retaddr
13924 ret;
13925 ENDPROC(serpent_ecb_enc_16way)
13926
13927 @@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
13928
13929 vzeroupper;
13930
13931 + pax_force_retaddr
13932 ret;
13933 ENDPROC(serpent_ecb_dec_16way)
13934
13935 @@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
13936
13937 vzeroupper;
13938
13939 + pax_force_retaddr
13940 ret;
13941 ENDPROC(serpent_cbc_dec_16way)
13942
13943 @@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
13944
13945 vzeroupper;
13946
13947 + pax_force_retaddr
13948 ret;
13949 ENDPROC(serpent_ctr_16way)
13950
13951 @@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
13952
13953 vzeroupper;
13954
13955 + pax_force_retaddr
13956 ret;
13957 ENDPROC(serpent_xts_enc_16way)
13958
13959 @@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
13960
13961 vzeroupper;
13962
13963 + pax_force_retaddr
13964 ret;
13965 ENDPROC(serpent_xts_dec_16way)
13966 diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13967 index acc066c..1559cc4 100644
13968 --- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13969 +++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13970 @@ -25,6 +25,7 @@
13971 */
13972
13973 #include <linux/linkage.h>
13974 +#include <asm/alternative-asm.h>
13975
13976 .file "serpent-sse2-x86_64-asm_64.S"
13977 .text
13978 @@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
13979 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13980 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13981
13982 + pax_force_retaddr
13983 ret;
13984
13985 .L__enc_xor8:
13986 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13987 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13988
13989 + pax_force_retaddr
13990 ret;
13991 ENDPROC(__serpent_enc_blk_8way)
13992
13993 @@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
13994 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13995 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13996
13997 + pax_force_retaddr
13998 ret;
13999 ENDPROC(serpent_dec_blk_8way)
14000 diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14001 index a410950..9dfe7ad 100644
14002 --- a/arch/x86/crypto/sha1_ssse3_asm.S
14003 +++ b/arch/x86/crypto/sha1_ssse3_asm.S
14004 @@ -29,6 +29,7 @@
14005 */
14006
14007 #include <linux/linkage.h>
14008 +#include <asm/alternative-asm.h>
14009
14010 #define CTX %rdi // arg1
14011 #define BUF %rsi // arg2
14012 @@ -75,9 +76,9 @@
14013
14014 push %rbx
14015 push %rbp
14016 - push %r12
14017 + push %r14
14018
14019 - mov %rsp, %r12
14020 + mov %rsp, %r14
14021 sub $64, %rsp # allocate workspace
14022 and $~15, %rsp # align stack
14023
14024 @@ -99,11 +100,12 @@
14025 xor %rax, %rax
14026 rep stosq
14027
14028 - mov %r12, %rsp # deallocate workspace
14029 + mov %r14, %rsp # deallocate workspace
14030
14031 - pop %r12
14032 + pop %r14
14033 pop %rbp
14034 pop %rbx
14035 + pax_force_retaddr
14036 ret
14037
14038 ENDPROC(\name)
14039 diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14040 index 642f156..51a513c 100644
14041 --- a/arch/x86/crypto/sha256-avx-asm.S
14042 +++ b/arch/x86/crypto/sha256-avx-asm.S
14043 @@ -49,6 +49,7 @@
14044
14045 #ifdef CONFIG_AS_AVX
14046 #include <linux/linkage.h>
14047 +#include <asm/alternative-asm.h>
14048
14049 ## assume buffers not aligned
14050 #define VMOVDQ vmovdqu
14051 @@ -460,6 +461,7 @@ done_hash:
14052 popq %r13
14053 popq %rbp
14054 popq %rbx
14055 + pax_force_retaddr
14056 ret
14057 ENDPROC(sha256_transform_avx)
14058
14059 diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14060 index 9e86944..3795e6a 100644
14061 --- a/arch/x86/crypto/sha256-avx2-asm.S
14062 +++ b/arch/x86/crypto/sha256-avx2-asm.S
14063 @@ -50,6 +50,7 @@
14064
14065 #ifdef CONFIG_AS_AVX2
14066 #include <linux/linkage.h>
14067 +#include <asm/alternative-asm.h>
14068
14069 ## assume buffers not aligned
14070 #define VMOVDQ vmovdqu
14071 @@ -720,6 +721,7 @@ done_hash:
14072 popq %r12
14073 popq %rbp
14074 popq %rbx
14075 + pax_force_retaddr
14076 ret
14077 ENDPROC(sha256_transform_rorx)
14078
14079 diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14080 index f833b74..8c62a9e 100644
14081 --- a/arch/x86/crypto/sha256-ssse3-asm.S
14082 +++ b/arch/x86/crypto/sha256-ssse3-asm.S
14083 @@ -47,6 +47,7 @@
14084 ########################################################################
14085
14086 #include <linux/linkage.h>
14087 +#include <asm/alternative-asm.h>
14088
14089 ## assume buffers not aligned
14090 #define MOVDQ movdqu
14091 @@ -471,6 +472,7 @@ done_hash:
14092 popq %rbp
14093 popq %rbx
14094
14095 + pax_force_retaddr
14096 ret
14097 ENDPROC(sha256_transform_ssse3)
14098
14099 diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14100 index 974dde9..a823ff9 100644
14101 --- a/arch/x86/crypto/sha512-avx-asm.S
14102 +++ b/arch/x86/crypto/sha512-avx-asm.S
14103 @@ -49,6 +49,7 @@
14104
14105 #ifdef CONFIG_AS_AVX
14106 #include <linux/linkage.h>
14107 +#include <asm/alternative-asm.h>
14108
14109 .text
14110
14111 @@ -364,6 +365,7 @@ updateblock:
14112 mov frame_RSPSAVE(%rsp), %rsp
14113
14114 nowork:
14115 + pax_force_retaddr
14116 ret
14117 ENDPROC(sha512_transform_avx)
14118
14119 diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14120 index 568b961..ed20c37 100644
14121 --- a/arch/x86/crypto/sha512-avx2-asm.S
14122 +++ b/arch/x86/crypto/sha512-avx2-asm.S
14123 @@ -51,6 +51,7 @@
14124
14125 #ifdef CONFIG_AS_AVX2
14126 #include <linux/linkage.h>
14127 +#include <asm/alternative-asm.h>
14128
14129 .text
14130
14131 @@ -678,6 +679,7 @@ done_hash:
14132
14133 # Restore Stack Pointer
14134 mov frame_RSPSAVE(%rsp), %rsp
14135 + pax_force_retaddr
14136 ret
14137 ENDPROC(sha512_transform_rorx)
14138
14139 diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14140 index fb56855..6edd768 100644
14141 --- a/arch/x86/crypto/sha512-ssse3-asm.S
14142 +++ b/arch/x86/crypto/sha512-ssse3-asm.S
14143 @@ -48,6 +48,7 @@
14144 ########################################################################
14145
14146 #include <linux/linkage.h>
14147 +#include <asm/alternative-asm.h>
14148
14149 .text
14150
14151 @@ -363,6 +364,7 @@ updateblock:
14152 mov frame_RSPSAVE(%rsp), %rsp
14153
14154 nowork:
14155 + pax_force_retaddr
14156 ret
14157 ENDPROC(sha512_transform_ssse3)
14158
14159 diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14160 index 0505813..b067311 100644
14161 --- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14162 +++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14163 @@ -24,6 +24,7 @@
14164 */
14165
14166 #include <linux/linkage.h>
14167 +#include <asm/alternative-asm.h>
14168 #include "glue_helper-asm-avx.S"
14169
14170 .file "twofish-avx-x86_64-asm_64.S"
14171 @@ -284,6 +285,7 @@ __twofish_enc_blk8:
14172 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14173 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14174
14175 + pax_force_retaddr
14176 ret;
14177 ENDPROC(__twofish_enc_blk8)
14178
14179 @@ -324,6 +326,7 @@ __twofish_dec_blk8:
14180 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14181 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14182
14183 + pax_force_retaddr
14184 ret;
14185 ENDPROC(__twofish_dec_blk8)
14186
14187 @@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14188
14189 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14190
14191 + pax_force_retaddr
14192 ret;
14193 ENDPROC(twofish_ecb_enc_8way)
14194
14195 @@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14196
14197 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14198
14199 + pax_force_retaddr
14200 ret;
14201 ENDPROC(twofish_ecb_dec_8way)
14202
14203 @@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14204 * %rdx: src
14205 */
14206
14207 - pushq %r12;
14208 + pushq %r14;
14209
14210 movq %rsi, %r11;
14211 - movq %rdx, %r12;
14212 + movq %rdx, %r14;
14213
14214 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14215
14216 call __twofish_dec_blk8;
14217
14218 - store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14219 + store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14220
14221 - popq %r12;
14222 + popq %r14;
14223
14224 + pax_force_retaddr
14225 ret;
14226 ENDPROC(twofish_cbc_dec_8way)
14227
14228 @@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14229 * %rcx: iv (little endian, 128bit)
14230 */
14231
14232 - pushq %r12;
14233 + pushq %r14;
14234
14235 movq %rsi, %r11;
14236 - movq %rdx, %r12;
14237 + movq %rdx, %r14;
14238
14239 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14240 RD2, RX0, RX1, RY0);
14241
14242 call __twofish_enc_blk8;
14243
14244 - store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14245 + store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14246
14247 - popq %r12;
14248 + popq %r14;
14249
14250 + pax_force_retaddr
14251 ret;
14252 ENDPROC(twofish_ctr_8way)
14253
14254 @@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14255 /* dst <= regs xor IVs(in dst) */
14256 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14257
14258 + pax_force_retaddr
14259 ret;
14260 ENDPROC(twofish_xts_enc_8way)
14261
14262 @@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14263 /* dst <= regs xor IVs(in dst) */
14264 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14265
14266 + pax_force_retaddr
14267 ret;
14268 ENDPROC(twofish_xts_dec_8way)
14269 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14270 index 1c3b7ce..02f578d 100644
14271 --- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14272 +++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14273 @@ -21,6 +21,7 @@
14274 */
14275
14276 #include <linux/linkage.h>
14277 +#include <asm/alternative-asm.h>
14278
14279 .file "twofish-x86_64-asm-3way.S"
14280 .text
14281 @@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14282 popq %r13;
14283 popq %r14;
14284 popq %r15;
14285 + pax_force_retaddr
14286 ret;
14287
14288 .L__enc_xor3:
14289 @@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14290 popq %r13;
14291 popq %r14;
14292 popq %r15;
14293 + pax_force_retaddr
14294 ret;
14295 ENDPROC(__twofish_enc_blk_3way)
14296
14297 @@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14298 popq %r13;
14299 popq %r14;
14300 popq %r15;
14301 + pax_force_retaddr
14302 ret;
14303 ENDPROC(twofish_dec_blk_3way)
14304 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14305 index a039d21..524b8b2 100644
14306 --- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14307 +++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14308 @@ -22,6 +22,7 @@
14309
14310 #include <linux/linkage.h>
14311 #include <asm/asm-offsets.h>
14312 +#include <asm/alternative-asm.h>
14313
14314 #define a_offset 0
14315 #define b_offset 4
14316 @@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14317
14318 popq R1
14319 movq $1,%rax
14320 + pax_force_retaddr
14321 ret
14322 ENDPROC(twofish_enc_blk)
14323
14324 @@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14325
14326 popq R1
14327 movq $1,%rax
14328 + pax_force_retaddr
14329 ret
14330 ENDPROC(twofish_dec_blk)
14331 diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14332 index d21ff89..6da8e6e 100644
14333 --- a/arch/x86/ia32/ia32_aout.c
14334 +++ b/arch/x86/ia32/ia32_aout.c
14335 @@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14336 unsigned long dump_start, dump_size;
14337 struct user32 dump;
14338
14339 + memset(&dump, 0, sizeof(dump));
14340 +
14341 fs = get_fs();
14342 set_fs(KERNEL_DS);
14343 has_dumped = 1;
14344 diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14345 index 2206757..85cbcfa 100644
14346 --- a/arch/x86/ia32/ia32_signal.c
14347 +++ b/arch/x86/ia32/ia32_signal.c
14348 @@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14349 if (__get_user(set.sig[0], &frame->sc.oldmask)
14350 || (_COMPAT_NSIG_WORDS > 1
14351 && __copy_from_user((((char *) &set.sig) + 4),
14352 - &frame->extramask,
14353 + frame->extramask,
14354 sizeof(frame->extramask))))
14355 goto badframe;
14356
14357 @@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14358 sp -= frame_size;
14359 /* Align the stack pointer according to the i386 ABI,
14360 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14361 - sp = ((sp + 4) & -16ul) - 4;
14362 + sp = ((sp - 12) & -16ul) - 4;
14363 return (void __user *) sp;
14364 }
14365
14366 @@ -386,7 +386,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14367 restorer = VDSO32_SYMBOL(current->mm->context.vdso,
14368 sigreturn);
14369 else
14370 - restorer = &frame->retcode;
14371 + restorer = frame->retcode;
14372 }
14373
14374 put_user_try {
14375 @@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14376 * These are actually not used anymore, but left because some
14377 * gdb versions depend on them as a marker.
14378 */
14379 - put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14380 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14381 } put_user_catch(err);
14382
14383 if (err)
14384 @@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14385 0xb8,
14386 __NR_ia32_rt_sigreturn,
14387 0x80cd,
14388 - 0,
14389 + 0
14390 };
14391
14392 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14393 @@ -461,16 +461,18 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14394
14395 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14396 restorer = ksig->ka.sa.sa_restorer;
14397 + else if (current->mm->context.vdso)
14398 + /* Return stub is in 32bit vsyscall page */
14399 + restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
14400 else
14401 - restorer = VDSO32_SYMBOL(current->mm->context.vdso,
14402 - rt_sigreturn);
14403 + restorer = frame->retcode;
14404 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14405
14406 /*
14407 * Not actually used anymore, but left because some gdb
14408 * versions need it.
14409 */
14410 - put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14411 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14412 } put_user_catch(err);
14413
14414 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14415 diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14416 index 4299eb0..c0687a7 100644
14417 --- a/arch/x86/ia32/ia32entry.S
14418 +++ b/arch/x86/ia32/ia32entry.S
14419 @@ -15,8 +15,10 @@
14420 #include <asm/irqflags.h>
14421 #include <asm/asm.h>
14422 #include <asm/smap.h>
14423 +#include <asm/pgtable.h>
14424 #include <linux/linkage.h>
14425 #include <linux/err.h>
14426 +#include <asm/alternative-asm.h>
14427
14428 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14429 #include <linux/elf-em.h>
14430 @@ -62,12 +64,12 @@
14431 */
14432 .macro LOAD_ARGS32 offset, _r9=0
14433 .if \_r9
14434 - movl \offset+16(%rsp),%r9d
14435 + movl \offset+R9(%rsp),%r9d
14436 .endif
14437 - movl \offset+40(%rsp),%ecx
14438 - movl \offset+48(%rsp),%edx
14439 - movl \offset+56(%rsp),%esi
14440 - movl \offset+64(%rsp),%edi
14441 + movl \offset+RCX(%rsp),%ecx
14442 + movl \offset+RDX(%rsp),%edx
14443 + movl \offset+RSI(%rsp),%esi
14444 + movl \offset+RDI(%rsp),%edi
14445 movl %eax,%eax /* zero extension */
14446 .endm
14447
14448 @@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14449 ENDPROC(native_irq_enable_sysexit)
14450 #endif
14451
14452 + .macro pax_enter_kernel_user
14453 + pax_set_fptr_mask
14454 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14455 + call pax_enter_kernel_user
14456 +#endif
14457 + .endm
14458 +
14459 + .macro pax_exit_kernel_user
14460 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14461 + call pax_exit_kernel_user
14462 +#endif
14463 +#ifdef CONFIG_PAX_RANDKSTACK
14464 + pushq %rax
14465 + pushq %r11
14466 + call pax_randomize_kstack
14467 + popq %r11
14468 + popq %rax
14469 +#endif
14470 + .endm
14471 +
14472 + .macro pax_erase_kstack
14473 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14474 + call pax_erase_kstack
14475 +#endif
14476 + .endm
14477 +
14478 /*
14479 * 32bit SYSENTER instruction entry.
14480 *
14481 @@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14482 CFI_REGISTER rsp,rbp
14483 SWAPGS_UNSAFE_STACK
14484 movq PER_CPU_VAR(kernel_stack), %rsp
14485 - addq $(KERNEL_STACK_OFFSET),%rsp
14486 - /*
14487 - * No need to follow this irqs on/off section: the syscall
14488 - * disabled irqs, here we enable it straight after entry:
14489 - */
14490 - ENABLE_INTERRUPTS(CLBR_NONE)
14491 movl %ebp,%ebp /* zero extension */
14492 pushq_cfi $__USER32_DS
14493 /*CFI_REL_OFFSET ss,0*/
14494 @@ -135,24 +157,49 @@ ENTRY(ia32_sysenter_target)
14495 CFI_REL_OFFSET rsp,0
14496 pushfq_cfi
14497 /*CFI_REL_OFFSET rflags,0*/
14498 - movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14499 - CFI_REGISTER rip,r10
14500 + orl $X86_EFLAGS_IF,(%rsp)
14501 + GET_THREAD_INFO(%r11)
14502 + movl TI_sysenter_return(%r11), %r11d
14503 + CFI_REGISTER rip,r11
14504 pushq_cfi $__USER32_CS
14505 /*CFI_REL_OFFSET cs,0*/
14506 movl %eax, %eax
14507 - pushq_cfi %r10
14508 + pushq_cfi %r11
14509 CFI_REL_OFFSET rip,0
14510 pushq_cfi %rax
14511 cld
14512 SAVE_ARGS 0,1,0
14513 + pax_enter_kernel_user
14514 +
14515 +#ifdef CONFIG_PAX_RANDKSTACK
14516 + pax_erase_kstack
14517 +#endif
14518 +
14519 + /*
14520 + * No need to follow this irqs on/off section: the syscall
14521 + * disabled irqs, here we enable it straight after entry:
14522 + */
14523 + ENABLE_INTERRUPTS(CLBR_NONE)
14524 /* no need to do an access_ok check here because rbp has been
14525 32bit zero extended */
14526 +
14527 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14528 + addq pax_user_shadow_base,%rbp
14529 + ASM_PAX_OPEN_USERLAND
14530 +#endif
14531 +
14532 ASM_STAC
14533 1: movl (%rbp),%ebp
14534 _ASM_EXTABLE(1b,ia32_badarg)
14535 ASM_CLAC
14536 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14537 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14538 +
14539 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14540 + ASM_PAX_CLOSE_USERLAND
14541 +#endif
14542 +
14543 + GET_THREAD_INFO(%r11)
14544 + orl $TS_COMPAT,TI_status(%r11)
14545 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14546 CFI_REMEMBER_STATE
14547 jnz sysenter_tracesys
14548 cmpq $(IA32_NR_syscalls-1),%rax
14549 @@ -162,15 +209,18 @@ sysenter_do_call:
14550 sysenter_dispatch:
14551 call *ia32_sys_call_table(,%rax,8)
14552 movq %rax,RAX-ARGOFFSET(%rsp)
14553 + GET_THREAD_INFO(%r11)
14554 DISABLE_INTERRUPTS(CLBR_NONE)
14555 TRACE_IRQS_OFF
14556 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14557 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14558 jnz sysexit_audit
14559 sysexit_from_sys_call:
14560 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14561 + pax_exit_kernel_user
14562 + pax_erase_kstack
14563 + andl $~TS_COMPAT,TI_status(%r11)
14564 /* clear IF, that popfq doesn't enable interrupts early */
14565 - andl $~0x200,EFLAGS-R11(%rsp)
14566 - movl RIP-R11(%rsp),%edx /* User %eip */
14567 + andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
14568 + movl RIP(%rsp),%edx /* User %eip */
14569 CFI_REGISTER rip,rdx
14570 RESTORE_ARGS 0,24,0,0,0,0
14571 xorq %r8,%r8
14572 @@ -193,6 +243,9 @@ sysexit_from_sys_call:
14573 movl %eax,%esi /* 2nd arg: syscall number */
14574 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
14575 call __audit_syscall_entry
14576 +
14577 + pax_erase_kstack
14578 +
14579 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14580 cmpq $(IA32_NR_syscalls-1),%rax
14581 ja ia32_badsys
14582 @@ -204,7 +257,7 @@ sysexit_from_sys_call:
14583 .endm
14584
14585 .macro auditsys_exit exit
14586 - testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14587 + testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14588 jnz ia32_ret_from_sys_call
14589 TRACE_IRQS_ON
14590 ENABLE_INTERRUPTS(CLBR_NONE)
14591 @@ -215,11 +268,12 @@ sysexit_from_sys_call:
14592 1: setbe %al /* 1 if error, 0 if not */
14593 movzbl %al,%edi /* zero-extend that into %edi */
14594 call __audit_syscall_exit
14595 + GET_THREAD_INFO(%r11)
14596 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14597 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14598 DISABLE_INTERRUPTS(CLBR_NONE)
14599 TRACE_IRQS_OFF
14600 - testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14601 + testl %edi,TI_flags(%r11)
14602 jz \exit
14603 CLEAR_RREGS -ARGOFFSET
14604 jmp int_with_check
14605 @@ -237,7 +291,7 @@ sysexit_audit:
14606
14607 sysenter_tracesys:
14608 #ifdef CONFIG_AUDITSYSCALL
14609 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14610 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14611 jz sysenter_auditsys
14612 #endif
14613 SAVE_REST
14614 @@ -249,6 +303,9 @@ sysenter_tracesys:
14615 RESTORE_REST
14616 cmpq $(IA32_NR_syscalls-1),%rax
14617 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14618 +
14619 + pax_erase_kstack
14620 +
14621 jmp sysenter_do_call
14622 CFI_ENDPROC
14623 ENDPROC(ia32_sysenter_target)
14624 @@ -276,19 +333,25 @@ ENDPROC(ia32_sysenter_target)
14625 ENTRY(ia32_cstar_target)
14626 CFI_STARTPROC32 simple
14627 CFI_SIGNAL_FRAME
14628 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14629 + CFI_DEF_CFA rsp,0
14630 CFI_REGISTER rip,rcx
14631 /*CFI_REGISTER rflags,r11*/
14632 SWAPGS_UNSAFE_STACK
14633 movl %esp,%r8d
14634 CFI_REGISTER rsp,r8
14635 movq PER_CPU_VAR(kernel_stack),%rsp
14636 + SAVE_ARGS 8*6,0,0
14637 + pax_enter_kernel_user
14638 +
14639 +#ifdef CONFIG_PAX_RANDKSTACK
14640 + pax_erase_kstack
14641 +#endif
14642 +
14643 /*
14644 * No need to follow this irqs on/off section: the syscall
14645 * disabled irqs and here we enable it straight after entry:
14646 */
14647 ENABLE_INTERRUPTS(CLBR_NONE)
14648 - SAVE_ARGS 8,0,0
14649 movl %eax,%eax /* zero extension */
14650 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14651 movq %rcx,RIP-ARGOFFSET(%rsp)
14652 @@ -304,12 +367,25 @@ ENTRY(ia32_cstar_target)
14653 /* no need to do an access_ok check here because r8 has been
14654 32bit zero extended */
14655 /* hardware stack frame is complete now */
14656 +
14657 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14658 + ASM_PAX_OPEN_USERLAND
14659 + movq pax_user_shadow_base,%r8
14660 + addq RSP-ARGOFFSET(%rsp),%r8
14661 +#endif
14662 +
14663 ASM_STAC
14664 1: movl (%r8),%r9d
14665 _ASM_EXTABLE(1b,ia32_badarg)
14666 ASM_CLAC
14667 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14668 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14669 +
14670 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14671 + ASM_PAX_CLOSE_USERLAND
14672 +#endif
14673 +
14674 + GET_THREAD_INFO(%r11)
14675 + orl $TS_COMPAT,TI_status(%r11)
14676 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14677 CFI_REMEMBER_STATE
14678 jnz cstar_tracesys
14679 cmpq $IA32_NR_syscalls-1,%rax
14680 @@ -319,13 +395,16 @@ cstar_do_call:
14681 cstar_dispatch:
14682 call *ia32_sys_call_table(,%rax,8)
14683 movq %rax,RAX-ARGOFFSET(%rsp)
14684 + GET_THREAD_INFO(%r11)
14685 DISABLE_INTERRUPTS(CLBR_NONE)
14686 TRACE_IRQS_OFF
14687 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14688 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14689 jnz sysretl_audit
14690 sysretl_from_sys_call:
14691 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14692 - RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14693 + pax_exit_kernel_user
14694 + pax_erase_kstack
14695 + andl $~TS_COMPAT,TI_status(%r11)
14696 + RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14697 movl RIP-ARGOFFSET(%rsp),%ecx
14698 CFI_REGISTER rip,rcx
14699 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14700 @@ -352,7 +431,7 @@ sysretl_audit:
14701
14702 cstar_tracesys:
14703 #ifdef CONFIG_AUDITSYSCALL
14704 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14705 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14706 jz cstar_auditsys
14707 #endif
14708 xchgl %r9d,%ebp
14709 @@ -366,11 +445,19 @@ cstar_tracesys:
14710 xchgl %ebp,%r9d
14711 cmpq $(IA32_NR_syscalls-1),%rax
14712 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14713 +
14714 + pax_erase_kstack
14715 +
14716 jmp cstar_do_call
14717 END(ia32_cstar_target)
14718
14719 ia32_badarg:
14720 ASM_CLAC
14721 +
14722 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14723 + ASM_PAX_CLOSE_USERLAND
14724 +#endif
14725 +
14726 movq $-EFAULT,%rax
14727 jmp ia32_sysret
14728 CFI_ENDPROC
14729 @@ -407,19 +494,26 @@ ENTRY(ia32_syscall)
14730 CFI_REL_OFFSET rip,RIP-RIP
14731 PARAVIRT_ADJUST_EXCEPTION_FRAME
14732 SWAPGS
14733 - /*
14734 - * No need to follow this irqs on/off section: the syscall
14735 - * disabled irqs and here we enable it straight after entry:
14736 - */
14737 - ENABLE_INTERRUPTS(CLBR_NONE)
14738 movl %eax,%eax
14739 pushq_cfi %rax
14740 cld
14741 /* note the registers are not zero extended to the sf.
14742 this could be a problem. */
14743 SAVE_ARGS 0,1,0
14744 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14745 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14746 + pax_enter_kernel_user
14747 +
14748 +#ifdef CONFIG_PAX_RANDKSTACK
14749 + pax_erase_kstack
14750 +#endif
14751 +
14752 + /*
14753 + * No need to follow this irqs on/off section: the syscall
14754 + * disabled irqs and here we enable it straight after entry:
14755 + */
14756 + ENABLE_INTERRUPTS(CLBR_NONE)
14757 + GET_THREAD_INFO(%r11)
14758 + orl $TS_COMPAT,TI_status(%r11)
14759 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14760 jnz ia32_tracesys
14761 cmpq $(IA32_NR_syscalls-1),%rax
14762 ja ia32_badsys
14763 @@ -442,6 +536,9 @@ ia32_tracesys:
14764 RESTORE_REST
14765 cmpq $(IA32_NR_syscalls-1),%rax
14766 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
14767 +
14768 + pax_erase_kstack
14769 +
14770 jmp ia32_do_call
14771 END(ia32_syscall)
14772
14773 diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
14774 index 8e0ceec..af13504 100644
14775 --- a/arch/x86/ia32/sys_ia32.c
14776 +++ b/arch/x86/ia32/sys_ia32.c
14777 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
14778 */
14779 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
14780 {
14781 - typeof(ubuf->st_uid) uid = 0;
14782 - typeof(ubuf->st_gid) gid = 0;
14783 + typeof(((struct stat64 *)0)->st_uid) uid = 0;
14784 + typeof(((struct stat64 *)0)->st_gid) gid = 0;
14785 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
14786 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
14787 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
14788 diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
14789 index 372231c..51b537d 100644
14790 --- a/arch/x86/include/asm/alternative-asm.h
14791 +++ b/arch/x86/include/asm/alternative-asm.h
14792 @@ -18,6 +18,45 @@
14793 .endm
14794 #endif
14795
14796 +#ifdef KERNEXEC_PLUGIN
14797 + .macro pax_force_retaddr_bts rip=0
14798 + btsq $63,\rip(%rsp)
14799 + .endm
14800 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
14801 + .macro pax_force_retaddr rip=0, reload=0
14802 + btsq $63,\rip(%rsp)
14803 + .endm
14804 + .macro pax_force_fptr ptr
14805 + btsq $63,\ptr
14806 + .endm
14807 + .macro pax_set_fptr_mask
14808 + .endm
14809 +#endif
14810 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14811 + .macro pax_force_retaddr rip=0, reload=0
14812 + .if \reload
14813 + pax_set_fptr_mask
14814 + .endif
14815 + orq %r12,\rip(%rsp)
14816 + .endm
14817 + .macro pax_force_fptr ptr
14818 + orq %r12,\ptr
14819 + .endm
14820 + .macro pax_set_fptr_mask
14821 + movabs $0x8000000000000000,%r12
14822 + .endm
14823 +#endif
14824 +#else
14825 + .macro pax_force_retaddr rip=0, reload=0
14826 + .endm
14827 + .macro pax_force_fptr ptr
14828 + .endm
14829 + .macro pax_force_retaddr_bts rip=0
14830 + .endm
14831 + .macro pax_set_fptr_mask
14832 + .endm
14833 +#endif
14834 +
14835 .macro altinstruction_entry orig alt feature orig_len alt_len
14836 .long \orig - .
14837 .long \alt - .
14838 diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
14839 index 0a3f9c9..c9d081d 100644
14840 --- a/arch/x86/include/asm/alternative.h
14841 +++ b/arch/x86/include/asm/alternative.h
14842 @@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
14843 ".pushsection .discard,\"aw\",@progbits\n" \
14844 DISCARD_ENTRY(1) \
14845 ".popsection\n" \
14846 - ".pushsection .altinstr_replacement, \"ax\"\n" \
14847 + ".pushsection .altinstr_replacement, \"a\"\n" \
14848 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
14849 ".popsection"
14850
14851 @@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
14852 DISCARD_ENTRY(1) \
14853 DISCARD_ENTRY(2) \
14854 ".popsection\n" \
14855 - ".pushsection .altinstr_replacement, \"ax\"\n" \
14856 + ".pushsection .altinstr_replacement, \"a\"\n" \
14857 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
14858 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
14859 ".popsection"
14860 diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
14861 index 19b0eba..12254cd 100644
14862 --- a/arch/x86/include/asm/apic.h
14863 +++ b/arch/x86/include/asm/apic.h
14864 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
14865
14866 #ifdef CONFIG_X86_LOCAL_APIC
14867
14868 -extern unsigned int apic_verbosity;
14869 +extern int apic_verbosity;
14870 extern int local_apic_timer_c2_ok;
14871
14872 extern int disable_apic;
14873 diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
14874 index 20370c6..a2eb9b0 100644
14875 --- a/arch/x86/include/asm/apm.h
14876 +++ b/arch/x86/include/asm/apm.h
14877 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
14878 __asm__ __volatile__(APM_DO_ZERO_SEGS
14879 "pushl %%edi\n\t"
14880 "pushl %%ebp\n\t"
14881 - "lcall *%%cs:apm_bios_entry\n\t"
14882 + "lcall *%%ss:apm_bios_entry\n\t"
14883 "setc %%al\n\t"
14884 "popl %%ebp\n\t"
14885 "popl %%edi\n\t"
14886 @@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
14887 __asm__ __volatile__(APM_DO_ZERO_SEGS
14888 "pushl %%edi\n\t"
14889 "pushl %%ebp\n\t"
14890 - "lcall *%%cs:apm_bios_entry\n\t"
14891 + "lcall *%%ss:apm_bios_entry\n\t"
14892 "setc %%bl\n\t"
14893 "popl %%ebp\n\t"
14894 "popl %%edi\n\t"
14895 diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
14896 index b17f4f4..9620151 100644
14897 --- a/arch/x86/include/asm/atomic.h
14898 +++ b/arch/x86/include/asm/atomic.h
14899 @@ -23,7 +23,18 @@
14900 */
14901 static inline int atomic_read(const atomic_t *v)
14902 {
14903 - return (*(volatile int *)&(v)->counter);
14904 + return (*(volatile const int *)&(v)->counter);
14905 +}
14906 +
14907 +/**
14908 + * atomic_read_unchecked - read atomic variable
14909 + * @v: pointer of type atomic_unchecked_t
14910 + *
14911 + * Atomically reads the value of @v.
14912 + */
14913 +static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
14914 +{
14915 + return (*(volatile const int *)&(v)->counter);
14916 }
14917
14918 /**
14919 @@ -39,6 +50,18 @@ static inline void atomic_set(atomic_t *v, int i)
14920 }
14921
14922 /**
14923 + * atomic_set_unchecked - set atomic variable
14924 + * @v: pointer of type atomic_unchecked_t
14925 + * @i: required value
14926 + *
14927 + * Atomically sets the value of @v to @i.
14928 + */
14929 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
14930 +{
14931 + v->counter = i;
14932 +}
14933 +
14934 +/**
14935 * atomic_add - add integer to atomic variable
14936 * @i: integer value to add
14937 * @v: pointer of type atomic_t
14938 @@ -47,7 +70,29 @@ static inline void atomic_set(atomic_t *v, int i)
14939 */
14940 static inline void atomic_add(int i, atomic_t *v)
14941 {
14942 - asm volatile(LOCK_PREFIX "addl %1,%0"
14943 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
14944 +
14945 +#ifdef CONFIG_PAX_REFCOUNT
14946 + "jno 0f\n"
14947 + LOCK_PREFIX "subl %1,%0\n"
14948 + "int $4\n0:\n"
14949 + _ASM_EXTABLE(0b, 0b)
14950 +#endif
14951 +
14952 + : "+m" (v->counter)
14953 + : "ir" (i));
14954 +}
14955 +
14956 +/**
14957 + * atomic_add_unchecked - add integer to atomic variable
14958 + * @i: integer value to add
14959 + * @v: pointer of type atomic_unchecked_t
14960 + *
14961 + * Atomically adds @i to @v.
14962 + */
14963 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
14964 +{
14965 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
14966 : "+m" (v->counter)
14967 : "ir" (i));
14968 }
14969 @@ -61,7 +106,29 @@ static inline void atomic_add(int i, atomic_t *v)
14970 */
14971 static inline void atomic_sub(int i, atomic_t *v)
14972 {
14973 - asm volatile(LOCK_PREFIX "subl %1,%0"
14974 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
14975 +
14976 +#ifdef CONFIG_PAX_REFCOUNT
14977 + "jno 0f\n"
14978 + LOCK_PREFIX "addl %1,%0\n"
14979 + "int $4\n0:\n"
14980 + _ASM_EXTABLE(0b, 0b)
14981 +#endif
14982 +
14983 + : "+m" (v->counter)
14984 + : "ir" (i));
14985 +}
14986 +
14987 +/**
14988 + * atomic_sub_unchecked - subtract integer from atomic variable
14989 + * @i: integer value to subtract
14990 + * @v: pointer of type atomic_unchecked_t
14991 + *
14992 + * Atomically subtracts @i from @v.
14993 + */
14994 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
14995 +{
14996 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
14997 : "+m" (v->counter)
14998 : "ir" (i));
14999 }
15000 @@ -77,7 +144,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15001 */
15002 static inline int atomic_sub_and_test(int i, atomic_t *v)
15003 {
15004 - GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15005 + GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15006 }
15007
15008 /**
15009 @@ -88,7 +155,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15010 */
15011 static inline void atomic_inc(atomic_t *v)
15012 {
15013 - asm volatile(LOCK_PREFIX "incl %0"
15014 + asm volatile(LOCK_PREFIX "incl %0\n"
15015 +
15016 +#ifdef CONFIG_PAX_REFCOUNT
15017 + "jno 0f\n"
15018 + LOCK_PREFIX "decl %0\n"
15019 + "int $4\n0:\n"
15020 + _ASM_EXTABLE(0b, 0b)
15021 +#endif
15022 +
15023 + : "+m" (v->counter));
15024 +}
15025 +
15026 +/**
15027 + * atomic_inc_unchecked - increment atomic variable
15028 + * @v: pointer of type atomic_unchecked_t
15029 + *
15030 + * Atomically increments @v by 1.
15031 + */
15032 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15033 +{
15034 + asm volatile(LOCK_PREFIX "incl %0\n"
15035 : "+m" (v->counter));
15036 }
15037
15038 @@ -100,7 +187,27 @@ static inline void atomic_inc(atomic_t *v)
15039 */
15040 static inline void atomic_dec(atomic_t *v)
15041 {
15042 - asm volatile(LOCK_PREFIX "decl %0"
15043 + asm volatile(LOCK_PREFIX "decl %0\n"
15044 +
15045 +#ifdef CONFIG_PAX_REFCOUNT
15046 + "jno 0f\n"
15047 + LOCK_PREFIX "incl %0\n"
15048 + "int $4\n0:\n"
15049 + _ASM_EXTABLE(0b, 0b)
15050 +#endif
15051 +
15052 + : "+m" (v->counter));
15053 +}
15054 +
15055 +/**
15056 + * atomic_dec_unchecked - decrement atomic variable
15057 + * @v: pointer of type atomic_unchecked_t
15058 + *
15059 + * Atomically decrements @v by 1.
15060 + */
15061 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15062 +{
15063 + asm volatile(LOCK_PREFIX "decl %0\n"
15064 : "+m" (v->counter));
15065 }
15066
15067 @@ -114,7 +221,7 @@ static inline void atomic_dec(atomic_t *v)
15068 */
15069 static inline int atomic_dec_and_test(atomic_t *v)
15070 {
15071 - GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15072 + GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15073 }
15074
15075 /**
15076 @@ -127,7 +234,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15077 */
15078 static inline int atomic_inc_and_test(atomic_t *v)
15079 {
15080 - GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15081 + GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15082 +}
15083 +
15084 +/**
15085 + * atomic_inc_and_test_unchecked - increment and test
15086 + * @v: pointer of type atomic_unchecked_t
15087 + *
15088 + * Atomically increments @v by 1
15089 + * and returns true if the result is zero, or false for all
15090 + * other cases.
15091 + */
15092 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15093 +{
15094 + GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15095 }
15096
15097 /**
15098 @@ -141,7 +261,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15099 */
15100 static inline int atomic_add_negative(int i, atomic_t *v)
15101 {
15102 - GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15103 + GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15104 }
15105
15106 /**
15107 @@ -153,6 +273,18 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15108 */
15109 static inline int atomic_add_return(int i, atomic_t *v)
15110 {
15111 + return i + xadd_check_overflow(&v->counter, i);
15112 +}
15113 +
15114 +/**
15115 + * atomic_add_return_unchecked - add integer and return
15116 + * @i: integer value to add
15117 + * @v: pointer of type atomic_unchecked_t
15118 + *
15119 + * Atomically adds @i to @v and returns @i + @v
15120 + */
15121 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15122 +{
15123 return i + xadd(&v->counter, i);
15124 }
15125
15126 @@ -169,9 +301,18 @@ static inline int atomic_sub_return(int i, atomic_t *v)
15127 }
15128
15129 #define atomic_inc_return(v) (atomic_add_return(1, v))
15130 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15131 +{
15132 + return atomic_add_return_unchecked(1, v);
15133 +}
15134 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15135
15136 -static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15137 +static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15138 +{
15139 + return cmpxchg(&v->counter, old, new);
15140 +}
15141 +
15142 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15143 {
15144 return cmpxchg(&v->counter, old, new);
15145 }
15146 @@ -181,6 +322,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15147 return xchg(&v->counter, new);
15148 }
15149
15150 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15151 +{
15152 + return xchg(&v->counter, new);
15153 +}
15154 +
15155 /**
15156 * __atomic_add_unless - add unless the number is already a given value
15157 * @v: pointer of type atomic_t
15158 @@ -190,14 +336,27 @@ static inline int atomic_xchg(atomic_t *v, int new)
15159 * Atomically adds @a to @v, so long as @v was not already @u.
15160 * Returns the old value of @v.
15161 */
15162 -static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15163 +static inline int __intentional_overflow(-1) __atomic_add_unless(atomic_t *v, int a, int u)
15164 {
15165 - int c, old;
15166 + int c, old, new;
15167 c = atomic_read(v);
15168 for (;;) {
15169 - if (unlikely(c == (u)))
15170 + if (unlikely(c == u))
15171 break;
15172 - old = atomic_cmpxchg((v), c, c + (a));
15173 +
15174 + asm volatile("addl %2,%0\n"
15175 +
15176 +#ifdef CONFIG_PAX_REFCOUNT
15177 + "jno 0f\n"
15178 + "subl %2,%0\n"
15179 + "int $4\n0:\n"
15180 + _ASM_EXTABLE(0b, 0b)
15181 +#endif
15182 +
15183 + : "=r" (new)
15184 + : "0" (c), "ir" (a));
15185 +
15186 + old = atomic_cmpxchg(v, c, new);
15187 if (likely(old == c))
15188 break;
15189 c = old;
15190 @@ -206,6 +365,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15191 }
15192
15193 /**
15194 + * atomic_inc_not_zero_hint - increment if not null
15195 + * @v: pointer of type atomic_t
15196 + * @hint: probable value of the atomic before the increment
15197 + *
15198 + * This version of atomic_inc_not_zero() gives a hint of probable
15199 + * value of the atomic. This helps processor to not read the memory
15200 + * before doing the atomic read/modify/write cycle, lowering
15201 + * number of bus transactions on some arches.
15202 + *
15203 + * Returns: 0 if increment was not done, 1 otherwise.
15204 + */
15205 +#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15206 +static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15207 +{
15208 + int val, c = hint, new;
15209 +
15210 + /* sanity test, should be removed by compiler if hint is a constant */
15211 + if (!hint)
15212 + return __atomic_add_unless(v, 1, 0);
15213 +
15214 + do {
15215 + asm volatile("incl %0\n"
15216 +
15217 +#ifdef CONFIG_PAX_REFCOUNT
15218 + "jno 0f\n"
15219 + "decl %0\n"
15220 + "int $4\n0:\n"
15221 + _ASM_EXTABLE(0b, 0b)
15222 +#endif
15223 +
15224 + : "=r" (new)
15225 + : "0" (c));
15226 +
15227 + val = atomic_cmpxchg(v, c, new);
15228 + if (val == c)
15229 + return 1;
15230 + c = val;
15231 + } while (c);
15232 +
15233 + return 0;
15234 +}
15235 +
15236 +/**
15237 * atomic_inc_short - increment of a short integer
15238 * @v: pointer to type int
15239 *
15240 @@ -234,14 +436,37 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
15241 #endif
15242
15243 /* These are x86-specific, used by some header files */
15244 -#define atomic_clear_mask(mask, addr) \
15245 - asm volatile(LOCK_PREFIX "andl %0,%1" \
15246 - : : "r" (~(mask)), "m" (*(addr)) : "memory")
15247 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15248 +{
15249 + asm volatile(LOCK_PREFIX "andl %1,%0"
15250 + : "+m" (v->counter)
15251 + : "r" (~(mask))
15252 + : "memory");
15253 +}
15254
15255 -#define atomic_set_mask(mask, addr) \
15256 - asm volatile(LOCK_PREFIX "orl %0,%1" \
15257 - : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15258 - : "memory")
15259 +static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15260 +{
15261 + asm volatile(LOCK_PREFIX "andl %1,%0"
15262 + : "+m" (v->counter)
15263 + : "r" (~(mask))
15264 + : "memory");
15265 +}
15266 +
15267 +static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15268 +{
15269 + asm volatile(LOCK_PREFIX "orl %1,%0"
15270 + : "+m" (v->counter)
15271 + : "r" (mask)
15272 + : "memory");
15273 +}
15274 +
15275 +static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15276 +{
15277 + asm volatile(LOCK_PREFIX "orl %1,%0"
15278 + : "+m" (v->counter)
15279 + : "r" (mask)
15280 + : "memory");
15281 +}
15282
15283 /* Atomic operations are already serializing on x86 */
15284 #define smp_mb__before_atomic_dec() barrier()
15285 diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15286 index b154de7..bf18a5a 100644
15287 --- a/arch/x86/include/asm/atomic64_32.h
15288 +++ b/arch/x86/include/asm/atomic64_32.h
15289 @@ -12,6 +12,14 @@ typedef struct {
15290 u64 __aligned(8) counter;
15291 } atomic64_t;
15292
15293 +#ifdef CONFIG_PAX_REFCOUNT
15294 +typedef struct {
15295 + u64 __aligned(8) counter;
15296 +} atomic64_unchecked_t;
15297 +#else
15298 +typedef atomic64_t atomic64_unchecked_t;
15299 +#endif
15300 +
15301 #define ATOMIC64_INIT(val) { (val) }
15302
15303 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15304 @@ -37,21 +45,31 @@ typedef struct {
15305 ATOMIC64_DECL_ONE(sym##_386)
15306
15307 ATOMIC64_DECL_ONE(add_386);
15308 +ATOMIC64_DECL_ONE(add_unchecked_386);
15309 ATOMIC64_DECL_ONE(sub_386);
15310 +ATOMIC64_DECL_ONE(sub_unchecked_386);
15311 ATOMIC64_DECL_ONE(inc_386);
15312 +ATOMIC64_DECL_ONE(inc_unchecked_386);
15313 ATOMIC64_DECL_ONE(dec_386);
15314 +ATOMIC64_DECL_ONE(dec_unchecked_386);
15315 #endif
15316
15317 #define alternative_atomic64(f, out, in...) \
15318 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15319
15320 ATOMIC64_DECL(read);
15321 +ATOMIC64_DECL(read_unchecked);
15322 ATOMIC64_DECL(set);
15323 +ATOMIC64_DECL(set_unchecked);
15324 ATOMIC64_DECL(xchg);
15325 ATOMIC64_DECL(add_return);
15326 +ATOMIC64_DECL(add_return_unchecked);
15327 ATOMIC64_DECL(sub_return);
15328 +ATOMIC64_DECL(sub_return_unchecked);
15329 ATOMIC64_DECL(inc_return);
15330 +ATOMIC64_DECL(inc_return_unchecked);
15331 ATOMIC64_DECL(dec_return);
15332 +ATOMIC64_DECL(dec_return_unchecked);
15333 ATOMIC64_DECL(dec_if_positive);
15334 ATOMIC64_DECL(inc_not_zero);
15335 ATOMIC64_DECL(add_unless);
15336 @@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15337 }
15338
15339 /**
15340 + * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15341 + * @p: pointer to type atomic64_unchecked_t
15342 + * @o: expected value
15343 + * @n: new value
15344 + *
15345 + * Atomically sets @v to @n if it was equal to @o and returns
15346 + * the old value.
15347 + */
15348 +
15349 +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15350 +{
15351 + return cmpxchg64(&v->counter, o, n);
15352 +}
15353 +
15354 +/**
15355 * atomic64_xchg - xchg atomic64 variable
15356 * @v: pointer to type atomic64_t
15357 * @n: value to assign
15358 @@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15359 }
15360
15361 /**
15362 + * atomic64_set_unchecked - set atomic64 variable
15363 + * @v: pointer to type atomic64_unchecked_t
15364 + * @n: value to assign
15365 + *
15366 + * Atomically sets the value of @v to @n.
15367 + */
15368 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15369 +{
15370 + unsigned high = (unsigned)(i >> 32);
15371 + unsigned low = (unsigned)i;
15372 + alternative_atomic64(set, /* no output */,
15373 + "S" (v), "b" (low), "c" (high)
15374 + : "eax", "edx", "memory");
15375 +}
15376 +
15377 +/**
15378 * atomic64_read - read atomic64 variable
15379 * @v: pointer to type atomic64_t
15380 *
15381 @@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15382 }
15383
15384 /**
15385 + * atomic64_read_unchecked - read atomic64 variable
15386 + * @v: pointer to type atomic64_unchecked_t
15387 + *
15388 + * Atomically reads the value of @v and returns it.
15389 + */
15390 +static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15391 +{
15392 + long long r;
15393 + alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15394 + return r;
15395 + }
15396 +
15397 +/**
15398 * atomic64_add_return - add and return
15399 * @i: integer value to add
15400 * @v: pointer to type atomic64_t
15401 @@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15402 return i;
15403 }
15404
15405 +/**
15406 + * atomic64_add_return_unchecked - add and return
15407 + * @i: integer value to add
15408 + * @v: pointer to type atomic64_unchecked_t
15409 + *
15410 + * Atomically adds @i to @v and returns @i + *@v
15411 + */
15412 +static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15413 +{
15414 + alternative_atomic64(add_return_unchecked,
15415 + ASM_OUTPUT2("+A" (i), "+c" (v)),
15416 + ASM_NO_INPUT_CLOBBER("memory"));
15417 + return i;
15418 +}
15419 +
15420 /*
15421 * Other variants with different arithmetic operators:
15422 */
15423 @@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15424 return a;
15425 }
15426
15427 +static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15428 +{
15429 + long long a;
15430 + alternative_atomic64(inc_return_unchecked, "=&A" (a),
15431 + "S" (v) : "memory", "ecx");
15432 + return a;
15433 +}
15434 +
15435 static inline long long atomic64_dec_return(atomic64_t *v)
15436 {
15437 long long a;
15438 @@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15439 }
15440
15441 /**
15442 + * atomic64_add_unchecked - add integer to atomic64 variable
15443 + * @i: integer value to add
15444 + * @v: pointer to type atomic64_unchecked_t
15445 + *
15446 + * Atomically adds @i to @v.
15447 + */
15448 +static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15449 +{
15450 + __alternative_atomic64(add_unchecked, add_return_unchecked,
15451 + ASM_OUTPUT2("+A" (i), "+c" (v)),
15452 + ASM_NO_INPUT_CLOBBER("memory"));
15453 + return i;
15454 +}
15455 +
15456 +/**
15457 * atomic64_sub - subtract the atomic64 variable
15458 * @i: integer value to subtract
15459 * @v: pointer to type atomic64_t
15460 diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15461 index 46e9052..ae45136 100644
15462 --- a/arch/x86/include/asm/atomic64_64.h
15463 +++ b/arch/x86/include/asm/atomic64_64.h
15464 @@ -18,7 +18,19 @@
15465 */
15466 static inline long atomic64_read(const atomic64_t *v)
15467 {
15468 - return (*(volatile long *)&(v)->counter);
15469 + return (*(volatile const long *)&(v)->counter);
15470 +}
15471 +
15472 +/**
15473 + * atomic64_read_unchecked - read atomic64 variable
15474 + * @v: pointer of type atomic64_unchecked_t
15475 + *
15476 + * Atomically reads the value of @v.
15477 + * Doesn't imply a read memory barrier.
15478 + */
15479 +static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15480 +{
15481 + return (*(volatile const long *)&(v)->counter);
15482 }
15483
15484 /**
15485 @@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15486 }
15487
15488 /**
15489 + * atomic64_set_unchecked - set atomic64 variable
15490 + * @v: pointer to type atomic64_unchecked_t
15491 + * @i: required value
15492 + *
15493 + * Atomically sets the value of @v to @i.
15494 + */
15495 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15496 +{
15497 + v->counter = i;
15498 +}
15499 +
15500 +/**
15501 * atomic64_add - add integer to atomic64 variable
15502 * @i: integer value to add
15503 * @v: pointer to type atomic64_t
15504 @@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15505 */
15506 static inline void atomic64_add(long i, atomic64_t *v)
15507 {
15508 + asm volatile(LOCK_PREFIX "addq %1,%0\n"
15509 +
15510 +#ifdef CONFIG_PAX_REFCOUNT
15511 + "jno 0f\n"
15512 + LOCK_PREFIX "subq %1,%0\n"
15513 + "int $4\n0:\n"
15514 + _ASM_EXTABLE(0b, 0b)
15515 +#endif
15516 +
15517 + : "=m" (v->counter)
15518 + : "er" (i), "m" (v->counter));
15519 +}
15520 +
15521 +/**
15522 + * atomic64_add_unchecked - add integer to atomic64 variable
15523 + * @i: integer value to add
15524 + * @v: pointer to type atomic64_unchecked_t
15525 + *
15526 + * Atomically adds @i to @v.
15527 + */
15528 +static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15529 +{
15530 asm volatile(LOCK_PREFIX "addq %1,%0"
15531 : "=m" (v->counter)
15532 : "er" (i), "m" (v->counter));
15533 @@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15534 */
15535 static inline void atomic64_sub(long i, atomic64_t *v)
15536 {
15537 - asm volatile(LOCK_PREFIX "subq %1,%0"
15538 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
15539 +
15540 +#ifdef CONFIG_PAX_REFCOUNT
15541 + "jno 0f\n"
15542 + LOCK_PREFIX "addq %1,%0\n"
15543 + "int $4\n0:\n"
15544 + _ASM_EXTABLE(0b, 0b)
15545 +#endif
15546 +
15547 + : "=m" (v->counter)
15548 + : "er" (i), "m" (v->counter));
15549 +}
15550 +
15551 +/**
15552 + * atomic64_sub_unchecked - subtract the atomic64 variable
15553 + * @i: integer value to subtract
15554 + * @v: pointer to type atomic64_unchecked_t
15555 + *
15556 + * Atomically subtracts @i from @v.
15557 + */
15558 +static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15559 +{
15560 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
15561 : "=m" (v->counter)
15562 : "er" (i), "m" (v->counter));
15563 }
15564 @@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15565 */
15566 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15567 {
15568 - GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15569 + GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15570 }
15571
15572 /**
15573 @@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15574 */
15575 static inline void atomic64_inc(atomic64_t *v)
15576 {
15577 + asm volatile(LOCK_PREFIX "incq %0\n"
15578 +
15579 +#ifdef CONFIG_PAX_REFCOUNT
15580 + "jno 0f\n"
15581 + LOCK_PREFIX "decq %0\n"
15582 + "int $4\n0:\n"
15583 + _ASM_EXTABLE(0b, 0b)
15584 +#endif
15585 +
15586 + : "=m" (v->counter)
15587 + : "m" (v->counter));
15588 +}
15589 +
15590 +/**
15591 + * atomic64_inc_unchecked - increment atomic64 variable
15592 + * @v: pointer to type atomic64_unchecked_t
15593 + *
15594 + * Atomically increments @v by 1.
15595 + */
15596 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15597 +{
15598 asm volatile(LOCK_PREFIX "incq %0"
15599 : "=m" (v->counter)
15600 : "m" (v->counter));
15601 @@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15602 */
15603 static inline void atomic64_dec(atomic64_t *v)
15604 {
15605 - asm volatile(LOCK_PREFIX "decq %0"
15606 + asm volatile(LOCK_PREFIX "decq %0\n"
15607 +
15608 +#ifdef CONFIG_PAX_REFCOUNT
15609 + "jno 0f\n"
15610 + LOCK_PREFIX "incq %0\n"
15611 + "int $4\n0:\n"
15612 + _ASM_EXTABLE(0b, 0b)
15613 +#endif
15614 +
15615 + : "=m" (v->counter)
15616 + : "m" (v->counter));
15617 +}
15618 +
15619 +/**
15620 + * atomic64_dec_unchecked - decrement atomic64 variable
15621 + * @v: pointer to type atomic64_t
15622 + *
15623 + * Atomically decrements @v by 1.
15624 + */
15625 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15626 +{
15627 + asm volatile(LOCK_PREFIX "decq %0\n"
15628 : "=m" (v->counter)
15629 : "m" (v->counter));
15630 }
15631 @@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15632 */
15633 static inline int atomic64_dec_and_test(atomic64_t *v)
15634 {
15635 - GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15636 + GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15637 }
15638
15639 /**
15640 @@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15641 */
15642 static inline int atomic64_inc_and_test(atomic64_t *v)
15643 {
15644 - GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15645 + GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15646 }
15647
15648 /**
15649 @@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15650 */
15651 static inline int atomic64_add_negative(long i, atomic64_t *v)
15652 {
15653 - GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15654 + GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15655 }
15656
15657 /**
15658 @@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15659 */
15660 static inline long atomic64_add_return(long i, atomic64_t *v)
15661 {
15662 + return i + xadd_check_overflow(&v->counter, i);
15663 +}
15664 +
15665 +/**
15666 + * atomic64_add_return_unchecked - add and return
15667 + * @i: integer value to add
15668 + * @v: pointer to type atomic64_unchecked_t
15669 + *
15670 + * Atomically adds @i to @v and returns @i + @v
15671 + */
15672 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15673 +{
15674 return i + xadd(&v->counter, i);
15675 }
15676
15677 @@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15678 }
15679
15680 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15681 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15682 +{
15683 + return atomic64_add_return_unchecked(1, v);
15684 +}
15685 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15686
15687 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15688 @@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15689 return cmpxchg(&v->counter, old, new);
15690 }
15691
15692 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15693 +{
15694 + return cmpxchg(&v->counter, old, new);
15695 +}
15696 +
15697 static inline long atomic64_xchg(atomic64_t *v, long new)
15698 {
15699 return xchg(&v->counter, new);
15700 @@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15701 */
15702 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15703 {
15704 - long c, old;
15705 + long c, old, new;
15706 c = atomic64_read(v);
15707 for (;;) {
15708 - if (unlikely(c == (u)))
15709 + if (unlikely(c == u))
15710 break;
15711 - old = atomic64_cmpxchg((v), c, c + (a));
15712 +
15713 + asm volatile("add %2,%0\n"
15714 +
15715 +#ifdef CONFIG_PAX_REFCOUNT
15716 + "jno 0f\n"
15717 + "sub %2,%0\n"
15718 + "int $4\n0:\n"
15719 + _ASM_EXTABLE(0b, 0b)
15720 +#endif
15721 +
15722 + : "=r" (new)
15723 + : "0" (c), "ir" (a));
15724 +
15725 + old = atomic64_cmpxchg(v, c, new);
15726 if (likely(old == c))
15727 break;
15728 c = old;
15729 }
15730 - return c != (u);
15731 + return c != u;
15732 }
15733
15734 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
15735 diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
15736 index 69bbb48..32517fe 100644
15737 --- a/arch/x86/include/asm/barrier.h
15738 +++ b/arch/x86/include/asm/barrier.h
15739 @@ -107,7 +107,7 @@
15740 do { \
15741 compiletime_assert_atomic_type(*p); \
15742 smp_mb(); \
15743 - ACCESS_ONCE(*p) = (v); \
15744 + ACCESS_ONCE_RW(*p) = (v); \
15745 } while (0)
15746
15747 #define smp_load_acquire(p) \
15748 @@ -124,7 +124,7 @@ do { \
15749 do { \
15750 compiletime_assert_atomic_type(*p); \
15751 barrier(); \
15752 - ACCESS_ONCE(*p) = (v); \
15753 + ACCESS_ONCE_RW(*p) = (v); \
15754 } while (0)
15755
15756 #define smp_load_acquire(p) \
15757 diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
15758 index 9fc1af7..776d75a 100644
15759 --- a/arch/x86/include/asm/bitops.h
15760 +++ b/arch/x86/include/asm/bitops.h
15761 @@ -49,7 +49,7 @@
15762 * a mask operation on a byte.
15763 */
15764 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
15765 -#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
15766 +#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
15767 #define CONST_MASK(nr) (1 << ((nr) & 7))
15768
15769 /**
15770 @@ -205,7 +205,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
15771 */
15772 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
15773 {
15774 - GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
15775 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
15776 }
15777
15778 /**
15779 @@ -251,7 +251,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
15780 */
15781 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
15782 {
15783 - GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
15784 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
15785 }
15786
15787 /**
15788 @@ -304,7 +304,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
15789 */
15790 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
15791 {
15792 - GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
15793 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
15794 }
15795
15796 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
15797 @@ -345,7 +345,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
15798 *
15799 * Undefined if no bit exists, so code should check against 0 first.
15800 */
15801 -static inline unsigned long __ffs(unsigned long word)
15802 +static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
15803 {
15804 asm("rep; bsf %1,%0"
15805 : "=r" (word)
15806 @@ -359,7 +359,7 @@ static inline unsigned long __ffs(unsigned long word)
15807 *
15808 * Undefined if no zero exists, so code should check against ~0UL first.
15809 */
15810 -static inline unsigned long ffz(unsigned long word)
15811 +static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
15812 {
15813 asm("rep; bsf %1,%0"
15814 : "=r" (word)
15815 @@ -373,7 +373,7 @@ static inline unsigned long ffz(unsigned long word)
15816 *
15817 * Undefined if no set bit exists, so code should check against 0 first.
15818 */
15819 -static inline unsigned long __fls(unsigned long word)
15820 +static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
15821 {
15822 asm("bsr %1,%0"
15823 : "=r" (word)
15824 @@ -436,7 +436,7 @@ static inline int ffs(int x)
15825 * set bit if value is nonzero. The last (most significant) bit is
15826 * at position 32.
15827 */
15828 -static inline int fls(int x)
15829 +static inline int __intentional_overflow(-1) fls(int x)
15830 {
15831 int r;
15832
15833 @@ -478,7 +478,7 @@ static inline int fls(int x)
15834 * at position 64.
15835 */
15836 #ifdef CONFIG_X86_64
15837 -static __always_inline int fls64(__u64 x)
15838 +static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
15839 {
15840 int bitpos = -1;
15841 /*
15842 diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
15843 index 4fa687a..60f2d39 100644
15844 --- a/arch/x86/include/asm/boot.h
15845 +++ b/arch/x86/include/asm/boot.h
15846 @@ -6,10 +6,15 @@
15847 #include <uapi/asm/boot.h>
15848
15849 /* Physical address where kernel should be loaded. */
15850 -#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
15851 +#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
15852 + (CONFIG_PHYSICAL_ALIGN - 1)) \
15853 & ~(CONFIG_PHYSICAL_ALIGN - 1))
15854
15855 +#ifndef __ASSEMBLY__
15856 +extern unsigned char __LOAD_PHYSICAL_ADDR[];
15857 +#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
15858 +#endif
15859 +
15860 /* Minimum kernel alignment, as a power of two */
15861 #ifdef CONFIG_X86_64
15862 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
15863 diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
15864 index 48f99f1..d78ebf9 100644
15865 --- a/arch/x86/include/asm/cache.h
15866 +++ b/arch/x86/include/asm/cache.h
15867 @@ -5,12 +5,13 @@
15868
15869 /* L1 cache line size */
15870 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
15871 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
15872 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
15873
15874 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
15875 +#define __read_only __attribute__((__section__(".data..read_only")))
15876
15877 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
15878 -#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
15879 +#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
15880
15881 #ifdef CONFIG_X86_VSMP
15882 #ifdef CONFIG_SMP
15883 diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
15884 index 9863ee3..4a1f8e1 100644
15885 --- a/arch/x86/include/asm/cacheflush.h
15886 +++ b/arch/x86/include/asm/cacheflush.h
15887 @@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
15888 unsigned long pg_flags = pg->flags & _PGMT_MASK;
15889
15890 if (pg_flags == _PGMT_DEFAULT)
15891 - return -1;
15892 + return ~0UL;
15893 else if (pg_flags == _PGMT_WC)
15894 return _PAGE_CACHE_WC;
15895 else if (pg_flags == _PGMT_UC_MINUS)
15896 diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
15897 index cb4c73b..c473c29 100644
15898 --- a/arch/x86/include/asm/calling.h
15899 +++ b/arch/x86/include/asm/calling.h
15900 @@ -82,103 +82,113 @@ For 32-bit we have the following conventions - kernel is built with
15901 #define RSP 152
15902 #define SS 160
15903
15904 -#define ARGOFFSET R11
15905 -#define SWFRAME ORIG_RAX
15906 +#define ARGOFFSET R15
15907
15908 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1
15909 - subq $9*8+\addskip, %rsp
15910 - CFI_ADJUST_CFA_OFFSET 9*8+\addskip
15911 - movq_cfi rdi, 8*8
15912 - movq_cfi rsi, 7*8
15913 - movq_cfi rdx, 6*8
15914 + subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
15915 + CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
15916 + movq_cfi rdi, RDI
15917 + movq_cfi rsi, RSI
15918 + movq_cfi rdx, RDX
15919
15920 .if \save_rcx
15921 - movq_cfi rcx, 5*8
15922 + movq_cfi rcx, RCX
15923 .endif
15924
15925 - movq_cfi rax, 4*8
15926 + movq_cfi rax, RAX
15927
15928 .if \save_r891011
15929 - movq_cfi r8, 3*8
15930 - movq_cfi r9, 2*8
15931 - movq_cfi r10, 1*8
15932 - movq_cfi r11, 0*8
15933 + movq_cfi r8, R8
15934 + movq_cfi r9, R9
15935 + movq_cfi r10, R10
15936 + movq_cfi r11, R11
15937 .endif
15938
15939 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15940 + movq_cfi r12, R12
15941 +#endif
15942 +
15943 .endm
15944
15945 -#define ARG_SKIP (9*8)
15946 +#define ARG_SKIP ORIG_RAX
15947
15948 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
15949 rstor_r8910=1, rstor_rdx=1
15950 +
15951 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15952 + movq_cfi_restore R12, r12
15953 +#endif
15954 +
15955 .if \rstor_r11
15956 - movq_cfi_restore 0*8, r11
15957 + movq_cfi_restore R11, r11
15958 .endif
15959
15960 .if \rstor_r8910
15961 - movq_cfi_restore 1*8, r10
15962 - movq_cfi_restore 2*8, r9
15963 - movq_cfi_restore 3*8, r8
15964 + movq_cfi_restore R10, r10
15965 + movq_cfi_restore R9, r9
15966 + movq_cfi_restore R8, r8
15967 .endif
15968
15969 .if \rstor_rax
15970 - movq_cfi_restore 4*8, rax
15971 + movq_cfi_restore RAX, rax
15972 .endif
15973
15974 .if \rstor_rcx
15975 - movq_cfi_restore 5*8, rcx
15976 + movq_cfi_restore RCX, rcx
15977 .endif
15978
15979 .if \rstor_rdx
15980 - movq_cfi_restore 6*8, rdx
15981 + movq_cfi_restore RDX, rdx
15982 .endif
15983
15984 - movq_cfi_restore 7*8, rsi
15985 - movq_cfi_restore 8*8, rdi
15986 + movq_cfi_restore RSI, rsi
15987 + movq_cfi_restore RDI, rdi
15988
15989 - .if ARG_SKIP+\addskip > 0
15990 - addq $ARG_SKIP+\addskip, %rsp
15991 - CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
15992 + .if ORIG_RAX+\addskip > 0
15993 + addq $ORIG_RAX+\addskip, %rsp
15994 + CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
15995 .endif
15996 .endm
15997
15998 - .macro LOAD_ARGS offset, skiprax=0
15999 - movq \offset(%rsp), %r11
16000 - movq \offset+8(%rsp), %r10
16001 - movq \offset+16(%rsp), %r9
16002 - movq \offset+24(%rsp), %r8
16003 - movq \offset+40(%rsp), %rcx
16004 - movq \offset+48(%rsp), %rdx
16005 - movq \offset+56(%rsp), %rsi
16006 - movq \offset+64(%rsp), %rdi
16007 + .macro LOAD_ARGS skiprax=0
16008 + movq R11(%rsp), %r11
16009 + movq R10(%rsp), %r10
16010 + movq R9(%rsp), %r9
16011 + movq R8(%rsp), %r8
16012 + movq RCX(%rsp), %rcx
16013 + movq RDX(%rsp), %rdx
16014 + movq RSI(%rsp), %rsi
16015 + movq RDI(%rsp), %rdi
16016 .if \skiprax
16017 .else
16018 - movq \offset+72(%rsp), %rax
16019 + movq RAX(%rsp), %rax
16020 .endif
16021 .endm
16022
16023 -#define REST_SKIP (6*8)
16024 -
16025 .macro SAVE_REST
16026 - subq $REST_SKIP, %rsp
16027 - CFI_ADJUST_CFA_OFFSET REST_SKIP
16028 - movq_cfi rbx, 5*8
16029 - movq_cfi rbp, 4*8
16030 - movq_cfi r12, 3*8
16031 - movq_cfi r13, 2*8
16032 - movq_cfi r14, 1*8
16033 - movq_cfi r15, 0*8
16034 + movq_cfi rbx, RBX
16035 + movq_cfi rbp, RBP
16036 +
16037 +#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16038 + movq_cfi r12, R12
16039 +#endif
16040 +
16041 + movq_cfi r13, R13
16042 + movq_cfi r14, R14
16043 + movq_cfi r15, R15
16044 .endm
16045
16046 .macro RESTORE_REST
16047 - movq_cfi_restore 0*8, r15
16048 - movq_cfi_restore 1*8, r14
16049 - movq_cfi_restore 2*8, r13
16050 - movq_cfi_restore 3*8, r12
16051 - movq_cfi_restore 4*8, rbp
16052 - movq_cfi_restore 5*8, rbx
16053 - addq $REST_SKIP, %rsp
16054 - CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16055 + movq_cfi_restore R15, r15
16056 + movq_cfi_restore R14, r14
16057 + movq_cfi_restore R13, r13
16058 +
16059 +#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16060 + movq_cfi_restore R12, r12
16061 +#endif
16062 +
16063 + movq_cfi_restore RBP, rbp
16064 + movq_cfi_restore RBX, rbx
16065 .endm
16066
16067 .macro SAVE_ALL
16068 diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16069 index f50de69..2b0a458 100644
16070 --- a/arch/x86/include/asm/checksum_32.h
16071 +++ b/arch/x86/include/asm/checksum_32.h
16072 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16073 int len, __wsum sum,
16074 int *src_err_ptr, int *dst_err_ptr);
16075
16076 +asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16077 + int len, __wsum sum,
16078 + int *src_err_ptr, int *dst_err_ptr);
16079 +
16080 +asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16081 + int len, __wsum sum,
16082 + int *src_err_ptr, int *dst_err_ptr);
16083 +
16084 /*
16085 * Note: when you get a NULL pointer exception here this means someone
16086 * passed in an incorrect kernel address to one of these functions.
16087 @@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16088
16089 might_sleep();
16090 stac();
16091 - ret = csum_partial_copy_generic((__force void *)src, dst,
16092 + ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16093 len, sum, err_ptr, NULL);
16094 clac();
16095
16096 @@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16097 might_sleep();
16098 if (access_ok(VERIFY_WRITE, dst, len)) {
16099 stac();
16100 - ret = csum_partial_copy_generic(src, (__force void *)dst,
16101 + ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16102 len, sum, NULL, err_ptr);
16103 clac();
16104 return ret;
16105 diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16106 index d47786a..2d8883e 100644
16107 --- a/arch/x86/include/asm/cmpxchg.h
16108 +++ b/arch/x86/include/asm/cmpxchg.h
16109 @@ -14,8 +14,12 @@ extern void __cmpxchg_wrong_size(void)
16110 __compiletime_error("Bad argument size for cmpxchg");
16111 extern void __xadd_wrong_size(void)
16112 __compiletime_error("Bad argument size for xadd");
16113 +extern void __xadd_check_overflow_wrong_size(void)
16114 + __compiletime_error("Bad argument size for xadd_check_overflow");
16115 extern void __add_wrong_size(void)
16116 __compiletime_error("Bad argument size for add");
16117 +extern void __add_check_overflow_wrong_size(void)
16118 + __compiletime_error("Bad argument size for add_check_overflow");
16119
16120 /*
16121 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16122 @@ -67,6 +71,38 @@ extern void __add_wrong_size(void)
16123 __ret; \
16124 })
16125
16126 +#ifdef CONFIG_PAX_REFCOUNT
16127 +#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16128 + ({ \
16129 + __typeof__ (*(ptr)) __ret = (arg); \
16130 + switch (sizeof(*(ptr))) { \
16131 + case __X86_CASE_L: \
16132 + asm volatile (lock #op "l %0, %1\n" \
16133 + "jno 0f\n" \
16134 + "mov %0,%1\n" \
16135 + "int $4\n0:\n" \
16136 + _ASM_EXTABLE(0b, 0b) \
16137 + : "+r" (__ret), "+m" (*(ptr)) \
16138 + : : "memory", "cc"); \
16139 + break; \
16140 + case __X86_CASE_Q: \
16141 + asm volatile (lock #op "q %q0, %1\n" \
16142 + "jno 0f\n" \
16143 + "mov %0,%1\n" \
16144 + "int $4\n0:\n" \
16145 + _ASM_EXTABLE(0b, 0b) \
16146 + : "+r" (__ret), "+m" (*(ptr)) \
16147 + : : "memory", "cc"); \
16148 + break; \
16149 + default: \
16150 + __ ## op ## _check_overflow_wrong_size(); \
16151 + } \
16152 + __ret; \
16153 + })
16154 +#else
16155 +#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16156 +#endif
16157 +
16158 /*
16159 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16160 * Since this is generally used to protect other memory information, we
16161 @@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16162 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16163 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16164
16165 +#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16166 +#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16167 +
16168 #define __add(ptr, inc, lock) \
16169 ({ \
16170 __typeof__ (*(ptr)) __ret = (inc); \
16171 diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16172 index 59c6c40..5e0b22c 100644
16173 --- a/arch/x86/include/asm/compat.h
16174 +++ b/arch/x86/include/asm/compat.h
16175 @@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16176 typedef u32 compat_uint_t;
16177 typedef u32 compat_ulong_t;
16178 typedef u64 __attribute__((aligned(4))) compat_u64;
16179 -typedef u32 compat_uptr_t;
16180 +typedef u32 __user compat_uptr_t;
16181
16182 struct compat_timespec {
16183 compat_time_t tv_sec;
16184 diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16185 index e265ff9..72c253b 100644
16186 --- a/arch/x86/include/asm/cpufeature.h
16187 +++ b/arch/x86/include/asm/cpufeature.h
16188 @@ -203,7 +203,7 @@
16189 #define X86_FEATURE_DECODEASSISTS (8*32+12) /* AMD Decode Assists support */
16190 #define X86_FEATURE_PAUSEFILTER (8*32+13) /* AMD filtered pause intercept */
16191 #define X86_FEATURE_PFTHRESHOLD (8*32+14) /* AMD pause filter threshold */
16192 -
16193 +#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16194
16195 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16196 #define X86_FEATURE_FSGSBASE (9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16197 @@ -211,7 +211,7 @@
16198 #define X86_FEATURE_BMI1 (9*32+ 3) /* 1st group bit manipulation extensions */
16199 #define X86_FEATURE_HLE (9*32+ 4) /* Hardware Lock Elision */
16200 #define X86_FEATURE_AVX2 (9*32+ 5) /* AVX2 instructions */
16201 -#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Protection */
16202 +#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Prevention */
16203 #define X86_FEATURE_BMI2 (9*32+ 8) /* 2nd group bit manipulation extensions */
16204 #define X86_FEATURE_ERMS (9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16205 #define X86_FEATURE_INVPCID (9*32+10) /* Invalidate Processor Context ID */
16206 @@ -359,6 +359,7 @@ extern const char * const x86_power_flags[32];
16207 #undef cpu_has_centaur_mcr
16208 #define cpu_has_centaur_mcr 0
16209
16210 +#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16211 #endif /* CONFIG_X86_64 */
16212
16213 #if __GNUC__ >= 4
16214 @@ -411,7 +412,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16215
16216 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16217 t_warn:
16218 - warn_pre_alternatives();
16219 + if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16220 + warn_pre_alternatives();
16221 return false;
16222 #endif
16223
16224 @@ -431,7 +433,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16225 ".section .discard,\"aw\",@progbits\n"
16226 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16227 ".previous\n"
16228 - ".section .altinstr_replacement,\"ax\"\n"
16229 + ".section .altinstr_replacement,\"a\"\n"
16230 "3: movb $1,%0\n"
16231 "4:\n"
16232 ".previous\n"
16233 @@ -468,7 +470,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16234 " .byte 2b - 1b\n" /* src len */
16235 " .byte 4f - 3f\n" /* repl len */
16236 ".previous\n"
16237 - ".section .altinstr_replacement,\"ax\"\n"
16238 + ".section .altinstr_replacement,\"a\"\n"
16239 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16240 "4:\n"
16241 ".previous\n"
16242 @@ -501,7 +503,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16243 ".section .discard,\"aw\",@progbits\n"
16244 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16245 ".previous\n"
16246 - ".section .altinstr_replacement,\"ax\"\n"
16247 + ".section .altinstr_replacement,\"a\"\n"
16248 "3: movb $0,%0\n"
16249 "4:\n"
16250 ".previous\n"
16251 @@ -515,7 +517,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16252 ".section .discard,\"aw\",@progbits\n"
16253 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16254 ".previous\n"
16255 - ".section .altinstr_replacement,\"ax\"\n"
16256 + ".section .altinstr_replacement,\"a\"\n"
16257 "5: movb $1,%0\n"
16258 "6:\n"
16259 ".previous\n"
16260 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16261 index 50d033a..37deb26 100644
16262 --- a/arch/x86/include/asm/desc.h
16263 +++ b/arch/x86/include/asm/desc.h
16264 @@ -4,6 +4,7 @@
16265 #include <asm/desc_defs.h>
16266 #include <asm/ldt.h>
16267 #include <asm/mmu.h>
16268 +#include <asm/pgtable.h>
16269
16270 #include <linux/smp.h>
16271 #include <linux/percpu.h>
16272 @@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16273
16274 desc->type = (info->read_exec_only ^ 1) << 1;
16275 desc->type |= info->contents << 2;
16276 + desc->type |= info->seg_not_present ^ 1;
16277
16278 desc->s = 1;
16279 desc->dpl = 0x3;
16280 @@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16281 }
16282
16283 extern struct desc_ptr idt_descr;
16284 -extern gate_desc idt_table[];
16285 -extern struct desc_ptr debug_idt_descr;
16286 -extern gate_desc debug_idt_table[];
16287 -
16288 -struct gdt_page {
16289 - struct desc_struct gdt[GDT_ENTRIES];
16290 -} __attribute__((aligned(PAGE_SIZE)));
16291 -
16292 -DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16293 +extern gate_desc idt_table[IDT_ENTRIES];
16294 +extern const struct desc_ptr debug_idt_descr;
16295 +extern gate_desc debug_idt_table[IDT_ENTRIES];
16296
16297 +extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16298 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16299 {
16300 - return per_cpu(gdt_page, cpu).gdt;
16301 + return cpu_gdt_table[cpu];
16302 }
16303
16304 #ifdef CONFIG_X86_64
16305 @@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16306 unsigned long base, unsigned dpl, unsigned flags,
16307 unsigned short seg)
16308 {
16309 - gate->a = (seg << 16) | (base & 0xffff);
16310 - gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16311 + gate->gate.offset_low = base;
16312 + gate->gate.seg = seg;
16313 + gate->gate.reserved = 0;
16314 + gate->gate.type = type;
16315 + gate->gate.s = 0;
16316 + gate->gate.dpl = dpl;
16317 + gate->gate.p = 1;
16318 + gate->gate.offset_high = base >> 16;
16319 }
16320
16321 #endif
16322 @@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16323
16324 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16325 {
16326 + pax_open_kernel();
16327 memcpy(&idt[entry], gate, sizeof(*gate));
16328 + pax_close_kernel();
16329 }
16330
16331 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16332 {
16333 + pax_open_kernel();
16334 memcpy(&ldt[entry], desc, 8);
16335 + pax_close_kernel();
16336 }
16337
16338 static inline void
16339 @@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16340 default: size = sizeof(*gdt); break;
16341 }
16342
16343 + pax_open_kernel();
16344 memcpy(&gdt[entry], desc, size);
16345 + pax_close_kernel();
16346 }
16347
16348 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16349 @@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16350
16351 static inline void native_load_tr_desc(void)
16352 {
16353 + pax_open_kernel();
16354 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16355 + pax_close_kernel();
16356 }
16357
16358 static inline void native_load_gdt(const struct desc_ptr *dtr)
16359 @@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16360 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16361 unsigned int i;
16362
16363 + pax_open_kernel();
16364 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16365 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16366 + pax_close_kernel();
16367 }
16368
16369 #define _LDT_empty(info) \
16370 @@ -287,7 +300,7 @@ static inline void load_LDT(mm_context_t *pc)
16371 preempt_enable();
16372 }
16373
16374 -static inline unsigned long get_desc_base(const struct desc_struct *desc)
16375 +static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16376 {
16377 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16378 }
16379 @@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16380 }
16381
16382 #ifdef CONFIG_X86_64
16383 -static inline void set_nmi_gate(int gate, void *addr)
16384 +static inline void set_nmi_gate(int gate, const void *addr)
16385 {
16386 gate_desc s;
16387
16388 @@ -321,14 +334,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16389 #endif
16390
16391 #ifdef CONFIG_TRACING
16392 -extern struct desc_ptr trace_idt_descr;
16393 -extern gate_desc trace_idt_table[];
16394 +extern const struct desc_ptr trace_idt_descr;
16395 +extern gate_desc trace_idt_table[IDT_ENTRIES];
16396 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16397 {
16398 write_idt_entry(trace_idt_table, entry, gate);
16399 }
16400
16401 -static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16402 +static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16403 unsigned dpl, unsigned ist, unsigned seg)
16404 {
16405 gate_desc s;
16406 @@ -348,7 +361,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16407 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16408 #endif
16409
16410 -static inline void _set_gate(int gate, unsigned type, void *addr,
16411 +static inline void _set_gate(int gate, unsigned type, const void *addr,
16412 unsigned dpl, unsigned ist, unsigned seg)
16413 {
16414 gate_desc s;
16415 @@ -371,9 +384,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16416 #define set_intr_gate(n, addr) \
16417 do { \
16418 BUG_ON((unsigned)n > 0xFF); \
16419 - _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16420 + _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16421 __KERNEL_CS); \
16422 - _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16423 + _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16424 0, 0, __KERNEL_CS); \
16425 } while (0)
16426
16427 @@ -401,19 +414,19 @@ static inline void alloc_system_vector(int vector)
16428 /*
16429 * This routine sets up an interrupt gate at directory privilege level 3.
16430 */
16431 -static inline void set_system_intr_gate(unsigned int n, void *addr)
16432 +static inline void set_system_intr_gate(unsigned int n, const void *addr)
16433 {
16434 BUG_ON((unsigned)n > 0xFF);
16435 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16436 }
16437
16438 -static inline void set_system_trap_gate(unsigned int n, void *addr)
16439 +static inline void set_system_trap_gate(unsigned int n, const void *addr)
16440 {
16441 BUG_ON((unsigned)n > 0xFF);
16442 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16443 }
16444
16445 -static inline void set_trap_gate(unsigned int n, void *addr)
16446 +static inline void set_trap_gate(unsigned int n, const void *addr)
16447 {
16448 BUG_ON((unsigned)n > 0xFF);
16449 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16450 @@ -422,16 +435,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16451 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16452 {
16453 BUG_ON((unsigned)n > 0xFF);
16454 - _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16455 + _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16456 }
16457
16458 -static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16459 +static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16460 {
16461 BUG_ON((unsigned)n > 0xFF);
16462 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16463 }
16464
16465 -static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16466 +static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16467 {
16468 BUG_ON((unsigned)n > 0xFF);
16469 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16470 @@ -503,4 +516,17 @@ static inline void load_current_idt(void)
16471 else
16472 load_idt((const struct desc_ptr *)&idt_descr);
16473 }
16474 +
16475 +#ifdef CONFIG_X86_32
16476 +static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16477 +{
16478 + struct desc_struct d;
16479 +
16480 + if (likely(limit))
16481 + limit = (limit - 1UL) >> PAGE_SHIFT;
16482 + pack_descriptor(&d, base, limit, 0xFB, 0xC);
16483 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16484 +}
16485 +#endif
16486 +
16487 #endif /* _ASM_X86_DESC_H */
16488 diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16489 index 278441f..b95a174 100644
16490 --- a/arch/x86/include/asm/desc_defs.h
16491 +++ b/arch/x86/include/asm/desc_defs.h
16492 @@ -31,6 +31,12 @@ struct desc_struct {
16493 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16494 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16495 };
16496 + struct {
16497 + u16 offset_low;
16498 + u16 seg;
16499 + unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16500 + unsigned offset_high: 16;
16501 + } gate;
16502 };
16503 } __attribute__((packed));
16504
16505 diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16506 index ced283a..ffe04cc 100644
16507 --- a/arch/x86/include/asm/div64.h
16508 +++ b/arch/x86/include/asm/div64.h
16509 @@ -39,7 +39,7 @@
16510 __mod; \
16511 })
16512
16513 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16514 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16515 {
16516 union {
16517 u64 v64;
16518 diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16519 index 2c71182..731124d 100644
16520 --- a/arch/x86/include/asm/elf.h
16521 +++ b/arch/x86/include/asm/elf.h
16522 @@ -243,7 +243,25 @@ extern int force_personality32;
16523 the loader. We need to make sure that it is out of the way of the program
16524 that it will "exec", and that there is sufficient room for the brk. */
16525
16526 +#ifdef CONFIG_PAX_SEGMEXEC
16527 +#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16528 +#else
16529 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16530 +#endif
16531 +
16532 +#ifdef CONFIG_PAX_ASLR
16533 +#ifdef CONFIG_X86_32
16534 +#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16535 +
16536 +#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16537 +#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16538 +#else
16539 +#define PAX_ELF_ET_DYN_BASE 0x400000UL
16540 +
16541 +#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16542 +#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16543 +#endif
16544 +#endif
16545
16546 /* This yields a mask that user programs can use to figure out what
16547 instruction set this CPU supports. This could be done in user space,
16548 @@ -292,16 +310,12 @@ do { \
16549
16550 #define ARCH_DLINFO \
16551 do { \
16552 - if (vdso_enabled) \
16553 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16554 - (unsigned long)current->mm->context.vdso); \
16555 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16556 } while (0)
16557
16558 #define ARCH_DLINFO_X32 \
16559 do { \
16560 - if (vdso_enabled) \
16561 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16562 - (unsigned long)current->mm->context.vdso); \
16563 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16564 } while (0)
16565
16566 #define AT_SYSINFO 32
16567 @@ -316,7 +330,7 @@ else \
16568
16569 #endif /* !CONFIG_X86_32 */
16570
16571 -#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16572 +#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16573
16574 #define VDSO_ENTRY \
16575 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
16576 @@ -332,9 +346,6 @@ extern int x32_setup_additional_pages(struct linux_binprm *bprm,
16577 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
16578 #define compat_arch_setup_additional_pages syscall32_setup_pages
16579
16580 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16581 -#define arch_randomize_brk arch_randomize_brk
16582 -
16583 /*
16584 * True on X86_32 or when emulating IA32 on X86_64
16585 */
16586 diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16587 index 77a99ac..39ff7f5 100644
16588 --- a/arch/x86/include/asm/emergency-restart.h
16589 +++ b/arch/x86/include/asm/emergency-restart.h
16590 @@ -1,6 +1,6 @@
16591 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16592 #define _ASM_X86_EMERGENCY_RESTART_H
16593
16594 -extern void machine_emergency_restart(void);
16595 +extern void machine_emergency_restart(void) __noreturn;
16596
16597 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16598 diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16599 index 1c7eefe..d0e4702 100644
16600 --- a/arch/x86/include/asm/floppy.h
16601 +++ b/arch/x86/include/asm/floppy.h
16602 @@ -229,18 +229,18 @@ static struct fd_routine_l {
16603 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16604 } fd_routine[] = {
16605 {
16606 - request_dma,
16607 - free_dma,
16608 - get_dma_residue,
16609 - dma_mem_alloc,
16610 - hard_dma_setup
16611 + ._request_dma = request_dma,
16612 + ._free_dma = free_dma,
16613 + ._get_dma_residue = get_dma_residue,
16614 + ._dma_mem_alloc = dma_mem_alloc,
16615 + ._dma_setup = hard_dma_setup
16616 },
16617 {
16618 - vdma_request_dma,
16619 - vdma_nop,
16620 - vdma_get_dma_residue,
16621 - vdma_mem_alloc,
16622 - vdma_dma_setup
16623 + ._request_dma = vdma_request_dma,
16624 + ._free_dma = vdma_nop,
16625 + ._get_dma_residue = vdma_get_dma_residue,
16626 + ._dma_mem_alloc = vdma_mem_alloc,
16627 + ._dma_setup = vdma_dma_setup
16628 }
16629 };
16630
16631 diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16632 index cea1c76..6c0d79b 100644
16633 --- a/arch/x86/include/asm/fpu-internal.h
16634 +++ b/arch/x86/include/asm/fpu-internal.h
16635 @@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16636 #define user_insn(insn, output, input...) \
16637 ({ \
16638 int err; \
16639 + pax_open_userland(); \
16640 asm volatile(ASM_STAC "\n" \
16641 - "1:" #insn "\n\t" \
16642 + "1:" \
16643 + __copyuser_seg \
16644 + #insn "\n\t" \
16645 "2: " ASM_CLAC "\n" \
16646 ".section .fixup,\"ax\"\n" \
16647 "3: movl $-1,%[err]\n" \
16648 @@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16649 _ASM_EXTABLE(1b, 3b) \
16650 : [err] "=r" (err), output \
16651 : "0"(0), input); \
16652 + pax_close_userland(); \
16653 err; \
16654 })
16655
16656 @@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16657 "fnclex\n\t"
16658 "emms\n\t"
16659 "fildl %P[addr]" /* set F?P to defined value */
16660 - : : [addr] "m" (tsk->thread.fpu.has_fpu));
16661 + : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16662 }
16663
16664 return fpu_restore_checking(&tsk->thread.fpu);
16665 diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16666 index b4c1f54..e290c08 100644
16667 --- a/arch/x86/include/asm/futex.h
16668 +++ b/arch/x86/include/asm/futex.h
16669 @@ -12,6 +12,7 @@
16670 #include <asm/smap.h>
16671
16672 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16673 + typecheck(u32 __user *, uaddr); \
16674 asm volatile("\t" ASM_STAC "\n" \
16675 "1:\t" insn "\n" \
16676 "2:\t" ASM_CLAC "\n" \
16677 @@ -20,15 +21,16 @@
16678 "\tjmp\t2b\n" \
16679 "\t.previous\n" \
16680 _ASM_EXTABLE(1b, 3b) \
16681 - : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16682 + : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16683 : "i" (-EFAULT), "0" (oparg), "1" (0))
16684
16685 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16686 + typecheck(u32 __user *, uaddr); \
16687 asm volatile("\t" ASM_STAC "\n" \
16688 "1:\tmovl %2, %0\n" \
16689 "\tmovl\t%0, %3\n" \
16690 "\t" insn "\n" \
16691 - "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16692 + "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16693 "\tjnz\t1b\n" \
16694 "3:\t" ASM_CLAC "\n" \
16695 "\t.section .fixup,\"ax\"\n" \
16696 @@ -38,7 +40,7 @@
16697 _ASM_EXTABLE(1b, 4b) \
16698 _ASM_EXTABLE(2b, 4b) \
16699 : "=&a" (oldval), "=&r" (ret), \
16700 - "+m" (*uaddr), "=&r" (tem) \
16701 + "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16702 : "r" (oparg), "i" (-EFAULT), "1" (0))
16703
16704 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16705 @@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16706
16707 pagefault_disable();
16708
16709 + pax_open_userland();
16710 switch (op) {
16711 case FUTEX_OP_SET:
16712 - __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16713 + __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16714 break;
16715 case FUTEX_OP_ADD:
16716 - __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
16717 + __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
16718 uaddr, oparg);
16719 break;
16720 case FUTEX_OP_OR:
16721 @@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16722 default:
16723 ret = -ENOSYS;
16724 }
16725 + pax_close_userland();
16726
16727 pagefault_enable();
16728
16729 diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
16730 index a307b75..ec74ca2 100644
16731 --- a/arch/x86/include/asm/hw_irq.h
16732 +++ b/arch/x86/include/asm/hw_irq.h
16733 @@ -164,8 +164,8 @@ extern void setup_ioapic_dest(void);
16734 extern void enable_IO_APIC(void);
16735
16736 /* Statistics */
16737 -extern atomic_t irq_err_count;
16738 -extern atomic_t irq_mis_count;
16739 +extern atomic_unchecked_t irq_err_count;
16740 +extern atomic_unchecked_t irq_mis_count;
16741
16742 /* EISA */
16743 extern void eisa_set_level_irq(unsigned int irq);
16744 diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
16745 index a203659..9889f1c 100644
16746 --- a/arch/x86/include/asm/i8259.h
16747 +++ b/arch/x86/include/asm/i8259.h
16748 @@ -62,7 +62,7 @@ struct legacy_pic {
16749 void (*init)(int auto_eoi);
16750 int (*irq_pending)(unsigned int irq);
16751 void (*make_irq)(unsigned int irq);
16752 -};
16753 +} __do_const;
16754
16755 extern struct legacy_pic *legacy_pic;
16756 extern struct legacy_pic null_legacy_pic;
16757 diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
16758 index b8237d8..3e8864e 100644
16759 --- a/arch/x86/include/asm/io.h
16760 +++ b/arch/x86/include/asm/io.h
16761 @@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
16762 "m" (*(volatile type __force *)addr) barrier); }
16763
16764 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
16765 -build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
16766 -build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
16767 +build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
16768 +build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
16769
16770 build_mmio_read(__readb, "b", unsigned char, "=q", )
16771 -build_mmio_read(__readw, "w", unsigned short, "=r", )
16772 -build_mmio_read(__readl, "l", unsigned int, "=r", )
16773 +build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
16774 +build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
16775
16776 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
16777 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
16778 @@ -109,7 +109,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
16779 * this function
16780 */
16781
16782 -static inline phys_addr_t virt_to_phys(volatile void *address)
16783 +static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
16784 {
16785 return __pa(address);
16786 }
16787 @@ -185,7 +185,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
16788 return ioremap_nocache(offset, size);
16789 }
16790
16791 -extern void iounmap(volatile void __iomem *addr);
16792 +extern void iounmap(const volatile void __iomem *addr);
16793
16794 extern void set_iounmap_nonlazy(void);
16795
16796 @@ -195,6 +195,17 @@ extern void set_iounmap_nonlazy(void);
16797
16798 #include <linux/vmalloc.h>
16799
16800 +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
16801 +static inline int valid_phys_addr_range(unsigned long addr, size_t count)
16802 +{
16803 + return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
16804 +}
16805 +
16806 +static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
16807 +{
16808 + return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
16809 +}
16810 +
16811 /*
16812 * Convert a virtual cached pointer to an uncached pointer
16813 */
16814 diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
16815 index bba3cf8..06bc8da 100644
16816 --- a/arch/x86/include/asm/irqflags.h
16817 +++ b/arch/x86/include/asm/irqflags.h
16818 @@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
16819 sti; \
16820 sysexit
16821
16822 +#define GET_CR0_INTO_RDI mov %cr0, %rdi
16823 +#define SET_RDI_INTO_CR0 mov %rdi, %cr0
16824 +#define GET_CR3_INTO_RDI mov %cr3, %rdi
16825 +#define SET_RDI_INTO_CR3 mov %rdi, %cr3
16826 +
16827 #else
16828 #define INTERRUPT_RETURN iret
16829 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
16830 diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
16831 index 9454c16..e4100e3 100644
16832 --- a/arch/x86/include/asm/kprobes.h
16833 +++ b/arch/x86/include/asm/kprobes.h
16834 @@ -38,13 +38,8 @@ typedef u8 kprobe_opcode_t;
16835 #define RELATIVEJUMP_SIZE 5
16836 #define RELATIVECALL_OPCODE 0xe8
16837 #define RELATIVE_ADDR_SIZE 4
16838 -#define MAX_STACK_SIZE 64
16839 -#define MIN_STACK_SIZE(ADDR) \
16840 - (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
16841 - THREAD_SIZE - (unsigned long)(ADDR))) \
16842 - ? (MAX_STACK_SIZE) \
16843 - : (((unsigned long)current_thread_info()) + \
16844 - THREAD_SIZE - (unsigned long)(ADDR)))
16845 +#define MAX_STACK_SIZE 64UL
16846 +#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
16847
16848 #define flush_insn_slot(p) do { } while (0)
16849
16850 diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
16851 index 4ad6560..75c7bdd 100644
16852 --- a/arch/x86/include/asm/local.h
16853 +++ b/arch/x86/include/asm/local.h
16854 @@ -10,33 +10,97 @@ typedef struct {
16855 atomic_long_t a;
16856 } local_t;
16857
16858 +typedef struct {
16859 + atomic_long_unchecked_t a;
16860 +} local_unchecked_t;
16861 +
16862 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
16863
16864 #define local_read(l) atomic_long_read(&(l)->a)
16865 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
16866 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
16867 +#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
16868
16869 static inline void local_inc(local_t *l)
16870 {
16871 - asm volatile(_ASM_INC "%0"
16872 + asm volatile(_ASM_INC "%0\n"
16873 +
16874 +#ifdef CONFIG_PAX_REFCOUNT
16875 + "jno 0f\n"
16876 + _ASM_DEC "%0\n"
16877 + "int $4\n0:\n"
16878 + _ASM_EXTABLE(0b, 0b)
16879 +#endif
16880 +
16881 + : "+m" (l->a.counter));
16882 +}
16883 +
16884 +static inline void local_inc_unchecked(local_unchecked_t *l)
16885 +{
16886 + asm volatile(_ASM_INC "%0\n"
16887 : "+m" (l->a.counter));
16888 }
16889
16890 static inline void local_dec(local_t *l)
16891 {
16892 - asm volatile(_ASM_DEC "%0"
16893 + asm volatile(_ASM_DEC "%0\n"
16894 +
16895 +#ifdef CONFIG_PAX_REFCOUNT
16896 + "jno 0f\n"
16897 + _ASM_INC "%0\n"
16898 + "int $4\n0:\n"
16899 + _ASM_EXTABLE(0b, 0b)
16900 +#endif
16901 +
16902 + : "+m" (l->a.counter));
16903 +}
16904 +
16905 +static inline void local_dec_unchecked(local_unchecked_t *l)
16906 +{
16907 + asm volatile(_ASM_DEC "%0\n"
16908 : "+m" (l->a.counter));
16909 }
16910
16911 static inline void local_add(long i, local_t *l)
16912 {
16913 - asm volatile(_ASM_ADD "%1,%0"
16914 + asm volatile(_ASM_ADD "%1,%0\n"
16915 +
16916 +#ifdef CONFIG_PAX_REFCOUNT
16917 + "jno 0f\n"
16918 + _ASM_SUB "%1,%0\n"
16919 + "int $4\n0:\n"
16920 + _ASM_EXTABLE(0b, 0b)
16921 +#endif
16922 +
16923 + : "+m" (l->a.counter)
16924 + : "ir" (i));
16925 +}
16926 +
16927 +static inline void local_add_unchecked(long i, local_unchecked_t *l)
16928 +{
16929 + asm volatile(_ASM_ADD "%1,%0\n"
16930 : "+m" (l->a.counter)
16931 : "ir" (i));
16932 }
16933
16934 static inline void local_sub(long i, local_t *l)
16935 {
16936 - asm volatile(_ASM_SUB "%1,%0"
16937 + asm volatile(_ASM_SUB "%1,%0\n"
16938 +
16939 +#ifdef CONFIG_PAX_REFCOUNT
16940 + "jno 0f\n"
16941 + _ASM_ADD "%1,%0\n"
16942 + "int $4\n0:\n"
16943 + _ASM_EXTABLE(0b, 0b)
16944 +#endif
16945 +
16946 + : "+m" (l->a.counter)
16947 + : "ir" (i));
16948 +}
16949 +
16950 +static inline void local_sub_unchecked(long i, local_unchecked_t *l)
16951 +{
16952 + asm volatile(_ASM_SUB "%1,%0\n"
16953 : "+m" (l->a.counter)
16954 : "ir" (i));
16955 }
16956 @@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
16957 */
16958 static inline int local_sub_and_test(long i, local_t *l)
16959 {
16960 - GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
16961 + GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
16962 }
16963
16964 /**
16965 @@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
16966 */
16967 static inline int local_dec_and_test(local_t *l)
16968 {
16969 - GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
16970 + GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
16971 }
16972
16973 /**
16974 @@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
16975 */
16976 static inline int local_inc_and_test(local_t *l)
16977 {
16978 - GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
16979 + GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
16980 }
16981
16982 /**
16983 @@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
16984 */
16985 static inline int local_add_negative(long i, local_t *l)
16986 {
16987 - GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
16988 + GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
16989 }
16990
16991 /**
16992 @@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
16993 static inline long local_add_return(long i, local_t *l)
16994 {
16995 long __i = i;
16996 + asm volatile(_ASM_XADD "%0, %1\n"
16997 +
16998 +#ifdef CONFIG_PAX_REFCOUNT
16999 + "jno 0f\n"
17000 + _ASM_MOV "%0,%1\n"
17001 + "int $4\n0:\n"
17002 + _ASM_EXTABLE(0b, 0b)
17003 +#endif
17004 +
17005 + : "+r" (i), "+m" (l->a.counter)
17006 + : : "memory");
17007 + return i + __i;
17008 +}
17009 +
17010 +/**
17011 + * local_add_return_unchecked - add and return
17012 + * @i: integer value to add
17013 + * @l: pointer to type local_unchecked_t
17014 + *
17015 + * Atomically adds @i to @l and returns @i + @l
17016 + */
17017 +static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17018 +{
17019 + long __i = i;
17020 asm volatile(_ASM_XADD "%0, %1;"
17021 : "+r" (i), "+m" (l->a.counter)
17022 : : "memory");
17023 @@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17024
17025 #define local_cmpxchg(l, o, n) \
17026 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17027 +#define local_cmpxchg_unchecked(l, o, n) \
17028 + (cmpxchg_local(&((l)->a.counter), (o), (n)))
17029 /* Always has a lock prefix */
17030 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17031
17032 diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17033 new file mode 100644
17034 index 0000000..2bfd3ba
17035 --- /dev/null
17036 +++ b/arch/x86/include/asm/mman.h
17037 @@ -0,0 +1,15 @@
17038 +#ifndef _X86_MMAN_H
17039 +#define _X86_MMAN_H
17040 +
17041 +#include <uapi/asm/mman.h>
17042 +
17043 +#ifdef __KERNEL__
17044 +#ifndef __ASSEMBLY__
17045 +#ifdef CONFIG_X86_32
17046 +#define arch_mmap_check i386_mmap_check
17047 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17048 +#endif
17049 +#endif
17050 +#endif
17051 +
17052 +#endif /* X86_MMAN_H */
17053 diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17054 index 5f55e69..e20bfb1 100644
17055 --- a/arch/x86/include/asm/mmu.h
17056 +++ b/arch/x86/include/asm/mmu.h
17057 @@ -9,7 +9,7 @@
17058 * we put the segment information here.
17059 */
17060 typedef struct {
17061 - void *ldt;
17062 + struct desc_struct *ldt;
17063 int size;
17064
17065 #ifdef CONFIG_X86_64
17066 @@ -18,7 +18,19 @@ typedef struct {
17067 #endif
17068
17069 struct mutex lock;
17070 - void *vdso;
17071 + unsigned long vdso;
17072 +
17073 +#ifdef CONFIG_X86_32
17074 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17075 + unsigned long user_cs_base;
17076 + unsigned long user_cs_limit;
17077 +
17078 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17079 + cpumask_t cpu_user_cs_mask;
17080 +#endif
17081 +
17082 +#endif
17083 +#endif
17084 } mm_context_t;
17085
17086 #ifdef CONFIG_SMP
17087 diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17088 index be12c53..4d24039 100644
17089 --- a/arch/x86/include/asm/mmu_context.h
17090 +++ b/arch/x86/include/asm/mmu_context.h
17091 @@ -24,6 +24,20 @@ void destroy_context(struct mm_struct *mm);
17092
17093 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17094 {
17095 +
17096 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17097 + if (!(static_cpu_has(X86_FEATURE_PCID))) {
17098 + unsigned int i;
17099 + pgd_t *pgd;
17100 +
17101 + pax_open_kernel();
17102 + pgd = get_cpu_pgd(smp_processor_id(), kernel);
17103 + for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17104 + set_pgd_batched(pgd+i, native_make_pgd(0));
17105 + pax_close_kernel();
17106 + }
17107 +#endif
17108 +
17109 #ifdef CONFIG_SMP
17110 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17111 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17112 @@ -34,16 +48,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17113 struct task_struct *tsk)
17114 {
17115 unsigned cpu = smp_processor_id();
17116 +#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17117 + int tlbstate = TLBSTATE_OK;
17118 +#endif
17119
17120 if (likely(prev != next)) {
17121 #ifdef CONFIG_SMP
17122 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17123 + tlbstate = this_cpu_read(cpu_tlbstate.state);
17124 +#endif
17125 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17126 this_cpu_write(cpu_tlbstate.active_mm, next);
17127 #endif
17128 cpumask_set_cpu(cpu, mm_cpumask(next));
17129
17130 /* Re-load page tables */
17131 +#ifdef CONFIG_PAX_PER_CPU_PGD
17132 + pax_open_kernel();
17133 +
17134 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17135 + if (static_cpu_has(X86_FEATURE_PCID))
17136 + __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17137 + else
17138 +#endif
17139 +
17140 + __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17141 + __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17142 + pax_close_kernel();
17143 + 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));
17144 +
17145 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17146 + if (static_cpu_has(X86_FEATURE_PCID)) {
17147 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
17148 + u64 descriptor[2];
17149 + descriptor[0] = PCID_USER;
17150 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17151 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17152 + descriptor[0] = PCID_KERNEL;
17153 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17154 + }
17155 + } else {
17156 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17157 + if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17158 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17159 + else
17160 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17161 + }
17162 + } else
17163 +#endif
17164 +
17165 + load_cr3(get_cpu_pgd(cpu, kernel));
17166 +#else
17167 load_cr3(next->pgd);
17168 +#endif
17169
17170 /* Stop flush ipis for the previous mm */
17171 cpumask_clear_cpu(cpu, mm_cpumask(prev));
17172 @@ -51,9 +108,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17173 /* Load the LDT, if the LDT is different: */
17174 if (unlikely(prev->context.ldt != next->context.ldt))
17175 load_LDT_nolock(&next->context);
17176 +
17177 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17178 + if (!(__supported_pte_mask & _PAGE_NX)) {
17179 + smp_mb__before_clear_bit();
17180 + cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17181 + smp_mb__after_clear_bit();
17182 + cpu_set(cpu, next->context.cpu_user_cs_mask);
17183 + }
17184 +#endif
17185 +
17186 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17187 + if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17188 + prev->context.user_cs_limit != next->context.user_cs_limit))
17189 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17190 +#ifdef CONFIG_SMP
17191 + else if (unlikely(tlbstate != TLBSTATE_OK))
17192 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17193 +#endif
17194 +#endif
17195 +
17196 }
17197 + else {
17198 +
17199 +#ifdef CONFIG_PAX_PER_CPU_PGD
17200 + pax_open_kernel();
17201 +
17202 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17203 + if (static_cpu_has(X86_FEATURE_PCID))
17204 + __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17205 + else
17206 +#endif
17207 +
17208 + __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17209 + __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17210 + pax_close_kernel();
17211 + 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));
17212 +
17213 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17214 + if (static_cpu_has(X86_FEATURE_PCID)) {
17215 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
17216 + u64 descriptor[2];
17217 + descriptor[0] = PCID_USER;
17218 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17219 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17220 + descriptor[0] = PCID_KERNEL;
17221 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17222 + }
17223 + } else {
17224 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17225 + if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17226 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17227 + else
17228 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17229 + }
17230 + } else
17231 +#endif
17232 +
17233 + load_cr3(get_cpu_pgd(cpu, kernel));
17234 +#endif
17235 +
17236 #ifdef CONFIG_SMP
17237 - else {
17238 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17239 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17240
17241 @@ -70,11 +185,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17242 * tlb flush IPI delivery. We must reload CR3
17243 * to make sure to use no freed page tables.
17244 */
17245 +
17246 +#ifndef CONFIG_PAX_PER_CPU_PGD
17247 load_cr3(next->pgd);
17248 +#endif
17249 +
17250 load_LDT_nolock(&next->context);
17251 +
17252 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17253 + if (!(__supported_pte_mask & _PAGE_NX))
17254 + cpu_set(cpu, next->context.cpu_user_cs_mask);
17255 +#endif
17256 +
17257 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17258 +#ifdef CONFIG_PAX_PAGEEXEC
17259 + if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17260 +#endif
17261 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17262 +#endif
17263 +
17264 }
17265 +#endif
17266 }
17267 -#endif
17268 }
17269
17270 #define activate_mm(prev, next) \
17271 diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17272 index e3b7819..b257c64 100644
17273 --- a/arch/x86/include/asm/module.h
17274 +++ b/arch/x86/include/asm/module.h
17275 @@ -5,6 +5,7 @@
17276
17277 #ifdef CONFIG_X86_64
17278 /* X86_64 does not define MODULE_PROC_FAMILY */
17279 +#define MODULE_PROC_FAMILY ""
17280 #elif defined CONFIG_M486
17281 #define MODULE_PROC_FAMILY "486 "
17282 #elif defined CONFIG_M586
17283 @@ -57,8 +58,20 @@
17284 #error unknown processor family
17285 #endif
17286
17287 -#ifdef CONFIG_X86_32
17288 -# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17289 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17290 +#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17291 +#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17292 +#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17293 +#else
17294 +#define MODULE_PAX_KERNEXEC ""
17295 #endif
17296
17297 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17298 +#define MODULE_PAX_UDEREF "UDEREF "
17299 +#else
17300 +#define MODULE_PAX_UDEREF ""
17301 +#endif
17302 +
17303 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17304 +
17305 #endif /* _ASM_X86_MODULE_H */
17306 diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17307 index 5f2fc44..106caa6 100644
17308 --- a/arch/x86/include/asm/nmi.h
17309 +++ b/arch/x86/include/asm/nmi.h
17310 @@ -36,26 +36,35 @@ enum {
17311
17312 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17313
17314 +struct nmiaction;
17315 +
17316 +struct nmiwork {
17317 + const struct nmiaction *action;
17318 + u64 max_duration;
17319 + struct irq_work irq_work;
17320 +};
17321 +
17322 struct nmiaction {
17323 struct list_head list;
17324 nmi_handler_t handler;
17325 - u64 max_duration;
17326 - struct irq_work irq_work;
17327 unsigned long flags;
17328 const char *name;
17329 -};
17330 + struct nmiwork *work;
17331 +} __do_const;
17332
17333 #define register_nmi_handler(t, fn, fg, n, init...) \
17334 ({ \
17335 - static struct nmiaction init fn##_na = { \
17336 + static struct nmiwork fn##_nw; \
17337 + static const struct nmiaction init fn##_na = { \
17338 .handler = (fn), \
17339 .name = (n), \
17340 .flags = (fg), \
17341 + .work = &fn##_nw, \
17342 }; \
17343 __register_nmi_handler((t), &fn##_na); \
17344 })
17345
17346 -int __register_nmi_handler(unsigned int, struct nmiaction *);
17347 +int __register_nmi_handler(unsigned int, const struct nmiaction *);
17348
17349 void unregister_nmi_handler(unsigned int, const char *);
17350
17351 diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17352 index 775873d..04cd306 100644
17353 --- a/arch/x86/include/asm/page.h
17354 +++ b/arch/x86/include/asm/page.h
17355 @@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17356 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17357
17358 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17359 +#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17360
17361 #define __boot_va(x) __va(x)
17362 #define __boot_pa(x) __pa(x)
17363 @@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17364 * virt_to_page(kaddr) returns a valid pointer if and only if
17365 * virt_addr_valid(kaddr) returns true.
17366 */
17367 -#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17368 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17369 extern bool __virt_addr_valid(unsigned long kaddr);
17370 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17371
17372 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17373 +#define virt_to_page(kaddr) \
17374 + ({ \
17375 + const void *__kaddr = (const void *)(kaddr); \
17376 + BUG_ON(!virt_addr_valid(__kaddr)); \
17377 + pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17378 + })
17379 +#else
17380 +#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17381 +#endif
17382 +
17383 #endif /* __ASSEMBLY__ */
17384
17385 #include <asm-generic/memory_model.h>
17386 diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17387 index 0f1ddee..e2fc3d1 100644
17388 --- a/arch/x86/include/asm/page_64.h
17389 +++ b/arch/x86/include/asm/page_64.h
17390 @@ -7,9 +7,9 @@
17391
17392 /* duplicated to the one in bootmem.h */
17393 extern unsigned long max_pfn;
17394 -extern unsigned long phys_base;
17395 +extern const unsigned long phys_base;
17396
17397 -static inline unsigned long __phys_addr_nodebug(unsigned long x)
17398 +static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17399 {
17400 unsigned long y = x - __START_KERNEL_map;
17401
17402 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17403 index cd6e1610..70f4418 100644
17404 --- a/arch/x86/include/asm/paravirt.h
17405 +++ b/arch/x86/include/asm/paravirt.h
17406 @@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17407 return (pmd_t) { ret };
17408 }
17409
17410 -static inline pmdval_t pmd_val(pmd_t pmd)
17411 +static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17412 {
17413 pmdval_t ret;
17414
17415 @@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17416 val);
17417 }
17418
17419 +static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17420 +{
17421 + pgdval_t val = native_pgd_val(pgd);
17422 +
17423 + if (sizeof(pgdval_t) > sizeof(long))
17424 + PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17425 + val, (u64)val >> 32);
17426 + else
17427 + PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17428 + val);
17429 +}
17430 +
17431 static inline void pgd_clear(pgd_t *pgdp)
17432 {
17433 set_pgd(pgdp, __pgd(0));
17434 @@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17435 pv_mmu_ops.set_fixmap(idx, phys, flags);
17436 }
17437
17438 +#ifdef CONFIG_PAX_KERNEXEC
17439 +static inline unsigned long pax_open_kernel(void)
17440 +{
17441 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17442 +}
17443 +
17444 +static inline unsigned long pax_close_kernel(void)
17445 +{
17446 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17447 +}
17448 +#else
17449 +static inline unsigned long pax_open_kernel(void) { return 0; }
17450 +static inline unsigned long pax_close_kernel(void) { return 0; }
17451 +#endif
17452 +
17453 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17454
17455 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17456 @@ -906,7 +933,7 @@ extern void default_banner(void);
17457
17458 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17459 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17460 -#define PARA_INDIRECT(addr) *%cs:addr
17461 +#define PARA_INDIRECT(addr) *%ss:addr
17462 #endif
17463
17464 #define INTERRUPT_RETURN \
17465 @@ -981,6 +1008,21 @@ extern void default_banner(void);
17466 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17467 CLBR_NONE, \
17468 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17469 +
17470 +#define GET_CR0_INTO_RDI \
17471 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17472 + mov %rax,%rdi
17473 +
17474 +#define SET_RDI_INTO_CR0 \
17475 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17476 +
17477 +#define GET_CR3_INTO_RDI \
17478 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17479 + mov %rax,%rdi
17480 +
17481 +#define SET_RDI_INTO_CR3 \
17482 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17483 +
17484 #endif /* CONFIG_X86_32 */
17485
17486 #endif /* __ASSEMBLY__ */
17487 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17488 index 7549b8b..f0edfda 100644
17489 --- a/arch/x86/include/asm/paravirt_types.h
17490 +++ b/arch/x86/include/asm/paravirt_types.h
17491 @@ -84,7 +84,7 @@ struct pv_init_ops {
17492 */
17493 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17494 unsigned long addr, unsigned len);
17495 -};
17496 +} __no_const __no_randomize_layout;
17497
17498
17499 struct pv_lazy_ops {
17500 @@ -92,13 +92,13 @@ struct pv_lazy_ops {
17501 void (*enter)(void);
17502 void (*leave)(void);
17503 void (*flush)(void);
17504 -};
17505 +} __no_randomize_layout;
17506
17507 struct pv_time_ops {
17508 unsigned long long (*sched_clock)(void);
17509 unsigned long long (*steal_clock)(int cpu);
17510 unsigned long (*get_tsc_khz)(void);
17511 -};
17512 +} __no_const __no_randomize_layout;
17513
17514 struct pv_cpu_ops {
17515 /* hooks for various privileged instructions */
17516 @@ -192,7 +192,7 @@ struct pv_cpu_ops {
17517
17518 void (*start_context_switch)(struct task_struct *prev);
17519 void (*end_context_switch)(struct task_struct *next);
17520 -};
17521 +} __no_const __no_randomize_layout;
17522
17523 struct pv_irq_ops {
17524 /*
17525 @@ -215,7 +215,7 @@ struct pv_irq_ops {
17526 #ifdef CONFIG_X86_64
17527 void (*adjust_exception_frame)(void);
17528 #endif
17529 -};
17530 +} __no_randomize_layout;
17531
17532 struct pv_apic_ops {
17533 #ifdef CONFIG_X86_LOCAL_APIC
17534 @@ -223,7 +223,7 @@ struct pv_apic_ops {
17535 unsigned long start_eip,
17536 unsigned long start_esp);
17537 #endif
17538 -};
17539 +} __no_const __no_randomize_layout;
17540
17541 struct pv_mmu_ops {
17542 unsigned long (*read_cr2)(void);
17543 @@ -313,6 +313,7 @@ struct pv_mmu_ops {
17544 struct paravirt_callee_save make_pud;
17545
17546 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17547 + void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17548 #endif /* PAGETABLE_LEVELS == 4 */
17549 #endif /* PAGETABLE_LEVELS >= 3 */
17550
17551 @@ -324,7 +325,13 @@ struct pv_mmu_ops {
17552 an mfn. We can tell which is which from the index. */
17553 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17554 phys_addr_t phys, pgprot_t flags);
17555 -};
17556 +
17557 +#ifdef CONFIG_PAX_KERNEXEC
17558 + unsigned long (*pax_open_kernel)(void);
17559 + unsigned long (*pax_close_kernel)(void);
17560 +#endif
17561 +
17562 +} __no_randomize_layout;
17563
17564 struct arch_spinlock;
17565 #ifdef CONFIG_SMP
17566 @@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17567 struct pv_lock_ops {
17568 struct paravirt_callee_save lock_spinning;
17569 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17570 -};
17571 +} __no_randomize_layout;
17572
17573 /* This contains all the paravirt structures: we get a convenient
17574 * number for each function using the offset which we use to indicate
17575 - * what to patch. */
17576 + * what to patch.
17577 + * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17578 + */
17579 +
17580 struct paravirt_patch_template {
17581 struct pv_init_ops pv_init_ops;
17582 struct pv_time_ops pv_time_ops;
17583 @@ -349,7 +359,7 @@ struct paravirt_patch_template {
17584 struct pv_apic_ops pv_apic_ops;
17585 struct pv_mmu_ops pv_mmu_ops;
17586 struct pv_lock_ops pv_lock_ops;
17587 -};
17588 +} __no_randomize_layout;
17589
17590 extern struct pv_info pv_info;
17591 extern struct pv_init_ops pv_init_ops;
17592 diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17593 index c4412e9..90e88c5 100644
17594 --- a/arch/x86/include/asm/pgalloc.h
17595 +++ b/arch/x86/include/asm/pgalloc.h
17596 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17597 pmd_t *pmd, pte_t *pte)
17598 {
17599 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17600 + set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17601 +}
17602 +
17603 +static inline void pmd_populate_user(struct mm_struct *mm,
17604 + pmd_t *pmd, pte_t *pte)
17605 +{
17606 + paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17607 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17608 }
17609
17610 @@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17611
17612 #ifdef CONFIG_X86_PAE
17613 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17614 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17615 +{
17616 + pud_populate(mm, pudp, pmd);
17617 +}
17618 #else /* !CONFIG_X86_PAE */
17619 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17620 {
17621 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17622 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17623 }
17624 +
17625 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17626 +{
17627 + paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17628 + set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17629 +}
17630 #endif /* CONFIG_X86_PAE */
17631
17632 #if PAGETABLE_LEVELS > 3
17633 @@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17634 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17635 }
17636
17637 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17638 +{
17639 + paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17640 + set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17641 +}
17642 +
17643 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17644 {
17645 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17646 diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17647 index 0d193e2..bf59aeb 100644
17648 --- a/arch/x86/include/asm/pgtable-2level.h
17649 +++ b/arch/x86/include/asm/pgtable-2level.h
17650 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17651
17652 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17653 {
17654 + pax_open_kernel();
17655 *pmdp = pmd;
17656 + pax_close_kernel();
17657 }
17658
17659 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17660 diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17661 index 81bb91b..9392125 100644
17662 --- a/arch/x86/include/asm/pgtable-3level.h
17663 +++ b/arch/x86/include/asm/pgtable-3level.h
17664 @@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17665
17666 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17667 {
17668 + pax_open_kernel();
17669 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17670 + pax_close_kernel();
17671 }
17672
17673 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17674 {
17675 + pax_open_kernel();
17676 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17677 + pax_close_kernel();
17678 }
17679
17680 /*
17681 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17682 index b459ddf..b44081b 100644
17683 --- a/arch/x86/include/asm/pgtable.h
17684 +++ b/arch/x86/include/asm/pgtable.h
17685 @@ -46,6 +46,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17686
17687 #ifndef __PAGETABLE_PUD_FOLDED
17688 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
17689 +#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
17690 #define pgd_clear(pgd) native_pgd_clear(pgd)
17691 #endif
17692
17693 @@ -83,12 +84,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17694
17695 #define arch_end_context_switch(prev) do {} while(0)
17696
17697 +#define pax_open_kernel() native_pax_open_kernel()
17698 +#define pax_close_kernel() native_pax_close_kernel()
17699 #endif /* CONFIG_PARAVIRT */
17700
17701 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
17702 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
17703 +
17704 +#ifdef CONFIG_PAX_KERNEXEC
17705 +static inline unsigned long native_pax_open_kernel(void)
17706 +{
17707 + unsigned long cr0;
17708 +
17709 + preempt_disable();
17710 + barrier();
17711 + cr0 = read_cr0() ^ X86_CR0_WP;
17712 + BUG_ON(cr0 & X86_CR0_WP);
17713 + write_cr0(cr0);
17714 + return cr0 ^ X86_CR0_WP;
17715 +}
17716 +
17717 +static inline unsigned long native_pax_close_kernel(void)
17718 +{
17719 + unsigned long cr0;
17720 +
17721 + cr0 = read_cr0() ^ X86_CR0_WP;
17722 + BUG_ON(!(cr0 & X86_CR0_WP));
17723 + write_cr0(cr0);
17724 + barrier();
17725 + preempt_enable_no_resched();
17726 + return cr0 ^ X86_CR0_WP;
17727 +}
17728 +#else
17729 +static inline unsigned long native_pax_open_kernel(void) { return 0; }
17730 +static inline unsigned long native_pax_close_kernel(void) { return 0; }
17731 +#endif
17732 +
17733 /*
17734 * The following only work if pte_present() is true.
17735 * Undefined behaviour if not..
17736 */
17737 +static inline int pte_user(pte_t pte)
17738 +{
17739 + return pte_val(pte) & _PAGE_USER;
17740 +}
17741 +
17742 static inline int pte_dirty(pte_t pte)
17743 {
17744 return pte_flags(pte) & _PAGE_DIRTY;
17745 @@ -149,6 +189,11 @@ static inline unsigned long pud_pfn(pud_t pud)
17746 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
17747 }
17748
17749 +static inline unsigned long pgd_pfn(pgd_t pgd)
17750 +{
17751 + return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
17752 +}
17753 +
17754 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
17755
17756 static inline int pmd_large(pmd_t pte)
17757 @@ -202,9 +247,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
17758 return pte_clear_flags(pte, _PAGE_RW);
17759 }
17760
17761 +static inline pte_t pte_mkread(pte_t pte)
17762 +{
17763 + return __pte(pte_val(pte) | _PAGE_USER);
17764 +}
17765 +
17766 static inline pte_t pte_mkexec(pte_t pte)
17767 {
17768 - return pte_clear_flags(pte, _PAGE_NX);
17769 +#ifdef CONFIG_X86_PAE
17770 + if (__supported_pte_mask & _PAGE_NX)
17771 + return pte_clear_flags(pte, _PAGE_NX);
17772 + else
17773 +#endif
17774 + return pte_set_flags(pte, _PAGE_USER);
17775 +}
17776 +
17777 +static inline pte_t pte_exprotect(pte_t pte)
17778 +{
17779 +#ifdef CONFIG_X86_PAE
17780 + if (__supported_pte_mask & _PAGE_NX)
17781 + return pte_set_flags(pte, _PAGE_NX);
17782 + else
17783 +#endif
17784 + return pte_clear_flags(pte, _PAGE_USER);
17785 }
17786
17787 static inline pte_t pte_mkdirty(pte_t pte)
17788 @@ -431,6 +496,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
17789 #endif
17790
17791 #ifndef __ASSEMBLY__
17792 +
17793 +#ifdef CONFIG_PAX_PER_CPU_PGD
17794 +extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
17795 +enum cpu_pgd_type {kernel = 0, user = 1};
17796 +static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
17797 +{
17798 + return cpu_pgd[cpu][type];
17799 +}
17800 +#endif
17801 +
17802 #include <linux/mm_types.h>
17803 #include <linux/mmdebug.h>
17804 #include <linux/log2.h>
17805 @@ -571,7 +646,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
17806 * Currently stuck as a macro due to indirect forward reference to
17807 * linux/mmzone.h's __section_mem_map_addr() definition:
17808 */
17809 -#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
17810 +#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
17811
17812 /* Find an entry in the second-level page table.. */
17813 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
17814 @@ -611,7 +686,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
17815 * Currently stuck as a macro due to indirect forward reference to
17816 * linux/mmzone.h's __section_mem_map_addr() definition:
17817 */
17818 -#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
17819 +#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
17820
17821 /* to find an entry in a page-table-directory. */
17822 static inline unsigned long pud_index(unsigned long address)
17823 @@ -626,7 +701,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
17824
17825 static inline int pgd_bad(pgd_t pgd)
17826 {
17827 - return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
17828 + return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
17829 }
17830
17831 static inline int pgd_none(pgd_t pgd)
17832 @@ -649,7 +724,12 @@ static inline int pgd_none(pgd_t pgd)
17833 * pgd_offset() returns a (pgd_t *)
17834 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
17835 */
17836 -#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
17837 +#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
17838 +
17839 +#ifdef CONFIG_PAX_PER_CPU_PGD
17840 +#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
17841 +#endif
17842 +
17843 /*
17844 * a shortcut which implies the use of the kernel's pgd, instead
17845 * of a process's
17846 @@ -660,6 +740,23 @@ static inline int pgd_none(pgd_t pgd)
17847 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
17848 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
17849
17850 +#ifdef CONFIG_X86_32
17851 +#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
17852 +#else
17853 +#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
17854 +#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
17855 +
17856 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17857 +#ifdef __ASSEMBLY__
17858 +#define pax_user_shadow_base pax_user_shadow_base(%rip)
17859 +#else
17860 +extern unsigned long pax_user_shadow_base;
17861 +extern pgdval_t clone_pgd_mask;
17862 +#endif
17863 +#endif
17864 +
17865 +#endif
17866 +
17867 #ifndef __ASSEMBLY__
17868
17869 extern int direct_gbpages;
17870 @@ -826,11 +923,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
17871 * dst and src can be on the same page, but the range must not overlap,
17872 * and must not cross a page boundary.
17873 */
17874 -static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
17875 +static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
17876 {
17877 - memcpy(dst, src, count * sizeof(pgd_t));
17878 + pax_open_kernel();
17879 + while (count--)
17880 + *dst++ = *src++;
17881 + pax_close_kernel();
17882 }
17883
17884 +#ifdef CONFIG_PAX_PER_CPU_PGD
17885 +extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
17886 +#endif
17887 +
17888 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17889 +extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
17890 +#else
17891 +static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
17892 +#endif
17893 +
17894 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
17895 static inline int page_level_shift(enum pg_level level)
17896 {
17897 diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
17898 index 9ee3221..b979c6b 100644
17899 --- a/arch/x86/include/asm/pgtable_32.h
17900 +++ b/arch/x86/include/asm/pgtable_32.h
17901 @@ -25,9 +25,6 @@
17902 struct mm_struct;
17903 struct vm_area_struct;
17904
17905 -extern pgd_t swapper_pg_dir[1024];
17906 -extern pgd_t initial_page_table[1024];
17907 -
17908 static inline void pgtable_cache_init(void) { }
17909 static inline void check_pgt_cache(void) { }
17910 void paging_init(void);
17911 @@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
17912 # include <asm/pgtable-2level.h>
17913 #endif
17914
17915 +extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
17916 +extern pgd_t initial_page_table[PTRS_PER_PGD];
17917 +#ifdef CONFIG_X86_PAE
17918 +extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
17919 +#endif
17920 +
17921 #if defined(CONFIG_HIGHPTE)
17922 #define pte_offset_map(dir, address) \
17923 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
17924 @@ -62,12 +65,17 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
17925 /* Clear a kernel PTE and flush it from the TLB */
17926 #define kpte_clear_flush(ptep, vaddr) \
17927 do { \
17928 + pax_open_kernel(); \
17929 pte_clear(&init_mm, (vaddr), (ptep)); \
17930 + pax_close_kernel(); \
17931 __flush_tlb_one((vaddr)); \
17932 } while (0)
17933
17934 #endif /* !__ASSEMBLY__ */
17935
17936 +#define HAVE_ARCH_UNMAPPED_AREA
17937 +#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
17938 +
17939 /*
17940 * kern_addr_valid() is (1) for FLATMEM and (0) for
17941 * SPARSEMEM and DISCONTIGMEM
17942 diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
17943 index ed5903b..c7fe163 100644
17944 --- a/arch/x86/include/asm/pgtable_32_types.h
17945 +++ b/arch/x86/include/asm/pgtable_32_types.h
17946 @@ -8,7 +8,7 @@
17947 */
17948 #ifdef CONFIG_X86_PAE
17949 # include <asm/pgtable-3level_types.h>
17950 -# define PMD_SIZE (1UL << PMD_SHIFT)
17951 +# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
17952 # define PMD_MASK (~(PMD_SIZE - 1))
17953 #else
17954 # include <asm/pgtable-2level_types.h>
17955 @@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
17956 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
17957 #endif
17958
17959 +#ifdef CONFIG_PAX_KERNEXEC
17960 +#ifndef __ASSEMBLY__
17961 +extern unsigned char MODULES_EXEC_VADDR[];
17962 +extern unsigned char MODULES_EXEC_END[];
17963 +#endif
17964 +#include <asm/boot.h>
17965 +#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
17966 +#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
17967 +#else
17968 +#define ktla_ktva(addr) (addr)
17969 +#define ktva_ktla(addr) (addr)
17970 +#endif
17971 +
17972 #define MODULES_VADDR VMALLOC_START
17973 #define MODULES_END VMALLOC_END
17974 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
17975 diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
17976 index e22c1db..23a625a 100644
17977 --- a/arch/x86/include/asm/pgtable_64.h
17978 +++ b/arch/x86/include/asm/pgtable_64.h
17979 @@ -16,10 +16,14 @@
17980
17981 extern pud_t level3_kernel_pgt[512];
17982 extern pud_t level3_ident_pgt[512];
17983 +extern pud_t level3_vmalloc_start_pgt[512];
17984 +extern pud_t level3_vmalloc_end_pgt[512];
17985 +extern pud_t level3_vmemmap_pgt[512];
17986 +extern pud_t level2_vmemmap_pgt[512];
17987 extern pmd_t level2_kernel_pgt[512];
17988 extern pmd_t level2_fixmap_pgt[512];
17989 -extern pmd_t level2_ident_pgt[512];
17990 -extern pgd_t init_level4_pgt[];
17991 +extern pmd_t level2_ident_pgt[512*2];
17992 +extern pgd_t init_level4_pgt[512];
17993
17994 #define swapper_pg_dir init_level4_pgt
17995
17996 @@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17997
17998 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17999 {
18000 + pax_open_kernel();
18001 *pmdp = pmd;
18002 + pax_close_kernel();
18003 }
18004
18005 static inline void native_pmd_clear(pmd_t *pmd)
18006 @@ -97,7 +103,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18007
18008 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18009 {
18010 + pax_open_kernel();
18011 *pudp = pud;
18012 + pax_close_kernel();
18013 }
18014
18015 static inline void native_pud_clear(pud_t *pud)
18016 @@ -107,6 +115,13 @@ static inline void native_pud_clear(pud_t *pud)
18017
18018 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18019 {
18020 + pax_open_kernel();
18021 + *pgdp = pgd;
18022 + pax_close_kernel();
18023 +}
18024 +
18025 +static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18026 +{
18027 *pgdp = pgd;
18028 }
18029
18030 diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18031 index c883bf7..19970b3 100644
18032 --- a/arch/x86/include/asm/pgtable_64_types.h
18033 +++ b/arch/x86/include/asm/pgtable_64_types.h
18034 @@ -61,6 +61,11 @@ typedef struct { pteval_t pte; } pte_t;
18035 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18036 #define MODULES_END _AC(0xffffffffff000000, UL)
18037 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18038 +#define MODULES_EXEC_VADDR MODULES_VADDR
18039 +#define MODULES_EXEC_END MODULES_END
18040 +
18041 +#define ktla_ktva(addr) (addr)
18042 +#define ktva_ktla(addr) (addr)
18043
18044 #define EARLY_DYNAMIC_PAGE_TABLES 64
18045
18046 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18047 index eb3d449..8d95316 100644
18048 --- a/arch/x86/include/asm/pgtable_types.h
18049 +++ b/arch/x86/include/asm/pgtable_types.h
18050 @@ -16,13 +16,12 @@
18051 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
18052 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
18053 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
18054 -#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
18055 +#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
18056 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
18057 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
18058 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
18059 -#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
18060 -#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
18061 -#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
18062 +#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
18063 +#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
18064 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
18065
18066 /* If _PAGE_BIT_PRESENT is clear, we use these: */
18067 @@ -40,7 +39,6 @@
18068 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
18069 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
18070 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
18071 -#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
18072 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
18073 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
18074 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
18075 @@ -87,8 +85,10 @@
18076
18077 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18078 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18079 -#else
18080 +#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18081 #define _PAGE_NX (_AT(pteval_t, 0))
18082 +#else
18083 +#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18084 #endif
18085
18086 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
18087 @@ -147,6 +147,9 @@
18088 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18089 _PAGE_ACCESSED)
18090
18091 +#define PAGE_READONLY_NOEXEC PAGE_READONLY
18092 +#define PAGE_SHARED_NOEXEC PAGE_SHARED
18093 +
18094 #define __PAGE_KERNEL_EXEC \
18095 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18096 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18097 @@ -157,7 +160,7 @@
18098 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
18099 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
18100 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
18101 -#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18102 +#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18103 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18104 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
18105 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18106 @@ -214,7 +217,7 @@
18107 #ifdef CONFIG_X86_64
18108 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18109 #else
18110 -#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18111 +#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18112 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18113 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18114 #endif
18115 @@ -253,7 +256,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18116 {
18117 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18118 }
18119 +#endif
18120
18121 +#if PAGETABLE_LEVELS == 3
18122 +#include <asm-generic/pgtable-nopud.h>
18123 +#endif
18124 +
18125 +#if PAGETABLE_LEVELS == 2
18126 +#include <asm-generic/pgtable-nopmd.h>
18127 +#endif
18128 +
18129 +#ifndef __ASSEMBLY__
18130 #if PAGETABLE_LEVELS > 3
18131 typedef struct { pudval_t pud; } pud_t;
18132
18133 @@ -267,8 +280,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18134 return pud.pud;
18135 }
18136 #else
18137 -#include <asm-generic/pgtable-nopud.h>
18138 -
18139 static inline pudval_t native_pud_val(pud_t pud)
18140 {
18141 return native_pgd_val(pud.pgd);
18142 @@ -288,8 +299,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18143 return pmd.pmd;
18144 }
18145 #else
18146 -#include <asm-generic/pgtable-nopmd.h>
18147 -
18148 static inline pmdval_t native_pmd_val(pmd_t pmd)
18149 {
18150 return native_pgd_val(pmd.pud.pgd);
18151 @@ -329,7 +338,6 @@ typedef struct page *pgtable_t;
18152
18153 extern pteval_t __supported_pte_mask;
18154 extern void set_nx(void);
18155 -extern int nx_enabled;
18156
18157 #define pgprot_writecombine pgprot_writecombine
18158 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18159 diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18160 index 7024c12..71c46b9 100644
18161 --- a/arch/x86/include/asm/preempt.h
18162 +++ b/arch/x86/include/asm/preempt.h
18163 @@ -87,7 +87,7 @@ static __always_inline void __preempt_count_sub(int val)
18164 */
18165 static __always_inline bool __preempt_count_dec_and_test(void)
18166 {
18167 - GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18168 + GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18169 }
18170
18171 /*
18172 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18173 index a4ea023..33aa874 100644
18174 --- a/arch/x86/include/asm/processor.h
18175 +++ b/arch/x86/include/asm/processor.h
18176 @@ -128,7 +128,7 @@ struct cpuinfo_x86 {
18177 /* Index into per_cpu list: */
18178 u16 cpu_index;
18179 u32 microcode;
18180 -} __attribute__((__aligned__(SMP_CACHE_BYTES)));
18181 +} __attribute__((__aligned__(SMP_CACHE_BYTES))) __randomize_layout;
18182
18183 #define X86_VENDOR_INTEL 0
18184 #define X86_VENDOR_CYRIX 1
18185 @@ -199,9 +199,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18186 : "memory");
18187 }
18188
18189 +/* invpcid (%rdx),%rax */
18190 +#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18191 +
18192 +#define INVPCID_SINGLE_ADDRESS 0UL
18193 +#define INVPCID_SINGLE_CONTEXT 1UL
18194 +#define INVPCID_ALL_GLOBAL 2UL
18195 +#define INVPCID_ALL_MONGLOBAL 3UL
18196 +
18197 +#define PCID_KERNEL 0UL
18198 +#define PCID_USER 1UL
18199 +#define PCID_NOFLUSH (1UL << 63)
18200 +
18201 static inline void load_cr3(pgd_t *pgdir)
18202 {
18203 - write_cr3(__pa(pgdir));
18204 + write_cr3(__pa(pgdir) | PCID_KERNEL);
18205 }
18206
18207 #ifdef CONFIG_X86_32
18208 @@ -283,7 +295,7 @@ struct tss_struct {
18209
18210 } ____cacheline_aligned;
18211
18212 -DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18213 +extern struct tss_struct init_tss[NR_CPUS];
18214
18215 /*
18216 * Save the original ist values for checking stack pointers during debugging
18217 @@ -479,6 +491,7 @@ struct thread_struct {
18218 unsigned short ds;
18219 unsigned short fsindex;
18220 unsigned short gsindex;
18221 + unsigned short ss;
18222 #endif
18223 #ifdef CONFIG_X86_32
18224 unsigned long ip;
18225 @@ -588,29 +601,8 @@ static inline void load_sp0(struct tss_struct *tss,
18226 extern unsigned long mmu_cr4_features;
18227 extern u32 *trampoline_cr4_features;
18228
18229 -static inline void set_in_cr4(unsigned long mask)
18230 -{
18231 - unsigned long cr4;
18232 -
18233 - mmu_cr4_features |= mask;
18234 - if (trampoline_cr4_features)
18235 - *trampoline_cr4_features = mmu_cr4_features;
18236 - cr4 = read_cr4();
18237 - cr4 |= mask;
18238 - write_cr4(cr4);
18239 -}
18240 -
18241 -static inline void clear_in_cr4(unsigned long mask)
18242 -{
18243 - unsigned long cr4;
18244 -
18245 - mmu_cr4_features &= ~mask;
18246 - if (trampoline_cr4_features)
18247 - *trampoline_cr4_features = mmu_cr4_features;
18248 - cr4 = read_cr4();
18249 - cr4 &= ~mask;
18250 - write_cr4(cr4);
18251 -}
18252 +extern void set_in_cr4(unsigned long mask);
18253 +extern void clear_in_cr4(unsigned long mask);
18254
18255 typedef struct {
18256 unsigned long seg;
18257 @@ -836,11 +828,18 @@ static inline void spin_lock_prefetch(const void *x)
18258 */
18259 #define TASK_SIZE PAGE_OFFSET
18260 #define TASK_SIZE_MAX TASK_SIZE
18261 +
18262 +#ifdef CONFIG_PAX_SEGMEXEC
18263 +#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18264 +#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18265 +#else
18266 #define STACK_TOP TASK_SIZE
18267 -#define STACK_TOP_MAX STACK_TOP
18268 +#endif
18269 +
18270 +#define STACK_TOP_MAX TASK_SIZE
18271
18272 #define INIT_THREAD { \
18273 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
18274 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18275 .vm86_info = NULL, \
18276 .sysenter_cs = __KERNEL_CS, \
18277 .io_bitmap_ptr = NULL, \
18278 @@ -854,7 +853,7 @@ static inline void spin_lock_prefetch(const void *x)
18279 */
18280 #define INIT_TSS { \
18281 .x86_tss = { \
18282 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
18283 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18284 .ss0 = __KERNEL_DS, \
18285 .ss1 = __KERNEL_CS, \
18286 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18287 @@ -865,11 +864,7 @@ static inline void spin_lock_prefetch(const void *x)
18288 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18289
18290 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18291 -#define KSTK_TOP(info) \
18292 -({ \
18293 - unsigned long *__ptr = (unsigned long *)(info); \
18294 - (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18295 -})
18296 +#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18297
18298 /*
18299 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18300 @@ -884,7 +879,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18301 #define task_pt_regs(task) \
18302 ({ \
18303 struct pt_regs *__regs__; \
18304 - __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18305 + __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18306 __regs__ - 1; \
18307 })
18308
18309 @@ -894,13 +889,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18310 /*
18311 * User space process size. 47bits minus one guard page.
18312 */
18313 -#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18314 +#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18315
18316 /* This decides where the kernel will search for a free chunk of vm
18317 * space during mmap's.
18318 */
18319 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18320 - 0xc0000000 : 0xFFFFe000)
18321 + 0xc0000000 : 0xFFFFf000)
18322
18323 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18324 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18325 @@ -911,11 +906,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18326 #define STACK_TOP_MAX TASK_SIZE_MAX
18327
18328 #define INIT_THREAD { \
18329 - .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18330 + .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18331 }
18332
18333 #define INIT_TSS { \
18334 - .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18335 + .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18336 }
18337
18338 /*
18339 @@ -943,6 +938,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18340 */
18341 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18342
18343 +#ifdef CONFIG_PAX_SEGMEXEC
18344 +#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18345 +#endif
18346 +
18347 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18348
18349 /* Get/set a process' ability to use the timestamp counter instruction */
18350 @@ -969,7 +968,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18351 return 0;
18352 }
18353
18354 -extern unsigned long arch_align_stack(unsigned long sp);
18355 +#define arch_align_stack(x) ((x) & ~0xfUL)
18356 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18357
18358 void default_idle(void);
18359 @@ -979,6 +978,6 @@ bool xen_set_default_idle(void);
18360 #define xen_set_default_idle 0
18361 #endif
18362
18363 -void stop_this_cpu(void *dummy);
18364 +void stop_this_cpu(void *dummy) __noreturn;
18365 void df_debug(struct pt_regs *regs, long error_code);
18366 #endif /* _ASM_X86_PROCESSOR_H */
18367 diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18368 index 6205f0c..b31a4a4 100644
18369 --- a/arch/x86/include/asm/ptrace.h
18370 +++ b/arch/x86/include/asm/ptrace.h
18371 @@ -84,28 +84,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18372 }
18373
18374 /*
18375 - * user_mode_vm(regs) determines whether a register set came from user mode.
18376 + * user_mode(regs) determines whether a register set came from user mode.
18377 * This is true if V8086 mode was enabled OR if the register set was from
18378 * protected mode with RPL-3 CS value. This tricky test checks that with
18379 * one comparison. Many places in the kernel can bypass this full check
18380 - * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18381 + * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18382 + * be used.
18383 */
18384 -static inline int user_mode(struct pt_regs *regs)
18385 +static inline int user_mode_novm(struct pt_regs *regs)
18386 {
18387 #ifdef CONFIG_X86_32
18388 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18389 #else
18390 - return !!(regs->cs & 3);
18391 + return !!(regs->cs & SEGMENT_RPL_MASK);
18392 #endif
18393 }
18394
18395 -static inline int user_mode_vm(struct pt_regs *regs)
18396 +static inline int user_mode(struct pt_regs *regs)
18397 {
18398 #ifdef CONFIG_X86_32
18399 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18400 USER_RPL;
18401 #else
18402 - return user_mode(regs);
18403 + return user_mode_novm(regs);
18404 #endif
18405 }
18406
18407 @@ -121,15 +122,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18408 #ifdef CONFIG_X86_64
18409 static inline bool user_64bit_mode(struct pt_regs *regs)
18410 {
18411 + unsigned long cs = regs->cs & 0xffff;
18412 #ifndef CONFIG_PARAVIRT
18413 /*
18414 * On non-paravirt systems, this is the only long mode CPL 3
18415 * selector. We do not allow long mode selectors in the LDT.
18416 */
18417 - return regs->cs == __USER_CS;
18418 + return cs == __USER_CS;
18419 #else
18420 /* Headers are too twisted for this to go in paravirt.h. */
18421 - return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18422 + return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18423 #endif
18424 }
18425
18426 @@ -180,9 +182,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18427 * Traps from the kernel do not save sp and ss.
18428 * Use the helper function to retrieve sp.
18429 */
18430 - if (offset == offsetof(struct pt_regs, sp) &&
18431 - regs->cs == __KERNEL_CS)
18432 - return kernel_stack_pointer(regs);
18433 + if (offset == offsetof(struct pt_regs, sp)) {
18434 + unsigned long cs = regs->cs & 0xffff;
18435 + if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18436 + return kernel_stack_pointer(regs);
18437 + }
18438 #endif
18439 return *(unsigned long *)((unsigned long)regs + offset);
18440 }
18441 diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18442 index 9c6b890..5305f53 100644
18443 --- a/arch/x86/include/asm/realmode.h
18444 +++ b/arch/x86/include/asm/realmode.h
18445 @@ -22,16 +22,14 @@ struct real_mode_header {
18446 #endif
18447 /* APM/BIOS reboot */
18448 u32 machine_real_restart_asm;
18449 -#ifdef CONFIG_X86_64
18450 u32 machine_real_restart_seg;
18451 -#endif
18452 };
18453
18454 /* This must match data at trampoline_32/64.S */
18455 struct trampoline_header {
18456 #ifdef CONFIG_X86_32
18457 u32 start;
18458 - u16 gdt_pad;
18459 + u16 boot_cs;
18460 u16 gdt_limit;
18461 u32 gdt_base;
18462 #else
18463 diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18464 index a82c4f1..ac45053 100644
18465 --- a/arch/x86/include/asm/reboot.h
18466 +++ b/arch/x86/include/asm/reboot.h
18467 @@ -6,13 +6,13 @@
18468 struct pt_regs;
18469
18470 struct machine_ops {
18471 - void (*restart)(char *cmd);
18472 - void (*halt)(void);
18473 - void (*power_off)(void);
18474 + void (* __noreturn restart)(char *cmd);
18475 + void (* __noreturn halt)(void);
18476 + void (* __noreturn power_off)(void);
18477 void (*shutdown)(void);
18478 void (*crash_shutdown)(struct pt_regs *);
18479 - void (*emergency_restart)(void);
18480 -};
18481 + void (* __noreturn emergency_restart)(void);
18482 +} __no_const;
18483
18484 extern struct machine_ops machine_ops;
18485
18486 diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18487 index 8f7866a..e442f20 100644
18488 --- a/arch/x86/include/asm/rmwcc.h
18489 +++ b/arch/x86/include/asm/rmwcc.h
18490 @@ -3,7 +3,34 @@
18491
18492 #ifdef CC_HAVE_ASM_GOTO
18493
18494 -#define __GEN_RMWcc(fullop, var, cc, ...) \
18495 +#ifdef CONFIG_PAX_REFCOUNT
18496 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18497 +do { \
18498 + asm_volatile_goto (fullop \
18499 + ";jno 0f\n" \
18500 + fullantiop \
18501 + ";int $4\n0:\n" \
18502 + _ASM_EXTABLE(0b, 0b) \
18503 + ";j" cc " %l[cc_label]" \
18504 + : : "m" (var), ## __VA_ARGS__ \
18505 + : "memory" : cc_label); \
18506 + return 0; \
18507 +cc_label: \
18508 + return 1; \
18509 +} while (0)
18510 +#else
18511 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18512 +do { \
18513 + asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18514 + : : "m" (var), ## __VA_ARGS__ \
18515 + : "memory" : cc_label); \
18516 + return 0; \
18517 +cc_label: \
18518 + return 1; \
18519 +} while (0)
18520 +#endif
18521 +
18522 +#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18523 do { \
18524 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18525 : : "m" (var), ## __VA_ARGS__ \
18526 @@ -13,15 +40,46 @@ cc_label: \
18527 return 1; \
18528 } while (0)
18529
18530 -#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18531 - __GEN_RMWcc(op " " arg0, var, cc)
18532 +#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18533 + __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18534
18535 -#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18536 - __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18537 +#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18538 + __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18539 +
18540 +#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18541 + __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18542 +
18543 +#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18544 + __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18545
18546 #else /* !CC_HAVE_ASM_GOTO */
18547
18548 -#define __GEN_RMWcc(fullop, var, cc, ...) \
18549 +#ifdef CONFIG_PAX_REFCOUNT
18550 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18551 +do { \
18552 + char c; \
18553 + asm volatile (fullop \
18554 + ";jno 0f\n" \
18555 + fullantiop \
18556 + ";int $4\n0:\n" \
18557 + _ASM_EXTABLE(0b, 0b) \
18558 + "; set" cc " %1" \
18559 + : "+m" (var), "=qm" (c) \
18560 + : __VA_ARGS__ : "memory"); \
18561 + return c != 0; \
18562 +} while (0)
18563 +#else
18564 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18565 +do { \
18566 + char c; \
18567 + asm volatile (fullop "; set" cc " %1" \
18568 + : "+m" (var), "=qm" (c) \
18569 + : __VA_ARGS__ : "memory"); \
18570 + return c != 0; \
18571 +} while (0)
18572 +#endif
18573 +
18574 +#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18575 do { \
18576 char c; \
18577 asm volatile (fullop "; set" cc " %1" \
18578 @@ -30,11 +88,17 @@ do { \
18579 return c != 0; \
18580 } while (0)
18581
18582 -#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18583 - __GEN_RMWcc(op " " arg0, var, cc)
18584 +#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18585 + __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18586 +
18587 +#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18588 + __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18589 +
18590 +#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18591 + __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18592
18593 -#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18594 - __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18595 +#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18596 + __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18597
18598 #endif /* CC_HAVE_ASM_GOTO */
18599
18600 diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18601 index cad82c9..2e5c5c1 100644
18602 --- a/arch/x86/include/asm/rwsem.h
18603 +++ b/arch/x86/include/asm/rwsem.h
18604 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18605 {
18606 asm volatile("# beginning down_read\n\t"
18607 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18608 +
18609 +#ifdef CONFIG_PAX_REFCOUNT
18610 + "jno 0f\n"
18611 + LOCK_PREFIX _ASM_DEC "(%1)\n"
18612 + "int $4\n0:\n"
18613 + _ASM_EXTABLE(0b, 0b)
18614 +#endif
18615 +
18616 /* adds 0x00000001 */
18617 " jns 1f\n"
18618 " call call_rwsem_down_read_failed\n"
18619 @@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18620 "1:\n\t"
18621 " mov %1,%2\n\t"
18622 " add %3,%2\n\t"
18623 +
18624 +#ifdef CONFIG_PAX_REFCOUNT
18625 + "jno 0f\n"
18626 + "sub %3,%2\n"
18627 + "int $4\n0:\n"
18628 + _ASM_EXTABLE(0b, 0b)
18629 +#endif
18630 +
18631 " jle 2f\n\t"
18632 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18633 " jnz 1b\n\t"
18634 @@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18635 long tmp;
18636 asm volatile("# beginning down_write\n\t"
18637 LOCK_PREFIX " xadd %1,(%2)\n\t"
18638 +
18639 +#ifdef CONFIG_PAX_REFCOUNT
18640 + "jno 0f\n"
18641 + "mov %1,(%2)\n"
18642 + "int $4\n0:\n"
18643 + _ASM_EXTABLE(0b, 0b)
18644 +#endif
18645 +
18646 /* adds 0xffff0001, returns the old value */
18647 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18648 /* was the active mask 0 before? */
18649 @@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18650 long tmp;
18651 asm volatile("# beginning __up_read\n\t"
18652 LOCK_PREFIX " xadd %1,(%2)\n\t"
18653 +
18654 +#ifdef CONFIG_PAX_REFCOUNT
18655 + "jno 0f\n"
18656 + "mov %1,(%2)\n"
18657 + "int $4\n0:\n"
18658 + _ASM_EXTABLE(0b, 0b)
18659 +#endif
18660 +
18661 /* subtracts 1, returns the old value */
18662 " jns 1f\n\t"
18663 " call call_rwsem_wake\n" /* expects old value in %edx */
18664 @@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18665 long tmp;
18666 asm volatile("# beginning __up_write\n\t"
18667 LOCK_PREFIX " xadd %1,(%2)\n\t"
18668 +
18669 +#ifdef CONFIG_PAX_REFCOUNT
18670 + "jno 0f\n"
18671 + "mov %1,(%2)\n"
18672 + "int $4\n0:\n"
18673 + _ASM_EXTABLE(0b, 0b)
18674 +#endif
18675 +
18676 /* subtracts 0xffff0001, returns the old value */
18677 " jns 1f\n\t"
18678 " call call_rwsem_wake\n" /* expects old value in %edx */
18679 @@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18680 {
18681 asm volatile("# beginning __downgrade_write\n\t"
18682 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18683 +
18684 +#ifdef CONFIG_PAX_REFCOUNT
18685 + "jno 0f\n"
18686 + LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18687 + "int $4\n0:\n"
18688 + _ASM_EXTABLE(0b, 0b)
18689 +#endif
18690 +
18691 /*
18692 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18693 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18694 @@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18695 */
18696 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18697 {
18698 - asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18699 + asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18700 +
18701 +#ifdef CONFIG_PAX_REFCOUNT
18702 + "jno 0f\n"
18703 + LOCK_PREFIX _ASM_SUB "%1,%0\n"
18704 + "int $4\n0:\n"
18705 + _ASM_EXTABLE(0b, 0b)
18706 +#endif
18707 +
18708 : "+m" (sem->count)
18709 : "er" (delta));
18710 }
18711 @@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18712 */
18713 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18714 {
18715 - return delta + xadd(&sem->count, delta);
18716 + return delta + xadd_check_overflow(&sem->count, delta);
18717 }
18718
18719 #endif /* __KERNEL__ */
18720 diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18721 index 6f1c3a8..7744f19 100644
18722 --- a/arch/x86/include/asm/segment.h
18723 +++ b/arch/x86/include/asm/segment.h
18724 @@ -64,10 +64,15 @@
18725 * 26 - ESPFIX small SS
18726 * 27 - per-cpu [ offset to per-cpu data area ]
18727 * 28 - stack_canary-20 [ for stack protector ]
18728 - * 29 - unused
18729 - * 30 - unused
18730 + * 29 - PCI BIOS CS
18731 + * 30 - PCI BIOS DS
18732 * 31 - TSS for double fault handler
18733 */
18734 +#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
18735 +#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
18736 +#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
18737 +#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
18738 +
18739 #define GDT_ENTRY_TLS_MIN 6
18740 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
18741
18742 @@ -79,6 +84,8 @@
18743
18744 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
18745
18746 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
18747 +
18748 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
18749
18750 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
18751 @@ -104,6 +111,12 @@
18752 #define __KERNEL_STACK_CANARY 0
18753 #endif
18754
18755 +#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
18756 +#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
18757 +
18758 +#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
18759 +#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
18760 +
18761 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
18762
18763 /*
18764 @@ -141,7 +154,7 @@
18765 */
18766
18767 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
18768 -#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
18769 +#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
18770
18771
18772 #else
18773 @@ -165,6 +178,8 @@
18774 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
18775 #define __USER32_DS __USER_DS
18776
18777 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
18778 +
18779 #define GDT_ENTRY_TSS 8 /* needs two entries */
18780 #define GDT_ENTRY_LDT 10 /* needs two entries */
18781 #define GDT_ENTRY_TLS_MIN 12
18782 @@ -173,6 +188,8 @@
18783 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
18784 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
18785
18786 +#define GDT_ENTRY_UDEREF_KERNEL_DS 16
18787 +
18788 /* TLS indexes for 64bit - hardcoded in arch_prctl */
18789 #define FS_TLS 0
18790 #define GS_TLS 1
18791 @@ -180,12 +197,14 @@
18792 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
18793 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
18794
18795 -#define GDT_ENTRIES 16
18796 +#define GDT_ENTRIES 17
18797
18798 #endif
18799
18800 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
18801 +#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
18802 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
18803 +#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
18804 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
18805 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
18806 #ifndef CONFIG_PARAVIRT
18807 @@ -268,7 +287,7 @@ static inline unsigned long get_limit(unsigned long segment)
18808 {
18809 unsigned long __limit;
18810 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
18811 - return __limit + 1;
18812 + return __limit;
18813 }
18814
18815 #endif /* !__ASSEMBLY__ */
18816 diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
18817 index 8d3120f..352b440 100644
18818 --- a/arch/x86/include/asm/smap.h
18819 +++ b/arch/x86/include/asm/smap.h
18820 @@ -25,11 +25,40 @@
18821
18822 #include <asm/alternative-asm.h>
18823
18824 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18825 +#define ASM_PAX_OPEN_USERLAND \
18826 + 661: jmp 663f; \
18827 + .pushsection .altinstr_replacement, "a" ; \
18828 + 662: pushq %rax; nop; \
18829 + .popsection ; \
18830 + .pushsection .altinstructions, "a" ; \
18831 + altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
18832 + .popsection ; \
18833 + call __pax_open_userland; \
18834 + popq %rax; \
18835 + 663:
18836 +
18837 +#define ASM_PAX_CLOSE_USERLAND \
18838 + 661: jmp 663f; \
18839 + .pushsection .altinstr_replacement, "a" ; \
18840 + 662: pushq %rax; nop; \
18841 + .popsection; \
18842 + .pushsection .altinstructions, "a" ; \
18843 + altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
18844 + .popsection; \
18845 + call __pax_close_userland; \
18846 + popq %rax; \
18847 + 663:
18848 +#else
18849 +#define ASM_PAX_OPEN_USERLAND
18850 +#define ASM_PAX_CLOSE_USERLAND
18851 +#endif
18852 +
18853 #ifdef CONFIG_X86_SMAP
18854
18855 #define ASM_CLAC \
18856 661: ASM_NOP3 ; \
18857 - .pushsection .altinstr_replacement, "ax" ; \
18858 + .pushsection .altinstr_replacement, "a" ; \
18859 662: __ASM_CLAC ; \
18860 .popsection ; \
18861 .pushsection .altinstructions, "a" ; \
18862 @@ -38,7 +67,7 @@
18863
18864 #define ASM_STAC \
18865 661: ASM_NOP3 ; \
18866 - .pushsection .altinstr_replacement, "ax" ; \
18867 + .pushsection .altinstr_replacement, "a" ; \
18868 662: __ASM_STAC ; \
18869 .popsection ; \
18870 .pushsection .altinstructions, "a" ; \
18871 @@ -56,6 +85,37 @@
18872
18873 #include <asm/alternative.h>
18874
18875 +#define __HAVE_ARCH_PAX_OPEN_USERLAND
18876 +#define __HAVE_ARCH_PAX_CLOSE_USERLAND
18877 +
18878 +extern void __pax_open_userland(void);
18879 +static __always_inline unsigned long pax_open_userland(void)
18880 +{
18881 +
18882 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18883 + asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
18884 + :
18885 + : [open] "i" (__pax_open_userland)
18886 + : "memory", "rax");
18887 +#endif
18888 +
18889 + return 0;
18890 +}
18891 +
18892 +extern void __pax_close_userland(void);
18893 +static __always_inline unsigned long pax_close_userland(void)
18894 +{
18895 +
18896 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18897 + asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
18898 + :
18899 + : [close] "i" (__pax_close_userland)
18900 + : "memory", "rax");
18901 +#endif
18902 +
18903 + return 0;
18904 +}
18905 +
18906 #ifdef CONFIG_X86_SMAP
18907
18908 static __always_inline void clac(void)
18909 diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
18910 index 8cd27e0..7f05ec8 100644
18911 --- a/arch/x86/include/asm/smp.h
18912 +++ b/arch/x86/include/asm/smp.h
18913 @@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
18914 /* cpus sharing the last level cache: */
18915 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
18916 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
18917 -DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
18918 +DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
18919
18920 static inline struct cpumask *cpu_sibling_mask(int cpu)
18921 {
18922 @@ -78,7 +78,7 @@ struct smp_ops {
18923
18924 void (*send_call_func_ipi)(const struct cpumask *mask);
18925 void (*send_call_func_single_ipi)(int cpu);
18926 -};
18927 +} __no_const;
18928
18929 /* Globals due to paravirt */
18930 extern void set_cpu_sibling_map(int cpu);
18931 @@ -190,14 +190,8 @@ extern unsigned disabled_cpus;
18932 extern int safe_smp_processor_id(void);
18933
18934 #elif defined(CONFIG_X86_64_SMP)
18935 -#define raw_smp_processor_id() (this_cpu_read(cpu_number))
18936 -
18937 -#define stack_smp_processor_id() \
18938 -({ \
18939 - struct thread_info *ti; \
18940 - __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
18941 - ti->cpu; \
18942 -})
18943 +#define raw_smp_processor_id() (this_cpu_read(cpu_number))
18944 +#define stack_smp_processor_id() raw_smp_processor_id()
18945 #define safe_smp_processor_id() smp_processor_id()
18946
18947 #endif
18948 diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
18949 index 0f62f54..cb5d0dd 100644
18950 --- a/arch/x86/include/asm/spinlock.h
18951 +++ b/arch/x86/include/asm/spinlock.h
18952 @@ -222,6 +222,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
18953 static inline void arch_read_lock(arch_rwlock_t *rw)
18954 {
18955 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
18956 +
18957 +#ifdef CONFIG_PAX_REFCOUNT
18958 + "jno 0f\n"
18959 + LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
18960 + "int $4\n0:\n"
18961 + _ASM_EXTABLE(0b, 0b)
18962 +#endif
18963 +
18964 "jns 1f\n"
18965 "call __read_lock_failed\n\t"
18966 "1:\n"
18967 @@ -231,6 +239,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
18968 static inline void arch_write_lock(arch_rwlock_t *rw)
18969 {
18970 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
18971 +
18972 +#ifdef CONFIG_PAX_REFCOUNT
18973 + "jno 0f\n"
18974 + LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
18975 + "int $4\n0:\n"
18976 + _ASM_EXTABLE(0b, 0b)
18977 +#endif
18978 +
18979 "jz 1f\n"
18980 "call __write_lock_failed\n\t"
18981 "1:\n"
18982 @@ -260,13 +276,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
18983
18984 static inline void arch_read_unlock(arch_rwlock_t *rw)
18985 {
18986 - asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
18987 + asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
18988 +
18989 +#ifdef CONFIG_PAX_REFCOUNT
18990 + "jno 0f\n"
18991 + LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
18992 + "int $4\n0:\n"
18993 + _ASM_EXTABLE(0b, 0b)
18994 +#endif
18995 +
18996 :"+m" (rw->lock) : : "memory");
18997 }
18998
18999 static inline void arch_write_unlock(arch_rwlock_t *rw)
19000 {
19001 - asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
19002 + asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
19003 +
19004 +#ifdef CONFIG_PAX_REFCOUNT
19005 + "jno 0f\n"
19006 + LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
19007 + "int $4\n0:\n"
19008 + _ASM_EXTABLE(0b, 0b)
19009 +#endif
19010 +
19011 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
19012 }
19013
19014 diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19015 index 6a99859..03cb807 100644
19016 --- a/arch/x86/include/asm/stackprotector.h
19017 +++ b/arch/x86/include/asm/stackprotector.h
19018 @@ -47,7 +47,7 @@
19019 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19020 */
19021 #define GDT_STACK_CANARY_INIT \
19022 - [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19023 + [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19024
19025 /*
19026 * Initialize the stackprotector canary value.
19027 @@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19028
19029 static inline void load_stack_canary_segment(void)
19030 {
19031 -#ifdef CONFIG_X86_32
19032 +#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19033 asm volatile ("mov %0, %%gs" : : "r" (0));
19034 #endif
19035 }
19036 diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19037 index 70bbe39..4ae2bd4 100644
19038 --- a/arch/x86/include/asm/stacktrace.h
19039 +++ b/arch/x86/include/asm/stacktrace.h
19040 @@ -11,28 +11,20 @@
19041
19042 extern int kstack_depth_to_print;
19043
19044 -struct thread_info;
19045 +struct task_struct;
19046 struct stacktrace_ops;
19047
19048 -typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19049 - unsigned long *stack,
19050 - unsigned long bp,
19051 - const struct stacktrace_ops *ops,
19052 - void *data,
19053 - unsigned long *end,
19054 - int *graph);
19055 +typedef unsigned long walk_stack_t(struct task_struct *task,
19056 + void *stack_start,
19057 + unsigned long *stack,
19058 + unsigned long bp,
19059 + const struct stacktrace_ops *ops,
19060 + void *data,
19061 + unsigned long *end,
19062 + int *graph);
19063
19064 -extern unsigned long
19065 -print_context_stack(struct thread_info *tinfo,
19066 - unsigned long *stack, unsigned long bp,
19067 - const struct stacktrace_ops *ops, void *data,
19068 - unsigned long *end, int *graph);
19069 -
19070 -extern unsigned long
19071 -print_context_stack_bp(struct thread_info *tinfo,
19072 - unsigned long *stack, unsigned long bp,
19073 - const struct stacktrace_ops *ops, void *data,
19074 - unsigned long *end, int *graph);
19075 +extern walk_stack_t print_context_stack;
19076 +extern walk_stack_t print_context_stack_bp;
19077
19078 /* Generic stack tracer with callbacks */
19079
19080 @@ -40,7 +32,7 @@ struct stacktrace_ops {
19081 void (*address)(void *data, unsigned long address, int reliable);
19082 /* On negative return stop dumping */
19083 int (*stack)(void *data, char *name);
19084 - walk_stack_t walk_stack;
19085 + walk_stack_t *walk_stack;
19086 };
19087
19088 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19089 diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19090 index d7f3b3b..3cc39f1 100644
19091 --- a/arch/x86/include/asm/switch_to.h
19092 +++ b/arch/x86/include/asm/switch_to.h
19093 @@ -108,7 +108,7 @@ do { \
19094 "call __switch_to\n\t" \
19095 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19096 __switch_canary \
19097 - "movq %P[thread_info](%%rsi),%%r8\n\t" \
19098 + "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19099 "movq %%rax,%%rdi\n\t" \
19100 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19101 "jnz ret_from_fork\n\t" \
19102 @@ -119,7 +119,7 @@ do { \
19103 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19104 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19105 [_tif_fork] "i" (_TIF_FORK), \
19106 - [thread_info] "i" (offsetof(struct task_struct, stack)), \
19107 + [thread_info] "m" (current_tinfo), \
19108 [current_task] "m" (current_task) \
19109 __switch_canary_iparam \
19110 : "memory", "cc" __EXTRA_CLOBBER)
19111 diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19112 index 47e5de2..d3dda54 100644
19113 --- a/arch/x86/include/asm/thread_info.h
19114 +++ b/arch/x86/include/asm/thread_info.h
19115 @@ -24,7 +24,6 @@ struct exec_domain;
19116 #include <linux/atomic.h>
19117
19118 struct thread_info {
19119 - struct task_struct *task; /* main task structure */
19120 struct exec_domain *exec_domain; /* execution domain */
19121 __u32 flags; /* low level flags */
19122 __u32 status; /* thread synchronous flags */
19123 @@ -33,13 +32,13 @@ struct thread_info {
19124 mm_segment_t addr_limit;
19125 struct restart_block restart_block;
19126 void __user *sysenter_return;
19127 + unsigned long lowest_stack;
19128 unsigned int sig_on_uaccess_error:1;
19129 unsigned int uaccess_err:1; /* uaccess failed */
19130 };
19131
19132 -#define INIT_THREAD_INFO(tsk) \
19133 +#define INIT_THREAD_INFO \
19134 { \
19135 - .task = &tsk, \
19136 .exec_domain = &default_exec_domain, \
19137 .flags = 0, \
19138 .cpu = 0, \
19139 @@ -50,7 +49,7 @@ struct thread_info {
19140 }, \
19141 }
19142
19143 -#define init_thread_info (init_thread_union.thread_info)
19144 +#define init_thread_info (init_thread_union.stack)
19145 #define init_stack (init_thread_union.stack)
19146
19147 #else /* !__ASSEMBLY__ */
19148 @@ -90,6 +89,7 @@ struct thread_info {
19149 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19150 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19151 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19152 +#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19153
19154 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19155 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19156 @@ -113,17 +113,18 @@ struct thread_info {
19157 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19158 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19159 #define _TIF_X32 (1 << TIF_X32)
19160 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19161
19162 /* work to do in syscall_trace_enter() */
19163 #define _TIF_WORK_SYSCALL_ENTRY \
19164 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19165 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19166 - _TIF_NOHZ)
19167 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
19168
19169 /* work to do in syscall_trace_leave() */
19170 #define _TIF_WORK_SYSCALL_EXIT \
19171 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19172 - _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19173 + _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19174
19175 /* work to do on interrupt/exception return */
19176 #define _TIF_WORK_MASK \
19177 @@ -134,7 +135,7 @@ struct thread_info {
19178 /* work to do on any return to user space */
19179 #define _TIF_ALLWORK_MASK \
19180 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19181 - _TIF_NOHZ)
19182 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
19183
19184 /* Only used for 64 bit */
19185 #define _TIF_DO_NOTIFY_MASK \
19186 @@ -149,7 +150,6 @@ struct thread_info {
19187 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19188
19189 #define STACK_WARN (THREAD_SIZE/8)
19190 -#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19191
19192 /*
19193 * macros/functions for gaining access to the thread information structure
19194 @@ -160,26 +160,18 @@ struct thread_info {
19195
19196 DECLARE_PER_CPU(unsigned long, kernel_stack);
19197
19198 +DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19199 +
19200 static inline struct thread_info *current_thread_info(void)
19201 {
19202 - struct thread_info *ti;
19203 - ti = (void *)(this_cpu_read_stable(kernel_stack) +
19204 - KERNEL_STACK_OFFSET - THREAD_SIZE);
19205 - return ti;
19206 + return this_cpu_read_stable(current_tinfo);
19207 }
19208
19209 #else /* !__ASSEMBLY__ */
19210
19211 /* how to get the thread information struct from ASM */
19212 #define GET_THREAD_INFO(reg) \
19213 - _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19214 - _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19215 -
19216 -/*
19217 - * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19218 - * a certain register (to be used in assembler memory operands).
19219 - */
19220 -#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19221 + _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19222
19223 #endif
19224
19225 @@ -237,5 +229,12 @@ static inline bool is_ia32_task(void)
19226 extern void arch_task_cache_init(void);
19227 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19228 extern void arch_release_task_struct(struct task_struct *tsk);
19229 +
19230 +#define __HAVE_THREAD_FUNCTIONS
19231 +#define task_thread_info(task) (&(task)->tinfo)
19232 +#define task_stack_page(task) ((task)->stack)
19233 +#define setup_thread_stack(p, org) do {} while (0)
19234 +#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19235 +
19236 #endif
19237 #endif /* _ASM_X86_THREAD_INFO_H */
19238 diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19239 index 04905bf..49203ca 100644
19240 --- a/arch/x86/include/asm/tlbflush.h
19241 +++ b/arch/x86/include/asm/tlbflush.h
19242 @@ -17,18 +17,44 @@
19243
19244 static inline void __native_flush_tlb(void)
19245 {
19246 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19247 + u64 descriptor[2];
19248 +
19249 + descriptor[0] = PCID_KERNEL;
19250 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_MONGLOBAL) : "memory");
19251 + return;
19252 + }
19253 +
19254 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19255 + if (static_cpu_has(X86_FEATURE_PCID)) {
19256 + unsigned int cpu = raw_get_cpu();
19257 +
19258 + native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19259 + native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19260 + raw_put_cpu_no_resched();
19261 + return;
19262 + }
19263 +#endif
19264 +
19265 native_write_cr3(native_read_cr3());
19266 }
19267
19268 static inline void __native_flush_tlb_global_irq_disabled(void)
19269 {
19270 - unsigned long cr4;
19271 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19272 + u64 descriptor[2];
19273
19274 - cr4 = native_read_cr4();
19275 - /* clear PGE */
19276 - native_write_cr4(cr4 & ~X86_CR4_PGE);
19277 - /* write old PGE again and flush TLBs */
19278 - native_write_cr4(cr4);
19279 + descriptor[0] = PCID_KERNEL;
19280 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19281 + } else {
19282 + unsigned long cr4;
19283 +
19284 + cr4 = native_read_cr4();
19285 + /* clear PGE */
19286 + native_write_cr4(cr4 & ~X86_CR4_PGE);
19287 + /* write old PGE again and flush TLBs */
19288 + native_write_cr4(cr4);
19289 + }
19290 }
19291
19292 static inline void __native_flush_tlb_global(void)
19293 @@ -49,6 +75,41 @@ static inline void __native_flush_tlb_global(void)
19294
19295 static inline void __native_flush_tlb_single(unsigned long addr)
19296 {
19297 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19298 + u64 descriptor[2];
19299 +
19300 + descriptor[0] = PCID_KERNEL;
19301 + descriptor[1] = addr;
19302 +
19303 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19304 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19305 + if (addr < TASK_SIZE_MAX)
19306 + descriptor[1] += pax_user_shadow_base;
19307 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19308 + }
19309 +
19310 + descriptor[0] = PCID_USER;
19311 + descriptor[1] = addr;
19312 +#endif
19313 +
19314 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19315 + return;
19316 + }
19317 +
19318 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19319 + if (static_cpu_has(X86_FEATURE_PCID)) {
19320 + unsigned int cpu = raw_get_cpu();
19321 +
19322 + native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19323 + asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19324 + native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19325 + raw_put_cpu_no_resched();
19326 +
19327 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19328 + addr += pax_user_shadow_base;
19329 + }
19330 +#endif
19331 +
19332 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19333 }
19334
19335 diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19336 index 0d592e0..7437fcc 100644
19337 --- a/arch/x86/include/asm/uaccess.h
19338 +++ b/arch/x86/include/asm/uaccess.h
19339 @@ -7,6 +7,7 @@
19340 #include <linux/compiler.h>
19341 #include <linux/thread_info.h>
19342 #include <linux/string.h>
19343 +#include <linux/spinlock.h>
19344 #include <asm/asm.h>
19345 #include <asm/page.h>
19346 #include <asm/smap.h>
19347 @@ -29,7 +30,12 @@
19348
19349 #define get_ds() (KERNEL_DS)
19350 #define get_fs() (current_thread_info()->addr_limit)
19351 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19352 +void __set_fs(mm_segment_t x);
19353 +void set_fs(mm_segment_t x);
19354 +#else
19355 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19356 +#endif
19357
19358 #define segment_eq(a, b) ((a).seg == (b).seg)
19359
19360 @@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19361 * checks that the pointer is in the user space range - after calling
19362 * this function, memory access functions may still return -EFAULT.
19363 */
19364 -#define access_ok(type, addr, size) \
19365 - likely(!__range_not_ok(addr, size, user_addr_max()))
19366 +extern int _cond_resched(void);
19367 +#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19368 +#define access_ok(type, addr, size) \
19369 +({ \
19370 + unsigned long __size = size; \
19371 + unsigned long __addr = (unsigned long)addr; \
19372 + bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19373 + if (__ret_ao && __size) { \
19374 + unsigned long __addr_ao = __addr & PAGE_MASK; \
19375 + unsigned long __end_ao = __addr + __size - 1; \
19376 + if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19377 + while (__addr_ao <= __end_ao) { \
19378 + char __c_ao; \
19379 + __addr_ao += PAGE_SIZE; \
19380 + if (__size > PAGE_SIZE) \
19381 + _cond_resched(); \
19382 + if (__get_user(__c_ao, (char __user *)__addr)) \
19383 + break; \
19384 + if (type != VERIFY_WRITE) { \
19385 + __addr = __addr_ao; \
19386 + continue; \
19387 + } \
19388 + if (__put_user(__c_ao, (char __user *)__addr)) \
19389 + break; \
19390 + __addr = __addr_ao; \
19391 + } \
19392 + } \
19393 + } \
19394 + __ret_ao; \
19395 +})
19396
19397 /*
19398 * The exception table consists of pairs of addresses relative to the
19399 @@ -176,10 +210,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19400 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19401 __chk_user_ptr(ptr); \
19402 might_fault(); \
19403 + pax_open_userland(); \
19404 asm volatile("call __get_user_%P3" \
19405 : "=a" (__ret_gu), "=r" (__val_gu) \
19406 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19407 (x) = (__typeof__(*(ptr))) __val_gu; \
19408 + pax_close_userland(); \
19409 __ret_gu; \
19410 })
19411
19412 @@ -187,13 +223,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19413 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19414 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19415
19416 -
19417 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19418 +#define __copyuser_seg "gs;"
19419 +#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19420 +#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19421 +#else
19422 +#define __copyuser_seg
19423 +#define __COPYUSER_SET_ES
19424 +#define __COPYUSER_RESTORE_ES
19425 +#endif
19426
19427 #ifdef CONFIG_X86_32
19428 #define __put_user_asm_u64(x, addr, err, errret) \
19429 asm volatile(ASM_STAC "\n" \
19430 - "1: movl %%eax,0(%2)\n" \
19431 - "2: movl %%edx,4(%2)\n" \
19432 + "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19433 + "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19434 "3: " ASM_CLAC "\n" \
19435 ".section .fixup,\"ax\"\n" \
19436 "4: movl %3,%0\n" \
19437 @@ -206,8 +250,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19438
19439 #define __put_user_asm_ex_u64(x, addr) \
19440 asm volatile(ASM_STAC "\n" \
19441 - "1: movl %%eax,0(%1)\n" \
19442 - "2: movl %%edx,4(%1)\n" \
19443 + "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19444 + "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19445 "3: " ASM_CLAC "\n" \
19446 _ASM_EXTABLE_EX(1b, 2b) \
19447 _ASM_EXTABLE_EX(2b, 3b) \
19448 @@ -257,7 +301,8 @@ extern void __put_user_8(void);
19449 __typeof__(*(ptr)) __pu_val; \
19450 __chk_user_ptr(ptr); \
19451 might_fault(); \
19452 - __pu_val = x; \
19453 + __pu_val = (x); \
19454 + pax_open_userland(); \
19455 switch (sizeof(*(ptr))) { \
19456 case 1: \
19457 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19458 @@ -275,6 +320,7 @@ extern void __put_user_8(void);
19459 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19460 break; \
19461 } \
19462 + pax_close_userland(); \
19463 __ret_pu; \
19464 })
19465
19466 @@ -355,8 +401,10 @@ do { \
19467 } while (0)
19468
19469 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19470 +do { \
19471 + pax_open_userland(); \
19472 asm volatile(ASM_STAC "\n" \
19473 - "1: mov"itype" %2,%"rtype"1\n" \
19474 + "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19475 "2: " ASM_CLAC "\n" \
19476 ".section .fixup,\"ax\"\n" \
19477 "3: mov %3,%0\n" \
19478 @@ -364,8 +412,10 @@ do { \
19479 " jmp 2b\n" \
19480 ".previous\n" \
19481 _ASM_EXTABLE(1b, 3b) \
19482 - : "=r" (err), ltype(x) \
19483 - : "m" (__m(addr)), "i" (errret), "0" (err))
19484 + : "=r" (err), ltype (x) \
19485 + : "m" (__m(addr)), "i" (errret), "0" (err)); \
19486 + pax_close_userland(); \
19487 +} while (0)
19488
19489 #define __get_user_size_ex(x, ptr, size) \
19490 do { \
19491 @@ -389,7 +439,7 @@ do { \
19492 } while (0)
19493
19494 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19495 - asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19496 + asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19497 "2:\n" \
19498 _ASM_EXTABLE_EX(1b, 2b) \
19499 : ltype(x) : "m" (__m(addr)))
19500 @@ -406,13 +456,24 @@ do { \
19501 int __gu_err; \
19502 unsigned long __gu_val; \
19503 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19504 - (x) = (__force __typeof__(*(ptr)))__gu_val; \
19505 + (x) = (__typeof__(*(ptr)))__gu_val; \
19506 __gu_err; \
19507 })
19508
19509 /* FIXME: this hack is definitely wrong -AK */
19510 struct __large_struct { unsigned long buf[100]; };
19511 -#define __m(x) (*(struct __large_struct __user *)(x))
19512 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19513 +#define ____m(x) \
19514 +({ \
19515 + unsigned long ____x = (unsigned long)(x); \
19516 + if (____x < pax_user_shadow_base) \
19517 + ____x += pax_user_shadow_base; \
19518 + (typeof(x))____x; \
19519 +})
19520 +#else
19521 +#define ____m(x) (x)
19522 +#endif
19523 +#define __m(x) (*(struct __large_struct __user *)____m(x))
19524
19525 /*
19526 * Tell gcc we read from memory instead of writing: this is because
19527 @@ -420,8 +481,10 @@ struct __large_struct { unsigned long buf[100]; };
19528 * aliasing issues.
19529 */
19530 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19531 +do { \
19532 + pax_open_userland(); \
19533 asm volatile(ASM_STAC "\n" \
19534 - "1: mov"itype" %"rtype"1,%2\n" \
19535 + "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19536 "2: " ASM_CLAC "\n" \
19537 ".section .fixup,\"ax\"\n" \
19538 "3: mov %3,%0\n" \
19539 @@ -429,10 +492,12 @@ struct __large_struct { unsigned long buf[100]; };
19540 ".previous\n" \
19541 _ASM_EXTABLE(1b, 3b) \
19542 : "=r"(err) \
19543 - : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19544 + : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19545 + pax_close_userland(); \
19546 +} while (0)
19547
19548 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19549 - asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19550 + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19551 "2:\n" \
19552 _ASM_EXTABLE_EX(1b, 2b) \
19553 : : ltype(x), "m" (__m(addr)))
19554 @@ -442,11 +507,13 @@ struct __large_struct { unsigned long buf[100]; };
19555 */
19556 #define uaccess_try do { \
19557 current_thread_info()->uaccess_err = 0; \
19558 + pax_open_userland(); \
19559 stac(); \
19560 barrier();
19561
19562 #define uaccess_catch(err) \
19563 clac(); \
19564 + pax_close_userland(); \
19565 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19566 } while (0)
19567
19568 @@ -471,8 +538,12 @@ struct __large_struct { unsigned long buf[100]; };
19569 * On error, the variable @x is set to zero.
19570 */
19571
19572 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19573 +#define __get_user(x, ptr) get_user((x), (ptr))
19574 +#else
19575 #define __get_user(x, ptr) \
19576 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19577 +#endif
19578
19579 /**
19580 * __put_user: - Write a simple value into user space, with less checking.
19581 @@ -494,8 +565,12 @@ struct __large_struct { unsigned long buf[100]; };
19582 * Returns zero on success, or -EFAULT on error.
19583 */
19584
19585 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19586 +#define __put_user(x, ptr) put_user((x), (ptr))
19587 +#else
19588 #define __put_user(x, ptr) \
19589 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19590 +#endif
19591
19592 #define __get_user_unaligned __get_user
19593 #define __put_user_unaligned __put_user
19594 @@ -513,7 +588,7 @@ struct __large_struct { unsigned long buf[100]; };
19595 #define get_user_ex(x, ptr) do { \
19596 unsigned long __gue_val; \
19597 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19598 - (x) = (__force __typeof__(*(ptr)))__gue_val; \
19599 + (x) = (__typeof__(*(ptr)))__gue_val; \
19600 } while (0)
19601
19602 #define put_user_try uaccess_try
19603 @@ -542,18 +617,19 @@ extern void __cmpxchg_wrong_size(void)
19604 __typeof__(ptr) __uval = (uval); \
19605 __typeof__(*(ptr)) __old = (old); \
19606 __typeof__(*(ptr)) __new = (new); \
19607 + pax_open_userland(); \
19608 switch (size) { \
19609 case 1: \
19610 { \
19611 asm volatile("\t" ASM_STAC "\n" \
19612 - "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19613 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19614 "2:\t" ASM_CLAC "\n" \
19615 "\t.section .fixup, \"ax\"\n" \
19616 "3:\tmov %3, %0\n" \
19617 "\tjmp 2b\n" \
19618 "\t.previous\n" \
19619 _ASM_EXTABLE(1b, 3b) \
19620 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19621 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19622 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19623 : "memory" \
19624 ); \
19625 @@ -562,14 +638,14 @@ extern void __cmpxchg_wrong_size(void)
19626 case 2: \
19627 { \
19628 asm volatile("\t" ASM_STAC "\n" \
19629 - "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19630 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19631 "2:\t" ASM_CLAC "\n" \
19632 "\t.section .fixup, \"ax\"\n" \
19633 "3:\tmov %3, %0\n" \
19634 "\tjmp 2b\n" \
19635 "\t.previous\n" \
19636 _ASM_EXTABLE(1b, 3b) \
19637 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19638 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19639 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19640 : "memory" \
19641 ); \
19642 @@ -578,14 +654,14 @@ extern void __cmpxchg_wrong_size(void)
19643 case 4: \
19644 { \
19645 asm volatile("\t" ASM_STAC "\n" \
19646 - "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19647 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19648 "2:\t" ASM_CLAC "\n" \
19649 "\t.section .fixup, \"ax\"\n" \
19650 "3:\tmov %3, %0\n" \
19651 "\tjmp 2b\n" \
19652 "\t.previous\n" \
19653 _ASM_EXTABLE(1b, 3b) \
19654 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19655 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19656 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19657 : "memory" \
19658 ); \
19659 @@ -597,14 +673,14 @@ extern void __cmpxchg_wrong_size(void)
19660 __cmpxchg_wrong_size(); \
19661 \
19662 asm volatile("\t" ASM_STAC "\n" \
19663 - "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19664 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19665 "2:\t" ASM_CLAC "\n" \
19666 "\t.section .fixup, \"ax\"\n" \
19667 "3:\tmov %3, %0\n" \
19668 "\tjmp 2b\n" \
19669 "\t.previous\n" \
19670 _ASM_EXTABLE(1b, 3b) \
19671 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19672 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19673 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19674 : "memory" \
19675 ); \
19676 @@ -613,6 +689,7 @@ extern void __cmpxchg_wrong_size(void)
19677 default: \
19678 __cmpxchg_wrong_size(); \
19679 } \
19680 + pax_close_userland(); \
19681 *__uval = __old; \
19682 __ret; \
19683 })
19684 @@ -636,17 +713,6 @@ extern struct movsl_mask {
19685
19686 #define ARCH_HAS_NOCACHE_UACCESS 1
19687
19688 -#ifdef CONFIG_X86_32
19689 -# include <asm/uaccess_32.h>
19690 -#else
19691 -# include <asm/uaccess_64.h>
19692 -#endif
19693 -
19694 -unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19695 - unsigned n);
19696 -unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19697 - unsigned n);
19698 -
19699 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19700 # define copy_user_diag __compiletime_error
19701 #else
19702 @@ -656,7 +722,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19703 extern void copy_user_diag("copy_from_user() buffer size is too small")
19704 copy_from_user_overflow(void);
19705 extern void copy_user_diag("copy_to_user() buffer size is too small")
19706 -copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19707 +copy_to_user_overflow(void);
19708
19709 #undef copy_user_diag
19710
19711 @@ -669,7 +735,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19712
19713 extern void
19714 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19715 -__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19716 +__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19717 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19718
19719 #else
19720 @@ -684,10 +750,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19721
19722 #endif
19723
19724 +#ifdef CONFIG_X86_32
19725 +# include <asm/uaccess_32.h>
19726 +#else
19727 +# include <asm/uaccess_64.h>
19728 +#endif
19729 +
19730 static inline unsigned long __must_check
19731 copy_from_user(void *to, const void __user *from, unsigned long n)
19732 {
19733 - int sz = __compiletime_object_size(to);
19734 + size_t sz = __compiletime_object_size(to);
19735
19736 might_fault();
19737
19738 @@ -709,12 +781,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19739 * case, and do only runtime checking for non-constant sizes.
19740 */
19741
19742 - if (likely(sz < 0 || sz >= n))
19743 - n = _copy_from_user(to, from, n);
19744 - else if(__builtin_constant_p(n))
19745 - copy_from_user_overflow();
19746 - else
19747 - __copy_from_user_overflow(sz, n);
19748 + if (likely(sz != (size_t)-1 && sz < n)) {
19749 + if(__builtin_constant_p(n))
19750 + copy_from_user_overflow();
19751 + else
19752 + __copy_from_user_overflow(sz, n);
19753 + } if (access_ok(VERIFY_READ, from, n))
19754 + n = __copy_from_user(to, from, n);
19755 + else if ((long)n > 0)
19756 + memset(to, 0, n);
19757
19758 return n;
19759 }
19760 @@ -722,17 +797,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19761 static inline unsigned long __must_check
19762 copy_to_user(void __user *to, const void *from, unsigned long n)
19763 {
19764 - int sz = __compiletime_object_size(from);
19765 + size_t sz = __compiletime_object_size(from);
19766
19767 might_fault();
19768
19769 /* See the comment in copy_from_user() above. */
19770 - if (likely(sz < 0 || sz >= n))
19771 - n = _copy_to_user(to, from, n);
19772 - else if(__builtin_constant_p(n))
19773 - copy_to_user_overflow();
19774 - else
19775 - __copy_to_user_overflow(sz, n);
19776 + if (likely(sz != (size_t)-1 && sz < n)) {
19777 + if(__builtin_constant_p(n))
19778 + copy_to_user_overflow();
19779 + else
19780 + __copy_to_user_overflow(sz, n);
19781 + } else if (access_ok(VERIFY_WRITE, to, n))
19782 + n = __copy_to_user(to, from, n);
19783
19784 return n;
19785 }
19786 diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
19787 index 3c03a5d..1071638 100644
19788 --- a/arch/x86/include/asm/uaccess_32.h
19789 +++ b/arch/x86/include/asm/uaccess_32.h
19790 @@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
19791 static __always_inline unsigned long __must_check
19792 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
19793 {
19794 + if ((long)n < 0)
19795 + return n;
19796 +
19797 + check_object_size(from, n, true);
19798 +
19799 if (__builtin_constant_p(n)) {
19800 unsigned long ret;
19801
19802 @@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
19803 __copy_to_user(void __user *to, const void *from, unsigned long n)
19804 {
19805 might_fault();
19806 +
19807 return __copy_to_user_inatomic(to, from, n);
19808 }
19809
19810 static __always_inline unsigned long
19811 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
19812 {
19813 + if ((long)n < 0)
19814 + return n;
19815 +
19816 /* Avoid zeroing the tail if the copy fails..
19817 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
19818 * but as the zeroing behaviour is only significant when n is not
19819 @@ -137,6 +146,12 @@ static __always_inline unsigned long
19820 __copy_from_user(void *to, const void __user *from, unsigned long n)
19821 {
19822 might_fault();
19823 +
19824 + if ((long)n < 0)
19825 + return n;
19826 +
19827 + check_object_size(to, n, false);
19828 +
19829 if (__builtin_constant_p(n)) {
19830 unsigned long ret;
19831
19832 @@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
19833 const void __user *from, unsigned long n)
19834 {
19835 might_fault();
19836 +
19837 + if ((long)n < 0)
19838 + return n;
19839 +
19840 if (__builtin_constant_p(n)) {
19841 unsigned long ret;
19842
19843 @@ -181,7 +200,10 @@ static __always_inline unsigned long
19844 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
19845 unsigned long n)
19846 {
19847 - return __copy_from_user_ll_nocache_nozero(to, from, n);
19848 + if ((long)n < 0)
19849 + return n;
19850 +
19851 + return __copy_from_user_ll_nocache_nozero(to, from, n);
19852 }
19853
19854 #endif /* _ASM_X86_UACCESS_32_H */
19855 diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
19856 index 12a26b9..206c200 100644
19857 --- a/arch/x86/include/asm/uaccess_64.h
19858 +++ b/arch/x86/include/asm/uaccess_64.h
19859 @@ -10,6 +10,9 @@
19860 #include <asm/alternative.h>
19861 #include <asm/cpufeature.h>
19862 #include <asm/page.h>
19863 +#include <asm/pgtable.h>
19864 +
19865 +#define set_fs(x) (current_thread_info()->addr_limit = (x))
19866
19867 /*
19868 * Copy To/From Userspace
19869 @@ -17,14 +20,14 @@
19870
19871 /* Handles exceptions in both to and from, but doesn't do access_ok */
19872 __must_check unsigned long
19873 -copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
19874 +copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
19875 __must_check unsigned long
19876 -copy_user_generic_string(void *to, const void *from, unsigned len);
19877 +copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
19878 __must_check unsigned long
19879 -copy_user_generic_unrolled(void *to, const void *from, unsigned len);
19880 +copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
19881
19882 static __always_inline __must_check unsigned long
19883 -copy_user_generic(void *to, const void *from, unsigned len)
19884 +copy_user_generic(void *to, const void *from, unsigned long len)
19885 {
19886 unsigned ret;
19887
19888 @@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
19889 }
19890
19891 __must_check unsigned long
19892 -copy_in_user(void __user *to, const void __user *from, unsigned len);
19893 +copy_in_user(void __user *to, const void __user *from, unsigned long len);
19894
19895 static __always_inline __must_check
19896 -int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
19897 +unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
19898 {
19899 - int ret = 0;
19900 + size_t sz = __compiletime_object_size(dst);
19901 + unsigned ret = 0;
19902 +
19903 + if (size > INT_MAX)
19904 + return size;
19905 +
19906 + check_object_size(dst, size, false);
19907 +
19908 +#ifdef CONFIG_PAX_MEMORY_UDEREF
19909 + if (!access_ok_noprefault(VERIFY_READ, src, size))
19910 + return size;
19911 +#endif
19912 +
19913 + if (unlikely(sz != (size_t)-1 && sz < size)) {
19914 + if(__builtin_constant_p(size))
19915 + copy_from_user_overflow();
19916 + else
19917 + __copy_from_user_overflow(sz, size);
19918 + return size;
19919 + }
19920
19921 if (!__builtin_constant_p(size))
19922 - return copy_user_generic(dst, (__force void *)src, size);
19923 + return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
19924 switch (size) {
19925 - case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
19926 + case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
19927 ret, "b", "b", "=q", 1);
19928 return ret;
19929 - case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
19930 + case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
19931 ret, "w", "w", "=r", 2);
19932 return ret;
19933 - case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
19934 + case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
19935 ret, "l", "k", "=r", 4);
19936 return ret;
19937 - case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
19938 + case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19939 ret, "q", "", "=r", 8);
19940 return ret;
19941 case 10:
19942 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
19943 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19944 ret, "q", "", "=r", 10);
19945 if (unlikely(ret))
19946 return ret;
19947 __get_user_asm(*(u16 *)(8 + (char *)dst),
19948 - (u16 __user *)(8 + (char __user *)src),
19949 + (const u16 __user *)(8 + (const char __user *)src),
19950 ret, "w", "w", "=r", 2);
19951 return ret;
19952 case 16:
19953 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
19954 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19955 ret, "q", "", "=r", 16);
19956 if (unlikely(ret))
19957 return ret;
19958 __get_user_asm(*(u64 *)(8 + (char *)dst),
19959 - (u64 __user *)(8 + (char __user *)src),
19960 + (const u64 __user *)(8 + (const char __user *)src),
19961 ret, "q", "", "=r", 8);
19962 return ret;
19963 default:
19964 - return copy_user_generic(dst, (__force void *)src, size);
19965 + return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
19966 }
19967 }
19968
19969 static __always_inline __must_check
19970 -int __copy_from_user(void *dst, const void __user *src, unsigned size)
19971 +unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
19972 {
19973 might_fault();
19974 return __copy_from_user_nocheck(dst, src, size);
19975 }
19976
19977 static __always_inline __must_check
19978 -int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
19979 +unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
19980 {
19981 - int ret = 0;
19982 + size_t sz = __compiletime_object_size(src);
19983 + unsigned ret = 0;
19984 +
19985 + if (size > INT_MAX)
19986 + return size;
19987 +
19988 + check_object_size(src, size, true);
19989 +
19990 +#ifdef CONFIG_PAX_MEMORY_UDEREF
19991 + if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
19992 + return size;
19993 +#endif
19994 +
19995 + if (unlikely(sz != (size_t)-1 && sz < size)) {
19996 + if(__builtin_constant_p(size))
19997 + copy_to_user_overflow();
19998 + else
19999 + __copy_to_user_overflow(sz, size);
20000 + return size;
20001 + }
20002
20003 if (!__builtin_constant_p(size))
20004 - return copy_user_generic((__force void *)dst, src, size);
20005 + return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20006 switch (size) {
20007 - case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20008 + case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20009 ret, "b", "b", "iq", 1);
20010 return ret;
20011 - case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20012 + case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20013 ret, "w", "w", "ir", 2);
20014 return ret;
20015 - case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20016 + case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20017 ret, "l", "k", "ir", 4);
20018 return ret;
20019 - case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20020 + case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20021 ret, "q", "", "er", 8);
20022 return ret;
20023 case 10:
20024 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20025 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20026 ret, "q", "", "er", 10);
20027 if (unlikely(ret))
20028 return ret;
20029 asm("":::"memory");
20030 - __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20031 + __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20032 ret, "w", "w", "ir", 2);
20033 return ret;
20034 case 16:
20035 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20036 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20037 ret, "q", "", "er", 16);
20038 if (unlikely(ret))
20039 return ret;
20040 asm("":::"memory");
20041 - __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20042 + __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20043 ret, "q", "", "er", 8);
20044 return ret;
20045 default:
20046 - return copy_user_generic((__force void *)dst, src, size);
20047 + return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20048 }
20049 }
20050
20051 static __always_inline __must_check
20052 -int __copy_to_user(void __user *dst, const void *src, unsigned size)
20053 +unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20054 {
20055 might_fault();
20056 return __copy_to_user_nocheck(dst, src, size);
20057 }
20058
20059 static __always_inline __must_check
20060 -int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20061 +unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20062 {
20063 - int ret = 0;
20064 + unsigned ret = 0;
20065
20066 might_fault();
20067 +
20068 + if (size > INT_MAX)
20069 + return size;
20070 +
20071 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20072 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20073 + return size;
20074 + if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20075 + return size;
20076 +#endif
20077 +
20078 if (!__builtin_constant_p(size))
20079 - return copy_user_generic((__force void *)dst,
20080 - (__force void *)src, size);
20081 + return copy_user_generic((__force_kernel void *)____m(dst),
20082 + (__force_kernel const void *)____m(src), size);
20083 switch (size) {
20084 case 1: {
20085 u8 tmp;
20086 - __get_user_asm(tmp, (u8 __user *)src,
20087 + __get_user_asm(tmp, (const u8 __user *)src,
20088 ret, "b", "b", "=q", 1);
20089 if (likely(!ret))
20090 __put_user_asm(tmp, (u8 __user *)dst,
20091 @@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20092 }
20093 case 2: {
20094 u16 tmp;
20095 - __get_user_asm(tmp, (u16 __user *)src,
20096 + __get_user_asm(tmp, (const u16 __user *)src,
20097 ret, "w", "w", "=r", 2);
20098 if (likely(!ret))
20099 __put_user_asm(tmp, (u16 __user *)dst,
20100 @@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20101
20102 case 4: {
20103 u32 tmp;
20104 - __get_user_asm(tmp, (u32 __user *)src,
20105 + __get_user_asm(tmp, (const u32 __user *)src,
20106 ret, "l", "k", "=r", 4);
20107 if (likely(!ret))
20108 __put_user_asm(tmp, (u32 __user *)dst,
20109 @@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20110 }
20111 case 8: {
20112 u64 tmp;
20113 - __get_user_asm(tmp, (u64 __user *)src,
20114 + __get_user_asm(tmp, (const u64 __user *)src,
20115 ret, "q", "", "=r", 8);
20116 if (likely(!ret))
20117 __put_user_asm(tmp, (u64 __user *)dst,
20118 @@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20119 return ret;
20120 }
20121 default:
20122 - return copy_user_generic((__force void *)dst,
20123 - (__force void *)src, size);
20124 + return copy_user_generic((__force_kernel void *)____m(dst),
20125 + (__force_kernel const void *)____m(src), size);
20126 }
20127 }
20128
20129 -static __must_check __always_inline int
20130 -__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20131 +static __must_check __always_inline unsigned long
20132 +__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20133 {
20134 return __copy_from_user_nocheck(dst, src, size);
20135 }
20136
20137 -static __must_check __always_inline int
20138 -__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20139 +static __must_check __always_inline unsigned long
20140 +__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20141 {
20142 return __copy_to_user_nocheck(dst, src, size);
20143 }
20144
20145 -extern long __copy_user_nocache(void *dst, const void __user *src,
20146 - unsigned size, int zerorest);
20147 +extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20148 + unsigned long size, int zerorest);
20149
20150 -static inline int
20151 -__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20152 +static inline unsigned long
20153 +__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20154 {
20155 might_fault();
20156 +
20157 + if (size > INT_MAX)
20158 + return size;
20159 +
20160 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20161 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20162 + return size;
20163 +#endif
20164 +
20165 return __copy_user_nocache(dst, src, size, 1);
20166 }
20167
20168 -static inline int
20169 +static inline unsigned long
20170 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20171 - unsigned size)
20172 + unsigned long size)
20173 {
20174 + if (size > INT_MAX)
20175 + return size;
20176 +
20177 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20178 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20179 + return size;
20180 +#endif
20181 +
20182 return __copy_user_nocache(dst, src, size, 0);
20183 }
20184
20185 unsigned long
20186 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
20187 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
20188
20189 #endif /* _ASM_X86_UACCESS_64_H */
20190 diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20191 index 5b238981..77fdd78 100644
20192 --- a/arch/x86/include/asm/word-at-a-time.h
20193 +++ b/arch/x86/include/asm/word-at-a-time.h
20194 @@ -11,7 +11,7 @@
20195 * and shift, for example.
20196 */
20197 struct word_at_a_time {
20198 - const unsigned long one_bits, high_bits;
20199 + unsigned long one_bits, high_bits;
20200 };
20201
20202 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20203 diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20204 index e45e4da..44e8572 100644
20205 --- a/arch/x86/include/asm/x86_init.h
20206 +++ b/arch/x86/include/asm/x86_init.h
20207 @@ -129,7 +129,7 @@ struct x86_init_ops {
20208 struct x86_init_timers timers;
20209 struct x86_init_iommu iommu;
20210 struct x86_init_pci pci;
20211 -};
20212 +} __no_const;
20213
20214 /**
20215 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20216 @@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20217 void (*setup_percpu_clockev)(void);
20218 void (*early_percpu_clock_init)(void);
20219 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20220 -};
20221 +} __no_const;
20222
20223 struct timespec;
20224
20225 @@ -168,7 +168,7 @@ struct x86_platform_ops {
20226 void (*save_sched_clock_state)(void);
20227 void (*restore_sched_clock_state)(void);
20228 void (*apic_post_init)(void);
20229 -};
20230 +} __no_const;
20231
20232 struct pci_dev;
20233 struct msi_msg;
20234 @@ -185,7 +185,7 @@ struct x86_msi_ops {
20235 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20236 u32 (*msi_mask_irq)(struct msi_desc *desc, u32 mask, u32 flag);
20237 u32 (*msix_mask_irq)(struct msi_desc *desc, u32 flag);
20238 -};
20239 +} __no_const;
20240
20241 struct IO_APIC_route_entry;
20242 struct io_apic_irq_attr;
20243 @@ -206,7 +206,7 @@ struct x86_io_apic_ops {
20244 unsigned int destination, int vector,
20245 struct io_apic_irq_attr *attr);
20246 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20247 -};
20248 +} __no_const;
20249
20250 extern struct x86_init_ops x86_init;
20251 extern struct x86_cpuinit_ops x86_cpuinit;
20252 diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20253 index c949923..c22bfa4 100644
20254 --- a/arch/x86/include/asm/xen/page.h
20255 +++ b/arch/x86/include/asm/xen/page.h
20256 @@ -63,7 +63,7 @@ extern int m2p_remove_override(struct page *page,
20257 extern struct page *m2p_find_override(unsigned long mfn);
20258 extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
20259
20260 -static inline unsigned long pfn_to_mfn(unsigned long pfn)
20261 +static inline unsigned long __intentional_overflow(-1) pfn_to_mfn(unsigned long pfn)
20262 {
20263 unsigned long mfn;
20264
20265 diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20266 index d949ef2..479b9d1 100644
20267 --- a/arch/x86/include/asm/xsave.h
20268 +++ b/arch/x86/include/asm/xsave.h
20269 @@ -82,8 +82,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20270 if (unlikely(err))
20271 return -EFAULT;
20272
20273 + pax_open_userland();
20274 __asm__ __volatile__(ASM_STAC "\n"
20275 - "1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
20276 + "1:"
20277 + __copyuser_seg
20278 + ".byte " REX_PREFIX "0x0f,0xae,0x27\n"
20279 "2: " ASM_CLAC "\n"
20280 ".section .fixup,\"ax\"\n"
20281 "3: movl $-1,%[err]\n"
20282 @@ -93,18 +96,22 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20283 : [err] "=r" (err)
20284 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20285 : "memory");
20286 + pax_close_userland();
20287 return err;
20288 }
20289
20290 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20291 {
20292 int err;
20293 - struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20294 + struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20295 u32 lmask = mask;
20296 u32 hmask = mask >> 32;
20297
20298 + pax_open_userland();
20299 __asm__ __volatile__(ASM_STAC "\n"
20300 - "1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
20301 + "1:"
20302 + __copyuser_seg
20303 + ".byte " REX_PREFIX "0x0f,0xae,0x2f\n"
20304 "2: " ASM_CLAC "\n"
20305 ".section .fixup,\"ax\"\n"
20306 "3: movl $-1,%[err]\n"
20307 @@ -114,6 +121,7 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20308 : [err] "=r" (err)
20309 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20310 : "memory"); /* memory required? */
20311 + pax_close_userland();
20312 return err;
20313 }
20314
20315 diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20316 index bbae024..e1528f9 100644
20317 --- a/arch/x86/include/uapi/asm/e820.h
20318 +++ b/arch/x86/include/uapi/asm/e820.h
20319 @@ -63,7 +63,7 @@ struct e820map {
20320 #define ISA_START_ADDRESS 0xa0000
20321 #define ISA_END_ADDRESS 0x100000
20322
20323 -#define BIOS_BEGIN 0x000a0000
20324 +#define BIOS_BEGIN 0x000c0000
20325 #define BIOS_END 0x00100000
20326
20327 #define BIOS_ROM_BASE 0xffe00000
20328 diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20329 index 7b0a55a..ad115bf 100644
20330 --- a/arch/x86/include/uapi/asm/ptrace-abi.h
20331 +++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20332 @@ -49,7 +49,6 @@
20333 #define EFLAGS 144
20334 #define RSP 152
20335 #define SS 160
20336 -#define ARGOFFSET R11
20337 #endif /* __ASSEMBLY__ */
20338
20339 /* top of stack page */
20340 diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20341 index f4d9600..b45af01 100644
20342 --- a/arch/x86/kernel/Makefile
20343 +++ b/arch/x86/kernel/Makefile
20344 @@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20345 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20346 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20347 obj-y += probe_roms.o
20348 -obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20349 +obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20350 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20351 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20352 obj-$(CONFIG_X86_64) += vsyscall_64.o
20353 diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20354 index 86281ff..e046fc2 100644
20355 --- a/arch/x86/kernel/acpi/boot.c
20356 +++ b/arch/x86/kernel/acpi/boot.c
20357 @@ -1296,7 +1296,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
20358 * If your system is blacklisted here, but you find that acpi=force
20359 * works for you, please contact linux-acpi@vger.kernel.org
20360 */
20361 -static struct dmi_system_id __initdata acpi_dmi_table[] = {
20362 +static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20363 /*
20364 * Boxes that need ACPI disabled
20365 */
20366 @@ -1371,7 +1371,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20367 };
20368
20369 /* second table for DMI checks that should run after early-quirks */
20370 -static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20371 +static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20372 /*
20373 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20374 * which includes some code which overrides all temperature
20375 diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20376 index 3136820..e2c6577 100644
20377 --- a/arch/x86/kernel/acpi/sleep.c
20378 +++ b/arch/x86/kernel/acpi/sleep.c
20379 @@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20380 #else /* CONFIG_64BIT */
20381 #ifdef CONFIG_SMP
20382 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20383 +
20384 + pax_open_kernel();
20385 early_gdt_descr.address =
20386 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20387 + pax_close_kernel();
20388 +
20389 initial_gs = per_cpu_offset(smp_processor_id());
20390 #endif
20391 initial_code = (unsigned long)wakeup_long64;
20392 diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20393 index 665c6b7..eae4d56 100644
20394 --- a/arch/x86/kernel/acpi/wakeup_32.S
20395 +++ b/arch/x86/kernel/acpi/wakeup_32.S
20396 @@ -29,13 +29,11 @@ wakeup_pmode_return:
20397 # and restore the stack ... but you need gdt for this to work
20398 movl saved_context_esp, %esp
20399
20400 - movl %cs:saved_magic, %eax
20401 - cmpl $0x12345678, %eax
20402 + cmpl $0x12345678, saved_magic
20403 jne bogus_magic
20404
20405 # jump to place where we left off
20406 - movl saved_eip, %eax
20407 - jmp *%eax
20408 + jmp *(saved_eip)
20409
20410 bogus_magic:
20411 jmp bogus_magic
20412 diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20413 index df94598..b7162f9 100644
20414 --- a/arch/x86/kernel/alternative.c
20415 +++ b/arch/x86/kernel/alternative.c
20416 @@ -269,6 +269,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20417 */
20418 for (a = start; a < end; a++) {
20419 instr = (u8 *)&a->instr_offset + a->instr_offset;
20420 +
20421 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20422 + instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20423 + if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20424 + instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20425 +#endif
20426 +
20427 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20428 BUG_ON(a->replacementlen > a->instrlen);
20429 BUG_ON(a->instrlen > sizeof(insnbuf));
20430 @@ -285,6 +292,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20431 add_nops(insnbuf + a->replacementlen,
20432 a->instrlen - a->replacementlen);
20433
20434 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20435 + if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20436 + instr = ktva_ktla(instr);
20437 +#endif
20438 +
20439 text_poke_early(instr, insnbuf, a->instrlen);
20440 }
20441 }
20442 @@ -300,10 +312,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20443 for (poff = start; poff < end; poff++) {
20444 u8 *ptr = (u8 *)poff + *poff;
20445
20446 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20447 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20448 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20449 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20450 +#endif
20451 +
20452 if (!*poff || ptr < text || ptr >= text_end)
20453 continue;
20454 /* turn DS segment override prefix into lock prefix */
20455 - if (*ptr == 0x3e)
20456 + if (*ktla_ktva(ptr) == 0x3e)
20457 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20458 }
20459 mutex_unlock(&text_mutex);
20460 @@ -318,10 +336,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20461 for (poff = start; poff < end; poff++) {
20462 u8 *ptr = (u8 *)poff + *poff;
20463
20464 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20465 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20466 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20467 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20468 +#endif
20469 +
20470 if (!*poff || ptr < text || ptr >= text_end)
20471 continue;
20472 /* turn lock prefix into DS segment override prefix */
20473 - if (*ptr == 0xf0)
20474 + if (*ktla_ktva(ptr) == 0xf0)
20475 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20476 }
20477 mutex_unlock(&text_mutex);
20478 @@ -458,7 +482,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20479
20480 BUG_ON(p->len > MAX_PATCH_LEN);
20481 /* prep the buffer with the original instructions */
20482 - memcpy(insnbuf, p->instr, p->len);
20483 + memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20484 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20485 (unsigned long)p->instr, p->len);
20486
20487 @@ -505,7 +529,7 @@ void __init alternative_instructions(void)
20488 if (!uniproc_patched || num_possible_cpus() == 1)
20489 free_init_pages("SMP alternatives",
20490 (unsigned long)__smp_locks,
20491 - (unsigned long)__smp_locks_end);
20492 + PAGE_ALIGN((unsigned long)__smp_locks_end));
20493 #endif
20494
20495 apply_paravirt(__parainstructions, __parainstructions_end);
20496 @@ -525,13 +549,17 @@ void __init alternative_instructions(void)
20497 * instructions. And on the local CPU you need to be protected again NMI or MCE
20498 * handlers seeing an inconsistent instruction while you patch.
20499 */
20500 -void *__init_or_module text_poke_early(void *addr, const void *opcode,
20501 +void *__kprobes text_poke_early(void *addr, const void *opcode,
20502 size_t len)
20503 {
20504 unsigned long flags;
20505 local_irq_save(flags);
20506 - memcpy(addr, opcode, len);
20507 +
20508 + pax_open_kernel();
20509 + memcpy(ktla_ktva(addr), opcode, len);
20510 sync_core();
20511 + pax_close_kernel();
20512 +
20513 local_irq_restore(flags);
20514 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20515 that causes hangs on some VIA CPUs. */
20516 @@ -553,36 +581,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20517 */
20518 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
20519 {
20520 - unsigned long flags;
20521 - char *vaddr;
20522 + unsigned char *vaddr = ktla_ktva(addr);
20523 struct page *pages[2];
20524 - int i;
20525 + size_t i;
20526
20527 if (!core_kernel_text((unsigned long)addr)) {
20528 - pages[0] = vmalloc_to_page(addr);
20529 - pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20530 + pages[0] = vmalloc_to_page(vaddr);
20531 + pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20532 } else {
20533 - pages[0] = virt_to_page(addr);
20534 + pages[0] = virt_to_page(vaddr);
20535 WARN_ON(!PageReserved(pages[0]));
20536 - pages[1] = virt_to_page(addr + PAGE_SIZE);
20537 + pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20538 }
20539 BUG_ON(!pages[0]);
20540 - local_irq_save(flags);
20541 - set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20542 - if (pages[1])
20543 - set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20544 - vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20545 - memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20546 - clear_fixmap(FIX_TEXT_POKE0);
20547 - if (pages[1])
20548 - clear_fixmap(FIX_TEXT_POKE1);
20549 - local_flush_tlb();
20550 - sync_core();
20551 - /* Could also do a CLFLUSH here to speed up CPU recovery; but
20552 - that causes hangs on some VIA CPUs. */
20553 + text_poke_early(addr, opcode, len);
20554 for (i = 0; i < len; i++)
20555 - BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20556 - local_irq_restore(flags);
20557 + BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20558 return addr;
20559 }
20560
20561 @@ -602,7 +616,7 @@ int poke_int3_handler(struct pt_regs *regs)
20562 if (likely(!bp_patching_in_progress))
20563 return 0;
20564
20565 - if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20566 + if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20567 return 0;
20568
20569 /* set up the specified breakpoint handler */
20570 @@ -636,7 +650,7 @@ int poke_int3_handler(struct pt_regs *regs)
20571 */
20572 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20573 {
20574 - unsigned char int3 = 0xcc;
20575 + const unsigned char int3 = 0xcc;
20576
20577 bp_int3_handler = handler;
20578 bp_int3_addr = (u8 *)addr + sizeof(int3);
20579 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20580 index ad28db7..c538b2c 100644
20581 --- a/arch/x86/kernel/apic/apic.c
20582 +++ b/arch/x86/kernel/apic/apic.c
20583 @@ -201,7 +201,7 @@ int first_system_vector = 0xfe;
20584 /*
20585 * Debug level, exported for io_apic.c
20586 */
20587 -unsigned int apic_verbosity;
20588 +int apic_verbosity;
20589
20590 int pic_mode;
20591
20592 @@ -2000,7 +2000,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20593 apic_write(APIC_ESR, 0);
20594 v = apic_read(APIC_ESR);
20595 ack_APIC_irq();
20596 - atomic_inc(&irq_err_count);
20597 + atomic_inc_unchecked(&irq_err_count);
20598
20599 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20600 smp_processor_id(), v);
20601 diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20602 index 7c1b294..e71d27f 100644
20603 --- a/arch/x86/kernel/apic/apic_flat_64.c
20604 +++ b/arch/x86/kernel/apic/apic_flat_64.c
20605 @@ -154,7 +154,7 @@ static int flat_probe(void)
20606 return 1;
20607 }
20608
20609 -static struct apic apic_flat = {
20610 +static struct apic apic_flat __read_only = {
20611 .name = "flat",
20612 .probe = flat_probe,
20613 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20614 @@ -268,7 +268,7 @@ static int physflat_probe(void)
20615 return 0;
20616 }
20617
20618 -static struct apic apic_physflat = {
20619 +static struct apic apic_physflat __read_only = {
20620
20621 .name = "physical flat",
20622 .probe = physflat_probe,
20623 diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20624 index 8c7c982..a225910 100644
20625 --- a/arch/x86/kernel/apic/apic_noop.c
20626 +++ b/arch/x86/kernel/apic/apic_noop.c
20627 @@ -118,7 +118,7 @@ static void noop_apic_write(u32 reg, u32 v)
20628 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20629 }
20630
20631 -struct apic apic_noop = {
20632 +struct apic apic_noop __read_only = {
20633 .name = "noop",
20634 .probe = noop_probe,
20635 .acpi_madt_oem_check = NULL,
20636 diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20637 index e4840aa..e7d9dac 100644
20638 --- a/arch/x86/kernel/apic/bigsmp_32.c
20639 +++ b/arch/x86/kernel/apic/bigsmp_32.c
20640 @@ -152,7 +152,7 @@ static int probe_bigsmp(void)
20641 return dmi_bigsmp;
20642 }
20643
20644 -static struct apic apic_bigsmp = {
20645 +static struct apic apic_bigsmp __read_only = {
20646
20647 .name = "bigsmp",
20648 .probe = probe_bigsmp,
20649 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20650 index 992060e..ecdc3b3 100644
20651 --- a/arch/x86/kernel/apic/io_apic.c
20652 +++ b/arch/x86/kernel/apic/io_apic.c
20653 @@ -1057,7 +1057,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
20654 }
20655 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
20656
20657 -void lock_vector_lock(void)
20658 +void lock_vector_lock(void) __acquires(vector_lock)
20659 {
20660 /* Used to the online set of cpus does not change
20661 * during assign_irq_vector.
20662 @@ -1065,7 +1065,7 @@ void lock_vector_lock(void)
20663 raw_spin_lock(&vector_lock);
20664 }
20665
20666 -void unlock_vector_lock(void)
20667 +void unlock_vector_lock(void) __releases(vector_lock)
20668 {
20669 raw_spin_unlock(&vector_lock);
20670 }
20671 @@ -2364,7 +2364,7 @@ static void ack_apic_edge(struct irq_data *data)
20672 ack_APIC_irq();
20673 }
20674
20675 -atomic_t irq_mis_count;
20676 +atomic_unchecked_t irq_mis_count;
20677
20678 #ifdef CONFIG_GENERIC_PENDING_IRQ
20679 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20680 @@ -2505,7 +2505,7 @@ static void ack_apic_level(struct irq_data *data)
20681 * at the cpu.
20682 */
20683 if (!(v & (1 << (i & 0x1f)))) {
20684 - atomic_inc(&irq_mis_count);
20685 + atomic_inc_unchecked(&irq_mis_count);
20686
20687 eoi_ioapic_irq(irq, cfg);
20688 }
20689 diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20690 index cceb352..a635fd8 100644
20691 --- a/arch/x86/kernel/apic/probe_32.c
20692 +++ b/arch/x86/kernel/apic/probe_32.c
20693 @@ -72,7 +72,7 @@ static int probe_default(void)
20694 return 1;
20695 }
20696
20697 -static struct apic apic_default = {
20698 +static struct apic apic_default __read_only = {
20699
20700 .name = "default",
20701 .probe = probe_default,
20702 diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20703 index e66766b..1c008ba 100644
20704 --- a/arch/x86/kernel/apic/x2apic_cluster.c
20705 +++ b/arch/x86/kernel/apic/x2apic_cluster.c
20706 @@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20707 return notifier_from_errno(err);
20708 }
20709
20710 -static struct notifier_block __refdata x2apic_cpu_notifier = {
20711 +static struct notifier_block x2apic_cpu_notifier = {
20712 .notifier_call = update_clusterinfo,
20713 };
20714
20715 @@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20716 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20717 }
20718
20719 -static struct apic apic_x2apic_cluster = {
20720 +static struct apic apic_x2apic_cluster __read_only = {
20721
20722 .name = "cluster x2apic",
20723 .probe = x2apic_cluster_probe,
20724 diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20725 index 6d600eb..0300c00 100644
20726 --- a/arch/x86/kernel/apic/x2apic_phys.c
20727 +++ b/arch/x86/kernel/apic/x2apic_phys.c
20728 @@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20729 return apic == &apic_x2apic_phys;
20730 }
20731
20732 -static struct apic apic_x2apic_phys = {
20733 +static struct apic apic_x2apic_phys __read_only = {
20734
20735 .name = "physical x2apic",
20736 .probe = x2apic_phys_probe,
20737 diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20738 index 7834389..4ffc9c8 100644
20739 --- a/arch/x86/kernel/apic/x2apic_uv_x.c
20740 +++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20741 @@ -350,7 +350,7 @@ static int uv_probe(void)
20742 return apic == &apic_x2apic_uv_x;
20743 }
20744
20745 -static struct apic __refdata apic_x2apic_uv_x = {
20746 +static struct apic apic_x2apic_uv_x __read_only = {
20747
20748 .name = "UV large system",
20749 .probe = uv_probe,
20750 diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20751 index 3ab0343..814c4787 100644
20752 --- a/arch/x86/kernel/apm_32.c
20753 +++ b/arch/x86/kernel/apm_32.c
20754 @@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
20755 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20756 * even though they are called in protected mode.
20757 */
20758 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20759 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
20760 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
20761
20762 static const char driver_version[] = "1.16ac"; /* no spaces */
20763 @@ -611,7 +611,10 @@ static long __apm_bios_call(void *_call)
20764 BUG_ON(cpu != 0);
20765 gdt = get_cpu_gdt_table(cpu);
20766 save_desc_40 = gdt[0x40 / 8];
20767 +
20768 + pax_open_kernel();
20769 gdt[0x40 / 8] = bad_bios_desc;
20770 + pax_close_kernel();
20771
20772 apm_irq_save(flags);
20773 APM_DO_SAVE_SEGS;
20774 @@ -620,7 +623,11 @@ static long __apm_bios_call(void *_call)
20775 &call->esi);
20776 APM_DO_RESTORE_SEGS;
20777 apm_irq_restore(flags);
20778 +
20779 + pax_open_kernel();
20780 gdt[0x40 / 8] = save_desc_40;
20781 + pax_close_kernel();
20782 +
20783 put_cpu();
20784
20785 return call->eax & 0xff;
20786 @@ -687,7 +694,10 @@ static long __apm_bios_call_simple(void *_call)
20787 BUG_ON(cpu != 0);
20788 gdt = get_cpu_gdt_table(cpu);
20789 save_desc_40 = gdt[0x40 / 8];
20790 +
20791 + pax_open_kernel();
20792 gdt[0x40 / 8] = bad_bios_desc;
20793 + pax_close_kernel();
20794
20795 apm_irq_save(flags);
20796 APM_DO_SAVE_SEGS;
20797 @@ -695,7 +705,11 @@ static long __apm_bios_call_simple(void *_call)
20798 &call->eax);
20799 APM_DO_RESTORE_SEGS;
20800 apm_irq_restore(flags);
20801 +
20802 + pax_open_kernel();
20803 gdt[0x40 / 8] = save_desc_40;
20804 + pax_close_kernel();
20805 +
20806 put_cpu();
20807 return error;
20808 }
20809 @@ -2362,12 +2376,15 @@ static int __init apm_init(void)
20810 * code to that CPU.
20811 */
20812 gdt = get_cpu_gdt_table(0);
20813 +
20814 + pax_open_kernel();
20815 set_desc_base(&gdt[APM_CS >> 3],
20816 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
20817 set_desc_base(&gdt[APM_CS_16 >> 3],
20818 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
20819 set_desc_base(&gdt[APM_DS >> 3],
20820 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
20821 + pax_close_kernel();
20822
20823 proc_create("apm", 0, NULL, &apm_file_ops);
20824
20825 diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
20826 index 9f6b934..cf5ffb3 100644
20827 --- a/arch/x86/kernel/asm-offsets.c
20828 +++ b/arch/x86/kernel/asm-offsets.c
20829 @@ -32,6 +32,8 @@ void common(void) {
20830 OFFSET(TI_flags, thread_info, flags);
20831 OFFSET(TI_status, thread_info, status);
20832 OFFSET(TI_addr_limit, thread_info, addr_limit);
20833 + OFFSET(TI_lowest_stack, thread_info, lowest_stack);
20834 + DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
20835
20836 BLANK();
20837 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
20838 @@ -52,8 +54,26 @@ void common(void) {
20839 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
20840 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
20841 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
20842 +
20843 +#ifdef CONFIG_PAX_KERNEXEC
20844 + OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
20845 #endif
20846
20847 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20848 + OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
20849 + OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
20850 +#ifdef CONFIG_X86_64
20851 + OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
20852 +#endif
20853 +#endif
20854 +
20855 +#endif
20856 +
20857 + BLANK();
20858 + DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
20859 + DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
20860 + DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
20861 +
20862 #ifdef CONFIG_XEN
20863 BLANK();
20864 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
20865 diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
20866 index e7c798b..2b2019b 100644
20867 --- a/arch/x86/kernel/asm-offsets_64.c
20868 +++ b/arch/x86/kernel/asm-offsets_64.c
20869 @@ -77,6 +77,7 @@ int main(void)
20870 BLANK();
20871 #undef ENTRY
20872
20873 + DEFINE(TSS_size, sizeof(struct tss_struct));
20874 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
20875 BLANK();
20876
20877 diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
20878 index 7fd54f0..0691410 100644
20879 --- a/arch/x86/kernel/cpu/Makefile
20880 +++ b/arch/x86/kernel/cpu/Makefile
20881 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
20882 CFLAGS_REMOVE_perf_event.o = -pg
20883 endif
20884
20885 -# Make sure load_percpu_segment has no stackprotector
20886 -nostackp := $(call cc-option, -fno-stack-protector)
20887 -CFLAGS_common.o := $(nostackp)
20888 -
20889 obj-y := intel_cacheinfo.o scattered.o topology.o
20890 obj-y += proc.o capflags.o powerflags.o common.o
20891 obj-y += rdrand.o
20892 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
20893 index ce8b8ff..d7d8851 100644
20894 --- a/arch/x86/kernel/cpu/amd.c
20895 +++ b/arch/x86/kernel/cpu/amd.c
20896 @@ -728,7 +728,7 @@ static void init_amd(struct cpuinfo_x86 *c)
20897 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
20898 {
20899 /* AMD errata T13 (order #21922) */
20900 - if ((c->x86 == 6)) {
20901 + if (c->x86 == 6) {
20902 /* Duron Rev A0 */
20903 if (c->x86_model == 3 && c->x86_mask == 0)
20904 size = 64;
20905 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
20906 index a135239..41fb30a 100644
20907 --- a/arch/x86/kernel/cpu/common.c
20908 +++ b/arch/x86/kernel/cpu/common.c
20909 @@ -88,60 +88,6 @@ static const struct cpu_dev default_cpu = {
20910
20911 static const struct cpu_dev *this_cpu = &default_cpu;
20912
20913 -DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
20914 -#ifdef CONFIG_X86_64
20915 - /*
20916 - * We need valid kernel segments for data and code in long mode too
20917 - * IRET will check the segment types kkeil 2000/10/28
20918 - * Also sysret mandates a special GDT layout
20919 - *
20920 - * TLS descriptors are currently at a different place compared to i386.
20921 - * Hopefully nobody expects them at a fixed place (Wine?)
20922 - */
20923 - [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
20924 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
20925 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
20926 - [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
20927 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
20928 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
20929 -#else
20930 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
20931 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20932 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
20933 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
20934 - /*
20935 - * Segments used for calling PnP BIOS have byte granularity.
20936 - * They code segments and data segments have fixed 64k limits,
20937 - * the transfer segment sizes are set at run time.
20938 - */
20939 - /* 32-bit code */
20940 - [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
20941 - /* 16-bit code */
20942 - [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
20943 - /* 16-bit data */
20944 - [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
20945 - /* 16-bit data */
20946 - [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
20947 - /* 16-bit data */
20948 - [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
20949 - /*
20950 - * The APM segments have byte granularity and their bases
20951 - * are set at run time. All have 64k limits.
20952 - */
20953 - /* 32-bit code */
20954 - [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
20955 - /* 16-bit code */
20956 - [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
20957 - /* data */
20958 - [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
20959 -
20960 - [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20961 - [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20962 - GDT_STACK_CANARY_INIT
20963 -#endif
20964 -} };
20965 -EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
20966 -
20967 static int __init x86_xsave_setup(char *s)
20968 {
20969 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
20970 @@ -293,6 +239,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
20971 }
20972 }
20973
20974 +#ifdef CONFIG_X86_64
20975 +static __init int setup_disable_pcid(char *arg)
20976 +{
20977 + setup_clear_cpu_cap(X86_FEATURE_PCID);
20978 + setup_clear_cpu_cap(X86_FEATURE_INVPCID);
20979 +
20980 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20981 + if (clone_pgd_mask != ~(pgdval_t)0UL)
20982 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
20983 +#endif
20984 +
20985 + return 1;
20986 +}
20987 +__setup("nopcid", setup_disable_pcid);
20988 +
20989 +static void setup_pcid(struct cpuinfo_x86 *c)
20990 +{
20991 + if (!cpu_has(c, X86_FEATURE_PCID)) {
20992 + clear_cpu_cap(c, X86_FEATURE_INVPCID);
20993 +
20994 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20995 + if (clone_pgd_mask != ~(pgdval_t)0UL) {
20996 + pax_open_kernel();
20997 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
20998 + pax_close_kernel();
20999 + printk("PAX: slow and weak UDEREF enabled\n");
21000 + } else
21001 + printk("PAX: UDEREF disabled\n");
21002 +#endif
21003 +
21004 + return;
21005 + }
21006 +
21007 + printk("PAX: PCID detected\n");
21008 + set_in_cr4(X86_CR4_PCIDE);
21009 +
21010 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21011 + pax_open_kernel();
21012 + clone_pgd_mask = ~(pgdval_t)0UL;
21013 + pax_close_kernel();
21014 + if (pax_user_shadow_base)
21015 + printk("PAX: weak UDEREF enabled\n");
21016 + else {
21017 + set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21018 + printk("PAX: strong UDEREF enabled\n");
21019 + }
21020 +#endif
21021 +
21022 + if (cpu_has(c, X86_FEATURE_INVPCID))
21023 + printk("PAX: INVPCID detected\n");
21024 +}
21025 +#endif
21026 +
21027 /*
21028 * Some CPU features depend on higher CPUID levels, which may not always
21029 * be available due to CPUID level capping or broken virtualization
21030 @@ -393,7 +392,7 @@ void switch_to_new_gdt(int cpu)
21031 {
21032 struct desc_ptr gdt_descr;
21033
21034 - gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21035 + gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21036 gdt_descr.size = GDT_SIZE - 1;
21037 load_gdt(&gdt_descr);
21038 /* Reload the per-cpu base */
21039 @@ -883,6 +882,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21040 setup_smep(c);
21041 setup_smap(c);
21042
21043 +#ifdef CONFIG_X86_64
21044 + setup_pcid(c);
21045 +#endif
21046 +
21047 /*
21048 * The vendor-specific functions might have changed features.
21049 * Now we do "generic changes."
21050 @@ -891,6 +894,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21051 /* Filter out anything that depends on CPUID levels we don't have */
21052 filter_cpuid_features(c, true);
21053
21054 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
21055 + setup_clear_cpu_cap(X86_FEATURE_SEP);
21056 +#endif
21057 +
21058 /* If the model name is still unset, do table lookup. */
21059 if (!c->x86_model_id[0]) {
21060 const char *p;
21061 @@ -1079,14 +1086,16 @@ static __init int setup_disablecpuid(char *arg)
21062 }
21063 __setup("clearcpuid=", setup_disablecpuid);
21064
21065 +DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21066 +EXPORT_PER_CPU_SYMBOL(current_tinfo);
21067 +
21068 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21069 - (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21070 + (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21071 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21072
21073 #ifdef CONFIG_X86_64
21074 -struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21075 -struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21076 - (unsigned long) debug_idt_table };
21077 +struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21078 +const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21079
21080 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21081 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21082 @@ -1246,7 +1255,7 @@ void cpu_init(void)
21083 load_ucode_ap();
21084
21085 cpu = stack_smp_processor_id();
21086 - t = &per_cpu(init_tss, cpu);
21087 + t = init_tss + cpu;
21088 oist = &per_cpu(orig_ist, cpu);
21089
21090 #ifdef CONFIG_NUMA
21091 @@ -1281,7 +1290,6 @@ void cpu_init(void)
21092 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21093 barrier();
21094
21095 - x86_configure_nx();
21096 enable_x2apic();
21097
21098 /*
21099 @@ -1333,7 +1341,7 @@ void cpu_init(void)
21100 {
21101 int cpu = smp_processor_id();
21102 struct task_struct *curr = current;
21103 - struct tss_struct *t = &per_cpu(init_tss, cpu);
21104 + struct tss_struct *t = init_tss + cpu;
21105 struct thread_struct *thread = &curr->thread;
21106
21107 show_ucode_info_early();
21108 diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21109 index a952e9c..58a4cbb 100644
21110 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21111 +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21112 @@ -1014,6 +1014,22 @@ static struct attribute *default_attrs[] = {
21113 };
21114
21115 #ifdef CONFIG_AMD_NB
21116 +static struct attribute *default_attrs_amd_nb[] = {
21117 + &type.attr,
21118 + &level.attr,
21119 + &coherency_line_size.attr,
21120 + &physical_line_partition.attr,
21121 + &ways_of_associativity.attr,
21122 + &number_of_sets.attr,
21123 + &size.attr,
21124 + &shared_cpu_map.attr,
21125 + &shared_cpu_list.attr,
21126 + NULL,
21127 + NULL,
21128 + NULL,
21129 + NULL
21130 +};
21131 +
21132 static struct attribute **amd_l3_attrs(void)
21133 {
21134 static struct attribute **attrs;
21135 @@ -1024,18 +1040,7 @@ static struct attribute **amd_l3_attrs(void)
21136
21137 n = ARRAY_SIZE(default_attrs);
21138
21139 - if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21140 - n += 2;
21141 -
21142 - if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21143 - n += 1;
21144 -
21145 - attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21146 - if (attrs == NULL)
21147 - return attrs = default_attrs;
21148 -
21149 - for (n = 0; default_attrs[n]; n++)
21150 - attrs[n] = default_attrs[n];
21151 + attrs = default_attrs_amd_nb;
21152
21153 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21154 attrs[n++] = &cache_disable_0.attr;
21155 @@ -1086,6 +1091,13 @@ static struct kobj_type ktype_cache = {
21156 .default_attrs = default_attrs,
21157 };
21158
21159 +#ifdef CONFIG_AMD_NB
21160 +static struct kobj_type ktype_cache_amd_nb = {
21161 + .sysfs_ops = &sysfs_ops,
21162 + .default_attrs = default_attrs_amd_nb,
21163 +};
21164 +#endif
21165 +
21166 static struct kobj_type ktype_percpu_entry = {
21167 .sysfs_ops = &sysfs_ops,
21168 };
21169 @@ -1151,20 +1163,26 @@ static int cache_add_dev(struct device *dev)
21170 return retval;
21171 }
21172
21173 +#ifdef CONFIG_AMD_NB
21174 + amd_l3_attrs();
21175 +#endif
21176 +
21177 for (i = 0; i < num_cache_leaves; i++) {
21178 + struct kobj_type *ktype;
21179 +
21180 this_object = INDEX_KOBJECT_PTR(cpu, i);
21181 this_object->cpu = cpu;
21182 this_object->index = i;
21183
21184 this_leaf = CPUID4_INFO_IDX(cpu, i);
21185
21186 - ktype_cache.default_attrs = default_attrs;
21187 + ktype = &ktype_cache;
21188 #ifdef CONFIG_AMD_NB
21189 if (this_leaf->base.nb)
21190 - ktype_cache.default_attrs = amd_l3_attrs();
21191 + ktype = &ktype_cache_amd_nb;
21192 #endif
21193 retval = kobject_init_and_add(&(this_object->kobj),
21194 - &ktype_cache,
21195 + ktype,
21196 per_cpu(ici_cache_kobject, cpu),
21197 "index%1lu", i);
21198 if (unlikely(retval)) {
21199 diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21200 index 68317c8..c860d41 100644
21201 --- a/arch/x86/kernel/cpu/mcheck/mce.c
21202 +++ b/arch/x86/kernel/cpu/mcheck/mce.c
21203 @@ -45,6 +45,7 @@
21204 #include <asm/processor.h>
21205 #include <asm/mce.h>
21206 #include <asm/msr.h>
21207 +#include <asm/local.h>
21208
21209 #include "mce-internal.h"
21210
21211 @@ -261,7 +262,7 @@ static void print_mce(struct mce *m)
21212 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21213 m->cs, m->ip);
21214
21215 - if (m->cs == __KERNEL_CS)
21216 + if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21217 print_symbol("{%s}", m->ip);
21218 pr_cont("\n");
21219 }
21220 @@ -294,10 +295,10 @@ static void print_mce(struct mce *m)
21221
21222 #define PANIC_TIMEOUT 5 /* 5 seconds */
21223
21224 -static atomic_t mce_paniced;
21225 +static atomic_unchecked_t mce_paniced;
21226
21227 static int fake_panic;
21228 -static atomic_t mce_fake_paniced;
21229 +static atomic_unchecked_t mce_fake_paniced;
21230
21231 /* Panic in progress. Enable interrupts and wait for final IPI */
21232 static void wait_for_panic(void)
21233 @@ -321,7 +322,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21234 /*
21235 * Make sure only one CPU runs in machine check panic
21236 */
21237 - if (atomic_inc_return(&mce_paniced) > 1)
21238 + if (atomic_inc_return_unchecked(&mce_paniced) > 1)
21239 wait_for_panic();
21240 barrier();
21241
21242 @@ -329,7 +330,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21243 console_verbose();
21244 } else {
21245 /* Don't log too much for fake panic */
21246 - if (atomic_inc_return(&mce_fake_paniced) > 1)
21247 + if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
21248 return;
21249 }
21250 /* First print corrected ones that are still unlogged */
21251 @@ -368,7 +369,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21252 if (!fake_panic) {
21253 if (panic_timeout == 0)
21254 panic_timeout = mca_cfg.panic_timeout;
21255 - panic(msg);
21256 + panic("%s", msg);
21257 } else
21258 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21259 }
21260 @@ -699,7 +700,7 @@ static int mce_timed_out(u64 *t)
21261 * might have been modified by someone else.
21262 */
21263 rmb();
21264 - if (atomic_read(&mce_paniced))
21265 + if (atomic_read_unchecked(&mce_paniced))
21266 wait_for_panic();
21267 if (!mca_cfg.monarch_timeout)
21268 goto out;
21269 @@ -1680,7 +1681,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21270 }
21271
21272 /* Call the installed machine check handler for this CPU setup. */
21273 -void (*machine_check_vector)(struct pt_regs *, long error_code) =
21274 +void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21275 unexpected_machine_check;
21276
21277 /*
21278 @@ -1703,7 +1704,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21279 return;
21280 }
21281
21282 + pax_open_kernel();
21283 machine_check_vector = do_machine_check;
21284 + pax_close_kernel();
21285
21286 __mcheck_cpu_init_generic();
21287 __mcheck_cpu_init_vendor(c);
21288 @@ -1717,7 +1720,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21289 */
21290
21291 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21292 -static int mce_chrdev_open_count; /* #times opened */
21293 +static local_t mce_chrdev_open_count; /* #times opened */
21294 static int mce_chrdev_open_exclu; /* already open exclusive? */
21295
21296 static int mce_chrdev_open(struct inode *inode, struct file *file)
21297 @@ -1725,7 +1728,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21298 spin_lock(&mce_chrdev_state_lock);
21299
21300 if (mce_chrdev_open_exclu ||
21301 - (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21302 + (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21303 spin_unlock(&mce_chrdev_state_lock);
21304
21305 return -EBUSY;
21306 @@ -1733,7 +1736,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21307
21308 if (file->f_flags & O_EXCL)
21309 mce_chrdev_open_exclu = 1;
21310 - mce_chrdev_open_count++;
21311 + local_inc(&mce_chrdev_open_count);
21312
21313 spin_unlock(&mce_chrdev_state_lock);
21314
21315 @@ -1744,7 +1747,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21316 {
21317 spin_lock(&mce_chrdev_state_lock);
21318
21319 - mce_chrdev_open_count--;
21320 + local_dec(&mce_chrdev_open_count);
21321 mce_chrdev_open_exclu = 0;
21322
21323 spin_unlock(&mce_chrdev_state_lock);
21324 @@ -2420,7 +2423,7 @@ static __init void mce_init_banks(void)
21325
21326 for (i = 0; i < mca_cfg.banks; i++) {
21327 struct mce_bank *b = &mce_banks[i];
21328 - struct device_attribute *a = &b->attr;
21329 + device_attribute_no_const *a = &b->attr;
21330
21331 sysfs_attr_init(&a->attr);
21332 a->attr.name = b->attrname;
21333 @@ -2492,7 +2495,7 @@ struct dentry *mce_get_debugfs_dir(void)
21334 static void mce_reset(void)
21335 {
21336 cpu_missing = 0;
21337 - atomic_set(&mce_fake_paniced, 0);
21338 + atomic_set_unchecked(&mce_fake_paniced, 0);
21339 atomic_set(&mce_executing, 0);
21340 atomic_set(&mce_callin, 0);
21341 atomic_set(&global_nwo, 0);
21342 diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21343 index a304298..49b6d06 100644
21344 --- a/arch/x86/kernel/cpu/mcheck/p5.c
21345 +++ b/arch/x86/kernel/cpu/mcheck/p5.c
21346 @@ -10,6 +10,7 @@
21347 #include <asm/processor.h>
21348 #include <asm/mce.h>
21349 #include <asm/msr.h>
21350 +#include <asm/pgtable.h>
21351
21352 /* By default disabled */
21353 int mce_p5_enabled __read_mostly;
21354 @@ -48,7 +49,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21355 if (!cpu_has(c, X86_FEATURE_MCE))
21356 return;
21357
21358 + pax_open_kernel();
21359 machine_check_vector = pentium_machine_check;
21360 + pax_close_kernel();
21361 /* Make sure the vector pointer is visible before we enable MCEs: */
21362 wmb();
21363
21364 diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21365 index 7dc5564..1273569 100644
21366 --- a/arch/x86/kernel/cpu/mcheck/winchip.c
21367 +++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21368 @@ -9,6 +9,7 @@
21369 #include <asm/processor.h>
21370 #include <asm/mce.h>
21371 #include <asm/msr.h>
21372 +#include <asm/pgtable.h>
21373
21374 /* Machine check handler for WinChip C6: */
21375 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21376 @@ -22,7 +23,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21377 {
21378 u32 lo, hi;
21379
21380 + pax_open_kernel();
21381 machine_check_vector = winchip_machine_check;
21382 + pax_close_kernel();
21383 /* Make sure the vector pointer is visible before we enable MCEs: */
21384 wmb();
21385
21386 diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21387 index 15c9876..0a43909 100644
21388 --- a/arch/x86/kernel/cpu/microcode/core.c
21389 +++ b/arch/x86/kernel/cpu/microcode/core.c
21390 @@ -513,7 +513,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21391 return NOTIFY_OK;
21392 }
21393
21394 -static struct notifier_block __refdata mc_cpu_notifier = {
21395 +static struct notifier_block mc_cpu_notifier = {
21396 .notifier_call = mc_cpu_callback,
21397 };
21398
21399 diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21400 index a276fa7..e66810f 100644
21401 --- a/arch/x86/kernel/cpu/microcode/intel.c
21402 +++ b/arch/x86/kernel/cpu/microcode/intel.c
21403 @@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21404
21405 static int get_ucode_user(void *to, const void *from, size_t n)
21406 {
21407 - return copy_from_user(to, from, n);
21408 + return copy_from_user(to, (const void __force_user *)from, n);
21409 }
21410
21411 static enum ucode_state
21412 request_microcode_user(int cpu, const void __user *buf, size_t size)
21413 {
21414 - return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21415 + return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21416 }
21417
21418 static void microcode_fini_cpu(int cpu)
21419 diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21420 index f961de9..8a9d332 100644
21421 --- a/arch/x86/kernel/cpu/mtrr/main.c
21422 +++ b/arch/x86/kernel/cpu/mtrr/main.c
21423 @@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21424 u64 size_or_mask, size_and_mask;
21425 static bool mtrr_aps_delayed_init;
21426
21427 -static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21428 +static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21429
21430 const struct mtrr_ops *mtrr_if;
21431
21432 diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21433 index df5e41f..816c719 100644
21434 --- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21435 +++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21436 @@ -25,7 +25,7 @@ struct mtrr_ops {
21437 int (*validate_add_page)(unsigned long base, unsigned long size,
21438 unsigned int type);
21439 int (*have_wrcomb)(void);
21440 -};
21441 +} __do_const;
21442
21443 extern int generic_get_free_region(unsigned long base, unsigned long size,
21444 int replace_reg);
21445 diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21446 index ae407f7..39c5b00 100644
21447 --- a/arch/x86/kernel/cpu/perf_event.c
21448 +++ b/arch/x86/kernel/cpu/perf_event.c
21449 @@ -1367,7 +1367,7 @@ static void __init pmu_check_apic(void)
21450 pr_info("no hardware sampling interrupt available.\n");
21451 }
21452
21453 -static struct attribute_group x86_pmu_format_group = {
21454 +static attribute_group_no_const x86_pmu_format_group = {
21455 .name = "format",
21456 .attrs = NULL,
21457 };
21458 @@ -1466,7 +1466,7 @@ static struct attribute *events_attr[] = {
21459 NULL,
21460 };
21461
21462 -static struct attribute_group x86_pmu_events_group = {
21463 +static attribute_group_no_const x86_pmu_events_group = {
21464 .name = "events",
21465 .attrs = events_attr,
21466 };
21467 @@ -1990,7 +1990,7 @@ static unsigned long get_segment_base(unsigned int segment)
21468 if (idx > GDT_ENTRIES)
21469 return 0;
21470
21471 - desc = __this_cpu_ptr(&gdt_page.gdt[0]);
21472 + desc = get_cpu_gdt_table(smp_processor_id());
21473 }
21474
21475 return get_desc_base(desc + idx);
21476 @@ -2080,7 +2080,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21477 break;
21478
21479 perf_callchain_store(entry, frame.return_address);
21480 - fp = frame.next_frame;
21481 + fp = (const void __force_user *)frame.next_frame;
21482 }
21483 }
21484
21485 diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21486 index 639d128..e92d7e5 100644
21487 --- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21488 +++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21489 @@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21490 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21491 {
21492 struct attribute **attrs;
21493 - struct attribute_group *attr_group;
21494 + attribute_group_no_const *attr_group;
21495 int i = 0, j;
21496
21497 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21498 diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21499 index adb02aa..9688c02 100644
21500 --- a/arch/x86/kernel/cpu/perf_event_intel.c
21501 +++ b/arch/x86/kernel/cpu/perf_event_intel.c
21502 @@ -2308,10 +2308,10 @@ __init int intel_pmu_init(void)
21503 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21504
21505 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21506 - u64 capabilities;
21507 + u64 capabilities = x86_pmu.intel_cap.capabilities;
21508
21509 - rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21510 - x86_pmu.intel_cap.capabilities = capabilities;
21511 + if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21512 + x86_pmu.intel_cap.capabilities = capabilities;
21513 }
21514
21515 intel_ds_init();
21516 diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21517 index 619f769..d510008 100644
21518 --- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21519 +++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21520 @@ -449,7 +449,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21521 NULL,
21522 };
21523
21524 -static struct attribute_group rapl_pmu_events_group = {
21525 +static attribute_group_no_const rapl_pmu_events_group __read_only = {
21526 .name = "events",
21527 .attrs = NULL, /* patched at runtime */
21528 };
21529 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21530 index 65bbbea..1438d9e 100644
21531 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21532 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21533 @@ -3693,7 +3693,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21534 static int __init uncore_type_init(struct intel_uncore_type *type)
21535 {
21536 struct intel_uncore_pmu *pmus;
21537 - struct attribute_group *attr_group;
21538 + attribute_group_no_const *attr_group;
21539 struct attribute **attrs;
21540 int i, j;
21541
21542 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21543 index 90236f0..54cb20d 100644
21544 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21545 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21546 @@ -503,7 +503,7 @@ struct intel_uncore_box {
21547 struct uncore_event_desc {
21548 struct kobj_attribute attr;
21549 const char *config;
21550 -};
21551 +} __do_const;
21552
21553 #define INTEL_UNCORE_EVENT_DESC(_name, _config) \
21554 { \
21555 diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21556 index 3225ae6c..ee3c6db 100644
21557 --- a/arch/x86/kernel/cpuid.c
21558 +++ b/arch/x86/kernel/cpuid.c
21559 @@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21560 return notifier_from_errno(err);
21561 }
21562
21563 -static struct notifier_block __refdata cpuid_class_cpu_notifier =
21564 +static struct notifier_block cpuid_class_cpu_notifier =
21565 {
21566 .notifier_call = cpuid_class_cpu_callback,
21567 };
21568 diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21569 index 507de80..ebaae2a 100644
21570 --- a/arch/x86/kernel/crash.c
21571 +++ b/arch/x86/kernel/crash.c
21572 @@ -58,7 +58,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21573 #ifdef CONFIG_X86_32
21574 struct pt_regs fixed_regs;
21575
21576 - if (!user_mode_vm(regs)) {
21577 + if (!user_mode(regs)) {
21578 crash_fixup_ss_esp(&fixed_regs, regs);
21579 regs = &fixed_regs;
21580 }
21581 diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21582 index afa64ad..dce67dd 100644
21583 --- a/arch/x86/kernel/crash_dump_64.c
21584 +++ b/arch/x86/kernel/crash_dump_64.c
21585 @@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21586 return -ENOMEM;
21587
21588 if (userbuf) {
21589 - if (copy_to_user(buf, vaddr + offset, csize)) {
21590 + if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21591 iounmap(vaddr);
21592 return -EFAULT;
21593 }
21594 diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21595 index f6dfd93..892ade4 100644
21596 --- a/arch/x86/kernel/doublefault.c
21597 +++ b/arch/x86/kernel/doublefault.c
21598 @@ -12,7 +12,7 @@
21599
21600 #define DOUBLEFAULT_STACKSIZE (1024)
21601 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21602 -#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21603 +#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21604
21605 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21606
21607 @@ -22,7 +22,7 @@ static void doublefault_fn(void)
21608 unsigned long gdt, tss;
21609
21610 native_store_gdt(&gdt_desc);
21611 - gdt = gdt_desc.address;
21612 + gdt = (unsigned long)gdt_desc.address;
21613
21614 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21615
21616 @@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21617 /* 0x2 bit is always set */
21618 .flags = X86_EFLAGS_SF | 0x2,
21619 .sp = STACK_START,
21620 - .es = __USER_DS,
21621 + .es = __KERNEL_DS,
21622 .cs = __KERNEL_CS,
21623 .ss = __KERNEL_DS,
21624 - .ds = __USER_DS,
21625 + .ds = __KERNEL_DS,
21626 .fs = __KERNEL_PERCPU,
21627
21628 .__cr3 = __pa_nodebug(swapper_pg_dir),
21629 diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21630 index d9c12d3..7858b62 100644
21631 --- a/arch/x86/kernel/dumpstack.c
21632 +++ b/arch/x86/kernel/dumpstack.c
21633 @@ -2,6 +2,9 @@
21634 * Copyright (C) 1991, 1992 Linus Torvalds
21635 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21636 */
21637 +#ifdef CONFIG_GRKERNSEC_HIDESYM
21638 +#define __INCLUDED_BY_HIDESYM 1
21639 +#endif
21640 #include <linux/kallsyms.h>
21641 #include <linux/kprobes.h>
21642 #include <linux/uaccess.h>
21643 @@ -40,16 +43,14 @@ void printk_address(unsigned long address)
21644 static void
21645 print_ftrace_graph_addr(unsigned long addr, void *data,
21646 const struct stacktrace_ops *ops,
21647 - struct thread_info *tinfo, int *graph)
21648 + struct task_struct *task, int *graph)
21649 {
21650 - struct task_struct *task;
21651 unsigned long ret_addr;
21652 int index;
21653
21654 if (addr != (unsigned long)return_to_handler)
21655 return;
21656
21657 - task = tinfo->task;
21658 index = task->curr_ret_stack;
21659
21660 if (!task->ret_stack || index < *graph)
21661 @@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21662 static inline void
21663 print_ftrace_graph_addr(unsigned long addr, void *data,
21664 const struct stacktrace_ops *ops,
21665 - struct thread_info *tinfo, int *graph)
21666 + struct task_struct *task, int *graph)
21667 { }
21668 #endif
21669
21670 @@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21671 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21672 */
21673
21674 -static inline int valid_stack_ptr(struct thread_info *tinfo,
21675 - void *p, unsigned int size, void *end)
21676 +static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21677 {
21678 - void *t = tinfo;
21679 if (end) {
21680 if (p < end && p >= (end-THREAD_SIZE))
21681 return 1;
21682 @@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21683 }
21684
21685 unsigned long
21686 -print_context_stack(struct thread_info *tinfo,
21687 +print_context_stack(struct task_struct *task, void *stack_start,
21688 unsigned long *stack, unsigned long bp,
21689 const struct stacktrace_ops *ops, void *data,
21690 unsigned long *end, int *graph)
21691 {
21692 struct stack_frame *frame = (struct stack_frame *)bp;
21693
21694 - while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21695 + while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21696 unsigned long addr;
21697
21698 addr = *stack;
21699 @@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21700 } else {
21701 ops->address(data, addr, 0);
21702 }
21703 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21704 + print_ftrace_graph_addr(addr, data, ops, task, graph);
21705 }
21706 stack++;
21707 }
21708 @@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21709 EXPORT_SYMBOL_GPL(print_context_stack);
21710
21711 unsigned long
21712 -print_context_stack_bp(struct thread_info *tinfo,
21713 +print_context_stack_bp(struct task_struct *task, void *stack_start,
21714 unsigned long *stack, unsigned long bp,
21715 const struct stacktrace_ops *ops, void *data,
21716 unsigned long *end, int *graph)
21717 @@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21718 struct stack_frame *frame = (struct stack_frame *)bp;
21719 unsigned long *ret_addr = &frame->return_address;
21720
21721 - while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21722 + while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21723 unsigned long addr = *ret_addr;
21724
21725 if (!__kernel_text_address(addr))
21726 @@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21727 ops->address(data, addr, 1);
21728 frame = frame->next_frame;
21729 ret_addr = &frame->return_address;
21730 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21731 + print_ftrace_graph_addr(addr, data, ops, task, graph);
21732 }
21733
21734 return (unsigned long)frame;
21735 @@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
21736 static void print_trace_address(void *data, unsigned long addr, int reliable)
21737 {
21738 touch_nmi_watchdog();
21739 - printk(data);
21740 + printk("%s", (char *)data);
21741 printk_stack_address(addr, reliable);
21742 }
21743
21744 @@ -224,6 +223,8 @@ unsigned __kprobes long oops_begin(void)
21745 }
21746 EXPORT_SYMBOL_GPL(oops_begin);
21747
21748 +extern void gr_handle_kernel_exploit(void);
21749 +
21750 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
21751 {
21752 if (regs && kexec_should_crash(current))
21753 @@ -245,7 +246,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
21754 panic("Fatal exception in interrupt");
21755 if (panic_on_oops)
21756 panic("Fatal exception");
21757 - do_exit(signr);
21758 +
21759 + gr_handle_kernel_exploit();
21760 +
21761 + do_group_exit(signr);
21762 }
21763
21764 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
21765 @@ -273,7 +277,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
21766 print_modules();
21767 show_regs(regs);
21768 #ifdef CONFIG_X86_32
21769 - if (user_mode_vm(regs)) {
21770 + if (user_mode(regs)) {
21771 sp = regs->sp;
21772 ss = regs->ss & 0xffff;
21773 } else {
21774 @@ -301,7 +305,7 @@ void die(const char *str, struct pt_regs *regs, long err)
21775 unsigned long flags = oops_begin();
21776 int sig = SIGSEGV;
21777
21778 - if (!user_mode_vm(regs))
21779 + if (!user_mode(regs))
21780 report_bug(regs->ip, regs);
21781
21782 if (__die(str, regs, err))
21783 diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
21784 index 5abd4cd..c65733b 100644
21785 --- a/arch/x86/kernel/dumpstack_32.c
21786 +++ b/arch/x86/kernel/dumpstack_32.c
21787 @@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21788 bp = stack_frame(task, regs);
21789
21790 for (;;) {
21791 - struct thread_info *context;
21792 + void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
21793 void *end_stack;
21794
21795 end_stack = is_hardirq_stack(stack, cpu);
21796 if (!end_stack)
21797 end_stack = is_softirq_stack(stack, cpu);
21798
21799 - context = task_thread_info(task);
21800 - bp = ops->walk_stack(context, stack, bp, ops, data,
21801 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
21802 end_stack, &graph);
21803
21804 /* Stop if not on irq stack */
21805 @@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
21806 int i;
21807
21808 show_regs_print_info(KERN_EMERG);
21809 - __show_regs(regs, !user_mode_vm(regs));
21810 + __show_regs(regs, !user_mode(regs));
21811
21812 /*
21813 * When in-kernel, we also print out the stack and code at the
21814 * time of the fault..
21815 */
21816 - if (!user_mode_vm(regs)) {
21817 + if (!user_mode(regs)) {
21818 unsigned int code_prologue = code_bytes * 43 / 64;
21819 unsigned int code_len = code_bytes;
21820 unsigned char c;
21821 u8 *ip;
21822 + unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
21823
21824 pr_emerg("Stack:\n");
21825 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
21826
21827 pr_emerg("Code:");
21828
21829 - ip = (u8 *)regs->ip - code_prologue;
21830 + ip = (u8 *)regs->ip - code_prologue + cs_base;
21831 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
21832 /* try starting at IP */
21833 - ip = (u8 *)regs->ip;
21834 + ip = (u8 *)regs->ip + cs_base;
21835 code_len = code_len - code_prologue + 1;
21836 }
21837 for (i = 0; i < code_len; i++, ip++) {
21838 @@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
21839 pr_cont(" Bad EIP value.");
21840 break;
21841 }
21842 - if (ip == (u8 *)regs->ip)
21843 + if (ip == (u8 *)regs->ip + cs_base)
21844 pr_cont(" <%02x>", c);
21845 else
21846 pr_cont(" %02x", c);
21847 @@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
21848 {
21849 unsigned short ud2;
21850
21851 + ip = ktla_ktva(ip);
21852 if (ip < PAGE_OFFSET)
21853 return 0;
21854 if (probe_kernel_address((unsigned short *)ip, ud2))
21855 @@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
21856
21857 return ud2 == 0x0b0f;
21858 }
21859 +
21860 +#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
21861 +void pax_check_alloca(unsigned long size)
21862 +{
21863 + unsigned long sp = (unsigned long)&sp, stack_left;
21864 +
21865 + /* all kernel stacks are of the same size */
21866 + stack_left = sp & (THREAD_SIZE - 1);
21867 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
21868 +}
21869 +EXPORT_SYMBOL(pax_check_alloca);
21870 +#endif
21871 diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
21872 index 1abcb50..6c8d702 100644
21873 --- a/arch/x86/kernel/dumpstack_64.c
21874 +++ b/arch/x86/kernel/dumpstack_64.c
21875 @@ -154,12 +154,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21876 const struct stacktrace_ops *ops, void *data)
21877 {
21878 const unsigned cpu = get_cpu();
21879 - struct thread_info *tinfo;
21880 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
21881 unsigned long dummy;
21882 unsigned used = 0;
21883 int graph = 0;
21884 int done = 0;
21885 + void *stack_start;
21886
21887 if (!task)
21888 task = current;
21889 @@ -180,7 +180,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21890 * current stack address. If the stacks consist of nested
21891 * exceptions
21892 */
21893 - tinfo = task_thread_info(task);
21894 while (!done) {
21895 unsigned long *stack_end;
21896 enum stack_type stype;
21897 @@ -203,7 +202,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21898 if (ops->stack(data, id) < 0)
21899 break;
21900
21901 - bp = ops->walk_stack(tinfo, stack, bp, ops,
21902 + bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
21903 data, stack_end, &graph);
21904 ops->stack(data, "<EOE>");
21905 /*
21906 @@ -211,6 +210,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21907 * second-to-last pointer (index -2 to end) in the
21908 * exception stack:
21909 */
21910 + if ((u16)stack_end[-1] != __KERNEL_DS)
21911 + goto out;
21912 stack = (unsigned long *) stack_end[-2];
21913 done = 0;
21914 break;
21915 @@ -219,7 +220,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21916
21917 if (ops->stack(data, "IRQ") < 0)
21918 break;
21919 - bp = ops->walk_stack(tinfo, stack, bp,
21920 + bp = ops->walk_stack(task, irq_stack, stack, bp,
21921 ops, data, stack_end, &graph);
21922 /*
21923 * We link to the next stack (which would be
21924 @@ -241,7 +242,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21925 /*
21926 * This handles the process stack:
21927 */
21928 - bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
21929 + stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
21930 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
21931 +out:
21932 put_cpu();
21933 }
21934 EXPORT_SYMBOL(dump_trace);
21935 @@ -350,3 +353,50 @@ int is_valid_bugaddr(unsigned long ip)
21936
21937 return ud2 == 0x0b0f;
21938 }
21939 +
21940 +#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
21941 +void pax_check_alloca(unsigned long size)
21942 +{
21943 + unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
21944 + unsigned cpu, used;
21945 + char *id;
21946 +
21947 + /* check the process stack first */
21948 + stack_start = (unsigned long)task_stack_page(current);
21949 + stack_end = stack_start + THREAD_SIZE;
21950 + if (likely(stack_start <= sp && sp < stack_end)) {
21951 + unsigned long stack_left = sp & (THREAD_SIZE - 1);
21952 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
21953 + return;
21954 + }
21955 +
21956 + cpu = get_cpu();
21957 +
21958 + /* check the irq stacks */
21959 + stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
21960 + stack_start = stack_end - IRQ_STACK_SIZE;
21961 + if (stack_start <= sp && sp < stack_end) {
21962 + unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
21963 + put_cpu();
21964 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
21965 + return;
21966 + }
21967 +
21968 + /* check the exception stacks */
21969 + used = 0;
21970 + stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
21971 + stack_start = stack_end - EXCEPTION_STKSZ;
21972 + if (stack_end && stack_start <= sp && sp < stack_end) {
21973 + unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
21974 + put_cpu();
21975 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
21976 + return;
21977 + }
21978 +
21979 + put_cpu();
21980 +
21981 + /* unknown stack */
21982 + BUG();
21983 +}
21984 +EXPORT_SYMBOL(pax_check_alloca);
21985 +#endif
21986 diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
21987 index 988c00a..4f673b6 100644
21988 --- a/arch/x86/kernel/e820.c
21989 +++ b/arch/x86/kernel/e820.c
21990 @@ -803,8 +803,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
21991
21992 static void early_panic(char *msg)
21993 {
21994 - early_printk(msg);
21995 - panic(msg);
21996 + early_printk("%s", msg);
21997 + panic("%s", msg);
21998 }
21999
22000 static int userdef __initdata;
22001 diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22002 index 01d1c18..8073693 100644
22003 --- a/arch/x86/kernel/early_printk.c
22004 +++ b/arch/x86/kernel/early_printk.c
22005 @@ -7,6 +7,7 @@
22006 #include <linux/pci_regs.h>
22007 #include <linux/pci_ids.h>
22008 #include <linux/errno.h>
22009 +#include <linux/sched.h>
22010 #include <asm/io.h>
22011 #include <asm/processor.h>
22012 #include <asm/fcntl.h>
22013 diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22014 index 6491353..a918952 100644
22015 --- a/arch/x86/kernel/entry_32.S
22016 +++ b/arch/x86/kernel/entry_32.S
22017 @@ -177,13 +177,153 @@
22018 /*CFI_REL_OFFSET gs, PT_GS*/
22019 .endm
22020 .macro SET_KERNEL_GS reg
22021 +
22022 +#ifdef CONFIG_CC_STACKPROTECTOR
22023 movl $(__KERNEL_STACK_CANARY), \reg
22024 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22025 + movl $(__USER_DS), \reg
22026 +#else
22027 + xorl \reg, \reg
22028 +#endif
22029 +
22030 movl \reg, %gs
22031 .endm
22032
22033 #endif /* CONFIG_X86_32_LAZY_GS */
22034
22035 -.macro SAVE_ALL
22036 +.macro pax_enter_kernel
22037 +#ifdef CONFIG_PAX_KERNEXEC
22038 + call pax_enter_kernel
22039 +#endif
22040 +.endm
22041 +
22042 +.macro pax_exit_kernel
22043 +#ifdef CONFIG_PAX_KERNEXEC
22044 + call pax_exit_kernel
22045 +#endif
22046 +.endm
22047 +
22048 +#ifdef CONFIG_PAX_KERNEXEC
22049 +ENTRY(pax_enter_kernel)
22050 +#ifdef CONFIG_PARAVIRT
22051 + pushl %eax
22052 + pushl %ecx
22053 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22054 + mov %eax, %esi
22055 +#else
22056 + mov %cr0, %esi
22057 +#endif
22058 + bts $16, %esi
22059 + jnc 1f
22060 + mov %cs, %esi
22061 + cmp $__KERNEL_CS, %esi
22062 + jz 3f
22063 + ljmp $__KERNEL_CS, $3f
22064 +1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22065 +2:
22066 +#ifdef CONFIG_PARAVIRT
22067 + mov %esi, %eax
22068 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22069 +#else
22070 + mov %esi, %cr0
22071 +#endif
22072 +3:
22073 +#ifdef CONFIG_PARAVIRT
22074 + popl %ecx
22075 + popl %eax
22076 +#endif
22077 + ret
22078 +ENDPROC(pax_enter_kernel)
22079 +
22080 +ENTRY(pax_exit_kernel)
22081 +#ifdef CONFIG_PARAVIRT
22082 + pushl %eax
22083 + pushl %ecx
22084 +#endif
22085 + mov %cs, %esi
22086 + cmp $__KERNEXEC_KERNEL_CS, %esi
22087 + jnz 2f
22088 +#ifdef CONFIG_PARAVIRT
22089 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22090 + mov %eax, %esi
22091 +#else
22092 + mov %cr0, %esi
22093 +#endif
22094 + btr $16, %esi
22095 + ljmp $__KERNEL_CS, $1f
22096 +1:
22097 +#ifdef CONFIG_PARAVIRT
22098 + mov %esi, %eax
22099 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22100 +#else
22101 + mov %esi, %cr0
22102 +#endif
22103 +2:
22104 +#ifdef CONFIG_PARAVIRT
22105 + popl %ecx
22106 + popl %eax
22107 +#endif
22108 + ret
22109 +ENDPROC(pax_exit_kernel)
22110 +#endif
22111 +
22112 + .macro pax_erase_kstack
22113 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22114 + call pax_erase_kstack
22115 +#endif
22116 + .endm
22117 +
22118 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22119 +/*
22120 + * ebp: thread_info
22121 + */
22122 +ENTRY(pax_erase_kstack)
22123 + pushl %edi
22124 + pushl %ecx
22125 + pushl %eax
22126 +
22127 + mov TI_lowest_stack(%ebp), %edi
22128 + mov $-0xBEEF, %eax
22129 + std
22130 +
22131 +1: mov %edi, %ecx
22132 + and $THREAD_SIZE_asm - 1, %ecx
22133 + shr $2, %ecx
22134 + repne scasl
22135 + jecxz 2f
22136 +
22137 + cmp $2*16, %ecx
22138 + jc 2f
22139 +
22140 + mov $2*16, %ecx
22141 + repe scasl
22142 + jecxz 2f
22143 + jne 1b
22144 +
22145 +2: cld
22146 + mov %esp, %ecx
22147 + sub %edi, %ecx
22148 +
22149 + cmp $THREAD_SIZE_asm, %ecx
22150 + jb 3f
22151 + ud2
22152 +3:
22153 +
22154 + shr $2, %ecx
22155 + rep stosl
22156 +
22157 + mov TI_task_thread_sp0(%ebp), %edi
22158 + sub $128, %edi
22159 + mov %edi, TI_lowest_stack(%ebp)
22160 +
22161 + popl %eax
22162 + popl %ecx
22163 + popl %edi
22164 + ret
22165 +ENDPROC(pax_erase_kstack)
22166 +#endif
22167 +
22168 +.macro __SAVE_ALL _DS
22169 cld
22170 PUSH_GS
22171 pushl_cfi %fs
22172 @@ -206,7 +346,7 @@
22173 CFI_REL_OFFSET ecx, 0
22174 pushl_cfi %ebx
22175 CFI_REL_OFFSET ebx, 0
22176 - movl $(__USER_DS), %edx
22177 + movl $\_DS, %edx
22178 movl %edx, %ds
22179 movl %edx, %es
22180 movl $(__KERNEL_PERCPU), %edx
22181 @@ -214,6 +354,15 @@
22182 SET_KERNEL_GS %edx
22183 .endm
22184
22185 +.macro SAVE_ALL
22186 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22187 + __SAVE_ALL __KERNEL_DS
22188 + pax_enter_kernel
22189 +#else
22190 + __SAVE_ALL __USER_DS
22191 +#endif
22192 +.endm
22193 +
22194 .macro RESTORE_INT_REGS
22195 popl_cfi %ebx
22196 CFI_RESTORE ebx
22197 @@ -297,7 +446,7 @@ ENTRY(ret_from_fork)
22198 popfl_cfi
22199 jmp syscall_exit
22200 CFI_ENDPROC
22201 -END(ret_from_fork)
22202 +ENDPROC(ret_from_fork)
22203
22204 ENTRY(ret_from_kernel_thread)
22205 CFI_STARTPROC
22206 @@ -344,7 +493,15 @@ ret_from_intr:
22207 andl $SEGMENT_RPL_MASK, %eax
22208 #endif
22209 cmpl $USER_RPL, %eax
22210 +
22211 +#ifdef CONFIG_PAX_KERNEXEC
22212 + jae resume_userspace
22213 +
22214 + pax_exit_kernel
22215 + jmp resume_kernel
22216 +#else
22217 jb resume_kernel # not returning to v8086 or userspace
22218 +#endif
22219
22220 ENTRY(resume_userspace)
22221 LOCKDEP_SYS_EXIT
22222 @@ -356,8 +513,8 @@ ENTRY(resume_userspace)
22223 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22224 # int/exception return?
22225 jne work_pending
22226 - jmp restore_all
22227 -END(ret_from_exception)
22228 + jmp restore_all_pax
22229 +ENDPROC(ret_from_exception)
22230
22231 #ifdef CONFIG_PREEMPT
22232 ENTRY(resume_kernel)
22233 @@ -369,7 +526,7 @@ need_resched:
22234 jz restore_all
22235 call preempt_schedule_irq
22236 jmp need_resched
22237 -END(resume_kernel)
22238 +ENDPROC(resume_kernel)
22239 #endif
22240 CFI_ENDPROC
22241 /*
22242 @@ -403,30 +560,45 @@ sysenter_past_esp:
22243 /*CFI_REL_OFFSET cs, 0*/
22244 /*
22245 * Push current_thread_info()->sysenter_return to the stack.
22246 - * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22247 - * pushed above; +8 corresponds to copy_thread's esp0 setting.
22248 */
22249 - pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22250 + pushl_cfi $0
22251 CFI_REL_OFFSET eip, 0
22252
22253 pushl_cfi %eax
22254 SAVE_ALL
22255 + GET_THREAD_INFO(%ebp)
22256 + movl TI_sysenter_return(%ebp),%ebp
22257 + movl %ebp,PT_EIP(%esp)
22258 ENABLE_INTERRUPTS(CLBR_NONE)
22259
22260 /*
22261 * Load the potential sixth argument from user stack.
22262 * Careful about security.
22263 */
22264 + movl PT_OLDESP(%esp),%ebp
22265 +
22266 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22267 + mov PT_OLDSS(%esp),%ds
22268 +1: movl %ds:(%ebp),%ebp
22269 + push %ss
22270 + pop %ds
22271 +#else
22272 cmpl $__PAGE_OFFSET-3,%ebp
22273 jae syscall_fault
22274 ASM_STAC
22275 1: movl (%ebp),%ebp
22276 ASM_CLAC
22277 +#endif
22278 +
22279 movl %ebp,PT_EBP(%esp)
22280 _ASM_EXTABLE(1b,syscall_fault)
22281
22282 GET_THREAD_INFO(%ebp)
22283
22284 +#ifdef CONFIG_PAX_RANDKSTACK
22285 + pax_erase_kstack
22286 +#endif
22287 +
22288 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22289 jnz sysenter_audit
22290 sysenter_do_call:
22291 @@ -442,12 +614,24 @@ sysenter_after_call:
22292 testl $_TIF_ALLWORK_MASK, %ecx
22293 jne sysexit_audit
22294 sysenter_exit:
22295 +
22296 +#ifdef CONFIG_PAX_RANDKSTACK
22297 + pushl_cfi %eax
22298 + movl %esp, %eax
22299 + call pax_randomize_kstack
22300 + popl_cfi %eax
22301 +#endif
22302 +
22303 + pax_erase_kstack
22304 +
22305 /* if something modifies registers it must also disable sysexit */
22306 movl PT_EIP(%esp), %edx
22307 movl PT_OLDESP(%esp), %ecx
22308 xorl %ebp,%ebp
22309 TRACE_IRQS_ON
22310 1: mov PT_FS(%esp), %fs
22311 +2: mov PT_DS(%esp), %ds
22312 +3: mov PT_ES(%esp), %es
22313 PTGS_TO_GS
22314 ENABLE_INTERRUPTS_SYSEXIT
22315
22316 @@ -464,6 +648,9 @@ sysenter_audit:
22317 movl %eax,%edx /* 2nd arg: syscall number */
22318 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
22319 call __audit_syscall_entry
22320 +
22321 + pax_erase_kstack
22322 +
22323 pushl_cfi %ebx
22324 movl PT_EAX(%esp),%eax /* reload syscall number */
22325 jmp sysenter_do_call
22326 @@ -489,10 +676,16 @@ sysexit_audit:
22327
22328 CFI_ENDPROC
22329 .pushsection .fixup,"ax"
22330 -2: movl $0,PT_FS(%esp)
22331 +4: movl $0,PT_FS(%esp)
22332 + jmp 1b
22333 +5: movl $0,PT_DS(%esp)
22334 + jmp 1b
22335 +6: movl $0,PT_ES(%esp)
22336 jmp 1b
22337 .popsection
22338 - _ASM_EXTABLE(1b,2b)
22339 + _ASM_EXTABLE(1b,4b)
22340 + _ASM_EXTABLE(2b,5b)
22341 + _ASM_EXTABLE(3b,6b)
22342 PTGS_TO_GS_EX
22343 ENDPROC(ia32_sysenter_target)
22344
22345 @@ -507,6 +700,11 @@ ENTRY(system_call)
22346 pushl_cfi %eax # save orig_eax
22347 SAVE_ALL
22348 GET_THREAD_INFO(%ebp)
22349 +
22350 +#ifdef CONFIG_PAX_RANDKSTACK
22351 + pax_erase_kstack
22352 +#endif
22353 +
22354 # system call tracing in operation / emulation
22355 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22356 jnz syscall_trace_entry
22357 @@ -525,6 +723,15 @@ syscall_exit:
22358 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22359 jne syscall_exit_work
22360
22361 +restore_all_pax:
22362 +
22363 +#ifdef CONFIG_PAX_RANDKSTACK
22364 + movl %esp, %eax
22365 + call pax_randomize_kstack
22366 +#endif
22367 +
22368 + pax_erase_kstack
22369 +
22370 restore_all:
22371 TRACE_IRQS_IRET
22372 restore_all_notrace:
22373 @@ -576,14 +783,34 @@ ldt_ss:
22374 * compensating for the offset by changing to the ESPFIX segment with
22375 * a base address that matches for the difference.
22376 */
22377 -#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22378 +#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22379 mov %esp, %edx /* load kernel esp */
22380 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22381 mov %dx, %ax /* eax: new kernel esp */
22382 sub %eax, %edx /* offset (low word is 0) */
22383 +#ifdef CONFIG_SMP
22384 + movl PER_CPU_VAR(cpu_number), %ebx
22385 + shll $PAGE_SHIFT_asm, %ebx
22386 + addl $cpu_gdt_table, %ebx
22387 +#else
22388 + movl $cpu_gdt_table, %ebx
22389 +#endif
22390 shr $16, %edx
22391 - mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22392 - mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22393 +
22394 +#ifdef CONFIG_PAX_KERNEXEC
22395 + mov %cr0, %esi
22396 + btr $16, %esi
22397 + mov %esi, %cr0
22398 +#endif
22399 +
22400 + mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22401 + mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22402 +
22403 +#ifdef CONFIG_PAX_KERNEXEC
22404 + bts $16, %esi
22405 + mov %esi, %cr0
22406 +#endif
22407 +
22408 pushl_cfi $__ESPFIX_SS
22409 pushl_cfi %eax /* new kernel esp */
22410 /* Disable interrupts, but do not irqtrace this section: we
22411 @@ -612,20 +839,18 @@ work_resched:
22412 movl TI_flags(%ebp), %ecx
22413 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22414 # than syscall tracing?
22415 - jz restore_all
22416 + jz restore_all_pax
22417 testb $_TIF_NEED_RESCHED, %cl
22418 jnz work_resched
22419
22420 work_notifysig: # deal with pending signals and
22421 # notify-resume requests
22422 + movl %esp, %eax
22423 #ifdef CONFIG_VM86
22424 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22425 - movl %esp, %eax
22426 jne work_notifysig_v86 # returning to kernel-space or
22427 # vm86-space
22428 1:
22429 -#else
22430 - movl %esp, %eax
22431 #endif
22432 TRACE_IRQS_ON
22433 ENABLE_INTERRUPTS(CLBR_NONE)
22434 @@ -646,7 +871,7 @@ work_notifysig_v86:
22435 movl %eax, %esp
22436 jmp 1b
22437 #endif
22438 -END(work_pending)
22439 +ENDPROC(work_pending)
22440
22441 # perform syscall exit tracing
22442 ALIGN
22443 @@ -654,11 +879,14 @@ syscall_trace_entry:
22444 movl $-ENOSYS,PT_EAX(%esp)
22445 movl %esp, %eax
22446 call syscall_trace_enter
22447 +
22448 + pax_erase_kstack
22449 +
22450 /* What it returned is what we'll actually use. */
22451 cmpl $(NR_syscalls), %eax
22452 jnae syscall_call
22453 jmp syscall_exit
22454 -END(syscall_trace_entry)
22455 +ENDPROC(syscall_trace_entry)
22456
22457 # perform syscall exit tracing
22458 ALIGN
22459 @@ -671,26 +899,30 @@ syscall_exit_work:
22460 movl %esp, %eax
22461 call syscall_trace_leave
22462 jmp resume_userspace
22463 -END(syscall_exit_work)
22464 +ENDPROC(syscall_exit_work)
22465 CFI_ENDPROC
22466
22467 RING0_INT_FRAME # can't unwind into user space anyway
22468 syscall_fault:
22469 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22470 + push %ss
22471 + pop %ds
22472 +#endif
22473 ASM_CLAC
22474 GET_THREAD_INFO(%ebp)
22475 movl $-EFAULT,PT_EAX(%esp)
22476 jmp resume_userspace
22477 -END(syscall_fault)
22478 +ENDPROC(syscall_fault)
22479
22480 syscall_badsys:
22481 movl $-ENOSYS,PT_EAX(%esp)
22482 jmp syscall_exit
22483 -END(syscall_badsys)
22484 +ENDPROC(syscall_badsys)
22485
22486 sysenter_badsys:
22487 movl $-ENOSYS,PT_EAX(%esp)
22488 jmp sysenter_after_call
22489 -END(syscall_badsys)
22490 +ENDPROC(sysenter_badsys)
22491 CFI_ENDPROC
22492 /*
22493 * End of kprobes section
22494 @@ -706,8 +938,15 @@ END(syscall_badsys)
22495 * normal stack and adjusts ESP with the matching offset.
22496 */
22497 /* fixup the stack */
22498 - mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22499 - mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22500 +#ifdef CONFIG_SMP
22501 + movl PER_CPU_VAR(cpu_number), %ebx
22502 + shll $PAGE_SHIFT_asm, %ebx
22503 + addl $cpu_gdt_table, %ebx
22504 +#else
22505 + movl $cpu_gdt_table, %ebx
22506 +#endif
22507 + mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22508 + mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22509 shl $16, %eax
22510 addl %esp, %eax /* the adjusted stack pointer */
22511 pushl_cfi $__KERNEL_DS
22512 @@ -760,7 +999,7 @@ vector=vector+1
22513 .endr
22514 2: jmp common_interrupt
22515 .endr
22516 -END(irq_entries_start)
22517 +ENDPROC(irq_entries_start)
22518
22519 .previous
22520 END(interrupt)
22521 @@ -821,7 +1060,7 @@ ENTRY(coprocessor_error)
22522 pushl_cfi $do_coprocessor_error
22523 jmp error_code
22524 CFI_ENDPROC
22525 -END(coprocessor_error)
22526 +ENDPROC(coprocessor_error)
22527
22528 ENTRY(simd_coprocessor_error)
22529 RING0_INT_FRAME
22530 @@ -834,7 +1073,7 @@ ENTRY(simd_coprocessor_error)
22531 .section .altinstructions,"a"
22532 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22533 .previous
22534 -.section .altinstr_replacement,"ax"
22535 +.section .altinstr_replacement,"a"
22536 663: pushl $do_simd_coprocessor_error
22537 664:
22538 .previous
22539 @@ -843,7 +1082,7 @@ ENTRY(simd_coprocessor_error)
22540 #endif
22541 jmp error_code
22542 CFI_ENDPROC
22543 -END(simd_coprocessor_error)
22544 +ENDPROC(simd_coprocessor_error)
22545
22546 ENTRY(device_not_available)
22547 RING0_INT_FRAME
22548 @@ -852,18 +1091,18 @@ ENTRY(device_not_available)
22549 pushl_cfi $do_device_not_available
22550 jmp error_code
22551 CFI_ENDPROC
22552 -END(device_not_available)
22553 +ENDPROC(device_not_available)
22554
22555 #ifdef CONFIG_PARAVIRT
22556 ENTRY(native_iret)
22557 iret
22558 _ASM_EXTABLE(native_iret, iret_exc)
22559 -END(native_iret)
22560 +ENDPROC(native_iret)
22561
22562 ENTRY(native_irq_enable_sysexit)
22563 sti
22564 sysexit
22565 -END(native_irq_enable_sysexit)
22566 +ENDPROC(native_irq_enable_sysexit)
22567 #endif
22568
22569 ENTRY(overflow)
22570 @@ -873,7 +1112,7 @@ ENTRY(overflow)
22571 pushl_cfi $do_overflow
22572 jmp error_code
22573 CFI_ENDPROC
22574 -END(overflow)
22575 +ENDPROC(overflow)
22576
22577 ENTRY(bounds)
22578 RING0_INT_FRAME
22579 @@ -882,7 +1121,7 @@ ENTRY(bounds)
22580 pushl_cfi $do_bounds
22581 jmp error_code
22582 CFI_ENDPROC
22583 -END(bounds)
22584 +ENDPROC(bounds)
22585
22586 ENTRY(invalid_op)
22587 RING0_INT_FRAME
22588 @@ -891,7 +1130,7 @@ ENTRY(invalid_op)
22589 pushl_cfi $do_invalid_op
22590 jmp error_code
22591 CFI_ENDPROC
22592 -END(invalid_op)
22593 +ENDPROC(invalid_op)
22594
22595 ENTRY(coprocessor_segment_overrun)
22596 RING0_INT_FRAME
22597 @@ -900,7 +1139,7 @@ ENTRY(coprocessor_segment_overrun)
22598 pushl_cfi $do_coprocessor_segment_overrun
22599 jmp error_code
22600 CFI_ENDPROC
22601 -END(coprocessor_segment_overrun)
22602 +ENDPROC(coprocessor_segment_overrun)
22603
22604 ENTRY(invalid_TSS)
22605 RING0_EC_FRAME
22606 @@ -908,7 +1147,7 @@ ENTRY(invalid_TSS)
22607 pushl_cfi $do_invalid_TSS
22608 jmp error_code
22609 CFI_ENDPROC
22610 -END(invalid_TSS)
22611 +ENDPROC(invalid_TSS)
22612
22613 ENTRY(segment_not_present)
22614 RING0_EC_FRAME
22615 @@ -916,7 +1155,7 @@ ENTRY(segment_not_present)
22616 pushl_cfi $do_segment_not_present
22617 jmp error_code
22618 CFI_ENDPROC
22619 -END(segment_not_present)
22620 +ENDPROC(segment_not_present)
22621
22622 ENTRY(stack_segment)
22623 RING0_EC_FRAME
22624 @@ -924,7 +1163,7 @@ ENTRY(stack_segment)
22625 pushl_cfi $do_stack_segment
22626 jmp error_code
22627 CFI_ENDPROC
22628 -END(stack_segment)
22629 +ENDPROC(stack_segment)
22630
22631 ENTRY(alignment_check)
22632 RING0_EC_FRAME
22633 @@ -932,7 +1171,7 @@ ENTRY(alignment_check)
22634 pushl_cfi $do_alignment_check
22635 jmp error_code
22636 CFI_ENDPROC
22637 -END(alignment_check)
22638 +ENDPROC(alignment_check)
22639
22640 ENTRY(divide_error)
22641 RING0_INT_FRAME
22642 @@ -941,7 +1180,7 @@ ENTRY(divide_error)
22643 pushl_cfi $do_divide_error
22644 jmp error_code
22645 CFI_ENDPROC
22646 -END(divide_error)
22647 +ENDPROC(divide_error)
22648
22649 #ifdef CONFIG_X86_MCE
22650 ENTRY(machine_check)
22651 @@ -951,7 +1190,7 @@ ENTRY(machine_check)
22652 pushl_cfi machine_check_vector
22653 jmp error_code
22654 CFI_ENDPROC
22655 -END(machine_check)
22656 +ENDPROC(machine_check)
22657 #endif
22658
22659 ENTRY(spurious_interrupt_bug)
22660 @@ -961,7 +1200,7 @@ ENTRY(spurious_interrupt_bug)
22661 pushl_cfi $do_spurious_interrupt_bug
22662 jmp error_code
22663 CFI_ENDPROC
22664 -END(spurious_interrupt_bug)
22665 +ENDPROC(spurious_interrupt_bug)
22666 /*
22667 * End of kprobes section
22668 */
22669 @@ -1071,7 +1310,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22670
22671 ENTRY(mcount)
22672 ret
22673 -END(mcount)
22674 +ENDPROC(mcount)
22675
22676 ENTRY(ftrace_caller)
22677 cmpl $0, function_trace_stop
22678 @@ -1104,7 +1343,7 @@ ftrace_graph_call:
22679 .globl ftrace_stub
22680 ftrace_stub:
22681 ret
22682 -END(ftrace_caller)
22683 +ENDPROC(ftrace_caller)
22684
22685 ENTRY(ftrace_regs_caller)
22686 pushf /* push flags before compare (in cs location) */
22687 @@ -1208,7 +1447,7 @@ trace:
22688 popl %ecx
22689 popl %eax
22690 jmp ftrace_stub
22691 -END(mcount)
22692 +ENDPROC(mcount)
22693 #endif /* CONFIG_DYNAMIC_FTRACE */
22694 #endif /* CONFIG_FUNCTION_TRACER */
22695
22696 @@ -1226,7 +1465,7 @@ ENTRY(ftrace_graph_caller)
22697 popl %ecx
22698 popl %eax
22699 ret
22700 -END(ftrace_graph_caller)
22701 +ENDPROC(ftrace_graph_caller)
22702
22703 .globl return_to_handler
22704 return_to_handler:
22705 @@ -1292,15 +1531,18 @@ error_code:
22706 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22707 REG_TO_PTGS %ecx
22708 SET_KERNEL_GS %ecx
22709 - movl $(__USER_DS), %ecx
22710 + movl $(__KERNEL_DS), %ecx
22711 movl %ecx, %ds
22712 movl %ecx, %es
22713 +
22714 + pax_enter_kernel
22715 +
22716 TRACE_IRQS_OFF
22717 movl %esp,%eax # pt_regs pointer
22718 call *%edi
22719 jmp ret_from_exception
22720 CFI_ENDPROC
22721 -END(page_fault)
22722 +ENDPROC(page_fault)
22723
22724 /*
22725 * Debug traps and NMI can happen at the one SYSENTER instruction
22726 @@ -1343,7 +1585,7 @@ debug_stack_correct:
22727 call do_debug
22728 jmp ret_from_exception
22729 CFI_ENDPROC
22730 -END(debug)
22731 +ENDPROC(debug)
22732
22733 /*
22734 * NMI is doubly nasty. It can happen _while_ we're handling
22735 @@ -1381,6 +1623,9 @@ nmi_stack_correct:
22736 xorl %edx,%edx # zero error code
22737 movl %esp,%eax # pt_regs pointer
22738 call do_nmi
22739 +
22740 + pax_exit_kernel
22741 +
22742 jmp restore_all_notrace
22743 CFI_ENDPROC
22744
22745 @@ -1417,12 +1662,15 @@ nmi_espfix_stack:
22746 FIXUP_ESPFIX_STACK # %eax == %esp
22747 xorl %edx,%edx # zero error code
22748 call do_nmi
22749 +
22750 + pax_exit_kernel
22751 +
22752 RESTORE_REGS
22753 lss 12+4(%esp), %esp # back to espfix stack
22754 CFI_ADJUST_CFA_OFFSET -24
22755 jmp irq_return
22756 CFI_ENDPROC
22757 -END(nmi)
22758 +ENDPROC(nmi)
22759
22760 ENTRY(int3)
22761 RING0_INT_FRAME
22762 @@ -1435,14 +1683,14 @@ ENTRY(int3)
22763 call do_int3
22764 jmp ret_from_exception
22765 CFI_ENDPROC
22766 -END(int3)
22767 +ENDPROC(int3)
22768
22769 ENTRY(general_protection)
22770 RING0_EC_FRAME
22771 pushl_cfi $do_general_protection
22772 jmp error_code
22773 CFI_ENDPROC
22774 -END(general_protection)
22775 +ENDPROC(general_protection)
22776
22777 #ifdef CONFIG_KVM_GUEST
22778 ENTRY(async_page_fault)
22779 @@ -1451,7 +1699,7 @@ ENTRY(async_page_fault)
22780 pushl_cfi $do_async_page_fault
22781 jmp error_code
22782 CFI_ENDPROC
22783 -END(async_page_fault)
22784 +ENDPROC(async_page_fault)
22785 #endif
22786
22787 /*
22788 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
22789 index 1e96c36..3ff710a 100644
22790 --- a/arch/x86/kernel/entry_64.S
22791 +++ b/arch/x86/kernel/entry_64.S
22792 @@ -59,6 +59,8 @@
22793 #include <asm/context_tracking.h>
22794 #include <asm/smap.h>
22795 #include <linux/err.h>
22796 +#include <asm/pgtable.h>
22797 +#include <asm/alternative-asm.h>
22798
22799 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
22800 #include <linux/elf-em.h>
22801 @@ -80,8 +82,9 @@
22802 #ifdef CONFIG_DYNAMIC_FTRACE
22803
22804 ENTRY(function_hook)
22805 + pax_force_retaddr
22806 retq
22807 -END(function_hook)
22808 +ENDPROC(function_hook)
22809
22810 /* skip is set if stack has been adjusted */
22811 .macro ftrace_caller_setup skip=0
22812 @@ -122,8 +125,9 @@ GLOBAL(ftrace_graph_call)
22813 #endif
22814
22815 GLOBAL(ftrace_stub)
22816 + pax_force_retaddr
22817 retq
22818 -END(ftrace_caller)
22819 +ENDPROC(ftrace_caller)
22820
22821 ENTRY(ftrace_regs_caller)
22822 /* Save the current flags before compare (in SS location)*/
22823 @@ -191,7 +195,7 @@ ftrace_restore_flags:
22824 popfq
22825 jmp ftrace_stub
22826
22827 -END(ftrace_regs_caller)
22828 +ENDPROC(ftrace_regs_caller)
22829
22830
22831 #else /* ! CONFIG_DYNAMIC_FTRACE */
22832 @@ -212,6 +216,7 @@ ENTRY(function_hook)
22833 #endif
22834
22835 GLOBAL(ftrace_stub)
22836 + pax_force_retaddr
22837 retq
22838
22839 trace:
22840 @@ -225,12 +230,13 @@ trace:
22841 #endif
22842 subq $MCOUNT_INSN_SIZE, %rdi
22843
22844 + pax_force_fptr ftrace_trace_function
22845 call *ftrace_trace_function
22846
22847 MCOUNT_RESTORE_FRAME
22848
22849 jmp ftrace_stub
22850 -END(function_hook)
22851 +ENDPROC(function_hook)
22852 #endif /* CONFIG_DYNAMIC_FTRACE */
22853 #endif /* CONFIG_FUNCTION_TRACER */
22854
22855 @@ -252,8 +258,9 @@ ENTRY(ftrace_graph_caller)
22856
22857 MCOUNT_RESTORE_FRAME
22858
22859 + pax_force_retaddr
22860 retq
22861 -END(ftrace_graph_caller)
22862 +ENDPROC(ftrace_graph_caller)
22863
22864 GLOBAL(return_to_handler)
22865 subq $24, %rsp
22866 @@ -269,7 +276,9 @@ GLOBAL(return_to_handler)
22867 movq 8(%rsp), %rdx
22868 movq (%rsp), %rax
22869 addq $24, %rsp
22870 + pax_force_fptr %rdi
22871 jmp *%rdi
22872 +ENDPROC(return_to_handler)
22873 #endif
22874
22875
22876 @@ -284,6 +293,430 @@ ENTRY(native_usergs_sysret64)
22877 ENDPROC(native_usergs_sysret64)
22878 #endif /* CONFIG_PARAVIRT */
22879
22880 + .macro ljmpq sel, off
22881 +#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
22882 + .byte 0x48; ljmp *1234f(%rip)
22883 + .pushsection .rodata
22884 + .align 16
22885 + 1234: .quad \off; .word \sel
22886 + .popsection
22887 +#else
22888 + pushq $\sel
22889 + pushq $\off
22890 + lretq
22891 +#endif
22892 + .endm
22893 +
22894 + .macro pax_enter_kernel
22895 + pax_set_fptr_mask
22896 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22897 + call pax_enter_kernel
22898 +#endif
22899 + .endm
22900 +
22901 + .macro pax_exit_kernel
22902 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22903 + call pax_exit_kernel
22904 +#endif
22905 +
22906 + .endm
22907 +
22908 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22909 +ENTRY(pax_enter_kernel)
22910 + pushq %rdi
22911 +
22912 +#ifdef CONFIG_PARAVIRT
22913 + PV_SAVE_REGS(CLBR_RDI)
22914 +#endif
22915 +
22916 +#ifdef CONFIG_PAX_KERNEXEC
22917 + GET_CR0_INTO_RDI
22918 + bts $16,%rdi
22919 + jnc 3f
22920 + mov %cs,%edi
22921 + cmp $__KERNEL_CS,%edi
22922 + jnz 2f
22923 +1:
22924 +#endif
22925 +
22926 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22927 + 661: jmp 111f
22928 + .pushsection .altinstr_replacement, "a"
22929 + 662: ASM_NOP2
22930 + .popsection
22931 + .pushsection .altinstructions, "a"
22932 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22933 + .popsection
22934 + GET_CR3_INTO_RDI
22935 + cmp $0,%dil
22936 + jnz 112f
22937 + mov $__KERNEL_DS,%edi
22938 + mov %edi,%ss
22939 + jmp 111f
22940 +112: cmp $1,%dil
22941 + jz 113f
22942 + ud2
22943 +113: sub $4097,%rdi
22944 + bts $63,%rdi
22945 + SET_RDI_INTO_CR3
22946 + mov $__UDEREF_KERNEL_DS,%edi
22947 + mov %edi,%ss
22948 +111:
22949 +#endif
22950 +
22951 +#ifdef CONFIG_PARAVIRT
22952 + PV_RESTORE_REGS(CLBR_RDI)
22953 +#endif
22954 +
22955 + popq %rdi
22956 + pax_force_retaddr
22957 + retq
22958 +
22959 +#ifdef CONFIG_PAX_KERNEXEC
22960 +2: ljmpq __KERNEL_CS,1b
22961 +3: ljmpq __KERNEXEC_KERNEL_CS,4f
22962 +4: SET_RDI_INTO_CR0
22963 + jmp 1b
22964 +#endif
22965 +ENDPROC(pax_enter_kernel)
22966 +
22967 +ENTRY(pax_exit_kernel)
22968 + pushq %rdi
22969 +
22970 +#ifdef CONFIG_PARAVIRT
22971 + PV_SAVE_REGS(CLBR_RDI)
22972 +#endif
22973 +
22974 +#ifdef CONFIG_PAX_KERNEXEC
22975 + mov %cs,%rdi
22976 + cmp $__KERNEXEC_KERNEL_CS,%edi
22977 + jz 2f
22978 + GET_CR0_INTO_RDI
22979 + bts $16,%rdi
22980 + jnc 4f
22981 +1:
22982 +#endif
22983 +
22984 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22985 + 661: jmp 111f
22986 + .pushsection .altinstr_replacement, "a"
22987 + 662: ASM_NOP2
22988 + .popsection
22989 + .pushsection .altinstructions, "a"
22990 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22991 + .popsection
22992 + mov %ss,%edi
22993 + cmp $__UDEREF_KERNEL_DS,%edi
22994 + jnz 111f
22995 + GET_CR3_INTO_RDI
22996 + cmp $0,%dil
22997 + jz 112f
22998 + ud2
22999 +112: add $4097,%rdi
23000 + bts $63,%rdi
23001 + SET_RDI_INTO_CR3
23002 + mov $__KERNEL_DS,%edi
23003 + mov %edi,%ss
23004 +111:
23005 +#endif
23006 +
23007 +#ifdef CONFIG_PARAVIRT
23008 + PV_RESTORE_REGS(CLBR_RDI);
23009 +#endif
23010 +
23011 + popq %rdi
23012 + pax_force_retaddr
23013 + retq
23014 +
23015 +#ifdef CONFIG_PAX_KERNEXEC
23016 +2: GET_CR0_INTO_RDI
23017 + btr $16,%rdi
23018 + jnc 4f
23019 + ljmpq __KERNEL_CS,3f
23020 +3: SET_RDI_INTO_CR0
23021 + jmp 1b
23022 +4: ud2
23023 + jmp 4b
23024 +#endif
23025 +ENDPROC(pax_exit_kernel)
23026 +#endif
23027 +
23028 + .macro pax_enter_kernel_user
23029 + pax_set_fptr_mask
23030 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23031 + call pax_enter_kernel_user
23032 +#endif
23033 + .endm
23034 +
23035 + .macro pax_exit_kernel_user
23036 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23037 + call pax_exit_kernel_user
23038 +#endif
23039 +#ifdef CONFIG_PAX_RANDKSTACK
23040 + pushq %rax
23041 + pushq %r11
23042 + call pax_randomize_kstack
23043 + popq %r11
23044 + popq %rax
23045 +#endif
23046 + .endm
23047 +
23048 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23049 +ENTRY(pax_enter_kernel_user)
23050 + pushq %rdi
23051 + pushq %rbx
23052 +
23053 +#ifdef CONFIG_PARAVIRT
23054 + PV_SAVE_REGS(CLBR_RDI)
23055 +#endif
23056 +
23057 + 661: jmp 111f
23058 + .pushsection .altinstr_replacement, "a"
23059 + 662: ASM_NOP2
23060 + .popsection
23061 + .pushsection .altinstructions, "a"
23062 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23063 + .popsection
23064 + GET_CR3_INTO_RDI
23065 + cmp $1,%dil
23066 + jnz 4f
23067 + sub $4097,%rdi
23068 + bts $63,%rdi
23069 + SET_RDI_INTO_CR3
23070 + jmp 3f
23071 +111:
23072 +
23073 + GET_CR3_INTO_RDI
23074 + mov %rdi,%rbx
23075 + add $__START_KERNEL_map,%rbx
23076 + sub phys_base(%rip),%rbx
23077 +
23078 +#ifdef CONFIG_PARAVIRT
23079 + cmpl $0, pv_info+PARAVIRT_enabled
23080 + jz 1f
23081 + pushq %rdi
23082 + i = 0
23083 + .rept USER_PGD_PTRS
23084 + mov i*8(%rbx),%rsi
23085 + mov $0,%sil
23086 + lea i*8(%rbx),%rdi
23087 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23088 + i = i + 1
23089 + .endr
23090 + popq %rdi
23091 + jmp 2f
23092 +1:
23093 +#endif
23094 +
23095 + i = 0
23096 + .rept USER_PGD_PTRS
23097 + movb $0,i*8(%rbx)
23098 + i = i + 1
23099 + .endr
23100 +
23101 +2: SET_RDI_INTO_CR3
23102 +
23103 +#ifdef CONFIG_PAX_KERNEXEC
23104 + GET_CR0_INTO_RDI
23105 + bts $16,%rdi
23106 + SET_RDI_INTO_CR0
23107 +#endif
23108 +
23109 +3:
23110 +
23111 +#ifdef CONFIG_PARAVIRT
23112 + PV_RESTORE_REGS(CLBR_RDI)
23113 +#endif
23114 +
23115 + popq %rbx
23116 + popq %rdi
23117 + pax_force_retaddr
23118 + retq
23119 +4: ud2
23120 +ENDPROC(pax_enter_kernel_user)
23121 +
23122 +ENTRY(pax_exit_kernel_user)
23123 + pushq %rdi
23124 + pushq %rbx
23125 +
23126 +#ifdef CONFIG_PARAVIRT
23127 + PV_SAVE_REGS(CLBR_RDI)
23128 +#endif
23129 +
23130 + GET_CR3_INTO_RDI
23131 + 661: jmp 1f
23132 + .pushsection .altinstr_replacement, "a"
23133 + 662: ASM_NOP2
23134 + .popsection
23135 + .pushsection .altinstructions, "a"
23136 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23137 + .popsection
23138 + cmp $0,%dil
23139 + jnz 3f
23140 + add $4097,%rdi
23141 + bts $63,%rdi
23142 + SET_RDI_INTO_CR3
23143 + jmp 2f
23144 +1:
23145 +
23146 + mov %rdi,%rbx
23147 +
23148 +#ifdef CONFIG_PAX_KERNEXEC
23149 + GET_CR0_INTO_RDI
23150 + btr $16,%rdi
23151 + jnc 3f
23152 + SET_RDI_INTO_CR0
23153 +#endif
23154 +
23155 + add $__START_KERNEL_map,%rbx
23156 + sub phys_base(%rip),%rbx
23157 +
23158 +#ifdef CONFIG_PARAVIRT
23159 + cmpl $0, pv_info+PARAVIRT_enabled
23160 + jz 1f
23161 + i = 0
23162 + .rept USER_PGD_PTRS
23163 + mov i*8(%rbx),%rsi
23164 + mov $0x67,%sil
23165 + lea i*8(%rbx),%rdi
23166 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23167 + i = i + 1
23168 + .endr
23169 + jmp 2f
23170 +1:
23171 +#endif
23172 +
23173 + i = 0
23174 + .rept USER_PGD_PTRS
23175 + movb $0x67,i*8(%rbx)
23176 + i = i + 1
23177 + .endr
23178 +2:
23179 +
23180 +#ifdef CONFIG_PARAVIRT
23181 + PV_RESTORE_REGS(CLBR_RDI)
23182 +#endif
23183 +
23184 + popq %rbx
23185 + popq %rdi
23186 + pax_force_retaddr
23187 + retq
23188 +3: ud2
23189 +ENDPROC(pax_exit_kernel_user)
23190 +#endif
23191 +
23192 + .macro pax_enter_kernel_nmi
23193 + pax_set_fptr_mask
23194 +
23195 +#ifdef CONFIG_PAX_KERNEXEC
23196 + GET_CR0_INTO_RDI
23197 + bts $16,%rdi
23198 + jc 110f
23199 + SET_RDI_INTO_CR0
23200 + or $2,%ebx
23201 +110:
23202 +#endif
23203 +
23204 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23205 + 661: jmp 111f
23206 + .pushsection .altinstr_replacement, "a"
23207 + 662: ASM_NOP2
23208 + .popsection
23209 + .pushsection .altinstructions, "a"
23210 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23211 + .popsection
23212 + GET_CR3_INTO_RDI
23213 + cmp $0,%dil
23214 + jz 111f
23215 + sub $4097,%rdi
23216 + or $4,%ebx
23217 + bts $63,%rdi
23218 + SET_RDI_INTO_CR3
23219 + mov $__UDEREF_KERNEL_DS,%edi
23220 + mov %edi,%ss
23221 +111:
23222 +#endif
23223 + .endm
23224 +
23225 + .macro pax_exit_kernel_nmi
23226 +#ifdef CONFIG_PAX_KERNEXEC
23227 + btr $1,%ebx
23228 + jnc 110f
23229 + GET_CR0_INTO_RDI
23230 + btr $16,%rdi
23231 + SET_RDI_INTO_CR0
23232 +110:
23233 +#endif
23234 +
23235 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23236 + btr $2,%ebx
23237 + jnc 111f
23238 + GET_CR3_INTO_RDI
23239 + add $4097,%rdi
23240 + bts $63,%rdi
23241 + SET_RDI_INTO_CR3
23242 + mov $__KERNEL_DS,%edi
23243 + mov %edi,%ss
23244 +111:
23245 +#endif
23246 + .endm
23247 +
23248 + .macro pax_erase_kstack
23249 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23250 + call pax_erase_kstack
23251 +#endif
23252 + .endm
23253 +
23254 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23255 +ENTRY(pax_erase_kstack)
23256 + pushq %rdi
23257 + pushq %rcx
23258 + pushq %rax
23259 + pushq %r11
23260 +
23261 + GET_THREAD_INFO(%r11)
23262 + mov TI_lowest_stack(%r11), %rdi
23263 + mov $-0xBEEF, %rax
23264 + std
23265 +
23266 +1: mov %edi, %ecx
23267 + and $THREAD_SIZE_asm - 1, %ecx
23268 + shr $3, %ecx
23269 + repne scasq
23270 + jecxz 2f
23271 +
23272 + cmp $2*8, %ecx
23273 + jc 2f
23274 +
23275 + mov $2*8, %ecx
23276 + repe scasq
23277 + jecxz 2f
23278 + jne 1b
23279 +
23280 +2: cld
23281 + mov %esp, %ecx
23282 + sub %edi, %ecx
23283 +
23284 + cmp $THREAD_SIZE_asm, %rcx
23285 + jb 3f
23286 + ud2
23287 +3:
23288 +
23289 + shr $3, %ecx
23290 + rep stosq
23291 +
23292 + mov TI_task_thread_sp0(%r11), %rdi
23293 + sub $256, %rdi
23294 + mov %rdi, TI_lowest_stack(%r11)
23295 +
23296 + popq %r11
23297 + popq %rax
23298 + popq %rcx
23299 + popq %rdi
23300 + pax_force_retaddr
23301 + ret
23302 +ENDPROC(pax_erase_kstack)
23303 +#endif
23304
23305 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23306 #ifdef CONFIG_TRACE_IRQFLAGS
23307 @@ -320,7 +753,7 @@ ENDPROC(native_usergs_sysret64)
23308 .endm
23309
23310 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23311 - bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23312 + bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23313 jnc 1f
23314 TRACE_IRQS_ON_DEBUG
23315 1:
23316 @@ -358,27 +791,6 @@ ENDPROC(native_usergs_sysret64)
23317 movq \tmp,R11+\offset(%rsp)
23318 .endm
23319
23320 - .macro FAKE_STACK_FRAME child_rip
23321 - /* push in order ss, rsp, eflags, cs, rip */
23322 - xorl %eax, %eax
23323 - pushq_cfi $__KERNEL_DS /* ss */
23324 - /*CFI_REL_OFFSET ss,0*/
23325 - pushq_cfi %rax /* rsp */
23326 - CFI_REL_OFFSET rsp,0
23327 - pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
23328 - /*CFI_REL_OFFSET rflags,0*/
23329 - pushq_cfi $__KERNEL_CS /* cs */
23330 - /*CFI_REL_OFFSET cs,0*/
23331 - pushq_cfi \child_rip /* rip */
23332 - CFI_REL_OFFSET rip,0
23333 - pushq_cfi %rax /* orig rax */
23334 - .endm
23335 -
23336 - .macro UNFAKE_STACK_FRAME
23337 - addq $8*6, %rsp
23338 - CFI_ADJUST_CFA_OFFSET -(6*8)
23339 - .endm
23340 -
23341 /*
23342 * initial frame state for interrupts (and exceptions without error code)
23343 */
23344 @@ -445,25 +857,26 @@ ENDPROC(native_usergs_sysret64)
23345 /* save partial stack frame */
23346 .macro SAVE_ARGS_IRQ
23347 cld
23348 - /* start from rbp in pt_regs and jump over */
23349 - movq_cfi rdi, (RDI-RBP)
23350 - movq_cfi rsi, (RSI-RBP)
23351 - movq_cfi rdx, (RDX-RBP)
23352 - movq_cfi rcx, (RCX-RBP)
23353 - movq_cfi rax, (RAX-RBP)
23354 - movq_cfi r8, (R8-RBP)
23355 - movq_cfi r9, (R9-RBP)
23356 - movq_cfi r10, (R10-RBP)
23357 - movq_cfi r11, (R11-RBP)
23358 + /* start from r15 in pt_regs and jump over */
23359 + movq_cfi rdi, RDI
23360 + movq_cfi rsi, RSI
23361 + movq_cfi rdx, RDX
23362 + movq_cfi rcx, RCX
23363 + movq_cfi rax, RAX
23364 + movq_cfi r8, R8
23365 + movq_cfi r9, R9
23366 + movq_cfi r10, R10
23367 + movq_cfi r11, R11
23368 + movq_cfi r12, R12
23369
23370 /* Save rbp so that we can unwind from get_irq_regs() */
23371 - movq_cfi rbp, 0
23372 + movq_cfi rbp, RBP
23373
23374 /* Save previous stack value */
23375 movq %rsp, %rsi
23376
23377 - leaq -RBP(%rsp),%rdi /* arg1 for handler */
23378 - testl $3, CS-RBP(%rsi)
23379 + movq %rsp,%rdi /* arg1 for handler */
23380 + testb $3, CS(%rsi)
23381 je 1f
23382 SWAPGS
23383 /*
23384 @@ -483,6 +896,18 @@ ENDPROC(native_usergs_sysret64)
23385 0x06 /* DW_OP_deref */, \
23386 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23387 0x22 /* DW_OP_plus */
23388 +
23389 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23390 + testb $3, CS(%rdi)
23391 + jnz 1f
23392 + pax_enter_kernel
23393 + jmp 2f
23394 +1: pax_enter_kernel_user
23395 +2:
23396 +#else
23397 + pax_enter_kernel
23398 +#endif
23399 +
23400 /* We entered an interrupt context - irqs are off: */
23401 TRACE_IRQS_OFF
23402 .endm
23403 @@ -514,9 +939,52 @@ ENTRY(save_paranoid)
23404 js 1f /* negative -> in kernel */
23405 SWAPGS
23406 xorl %ebx,%ebx
23407 -1: ret
23408 +1:
23409 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23410 + testb $3, CS+8(%rsp)
23411 + jnz 1f
23412 + pax_enter_kernel
23413 + jmp 2f
23414 +1: pax_enter_kernel_user
23415 +2:
23416 +#else
23417 + pax_enter_kernel
23418 +#endif
23419 + pax_force_retaddr
23420 + ret
23421 CFI_ENDPROC
23422 -END(save_paranoid)
23423 +ENDPROC(save_paranoid)
23424 +
23425 +ENTRY(save_paranoid_nmi)
23426 + XCPT_FRAME 1 RDI+8
23427 + cld
23428 + movq_cfi rdi, RDI+8
23429 + movq_cfi rsi, RSI+8
23430 + movq_cfi rdx, RDX+8
23431 + movq_cfi rcx, RCX+8
23432 + movq_cfi rax, RAX+8
23433 + movq_cfi r8, R8+8
23434 + movq_cfi r9, R9+8
23435 + movq_cfi r10, R10+8
23436 + movq_cfi r11, R11+8
23437 + movq_cfi rbx, RBX+8
23438 + movq_cfi rbp, RBP+8
23439 + movq_cfi r12, R12+8
23440 + movq_cfi r13, R13+8
23441 + movq_cfi r14, R14+8
23442 + movq_cfi r15, R15+8
23443 + movl $1,%ebx
23444 + movl $MSR_GS_BASE,%ecx
23445 + rdmsr
23446 + testl %edx,%edx
23447 + js 1f /* negative -> in kernel */
23448 + SWAPGS
23449 + xorl %ebx,%ebx
23450 +1: pax_enter_kernel_nmi
23451 + pax_force_retaddr
23452 + ret
23453 + CFI_ENDPROC
23454 +ENDPROC(save_paranoid_nmi)
23455 .popsection
23456
23457 /*
23458 @@ -538,7 +1006,7 @@ ENTRY(ret_from_fork)
23459
23460 RESTORE_REST
23461
23462 - testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23463 + testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23464 jz 1f
23465
23466 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
23467 @@ -548,15 +1016,13 @@ ENTRY(ret_from_fork)
23468 jmp ret_from_sys_call # go to the SYSRET fastpath
23469
23470 1:
23471 - subq $REST_SKIP, %rsp # leave space for volatiles
23472 - CFI_ADJUST_CFA_OFFSET REST_SKIP
23473 movq %rbp, %rdi
23474 call *%rbx
23475 movl $0, RAX(%rsp)
23476 RESTORE_REST
23477 jmp int_ret_from_sys_call
23478 CFI_ENDPROC
23479 -END(ret_from_fork)
23480 +ENDPROC(ret_from_fork)
23481
23482 /*
23483 * System call entry. Up to 6 arguments in registers are supported.
23484 @@ -593,7 +1059,7 @@ END(ret_from_fork)
23485 ENTRY(system_call)
23486 CFI_STARTPROC simple
23487 CFI_SIGNAL_FRAME
23488 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23489 + CFI_DEF_CFA rsp,0
23490 CFI_REGISTER rip,rcx
23491 /*CFI_REGISTER rflags,r11*/
23492 SWAPGS_UNSAFE_STACK
23493 @@ -606,16 +1072,23 @@ GLOBAL(system_call_after_swapgs)
23494
23495 movq %rsp,PER_CPU_VAR(old_rsp)
23496 movq PER_CPU_VAR(kernel_stack),%rsp
23497 + SAVE_ARGS 8*6,0
23498 + pax_enter_kernel_user
23499 +
23500 +#ifdef CONFIG_PAX_RANDKSTACK
23501 + pax_erase_kstack
23502 +#endif
23503 +
23504 /*
23505 * No need to follow this irqs off/on section - it's straight
23506 * and short:
23507 */
23508 ENABLE_INTERRUPTS(CLBR_NONE)
23509 - SAVE_ARGS 8,0
23510 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
23511 movq %rcx,RIP-ARGOFFSET(%rsp)
23512 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23513 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23514 + GET_THREAD_INFO(%rcx)
23515 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23516 jnz tracesys
23517 system_call_fastpath:
23518 #if __SYSCALL_MASK == ~0
23519 @@ -639,10 +1112,13 @@ sysret_check:
23520 LOCKDEP_SYS_EXIT
23521 DISABLE_INTERRUPTS(CLBR_NONE)
23522 TRACE_IRQS_OFF
23523 - movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
23524 + GET_THREAD_INFO(%rcx)
23525 + movl TI_flags(%rcx),%edx
23526 andl %edi,%edx
23527 jnz sysret_careful
23528 CFI_REMEMBER_STATE
23529 + pax_exit_kernel_user
23530 + pax_erase_kstack
23531 /*
23532 * sysretq will re-enable interrupts:
23533 */
23534 @@ -701,6 +1177,9 @@ auditsys:
23535 movq %rax,%rsi /* 2nd arg: syscall number */
23536 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
23537 call __audit_syscall_entry
23538 +
23539 + pax_erase_kstack
23540 +
23541 LOAD_ARGS 0 /* reload call-clobbered registers */
23542 jmp system_call_fastpath
23543
23544 @@ -722,7 +1201,7 @@ sysret_audit:
23545 /* Do syscall tracing */
23546 tracesys:
23547 #ifdef CONFIG_AUDITSYSCALL
23548 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23549 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
23550 jz auditsys
23551 #endif
23552 SAVE_REST
23553 @@ -730,12 +1209,15 @@ tracesys:
23554 FIXUP_TOP_OF_STACK %rdi
23555 movq %rsp,%rdi
23556 call syscall_trace_enter
23557 +
23558 + pax_erase_kstack
23559 +
23560 /*
23561 * Reload arg registers from stack in case ptrace changed them.
23562 * We don't reload %rax because syscall_trace_enter() returned
23563 * the value it wants us to use in the table lookup.
23564 */
23565 - LOAD_ARGS ARGOFFSET, 1
23566 + LOAD_ARGS 1
23567 RESTORE_REST
23568 #if __SYSCALL_MASK == ~0
23569 cmpq $__NR_syscall_max,%rax
23570 @@ -765,7 +1247,9 @@ GLOBAL(int_with_check)
23571 andl %edi,%edx
23572 jnz int_careful
23573 andl $~TS_COMPAT,TI_status(%rcx)
23574 - jmp retint_swapgs
23575 + pax_exit_kernel_user
23576 + pax_erase_kstack
23577 + jmp retint_swapgs_pax
23578
23579 /* Either reschedule or signal or syscall exit tracking needed. */
23580 /* First do a reschedule test. */
23581 @@ -811,7 +1295,7 @@ int_restore_rest:
23582 TRACE_IRQS_OFF
23583 jmp int_with_check
23584 CFI_ENDPROC
23585 -END(system_call)
23586 +ENDPROC(system_call)
23587
23588 .macro FORK_LIKE func
23589 ENTRY(stub_\func)
23590 @@ -824,9 +1308,10 @@ ENTRY(stub_\func)
23591 DEFAULT_FRAME 0 8 /* offset 8: return address */
23592 call sys_\func
23593 RESTORE_TOP_OF_STACK %r11, 8
23594 - ret $REST_SKIP /* pop extended registers */
23595 + pax_force_retaddr
23596 + ret
23597 CFI_ENDPROC
23598 -END(stub_\func)
23599 +ENDPROC(stub_\func)
23600 .endm
23601
23602 .macro FIXED_FRAME label,func
23603 @@ -836,9 +1321,10 @@ ENTRY(\label)
23604 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23605 call \func
23606 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23607 + pax_force_retaddr
23608 ret
23609 CFI_ENDPROC
23610 -END(\label)
23611 +ENDPROC(\label)
23612 .endm
23613
23614 FORK_LIKE clone
23615 @@ -846,19 +1332,6 @@ END(\label)
23616 FORK_LIKE vfork
23617 FIXED_FRAME stub_iopl, sys_iopl
23618
23619 -ENTRY(ptregscall_common)
23620 - DEFAULT_FRAME 1 8 /* offset 8: return address */
23621 - RESTORE_TOP_OF_STACK %r11, 8
23622 - movq_cfi_restore R15+8, r15
23623 - movq_cfi_restore R14+8, r14
23624 - movq_cfi_restore R13+8, r13
23625 - movq_cfi_restore R12+8, r12
23626 - movq_cfi_restore RBP+8, rbp
23627 - movq_cfi_restore RBX+8, rbx
23628 - ret $REST_SKIP /* pop extended registers */
23629 - CFI_ENDPROC
23630 -END(ptregscall_common)
23631 -
23632 ENTRY(stub_execve)
23633 CFI_STARTPROC
23634 addq $8, %rsp
23635 @@ -870,7 +1343,7 @@ ENTRY(stub_execve)
23636 RESTORE_REST
23637 jmp int_ret_from_sys_call
23638 CFI_ENDPROC
23639 -END(stub_execve)
23640 +ENDPROC(stub_execve)
23641
23642 /*
23643 * sigreturn is special because it needs to restore all registers on return.
23644 @@ -887,7 +1360,7 @@ ENTRY(stub_rt_sigreturn)
23645 RESTORE_REST
23646 jmp int_ret_from_sys_call
23647 CFI_ENDPROC
23648 -END(stub_rt_sigreturn)
23649 +ENDPROC(stub_rt_sigreturn)
23650
23651 #ifdef CONFIG_X86_X32_ABI
23652 ENTRY(stub_x32_rt_sigreturn)
23653 @@ -901,7 +1374,7 @@ ENTRY(stub_x32_rt_sigreturn)
23654 RESTORE_REST
23655 jmp int_ret_from_sys_call
23656 CFI_ENDPROC
23657 -END(stub_x32_rt_sigreturn)
23658 +ENDPROC(stub_x32_rt_sigreturn)
23659
23660 ENTRY(stub_x32_execve)
23661 CFI_STARTPROC
23662 @@ -915,7 +1388,7 @@ ENTRY(stub_x32_execve)
23663 RESTORE_REST
23664 jmp int_ret_from_sys_call
23665 CFI_ENDPROC
23666 -END(stub_x32_execve)
23667 +ENDPROC(stub_x32_execve)
23668
23669 #endif
23670
23671 @@ -952,7 +1425,7 @@ vector=vector+1
23672 2: jmp common_interrupt
23673 .endr
23674 CFI_ENDPROC
23675 -END(irq_entries_start)
23676 +ENDPROC(irq_entries_start)
23677
23678 .previous
23679 END(interrupt)
23680 @@ -969,8 +1442,8 @@ END(interrupt)
23681 /* 0(%rsp): ~(interrupt number) */
23682 .macro interrupt func
23683 /* reserve pt_regs for scratch regs and rbp */
23684 - subq $ORIG_RAX-RBP, %rsp
23685 - CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23686 + subq $ORIG_RAX, %rsp
23687 + CFI_ADJUST_CFA_OFFSET ORIG_RAX
23688 SAVE_ARGS_IRQ
23689 call \func
23690 .endm
23691 @@ -997,14 +1470,14 @@ ret_from_intr:
23692
23693 /* Restore saved previous stack */
23694 popq %rsi
23695 - CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23696 - leaq ARGOFFSET-RBP(%rsi), %rsp
23697 + CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23698 + movq %rsi, %rsp
23699 CFI_DEF_CFA_REGISTER rsp
23700 - CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23701 + CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23702
23703 exit_intr:
23704 GET_THREAD_INFO(%rcx)
23705 - testl $3,CS-ARGOFFSET(%rsp)
23706 + testb $3,CS-ARGOFFSET(%rsp)
23707 je retint_kernel
23708
23709 /* Interrupt came from user space */
23710 @@ -1026,12 +1499,16 @@ retint_swapgs: /* return to user-space */
23711 * The iretq could re-enable interrupts:
23712 */
23713 DISABLE_INTERRUPTS(CLBR_ANY)
23714 + pax_exit_kernel_user
23715 +retint_swapgs_pax:
23716 TRACE_IRQS_IRETQ
23717 SWAPGS
23718 jmp restore_args
23719
23720 retint_restore_args: /* return to kernel space */
23721 DISABLE_INTERRUPTS(CLBR_ANY)
23722 + pax_exit_kernel
23723 + pax_force_retaddr (RIP-ARGOFFSET)
23724 /*
23725 * The iretq could re-enable interrupts:
23726 */
23727 @@ -1112,7 +1589,7 @@ ENTRY(retint_kernel)
23728 #endif
23729
23730 CFI_ENDPROC
23731 -END(common_interrupt)
23732 +ENDPROC(common_interrupt)
23733 /*
23734 * End of kprobes section
23735 */
23736 @@ -1130,7 +1607,7 @@ ENTRY(\sym)
23737 interrupt \do_sym
23738 jmp ret_from_intr
23739 CFI_ENDPROC
23740 -END(\sym)
23741 +ENDPROC(\sym)
23742 .endm
23743
23744 #ifdef CONFIG_TRACING
23745 @@ -1218,7 +1695,7 @@ ENTRY(\sym)
23746 call \do_sym
23747 jmp error_exit /* %ebx: no swapgs flag */
23748 CFI_ENDPROC
23749 -END(\sym)
23750 +ENDPROC(\sym)
23751 .endm
23752
23753 .macro paranoidzeroentry sym do_sym
23754 @@ -1236,10 +1713,10 @@ ENTRY(\sym)
23755 call \do_sym
23756 jmp paranoid_exit /* %ebx: no swapgs flag */
23757 CFI_ENDPROC
23758 -END(\sym)
23759 +ENDPROC(\sym)
23760 .endm
23761
23762 -#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23763 +#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23764 .macro paranoidzeroentry_ist sym do_sym ist
23765 ENTRY(\sym)
23766 INTR_FRAME
23767 @@ -1252,12 +1729,18 @@ ENTRY(\sym)
23768 TRACE_IRQS_OFF_DEBUG
23769 movq %rsp,%rdi /* pt_regs pointer */
23770 xorl %esi,%esi /* no error code */
23771 +#ifdef CONFIG_SMP
23772 + imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23773 + lea init_tss(%r13), %r13
23774 +#else
23775 + lea init_tss(%rip), %r13
23776 +#endif
23777 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
23778 call \do_sym
23779 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
23780 jmp paranoid_exit /* %ebx: no swapgs flag */
23781 CFI_ENDPROC
23782 -END(\sym)
23783 +ENDPROC(\sym)
23784 .endm
23785
23786 .macro errorentry sym do_sym
23787 @@ -1275,7 +1758,7 @@ ENTRY(\sym)
23788 call \do_sym
23789 jmp error_exit /* %ebx: no swapgs flag */
23790 CFI_ENDPROC
23791 -END(\sym)
23792 +ENDPROC(\sym)
23793 .endm
23794
23795 #ifdef CONFIG_TRACING
23796 @@ -1306,7 +1789,7 @@ ENTRY(\sym)
23797 call \do_sym
23798 jmp paranoid_exit /* %ebx: no swapgs flag */
23799 CFI_ENDPROC
23800 -END(\sym)
23801 +ENDPROC(\sym)
23802 .endm
23803
23804 zeroentry divide_error do_divide_error
23805 @@ -1336,9 +1819,10 @@ gs_change:
23806 2: mfence /* workaround */
23807 SWAPGS
23808 popfq_cfi
23809 + pax_force_retaddr
23810 ret
23811 CFI_ENDPROC
23812 -END(native_load_gs_index)
23813 +ENDPROC(native_load_gs_index)
23814
23815 _ASM_EXTABLE(gs_change,bad_gs)
23816 .section .fixup,"ax"
23817 @@ -1366,9 +1850,10 @@ ENTRY(do_softirq_own_stack)
23818 CFI_DEF_CFA_REGISTER rsp
23819 CFI_ADJUST_CFA_OFFSET -8
23820 decl PER_CPU_VAR(irq_count)
23821 + pax_force_retaddr
23822 ret
23823 CFI_ENDPROC
23824 -END(do_softirq_own_stack)
23825 +ENDPROC(do_softirq_own_stack)
23826
23827 #ifdef CONFIG_XEN
23828 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
23829 @@ -1406,7 +1891,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
23830 decl PER_CPU_VAR(irq_count)
23831 jmp error_exit
23832 CFI_ENDPROC
23833 -END(xen_do_hypervisor_callback)
23834 +ENDPROC(xen_do_hypervisor_callback)
23835
23836 /*
23837 * Hypervisor uses this for application faults while it executes.
23838 @@ -1465,7 +1950,7 @@ ENTRY(xen_failsafe_callback)
23839 SAVE_ALL
23840 jmp error_exit
23841 CFI_ENDPROC
23842 -END(xen_failsafe_callback)
23843 +ENDPROC(xen_failsafe_callback)
23844
23845 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
23846 xen_hvm_callback_vector xen_evtchn_do_upcall
23847 @@ -1517,18 +2002,33 @@ ENTRY(paranoid_exit)
23848 DEFAULT_FRAME
23849 DISABLE_INTERRUPTS(CLBR_NONE)
23850 TRACE_IRQS_OFF_DEBUG
23851 - testl %ebx,%ebx /* swapgs needed? */
23852 + testl $1,%ebx /* swapgs needed? */
23853 jnz paranoid_restore
23854 - testl $3,CS(%rsp)
23855 + testb $3,CS(%rsp)
23856 jnz paranoid_userspace
23857 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23858 + pax_exit_kernel
23859 + TRACE_IRQS_IRETQ 0
23860 + SWAPGS_UNSAFE_STACK
23861 + RESTORE_ALL 8
23862 + pax_force_retaddr_bts
23863 + jmp irq_return
23864 +#endif
23865 paranoid_swapgs:
23866 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23867 + pax_exit_kernel_user
23868 +#else
23869 + pax_exit_kernel
23870 +#endif
23871 TRACE_IRQS_IRETQ 0
23872 SWAPGS_UNSAFE_STACK
23873 RESTORE_ALL 8
23874 jmp irq_return
23875 paranoid_restore:
23876 + pax_exit_kernel
23877 TRACE_IRQS_IRETQ_DEBUG 0
23878 RESTORE_ALL 8
23879 + pax_force_retaddr_bts
23880 jmp irq_return
23881 paranoid_userspace:
23882 GET_THREAD_INFO(%rcx)
23883 @@ -1557,7 +2057,7 @@ paranoid_schedule:
23884 TRACE_IRQS_OFF
23885 jmp paranoid_userspace
23886 CFI_ENDPROC
23887 -END(paranoid_exit)
23888 +ENDPROC(paranoid_exit)
23889
23890 /*
23891 * Exception entry point. This expects an error code/orig_rax on the stack.
23892 @@ -1584,12 +2084,23 @@ ENTRY(error_entry)
23893 movq_cfi r14, R14+8
23894 movq_cfi r15, R15+8
23895 xorl %ebx,%ebx
23896 - testl $3,CS+8(%rsp)
23897 + testb $3,CS+8(%rsp)
23898 je error_kernelspace
23899 error_swapgs:
23900 SWAPGS
23901 error_sti:
23902 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23903 + testb $3, CS+8(%rsp)
23904 + jnz 1f
23905 + pax_enter_kernel
23906 + jmp 2f
23907 +1: pax_enter_kernel_user
23908 +2:
23909 +#else
23910 + pax_enter_kernel
23911 +#endif
23912 TRACE_IRQS_OFF
23913 + pax_force_retaddr
23914 ret
23915
23916 /*
23917 @@ -1616,7 +2127,7 @@ bstep_iret:
23918 movq %rcx,RIP+8(%rsp)
23919 jmp error_swapgs
23920 CFI_ENDPROC
23921 -END(error_entry)
23922 +ENDPROC(error_entry)
23923
23924
23925 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
23926 @@ -1627,7 +2138,7 @@ ENTRY(error_exit)
23927 DISABLE_INTERRUPTS(CLBR_NONE)
23928 TRACE_IRQS_OFF
23929 GET_THREAD_INFO(%rcx)
23930 - testl %eax,%eax
23931 + testl $1,%eax
23932 jne retint_kernel
23933 LOCKDEP_SYS_EXIT_IRQ
23934 movl TI_flags(%rcx),%edx
23935 @@ -1636,7 +2147,7 @@ ENTRY(error_exit)
23936 jnz retint_careful
23937 jmp retint_swapgs
23938 CFI_ENDPROC
23939 -END(error_exit)
23940 +ENDPROC(error_exit)
23941
23942 /*
23943 * Test if a given stack is an NMI stack or not.
23944 @@ -1694,9 +2205,11 @@ ENTRY(nmi)
23945 * If %cs was not the kernel segment, then the NMI triggered in user
23946 * space, which means it is definitely not nested.
23947 */
23948 + cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
23949 + je 1f
23950 cmpl $__KERNEL_CS, 16(%rsp)
23951 jne first_nmi
23952 -
23953 +1:
23954 /*
23955 * Check the special variable on the stack to see if NMIs are
23956 * executing.
23957 @@ -1730,8 +2243,7 @@ nested_nmi:
23958
23959 1:
23960 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
23961 - leaq -1*8(%rsp), %rdx
23962 - movq %rdx, %rsp
23963 + subq $8, %rsp
23964 CFI_ADJUST_CFA_OFFSET 1*8
23965 leaq -10*8(%rsp), %rdx
23966 pushq_cfi $__KERNEL_DS
23967 @@ -1749,6 +2261,7 @@ nested_nmi_out:
23968 CFI_RESTORE rdx
23969
23970 /* No need to check faults here */
23971 +# pax_force_retaddr_bts
23972 INTERRUPT_RETURN
23973
23974 CFI_RESTORE_STATE
23975 @@ -1845,13 +2358,13 @@ end_repeat_nmi:
23976 subq $ORIG_RAX-R15, %rsp
23977 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
23978 /*
23979 - * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
23980 + * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
23981 * as we should not be calling schedule in NMI context.
23982 * Even with normal interrupts enabled. An NMI should not be
23983 * setting NEED_RESCHED or anything that normal interrupts and
23984 * exceptions might do.
23985 */
23986 - call save_paranoid
23987 + call save_paranoid_nmi
23988 DEFAULT_FRAME 0
23989
23990 /*
23991 @@ -1861,9 +2374,9 @@ end_repeat_nmi:
23992 * NMI itself takes a page fault, the page fault that was preempted
23993 * will read the information from the NMI page fault and not the
23994 * origin fault. Save it off and restore it if it changes.
23995 - * Use the r12 callee-saved register.
23996 + * Use the r13 callee-saved register.
23997 */
23998 - movq %cr2, %r12
23999 + movq %cr2, %r13
24000
24001 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24002 movq %rsp,%rdi
24003 @@ -1872,31 +2385,36 @@ end_repeat_nmi:
24004
24005 /* Did the NMI take a page fault? Restore cr2 if it did */
24006 movq %cr2, %rcx
24007 - cmpq %rcx, %r12
24008 + cmpq %rcx, %r13
24009 je 1f
24010 - movq %r12, %cr2
24011 + movq %r13, %cr2
24012 1:
24013
24014 - testl %ebx,%ebx /* swapgs needed? */
24015 + testl $1,%ebx /* swapgs needed? */
24016 jnz nmi_restore
24017 nmi_swapgs:
24018 SWAPGS_UNSAFE_STACK
24019 nmi_restore:
24020 + pax_exit_kernel_nmi
24021 /* Pop the extra iret frame at once */
24022 RESTORE_ALL 6*8
24023 + testb $3, 8(%rsp)
24024 + jnz 1f
24025 + pax_force_retaddr_bts
24026 +1:
24027
24028 /* Clear the NMI executing stack variable */
24029 movq $0, 5*8(%rsp)
24030 jmp irq_return
24031 CFI_ENDPROC
24032 -END(nmi)
24033 +ENDPROC(nmi)
24034
24035 ENTRY(ignore_sysret)
24036 CFI_STARTPROC
24037 mov $-ENOSYS,%eax
24038 sysret
24039 CFI_ENDPROC
24040 -END(ignore_sysret)
24041 +ENDPROC(ignore_sysret)
24042
24043 /*
24044 * End of kprobes section
24045 diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24046 index 52819e8..b6d1dbd 100644
24047 --- a/arch/x86/kernel/ftrace.c
24048 +++ b/arch/x86/kernel/ftrace.c
24049 @@ -104,6 +104,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24050 {
24051 unsigned char replaced[MCOUNT_INSN_SIZE];
24052
24053 + ip = ktla_ktva(ip);
24054 +
24055 /*
24056 * Note: Due to modules and __init, code can
24057 * disappear and change, we need to protect against faulting
24058 @@ -229,7 +231,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24059 unsigned char old[MCOUNT_INSN_SIZE];
24060 int ret;
24061
24062 - memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24063 + memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24064
24065 ftrace_update_func = ip;
24066 /* Make sure the breakpoints see the ftrace_update_func update */
24067 @@ -306,7 +308,7 @@ static int ftrace_write(unsigned long ip, const char *val, int size)
24068 * kernel identity mapping to modify code.
24069 */
24070 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24071 - ip = (unsigned long)__va(__pa_symbol(ip));
24072 + ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24073
24074 if (probe_kernel_write((void *)ip, val, size))
24075 return -EPERM;
24076 @@ -319,7 +321,7 @@ static int add_break(unsigned long ip, const char *old)
24077 unsigned char replaced[MCOUNT_INSN_SIZE];
24078 unsigned char brk = BREAKPOINT_INSTRUCTION;
24079
24080 - if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24081 + if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24082 return -EFAULT;
24083
24084 /* Make sure it is what we expect it to be */
24085 diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24086 index 068054f..c248bcd 100644
24087 --- a/arch/x86/kernel/head64.c
24088 +++ b/arch/x86/kernel/head64.c
24089 @@ -67,12 +67,12 @@ again:
24090 pgd = *pgd_p;
24091
24092 /*
24093 - * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24094 - * critical -- __PAGE_OFFSET would point us back into the dynamic
24095 + * The use of __early_va rather than __va here is critical:
24096 + * __va would point us back into the dynamic
24097 * range and we might end up looping forever...
24098 */
24099 if (pgd)
24100 - pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24101 + pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24102 else {
24103 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24104 reset_early_page_tables();
24105 @@ -82,13 +82,13 @@ again:
24106 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24107 for (i = 0; i < PTRS_PER_PUD; i++)
24108 pud_p[i] = 0;
24109 - *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24110 + *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24111 }
24112 pud_p += pud_index(address);
24113 pud = *pud_p;
24114
24115 if (pud)
24116 - pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24117 + pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24118 else {
24119 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24120 reset_early_page_tables();
24121 @@ -98,7 +98,7 @@ again:
24122 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24123 for (i = 0; i < PTRS_PER_PMD; i++)
24124 pmd_p[i] = 0;
24125 - *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24126 + *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24127 }
24128 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24129 pmd_p[pmd_index(address)] = pmd;
24130 @@ -175,7 +175,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24131 if (console_loglevel == 10)
24132 early_printk("Kernel alive\n");
24133
24134 - clear_page(init_level4_pgt);
24135 /* set init_level4_pgt kernel high mapping*/
24136 init_level4_pgt[511] = early_level4_pgt[511];
24137
24138 diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24139 index f36bd42..56ee1534 100644
24140 --- a/arch/x86/kernel/head_32.S
24141 +++ b/arch/x86/kernel/head_32.S
24142 @@ -26,6 +26,12 @@
24143 /* Physical address */
24144 #define pa(X) ((X) - __PAGE_OFFSET)
24145
24146 +#ifdef CONFIG_PAX_KERNEXEC
24147 +#define ta(X) (X)
24148 +#else
24149 +#define ta(X) ((X) - __PAGE_OFFSET)
24150 +#endif
24151 +
24152 /*
24153 * References to members of the new_cpu_data structure.
24154 */
24155 @@ -55,11 +61,7 @@
24156 * and small than max_low_pfn, otherwise will waste some page table entries
24157 */
24158
24159 -#if PTRS_PER_PMD > 1
24160 -#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24161 -#else
24162 -#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24163 -#endif
24164 +#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24165
24166 /* Number of possible pages in the lowmem region */
24167 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24168 @@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24169 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24170
24171 /*
24172 + * Real beginning of normal "text" segment
24173 + */
24174 +ENTRY(stext)
24175 +ENTRY(_stext)
24176 +
24177 +/*
24178 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24179 * %esi points to the real-mode code as a 32-bit pointer.
24180 * CS and DS must be 4 GB flat segments, but we don't depend on
24181 @@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24182 * can.
24183 */
24184 __HEAD
24185 +
24186 +#ifdef CONFIG_PAX_KERNEXEC
24187 + jmp startup_32
24188 +/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24189 +.fill PAGE_SIZE-5,1,0xcc
24190 +#endif
24191 +
24192 ENTRY(startup_32)
24193 movl pa(stack_start),%ecx
24194
24195 @@ -106,6 +121,59 @@ ENTRY(startup_32)
24196 2:
24197 leal -__PAGE_OFFSET(%ecx),%esp
24198
24199 +#ifdef CONFIG_SMP
24200 + movl $pa(cpu_gdt_table),%edi
24201 + movl $__per_cpu_load,%eax
24202 + movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24203 + rorl $16,%eax
24204 + movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24205 + movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24206 + movl $__per_cpu_end - 1,%eax
24207 + subl $__per_cpu_start,%eax
24208 + movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24209 +#endif
24210 +
24211 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24212 + movl $NR_CPUS,%ecx
24213 + movl $pa(cpu_gdt_table),%edi
24214 +1:
24215 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24216 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24217 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24218 + addl $PAGE_SIZE_asm,%edi
24219 + loop 1b
24220 +#endif
24221 +
24222 +#ifdef CONFIG_PAX_KERNEXEC
24223 + movl $pa(boot_gdt),%edi
24224 + movl $__LOAD_PHYSICAL_ADDR,%eax
24225 + movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24226 + rorl $16,%eax
24227 + movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24228 + movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24229 + rorl $16,%eax
24230 +
24231 + ljmp $(__BOOT_CS),$1f
24232 +1:
24233 +
24234 + movl $NR_CPUS,%ecx
24235 + movl $pa(cpu_gdt_table),%edi
24236 + addl $__PAGE_OFFSET,%eax
24237 +1:
24238 + movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24239 + movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24240 + movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24241 + movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24242 + rorl $16,%eax
24243 + movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24244 + movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24245 + movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24246 + movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24247 + rorl $16,%eax
24248 + addl $PAGE_SIZE_asm,%edi
24249 + loop 1b
24250 +#endif
24251 +
24252 /*
24253 * Clear BSS first so that there are no surprises...
24254 */
24255 @@ -201,8 +269,11 @@ ENTRY(startup_32)
24256 movl %eax, pa(max_pfn_mapped)
24257
24258 /* Do early initialization of the fixmap area */
24259 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24260 - movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24261 +#ifdef CONFIG_COMPAT_VDSO
24262 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24263 +#else
24264 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24265 +#endif
24266 #else /* Not PAE */
24267
24268 page_pde_offset = (__PAGE_OFFSET >> 20);
24269 @@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24270 movl %eax, pa(max_pfn_mapped)
24271
24272 /* Do early initialization of the fixmap area */
24273 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24274 - movl %eax,pa(initial_page_table+0xffc)
24275 +#ifdef CONFIG_COMPAT_VDSO
24276 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24277 +#else
24278 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24279 +#endif
24280 #endif
24281
24282 #ifdef CONFIG_PARAVIRT
24283 @@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24284 cmpl $num_subarch_entries, %eax
24285 jae bad_subarch
24286
24287 - movl pa(subarch_entries)(,%eax,4), %eax
24288 - subl $__PAGE_OFFSET, %eax
24289 - jmp *%eax
24290 + jmp *pa(subarch_entries)(,%eax,4)
24291
24292 bad_subarch:
24293 WEAK(lguest_entry)
24294 @@ -261,10 +333,10 @@ WEAK(xen_entry)
24295 __INITDATA
24296
24297 subarch_entries:
24298 - .long default_entry /* normal x86/PC */
24299 - .long lguest_entry /* lguest hypervisor */
24300 - .long xen_entry /* Xen hypervisor */
24301 - .long default_entry /* Moorestown MID */
24302 + .long ta(default_entry) /* normal x86/PC */
24303 + .long ta(lguest_entry) /* lguest hypervisor */
24304 + .long ta(xen_entry) /* Xen hypervisor */
24305 + .long ta(default_entry) /* Moorestown MID */
24306 num_subarch_entries = (. - subarch_entries) / 4
24307 .previous
24308 #else
24309 @@ -354,6 +426,7 @@ default_entry:
24310 movl pa(mmu_cr4_features),%eax
24311 movl %eax,%cr4
24312
24313 +#ifdef CONFIG_X86_PAE
24314 testb $X86_CR4_PAE, %al # check if PAE is enabled
24315 jz enable_paging
24316
24317 @@ -382,6 +455,9 @@ default_entry:
24318 /* Make changes effective */
24319 wrmsr
24320
24321 + btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24322 +#endif
24323 +
24324 enable_paging:
24325
24326 /*
24327 @@ -449,14 +525,20 @@ is486:
24328 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24329 movl %eax,%ss # after changing gdt.
24330
24331 - movl $(__USER_DS),%eax # DS/ES contains default USER segment
24332 +# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24333 movl %eax,%ds
24334 movl %eax,%es
24335
24336 movl $(__KERNEL_PERCPU), %eax
24337 movl %eax,%fs # set this cpu's percpu
24338
24339 +#ifdef CONFIG_CC_STACKPROTECTOR
24340 movl $(__KERNEL_STACK_CANARY),%eax
24341 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24342 + movl $(__USER_DS),%eax
24343 +#else
24344 + xorl %eax,%eax
24345 +#endif
24346 movl %eax,%gs
24347
24348 xorl %eax,%eax # Clear LDT
24349 @@ -512,8 +594,11 @@ setup_once:
24350 * relocation. Manually set base address in stack canary
24351 * segment descriptor.
24352 */
24353 - movl $gdt_page,%eax
24354 + movl $cpu_gdt_table,%eax
24355 movl $stack_canary,%ecx
24356 +#ifdef CONFIG_SMP
24357 + addl $__per_cpu_load,%ecx
24358 +#endif
24359 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24360 shrl $16, %ecx
24361 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24362 @@ -548,7 +633,7 @@ ENTRY(early_idt_handler)
24363 cmpl $2,(%esp) # X86_TRAP_NMI
24364 je is_nmi # Ignore NMI
24365
24366 - cmpl $2,%ss:early_recursion_flag
24367 + cmpl $1,%ss:early_recursion_flag
24368 je hlt_loop
24369 incl %ss:early_recursion_flag
24370
24371 @@ -586,8 +671,8 @@ ENTRY(early_idt_handler)
24372 pushl (20+6*4)(%esp) /* trapno */
24373 pushl $fault_msg
24374 call printk
24375 -#endif
24376 call dump_stack
24377 +#endif
24378 hlt_loop:
24379 hlt
24380 jmp hlt_loop
24381 @@ -607,8 +692,11 @@ ENDPROC(early_idt_handler)
24382 /* This is the default interrupt "handler" :-) */
24383 ALIGN
24384 ignore_int:
24385 - cld
24386 #ifdef CONFIG_PRINTK
24387 + cmpl $2,%ss:early_recursion_flag
24388 + je hlt_loop
24389 + incl %ss:early_recursion_flag
24390 + cld
24391 pushl %eax
24392 pushl %ecx
24393 pushl %edx
24394 @@ -617,9 +705,6 @@ ignore_int:
24395 movl $(__KERNEL_DS),%eax
24396 movl %eax,%ds
24397 movl %eax,%es
24398 - cmpl $2,early_recursion_flag
24399 - je hlt_loop
24400 - incl early_recursion_flag
24401 pushl 16(%esp)
24402 pushl 24(%esp)
24403 pushl 32(%esp)
24404 @@ -653,29 +738,34 @@ ENTRY(setup_once_ref)
24405 /*
24406 * BSS section
24407 */
24408 -__PAGE_ALIGNED_BSS
24409 - .align PAGE_SIZE
24410 #ifdef CONFIG_X86_PAE
24411 +.section .initial_pg_pmd,"a",@progbits
24412 initial_pg_pmd:
24413 .fill 1024*KPMDS,4,0
24414 #else
24415 +.section .initial_page_table,"a",@progbits
24416 ENTRY(initial_page_table)
24417 .fill 1024,4,0
24418 #endif
24419 +.section .initial_pg_fixmap,"a",@progbits
24420 initial_pg_fixmap:
24421 .fill 1024,4,0
24422 +.section .empty_zero_page,"a",@progbits
24423 ENTRY(empty_zero_page)
24424 .fill 4096,1,0
24425 +.section .swapper_pg_dir,"a",@progbits
24426 ENTRY(swapper_pg_dir)
24427 +#ifdef CONFIG_X86_PAE
24428 + .fill 4,8,0
24429 +#else
24430 .fill 1024,4,0
24431 +#endif
24432
24433 /*
24434 * This starts the data section.
24435 */
24436 #ifdef CONFIG_X86_PAE
24437 -__PAGE_ALIGNED_DATA
24438 - /* Page-aligned for the benefit of paravirt? */
24439 - .align PAGE_SIZE
24440 +.section .initial_page_table,"a",@progbits
24441 ENTRY(initial_page_table)
24442 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24443 # if KPMDS == 3
24444 @@ -694,12 +784,20 @@ ENTRY(initial_page_table)
24445 # error "Kernel PMDs should be 1, 2 or 3"
24446 # endif
24447 .align PAGE_SIZE /* needs to be page-sized too */
24448 +
24449 +#ifdef CONFIG_PAX_PER_CPU_PGD
24450 +ENTRY(cpu_pgd)
24451 + .rept 2*NR_CPUS
24452 + .fill 4,8,0
24453 + .endr
24454 +#endif
24455 +
24456 #endif
24457
24458 .data
24459 .balign 4
24460 ENTRY(stack_start)
24461 - .long init_thread_union+THREAD_SIZE
24462 + .long init_thread_union+THREAD_SIZE-8
24463
24464 __INITRODATA
24465 int_msg:
24466 @@ -727,7 +825,7 @@ fault_msg:
24467 * segment size, and 32-bit linear address value:
24468 */
24469
24470 - .data
24471 +.section .rodata,"a",@progbits
24472 .globl boot_gdt_descr
24473 .globl idt_descr
24474
24475 @@ -736,7 +834,7 @@ fault_msg:
24476 .word 0 # 32 bit align gdt_desc.address
24477 boot_gdt_descr:
24478 .word __BOOT_DS+7
24479 - .long boot_gdt - __PAGE_OFFSET
24480 + .long pa(boot_gdt)
24481
24482 .word 0 # 32-bit align idt_desc.address
24483 idt_descr:
24484 @@ -747,7 +845,7 @@ idt_descr:
24485 .word 0 # 32 bit align gdt_desc.address
24486 ENTRY(early_gdt_descr)
24487 .word GDT_ENTRIES*8-1
24488 - .long gdt_page /* Overwritten for secondary CPUs */
24489 + .long cpu_gdt_table /* Overwritten for secondary CPUs */
24490
24491 /*
24492 * The boot_gdt must mirror the equivalent in setup.S and is
24493 @@ -756,5 +854,65 @@ ENTRY(early_gdt_descr)
24494 .align L1_CACHE_BYTES
24495 ENTRY(boot_gdt)
24496 .fill GDT_ENTRY_BOOT_CS,8,0
24497 - .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24498 - .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24499 + .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24500 + .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24501 +
24502 + .align PAGE_SIZE_asm
24503 +ENTRY(cpu_gdt_table)
24504 + .rept NR_CPUS
24505 + .quad 0x0000000000000000 /* NULL descriptor */
24506 + .quad 0x0000000000000000 /* 0x0b reserved */
24507 + .quad 0x0000000000000000 /* 0x13 reserved */
24508 + .quad 0x0000000000000000 /* 0x1b reserved */
24509 +
24510 +#ifdef CONFIG_PAX_KERNEXEC
24511 + .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24512 +#else
24513 + .quad 0x0000000000000000 /* 0x20 unused */
24514 +#endif
24515 +
24516 + .quad 0x0000000000000000 /* 0x28 unused */
24517 + .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24518 + .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24519 + .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24520 + .quad 0x0000000000000000 /* 0x4b reserved */
24521 + .quad 0x0000000000000000 /* 0x53 reserved */
24522 + .quad 0x0000000000000000 /* 0x5b reserved */
24523 +
24524 + .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24525 + .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24526 + .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24527 + .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24528 +
24529 + .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24530 + .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24531 +
24532 + /*
24533 + * Segments used for calling PnP BIOS have byte granularity.
24534 + * The code segments and data segments have fixed 64k limits,
24535 + * the transfer segment sizes are set at run time.
24536 + */
24537 + .quad 0x00409b000000ffff /* 0x90 32-bit code */
24538 + .quad 0x00009b000000ffff /* 0x98 16-bit code */
24539 + .quad 0x000093000000ffff /* 0xa0 16-bit data */
24540 + .quad 0x0000930000000000 /* 0xa8 16-bit data */
24541 + .quad 0x0000930000000000 /* 0xb0 16-bit data */
24542 +
24543 + /*
24544 + * The APM segments have byte granularity and their bases
24545 + * are set at run time. All have 64k limits.
24546 + */
24547 + .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24548 + .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24549 + .quad 0x004093000000ffff /* 0xc8 APM DS data */
24550 +
24551 + .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
24552 + .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24553 + .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24554 + .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24555 + .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24556 + .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24557 +
24558 + /* Be sure this is zeroed to avoid false validations in Xen */
24559 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24560 + .endr
24561 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24562 index a468c0a..c7dec74 100644
24563 --- a/arch/x86/kernel/head_64.S
24564 +++ b/arch/x86/kernel/head_64.S
24565 @@ -20,6 +20,8 @@
24566 #include <asm/processor-flags.h>
24567 #include <asm/percpu.h>
24568 #include <asm/nops.h>
24569 +#include <asm/cpufeature.h>
24570 +#include <asm/alternative-asm.h>
24571
24572 #ifdef CONFIG_PARAVIRT
24573 #include <asm/asm-offsets.h>
24574 @@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24575 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24576 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24577 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24578 +L4_VMALLOC_START = pgd_index(VMALLOC_START)
24579 +L3_VMALLOC_START = pud_index(VMALLOC_START)
24580 +L4_VMALLOC_END = pgd_index(VMALLOC_END)
24581 +L3_VMALLOC_END = pud_index(VMALLOC_END)
24582 +L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24583 +L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24584
24585 .text
24586 __HEAD
24587 @@ -89,11 +97,24 @@ startup_64:
24588 * Fixup the physical addresses in the page table
24589 */
24590 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24591 + addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24592 + addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24593 + addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24594 + addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24595 + addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24596
24597 - addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24598 - addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24599 + addq %rbp, level3_ident_pgt + (0*8)(%rip)
24600 +#ifndef CONFIG_XEN
24601 + addq %rbp, level3_ident_pgt + (1*8)(%rip)
24602 +#endif
24603 +
24604 + addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24605 +
24606 + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24607 + addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24608
24609 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24610 + addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24611
24612 /*
24613 * Set up the identity mapping for the switchover. These
24614 @@ -177,8 +198,8 @@ ENTRY(secondary_startup_64)
24615 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24616 1:
24617
24618 - /* Enable PAE mode and PGE */
24619 - movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24620 + /* Enable PAE mode and PSE/PGE */
24621 + movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24622 movq %rcx, %cr4
24623
24624 /* Setup early boot stage 4 level pagetables. */
24625 @@ -199,10 +220,19 @@ ENTRY(secondary_startup_64)
24626 movl $MSR_EFER, %ecx
24627 rdmsr
24628 btsl $_EFER_SCE, %eax /* Enable System Call */
24629 - btl $20,%edi /* No Execute supported? */
24630 + btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24631 jnc 1f
24632 btsl $_EFER_NX, %eax
24633 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24634 +#ifndef CONFIG_EFI
24635 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24636 +#endif
24637 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24638 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24639 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24640 + btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24641 + btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24642 + btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24643 1: wrmsr /* Make changes effective */
24644
24645 /* Setup cr0 */
24646 @@ -282,6 +312,7 @@ ENTRY(secondary_startup_64)
24647 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24648 * address given in m16:64.
24649 */
24650 + pax_set_fptr_mask
24651 movq initial_code(%rip),%rax
24652 pushq $0 # fake return address to stop unwinder
24653 pushq $__KERNEL_CS # set correct cs
24654 @@ -313,7 +344,7 @@ ENDPROC(start_cpu0)
24655 .quad INIT_PER_CPU_VAR(irq_stack_union)
24656
24657 GLOBAL(stack_start)
24658 - .quad init_thread_union+THREAD_SIZE-8
24659 + .quad init_thread_union+THREAD_SIZE-16
24660 .word 0
24661 __FINITDATA
24662
24663 @@ -391,7 +422,7 @@ ENTRY(early_idt_handler)
24664 call dump_stack
24665 #ifdef CONFIG_KALLSYMS
24666 leaq early_idt_ripmsg(%rip),%rdi
24667 - movq 40(%rsp),%rsi # %rip again
24668 + movq 88(%rsp),%rsi # %rip again
24669 call __print_symbol
24670 #endif
24671 #endif /* EARLY_PRINTK */
24672 @@ -420,6 +451,7 @@ ENDPROC(early_idt_handler)
24673 early_recursion_flag:
24674 .long 0
24675
24676 + .section .rodata,"a",@progbits
24677 #ifdef CONFIG_EARLY_PRINTK
24678 early_idt_msg:
24679 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24680 @@ -447,29 +479,52 @@ NEXT_PAGE(early_level4_pgt)
24681 NEXT_PAGE(early_dynamic_pgts)
24682 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24683
24684 - .data
24685 + .section .rodata,"a",@progbits
24686
24687 -#ifndef CONFIG_XEN
24688 NEXT_PAGE(init_level4_pgt)
24689 - .fill 512,8,0
24690 -#else
24691 -NEXT_PAGE(init_level4_pgt)
24692 - .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24693 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24694 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24695 + .org init_level4_pgt + L4_VMALLOC_START*8, 0
24696 + .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24697 + .org init_level4_pgt + L4_VMALLOC_END*8, 0
24698 + .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24699 + .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24700 + .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24701 .org init_level4_pgt + L4_START_KERNEL*8, 0
24702 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24703 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24704
24705 +#ifdef CONFIG_PAX_PER_CPU_PGD
24706 +NEXT_PAGE(cpu_pgd)
24707 + .rept 2*NR_CPUS
24708 + .fill 512,8,0
24709 + .endr
24710 +#endif
24711 +
24712 NEXT_PAGE(level3_ident_pgt)
24713 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24714 +#ifdef CONFIG_XEN
24715 .fill 511, 8, 0
24716 +#else
24717 + .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24718 + .fill 510,8,0
24719 +#endif
24720 +
24721 +NEXT_PAGE(level3_vmalloc_start_pgt)
24722 + .fill 512,8,0
24723 +
24724 +NEXT_PAGE(level3_vmalloc_end_pgt)
24725 + .fill 512,8,0
24726 +
24727 +NEXT_PAGE(level3_vmemmap_pgt)
24728 + .fill L3_VMEMMAP_START,8,0
24729 + .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24730 +
24731 NEXT_PAGE(level2_ident_pgt)
24732 - /* Since I easily can, map the first 1G.
24733 + /* Since I easily can, map the first 2G.
24734 * Don't set NX because code runs from these pages.
24735 */
24736 - PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
24737 -#endif
24738 + PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
24739
24740 NEXT_PAGE(level3_kernel_pgt)
24741 .fill L3_START_KERNEL,8,0
24742 @@ -477,6 +532,9 @@ NEXT_PAGE(level3_kernel_pgt)
24743 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
24744 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24745
24746 +NEXT_PAGE(level2_vmemmap_pgt)
24747 + .fill 512,8,0
24748 +
24749 NEXT_PAGE(level2_kernel_pgt)
24750 /*
24751 * 512 MB kernel mapping. We spend a full page on this pagetable
24752 @@ -494,28 +552,64 @@ NEXT_PAGE(level2_kernel_pgt)
24753 NEXT_PAGE(level2_fixmap_pgt)
24754 .fill 506,8,0
24755 .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24756 - /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
24757 - .fill 5,8,0
24758 + .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24759 + /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
24760 + .fill 4,8,0
24761
24762 NEXT_PAGE(level1_fixmap_pgt)
24763 .fill 512,8,0
24764
24765 +NEXT_PAGE(level1_vsyscall_pgt)
24766 + .fill 512,8,0
24767 +
24768 #undef PMDS
24769
24770 - .data
24771 + .align PAGE_SIZE
24772 +ENTRY(cpu_gdt_table)
24773 + .rept NR_CPUS
24774 + .quad 0x0000000000000000 /* NULL descriptor */
24775 + .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
24776 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
24777 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
24778 + .quad 0x00cffb000000ffff /* __USER32_CS */
24779 + .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
24780 + .quad 0x00affb000000ffff /* __USER_CS */
24781 +
24782 +#ifdef CONFIG_PAX_KERNEXEC
24783 + .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
24784 +#else
24785 + .quad 0x0 /* unused */
24786 +#endif
24787 +
24788 + .quad 0,0 /* TSS */
24789 + .quad 0,0 /* LDT */
24790 + .quad 0,0,0 /* three TLS descriptors */
24791 + .quad 0x0000f40000000000 /* node/CPU stored in limit */
24792 + /* asm/segment.h:GDT_ENTRIES must match this */
24793 +
24794 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24795 + .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
24796 +#else
24797 + .quad 0x0 /* unused */
24798 +#endif
24799 +
24800 + /* zero the remaining page */
24801 + .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
24802 + .endr
24803 +
24804 .align 16
24805 .globl early_gdt_descr
24806 early_gdt_descr:
24807 .word GDT_ENTRIES*8-1
24808 early_gdt_descr_base:
24809 - .quad INIT_PER_CPU_VAR(gdt_page)
24810 + .quad cpu_gdt_table
24811
24812 ENTRY(phys_base)
24813 /* This must match the first entry in level2_kernel_pgt */
24814 .quad 0x0000000000000000
24815
24816 #include "../../x86/xen/xen-head.S"
24817 -
24818 - __PAGE_ALIGNED_BSS
24819 +
24820 + .section .rodata,"a",@progbits
24821 NEXT_PAGE(empty_zero_page)
24822 .skip PAGE_SIZE
24823 diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
24824 index 05fd74f..c3548b1 100644
24825 --- a/arch/x86/kernel/i386_ksyms_32.c
24826 +++ b/arch/x86/kernel/i386_ksyms_32.c
24827 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
24828 EXPORT_SYMBOL(cmpxchg8b_emu);
24829 #endif
24830
24831 +EXPORT_SYMBOL_GPL(cpu_gdt_table);
24832 +
24833 /* Networking helper routines. */
24834 EXPORT_SYMBOL(csum_partial_copy_generic);
24835 +EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
24836 +EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
24837
24838 EXPORT_SYMBOL(__get_user_1);
24839 EXPORT_SYMBOL(__get_user_2);
24840 @@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
24841 EXPORT_SYMBOL(___preempt_schedule_context);
24842 #endif
24843 #endif
24844 +
24845 +#ifdef CONFIG_PAX_KERNEXEC
24846 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
24847 +#endif
24848 +
24849 +#ifdef CONFIG_PAX_PER_CPU_PGD
24850 +EXPORT_SYMBOL(cpu_pgd);
24851 +#endif
24852 diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
24853 index d5dd808..b6432cf 100644
24854 --- a/arch/x86/kernel/i387.c
24855 +++ b/arch/x86/kernel/i387.c
24856 @@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
24857 static inline bool interrupted_user_mode(void)
24858 {
24859 struct pt_regs *regs = get_irq_regs();
24860 - return regs && user_mode_vm(regs);
24861 + return regs && user_mode(regs);
24862 }
24863
24864 /*
24865 diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
24866 index 2e977b5..5f2c273 100644
24867 --- a/arch/x86/kernel/i8259.c
24868 +++ b/arch/x86/kernel/i8259.c
24869 @@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
24870 static void make_8259A_irq(unsigned int irq)
24871 {
24872 disable_irq_nosync(irq);
24873 - io_apic_irqs &= ~(1<<irq);
24874 + io_apic_irqs &= ~(1UL<<irq);
24875 irq_set_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq,
24876 i8259A_chip.name);
24877 enable_irq(irq);
24878 @@ -209,7 +209,7 @@ spurious_8259A_irq:
24879 "spurious 8259A interrupt: IRQ%d.\n", irq);
24880 spurious_irq_mask |= irqmask;
24881 }
24882 - atomic_inc(&irq_err_count);
24883 + atomic_inc_unchecked(&irq_err_count);
24884 /*
24885 * Theoretically we do not have to handle this IRQ,
24886 * but in Linux this does not cause problems and is
24887 @@ -332,14 +332,16 @@ static void init_8259A(int auto_eoi)
24888 /* (slave's support for AEOI in flat mode is to be investigated) */
24889 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
24890
24891 + pax_open_kernel();
24892 if (auto_eoi)
24893 /*
24894 * In AEOI mode we just have to mask the interrupt
24895 * when acking.
24896 */
24897 - i8259A_chip.irq_mask_ack = disable_8259A_irq;
24898 + *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
24899 else
24900 - i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
24901 + *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
24902 + pax_close_kernel();
24903
24904 udelay(100); /* wait for 8259A to initialize */
24905
24906 diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
24907 index a979b5b..1d6db75 100644
24908 --- a/arch/x86/kernel/io_delay.c
24909 +++ b/arch/x86/kernel/io_delay.c
24910 @@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
24911 * Quirk table for systems that misbehave (lock up, etc.) if port
24912 * 0x80 is used:
24913 */
24914 -static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
24915 +static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
24916 {
24917 .callback = dmi_io_delay_0xed_port,
24918 .ident = "Compaq Presario V6000",
24919 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
24920 index 4ddaf66..49d5c18 100644
24921 --- a/arch/x86/kernel/ioport.c
24922 +++ b/arch/x86/kernel/ioport.c
24923 @@ -6,6 +6,7 @@
24924 #include <linux/sched.h>
24925 #include <linux/kernel.h>
24926 #include <linux/capability.h>
24927 +#include <linux/security.h>
24928 #include <linux/errno.h>
24929 #include <linux/types.h>
24930 #include <linux/ioport.h>
24931 @@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
24932 return -EINVAL;
24933 if (turn_on && !capable(CAP_SYS_RAWIO))
24934 return -EPERM;
24935 +#ifdef CONFIG_GRKERNSEC_IO
24936 + if (turn_on && grsec_disable_privio) {
24937 + gr_handle_ioperm();
24938 + return -ENODEV;
24939 + }
24940 +#endif
24941
24942 /*
24943 * If it's the first ioperm() call in this thread's lifetime, set the
24944 @@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
24945 * because the ->io_bitmap_max value must match the bitmap
24946 * contents:
24947 */
24948 - tss = &per_cpu(init_tss, get_cpu());
24949 + tss = init_tss + get_cpu();
24950
24951 if (turn_on)
24952 bitmap_clear(t->io_bitmap_ptr, from, num);
24953 @@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
24954 if (level > old) {
24955 if (!capable(CAP_SYS_RAWIO))
24956 return -EPERM;
24957 +#ifdef CONFIG_GRKERNSEC_IO
24958 + if (grsec_disable_privio) {
24959 + gr_handle_iopl();
24960 + return -ENODEV;
24961 + }
24962 +#endif
24963 }
24964 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
24965 t->iopl = level << 12;
24966 diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
24967 index 11ccfb0..ec1e46f 100644
24968 --- a/arch/x86/kernel/irq.c
24969 +++ b/arch/x86/kernel/irq.c
24970 @@ -22,7 +22,7 @@
24971 #define CREATE_TRACE_POINTS
24972 #include <asm/trace/irq_vectors.h>
24973
24974 -atomic_t irq_err_count;
24975 +atomic_unchecked_t irq_err_count;
24976
24977 /* Function pointer for generic interrupt vector handling */
24978 void (*x86_platform_ipi_callback)(void) = NULL;
24979 @@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
24980 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
24981 seq_printf(p, " Hypervisor callback interrupts\n");
24982 #endif
24983 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
24984 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
24985 #if defined(CONFIG_X86_IO_APIC)
24986 - seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
24987 + seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
24988 #endif
24989 return 0;
24990 }
24991 @@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
24992
24993 u64 arch_irq_stat(void)
24994 {
24995 - u64 sum = atomic_read(&irq_err_count);
24996 + u64 sum = atomic_read_unchecked(&irq_err_count);
24997 return sum;
24998 }
24999
25000 diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25001 index 63ce838..2ea3e06 100644
25002 --- a/arch/x86/kernel/irq_32.c
25003 +++ b/arch/x86/kernel/irq_32.c
25004 @@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25005
25006 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25007
25008 +extern void gr_handle_kernel_exploit(void);
25009 +
25010 int sysctl_panic_on_stackoverflow __read_mostly;
25011
25012 /* Debugging check for stack overflow: is there less than 1KB free? */
25013 @@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25014 __asm__ __volatile__("andl %%esp,%0" :
25015 "=r" (sp) : "0" (THREAD_SIZE - 1));
25016
25017 - return sp < (sizeof(struct thread_info) + STACK_WARN);
25018 + return sp < STACK_WARN;
25019 }
25020
25021 static void print_stack_overflow(void)
25022 {
25023 printk(KERN_WARNING "low stack detected by irq handler\n");
25024 dump_stack();
25025 + gr_handle_kernel_exploit();
25026 if (sysctl_panic_on_stackoverflow)
25027 panic("low stack detected by irq handler - check messages\n");
25028 }
25029 @@ -84,10 +87,9 @@ static inline void *current_stack(void)
25030 static inline int
25031 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25032 {
25033 - struct irq_stack *curstk, *irqstk;
25034 + struct irq_stack *irqstk;
25035 u32 *isp, *prev_esp, arg1, arg2;
25036
25037 - curstk = (struct irq_stack *) current_stack();
25038 irqstk = __this_cpu_read(hardirq_stack);
25039
25040 /*
25041 @@ -96,15 +98,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25042 * handler) we can't do that and just have to keep using the
25043 * current stack (which is the irq stack already after all)
25044 */
25045 - if (unlikely(curstk == irqstk))
25046 + if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25047 return 0;
25048
25049 - isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25050 + isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25051
25052 /* Save the next esp at the bottom of the stack */
25053 prev_esp = (u32 *)irqstk;
25054 *prev_esp = current_stack_pointer;
25055
25056 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25057 + __set_fs(MAKE_MM_SEG(0));
25058 +#endif
25059 +
25060 if (unlikely(overflow))
25061 call_on_stack(print_stack_overflow, isp);
25062
25063 @@ -115,6 +121,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25064 : "0" (irq), "1" (desc), "2" (isp),
25065 "D" (desc->handle_irq)
25066 : "memory", "cc", "ecx");
25067 +
25068 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25069 + __set_fs(current_thread_info()->addr_limit);
25070 +#endif
25071 +
25072 return 1;
25073 }
25074
25075 @@ -123,32 +134,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25076 */
25077 void irq_ctx_init(int cpu)
25078 {
25079 - struct irq_stack *irqstk;
25080 -
25081 if (per_cpu(hardirq_stack, cpu))
25082 return;
25083
25084 - irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25085 - THREADINFO_GFP,
25086 - THREAD_SIZE_ORDER));
25087 - per_cpu(hardirq_stack, cpu) = irqstk;
25088 -
25089 - irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25090 - THREADINFO_GFP,
25091 - THREAD_SIZE_ORDER));
25092 - per_cpu(softirq_stack, cpu) = irqstk;
25093 -
25094 - printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25095 - cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25096 + per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25097 + per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25098 }
25099
25100 void do_softirq_own_stack(void)
25101 {
25102 - struct thread_info *curstk;
25103 struct irq_stack *irqstk;
25104 u32 *isp, *prev_esp;
25105
25106 - curstk = current_stack();
25107 irqstk = __this_cpu_read(softirq_stack);
25108
25109 /* build the stack frame on the softirq stack */
25110 @@ -158,7 +155,16 @@ void do_softirq_own_stack(void)
25111 prev_esp = (u32 *)irqstk;
25112 *prev_esp = current_stack_pointer;
25113
25114 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25115 + __set_fs(MAKE_MM_SEG(0));
25116 +#endif
25117 +
25118 call_on_stack(__do_softirq, isp);
25119 +
25120 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25121 + __set_fs(current_thread_info()->addr_limit);
25122 +#endif
25123 +
25124 }
25125
25126 bool handle_irq(unsigned irq, struct pt_regs *regs)
25127 @@ -172,7 +178,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25128 if (unlikely(!desc))
25129 return false;
25130
25131 - if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25132 + if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25133 if (unlikely(overflow))
25134 print_stack_overflow();
25135 desc->handle_irq(irq, desc);
25136 diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25137 index 4d1c746..55a22d6 100644
25138 --- a/arch/x86/kernel/irq_64.c
25139 +++ b/arch/x86/kernel/irq_64.c
25140 @@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25141 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25142 EXPORT_PER_CPU_SYMBOL(irq_regs);
25143
25144 +extern void gr_handle_kernel_exploit(void);
25145 +
25146 int sysctl_panic_on_stackoverflow;
25147
25148 /*
25149 @@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25150 u64 estack_top, estack_bottom;
25151 u64 curbase = (u64)task_stack_page(current);
25152
25153 - if (user_mode_vm(regs))
25154 + if (user_mode(regs))
25155 return;
25156
25157 if (regs->sp >= curbase + sizeof(struct thread_info) +
25158 @@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25159 irq_stack_top, irq_stack_bottom,
25160 estack_top, estack_bottom);
25161
25162 + gr_handle_kernel_exploit();
25163 +
25164 if (sysctl_panic_on_stackoverflow)
25165 panic("low stack detected by irq handler - check messages\n");
25166 #endif
25167 diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25168 index 26d5a55..a01160a 100644
25169 --- a/arch/x86/kernel/jump_label.c
25170 +++ b/arch/x86/kernel/jump_label.c
25171 @@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25172 * Jump label is enabled for the first time.
25173 * So we expect a default_nop...
25174 */
25175 - if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25176 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25177 != 0))
25178 bug_at((void *)entry->code, __LINE__);
25179 } else {
25180 @@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25181 * ...otherwise expect an ideal_nop. Otherwise
25182 * something went horribly wrong.
25183 */
25184 - if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25185 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25186 != 0))
25187 bug_at((void *)entry->code, __LINE__);
25188 }
25189 @@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25190 * are converting the default nop to the ideal nop.
25191 */
25192 if (init) {
25193 - if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25194 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25195 bug_at((void *)entry->code, __LINE__);
25196 } else {
25197 code.jump = 0xe9;
25198 code.offset = entry->target -
25199 (entry->code + JUMP_LABEL_NOP_SIZE);
25200 - if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25201 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25202 bug_at((void *)entry->code, __LINE__);
25203 }
25204 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25205 diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25206 index 7ec1d5f..5a7d130 100644
25207 --- a/arch/x86/kernel/kgdb.c
25208 +++ b/arch/x86/kernel/kgdb.c
25209 @@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25210 #ifdef CONFIG_X86_32
25211 switch (regno) {
25212 case GDB_SS:
25213 - if (!user_mode_vm(regs))
25214 + if (!user_mode(regs))
25215 *(unsigned long *)mem = __KERNEL_DS;
25216 break;
25217 case GDB_SP:
25218 - if (!user_mode_vm(regs))
25219 + if (!user_mode(regs))
25220 *(unsigned long *)mem = kernel_stack_pointer(regs);
25221 break;
25222 case GDB_GS:
25223 @@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25224 bp->attr.bp_addr = breakinfo[breakno].addr;
25225 bp->attr.bp_len = breakinfo[breakno].len;
25226 bp->attr.bp_type = breakinfo[breakno].type;
25227 - info->address = breakinfo[breakno].addr;
25228 + if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25229 + info->address = ktla_ktva(breakinfo[breakno].addr);
25230 + else
25231 + info->address = breakinfo[breakno].addr;
25232 info->len = breakinfo[breakno].len;
25233 info->type = breakinfo[breakno].type;
25234 val = arch_install_hw_breakpoint(bp);
25235 @@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25236 case 'k':
25237 /* clear the trace bit */
25238 linux_regs->flags &= ~X86_EFLAGS_TF;
25239 - atomic_set(&kgdb_cpu_doing_single_step, -1);
25240 + atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25241
25242 /* set the trace bit if we're stepping */
25243 if (remcomInBuffer[0] == 's') {
25244 linux_regs->flags |= X86_EFLAGS_TF;
25245 - atomic_set(&kgdb_cpu_doing_single_step,
25246 + atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25247 raw_smp_processor_id());
25248 }
25249
25250 @@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25251
25252 switch (cmd) {
25253 case DIE_DEBUG:
25254 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25255 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25256 if (user_mode(regs))
25257 return single_step_cont(regs, args);
25258 break;
25259 @@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25260 #endif /* CONFIG_DEBUG_RODATA */
25261
25262 bpt->type = BP_BREAKPOINT;
25263 - err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25264 + err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25265 BREAK_INSTR_SIZE);
25266 if (err)
25267 return err;
25268 - err = probe_kernel_write((char *)bpt->bpt_addr,
25269 + err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25270 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25271 #ifdef CONFIG_DEBUG_RODATA
25272 if (!err)
25273 @@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25274 return -EBUSY;
25275 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25276 BREAK_INSTR_SIZE);
25277 - err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25278 + err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25279 if (err)
25280 return err;
25281 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25282 @@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25283 if (mutex_is_locked(&text_mutex))
25284 goto knl_write;
25285 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25286 - err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25287 + err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25288 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25289 goto knl_write;
25290 return err;
25291 knl_write:
25292 #endif /* CONFIG_DEBUG_RODATA */
25293 - return probe_kernel_write((char *)bpt->bpt_addr,
25294 + return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25295 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25296 }
25297
25298 diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25299 index 61b17dc..784bfe9 100644
25300 --- a/arch/x86/kernel/kprobes/core.c
25301 +++ b/arch/x86/kernel/kprobes/core.c
25302 @@ -119,9 +119,12 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
25303 s32 raddr;
25304 } __packed *insn;
25305
25306 - insn = (struct __arch_relative_insn *)from;
25307 + insn = (struct __arch_relative_insn *)ktla_ktva(from);
25308 +
25309 + pax_open_kernel();
25310 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25311 insn->op = op;
25312 + pax_close_kernel();
25313 }
25314
25315 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25316 @@ -164,7 +167,7 @@ int __kprobes can_boost(kprobe_opcode_t *opcodes)
25317 kprobe_opcode_t opcode;
25318 kprobe_opcode_t *orig_opcodes = opcodes;
25319
25320 - if (search_exception_tables((unsigned long)opcodes))
25321 + if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25322 return 0; /* Page fault may occur on this address. */
25323
25324 retry:
25325 @@ -238,9 +241,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25326 * for the first byte, we can recover the original instruction
25327 * from it and kp->opcode.
25328 */
25329 - memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25330 + memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25331 buf[0] = kp->opcode;
25332 - return (unsigned long)buf;
25333 + return ktva_ktla((unsigned long)buf);
25334 }
25335
25336 /*
25337 @@ -332,7 +335,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
25338 /* Another subsystem puts a breakpoint, failed to recover */
25339 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25340 return 0;
25341 + pax_open_kernel();
25342 memcpy(dest, insn.kaddr, insn.length);
25343 + pax_close_kernel();
25344
25345 #ifdef CONFIG_X86_64
25346 if (insn_rip_relative(&insn)) {
25347 @@ -359,7 +364,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
25348 return 0;
25349 }
25350 disp = (u8 *) dest + insn_offset_displacement(&insn);
25351 + pax_open_kernel();
25352 *(s32 *) disp = (s32) newdisp;
25353 + pax_close_kernel();
25354 }
25355 #endif
25356 return insn.length;
25357 @@ -498,7 +505,7 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
25358 * nor set current_kprobe, because it doesn't use single
25359 * stepping.
25360 */
25361 - regs->ip = (unsigned long)p->ainsn.insn;
25362 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25363 preempt_enable_no_resched();
25364 return;
25365 }
25366 @@ -515,9 +522,9 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
25367 regs->flags &= ~X86_EFLAGS_IF;
25368 /* single step inline if the instruction is an int3 */
25369 if (p->opcode == BREAKPOINT_INSTRUCTION)
25370 - regs->ip = (unsigned long)p->addr;
25371 + regs->ip = ktla_ktva((unsigned long)p->addr);
25372 else
25373 - regs->ip = (unsigned long)p->ainsn.insn;
25374 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25375 }
25376
25377 /*
25378 @@ -596,7 +603,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
25379 setup_singlestep(p, regs, kcb, 0);
25380 return 1;
25381 }
25382 - } else if (*addr != BREAKPOINT_INSTRUCTION) {
25383 + } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25384 /*
25385 * The breakpoint instruction was removed right
25386 * after we hit it. Another cpu has removed
25387 @@ -642,6 +649,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
25388 " movq %rax, 152(%rsp)\n"
25389 RESTORE_REGS_STRING
25390 " popfq\n"
25391 +#ifdef KERNEXEC_PLUGIN
25392 + " btsq $63,(%rsp)\n"
25393 +#endif
25394 #else
25395 " pushf\n"
25396 SAVE_REGS_STRING
25397 @@ -779,7 +789,7 @@ static void __kprobes
25398 resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
25399 {
25400 unsigned long *tos = stack_addr(regs);
25401 - unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25402 + unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25403 unsigned long orig_ip = (unsigned long)p->addr;
25404 kprobe_opcode_t *insn = p->ainsn.insn;
25405
25406 @@ -959,7 +969,7 @@ kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *d
25407 struct die_args *args = data;
25408 int ret = NOTIFY_DONE;
25409
25410 - if (args->regs && user_mode_vm(args->regs))
25411 + if (args->regs && user_mode(args->regs))
25412 return ret;
25413
25414 switch (val) {
25415 diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25416 index 898160b..758cde8 100644
25417 --- a/arch/x86/kernel/kprobes/opt.c
25418 +++ b/arch/x86/kernel/kprobes/opt.c
25419 @@ -79,6 +79,7 @@ found:
25420 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25421 static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25422 {
25423 + pax_open_kernel();
25424 #ifdef CONFIG_X86_64
25425 *addr++ = 0x48;
25426 *addr++ = 0xbf;
25427 @@ -86,6 +87,7 @@ static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long v
25428 *addr++ = 0xb8;
25429 #endif
25430 *(unsigned long *)addr = val;
25431 + pax_close_kernel();
25432 }
25433
25434 asm (
25435 @@ -335,7 +337,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25436 * Verify if the address gap is in 2GB range, because this uses
25437 * a relative jump.
25438 */
25439 - rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25440 + rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25441 if (abs(rel) > 0x7fffffff)
25442 return -ERANGE;
25443
25444 @@ -350,16 +352,18 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25445 op->optinsn.size = ret;
25446
25447 /* Copy arch-dep-instance from template */
25448 - memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25449 + pax_open_kernel();
25450 + memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25451 + pax_close_kernel();
25452
25453 /* Set probe information */
25454 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25455
25456 /* Set probe function call */
25457 - synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25458 + synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25459
25460 /* Set returning jmp instruction at the tail of out-of-line buffer */
25461 - synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25462 + synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25463 (u8 *)op->kp.addr + op->optinsn.size);
25464
25465 flush_icache_range((unsigned long) buf,
25466 @@ -384,7 +388,7 @@ void __kprobes arch_optimize_kprobes(struct list_head *oplist)
25467 WARN_ON(kprobe_disabled(&op->kp));
25468
25469 /* Backup instructions which will be replaced by jump address */
25470 - memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25471 + memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25472 RELATIVE_ADDR_SIZE);
25473
25474 insn_buf[0] = RELATIVEJUMP_OPCODE;
25475 @@ -433,7 +437,7 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25476 /* This kprobe is really able to run optimized path. */
25477 op = container_of(p, struct optimized_kprobe, kp);
25478 /* Detour through copied instructions */
25479 - regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25480 + regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25481 if (!reenter)
25482 reset_current_kprobe();
25483 preempt_enable_no_resched();
25484 diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25485 index c2bedae..25e7ab60 100644
25486 --- a/arch/x86/kernel/ksysfs.c
25487 +++ b/arch/x86/kernel/ksysfs.c
25488 @@ -184,7 +184,7 @@ out:
25489
25490 static struct kobj_attribute type_attr = __ATTR_RO(type);
25491
25492 -static struct bin_attribute data_attr = {
25493 +static bin_attribute_no_const data_attr __read_only = {
25494 .attr = {
25495 .name = "data",
25496 .mode = S_IRUGO,
25497 diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25498 index dcbbaa1..81ae763 100644
25499 --- a/arch/x86/kernel/ldt.c
25500 +++ b/arch/x86/kernel/ldt.c
25501 @@ -68,13 +68,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25502 if (reload) {
25503 #ifdef CONFIG_SMP
25504 preempt_disable();
25505 - load_LDT(pc);
25506 + load_LDT_nolock(pc);
25507 if (!cpumask_equal(mm_cpumask(current->mm),
25508 cpumask_of(smp_processor_id())))
25509 smp_call_function(flush_ldt, current->mm, 1);
25510 preempt_enable();
25511 #else
25512 - load_LDT(pc);
25513 + load_LDT_nolock(pc);
25514 #endif
25515 }
25516 if (oldsize) {
25517 @@ -96,7 +96,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25518 return err;
25519
25520 for (i = 0; i < old->size; i++)
25521 - write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25522 + write_ldt_entry(new->ldt, i, old->ldt + i);
25523 return 0;
25524 }
25525
25526 @@ -117,6 +117,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25527 retval = copy_ldt(&mm->context, &old_mm->context);
25528 mutex_unlock(&old_mm->context.lock);
25529 }
25530 +
25531 + if (tsk == current) {
25532 + mm->context.vdso = 0;
25533 +
25534 +#ifdef CONFIG_X86_32
25535 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25536 + mm->context.user_cs_base = 0UL;
25537 + mm->context.user_cs_limit = ~0UL;
25538 +
25539 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25540 + cpus_clear(mm->context.cpu_user_cs_mask);
25541 +#endif
25542 +
25543 +#endif
25544 +#endif
25545 +
25546 + }
25547 +
25548 return retval;
25549 }
25550
25551 @@ -231,6 +249,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25552 }
25553 }
25554
25555 +#ifdef CONFIG_PAX_SEGMEXEC
25556 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25557 + error = -EINVAL;
25558 + goto out_unlock;
25559 + }
25560 +#endif
25561 +
25562 /*
25563 * On x86-64 we do not support 16-bit segments due to
25564 * IRET leaking the high bits of the kernel stack address.
25565 diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25566 index 1667b1d..16492c5 100644
25567 --- a/arch/x86/kernel/machine_kexec_32.c
25568 +++ b/arch/x86/kernel/machine_kexec_32.c
25569 @@ -25,7 +25,7 @@
25570 #include <asm/cacheflush.h>
25571 #include <asm/debugreg.h>
25572
25573 -static void set_idt(void *newidt, __u16 limit)
25574 +static void set_idt(struct desc_struct *newidt, __u16 limit)
25575 {
25576 struct desc_ptr curidt;
25577
25578 @@ -37,7 +37,7 @@ static void set_idt(void *newidt, __u16 limit)
25579 }
25580
25581
25582 -static void set_gdt(void *newgdt, __u16 limit)
25583 +static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25584 {
25585 struct desc_ptr curgdt;
25586
25587 @@ -215,7 +215,7 @@ void machine_kexec(struct kimage *image)
25588 }
25589
25590 control_page = page_address(image->control_code_page);
25591 - memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25592 + memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25593
25594 relocate_kernel_ptr = control_page;
25595 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25596 diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25597 index e69f988..da078ea 100644
25598 --- a/arch/x86/kernel/module.c
25599 +++ b/arch/x86/kernel/module.c
25600 @@ -81,17 +81,62 @@ static unsigned long int get_module_load_offset(void)
25601 }
25602 #endif
25603
25604 -void *module_alloc(unsigned long size)
25605 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
25606 {
25607 - if (PAGE_ALIGN(size) > MODULES_LEN)
25608 + if (!size || PAGE_ALIGN(size) > MODULES_LEN)
25609 return NULL;
25610 return __vmalloc_node_range(size, 1,
25611 MODULES_VADDR + get_module_load_offset(),
25612 - MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
25613 - PAGE_KERNEL_EXEC, NUMA_NO_NODE,
25614 + MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
25615 + prot, NUMA_NO_NODE,
25616 __builtin_return_address(0));
25617 }
25618
25619 +void *module_alloc(unsigned long size)
25620 +{
25621 +
25622 +#ifdef CONFIG_PAX_KERNEXEC
25623 + return __module_alloc(size, PAGE_KERNEL);
25624 +#else
25625 + return __module_alloc(size, PAGE_KERNEL_EXEC);
25626 +#endif
25627 +
25628 +}
25629 +
25630 +#ifdef CONFIG_PAX_KERNEXEC
25631 +#ifdef CONFIG_X86_32
25632 +void *module_alloc_exec(unsigned long size)
25633 +{
25634 + struct vm_struct *area;
25635 +
25636 + if (size == 0)
25637 + return NULL;
25638 +
25639 + area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
25640 +return area ? area->addr : NULL;
25641 +}
25642 +EXPORT_SYMBOL(module_alloc_exec);
25643 +
25644 +void module_free_exec(struct module *mod, void *module_region)
25645 +{
25646 + vunmap(module_region);
25647 +}
25648 +EXPORT_SYMBOL(module_free_exec);
25649 +#else
25650 +void module_free_exec(struct module *mod, void *module_region)
25651 +{
25652 + module_free(mod, module_region);
25653 +}
25654 +EXPORT_SYMBOL(module_free_exec);
25655 +
25656 +void *module_alloc_exec(unsigned long size)
25657 +{
25658 + return __module_alloc(size, PAGE_KERNEL_RX);
25659 +}
25660 +EXPORT_SYMBOL(module_alloc_exec);
25661 +#endif
25662 +#endif
25663 +
25664 #ifdef CONFIG_X86_32
25665 int apply_relocate(Elf32_Shdr *sechdrs,
25666 const char *strtab,
25667 @@ -102,14 +147,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
25668 unsigned int i;
25669 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
25670 Elf32_Sym *sym;
25671 - uint32_t *location;
25672 + uint32_t *plocation, location;
25673
25674 DEBUGP("Applying relocate section %u to %u\n",
25675 relsec, sechdrs[relsec].sh_info);
25676 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
25677 /* This is where to make the change */
25678 - location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
25679 - + rel[i].r_offset;
25680 + plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
25681 + location = (uint32_t)plocation;
25682 + if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
25683 + plocation = ktla_ktva((void *)plocation);
25684 /* This is the symbol it is referring to. Note that all
25685 undefined symbols have been resolved. */
25686 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
25687 @@ -118,11 +165,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
25688 switch (ELF32_R_TYPE(rel[i].r_info)) {
25689 case R_386_32:
25690 /* We add the value into the location given */
25691 - *location += sym->st_value;
25692 + pax_open_kernel();
25693 + *plocation += sym->st_value;
25694 + pax_close_kernel();
25695 break;
25696 case R_386_PC32:
25697 /* Add the value, subtract its position */
25698 - *location += sym->st_value - (uint32_t)location;
25699 + pax_open_kernel();
25700 + *plocation += sym->st_value - location;
25701 + pax_close_kernel();
25702 break;
25703 default:
25704 pr_err("%s: Unknown relocation: %u\n",
25705 @@ -167,21 +218,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
25706 case R_X86_64_NONE:
25707 break;
25708 case R_X86_64_64:
25709 + pax_open_kernel();
25710 *(u64 *)loc = val;
25711 + pax_close_kernel();
25712 break;
25713 case R_X86_64_32:
25714 + pax_open_kernel();
25715 *(u32 *)loc = val;
25716 + pax_close_kernel();
25717 if (val != *(u32 *)loc)
25718 goto overflow;
25719 break;
25720 case R_X86_64_32S:
25721 + pax_open_kernel();
25722 *(s32 *)loc = val;
25723 + pax_close_kernel();
25724 if ((s64)val != *(s32 *)loc)
25725 goto overflow;
25726 break;
25727 case R_X86_64_PC32:
25728 val -= (u64)loc;
25729 + pax_open_kernel();
25730 *(u32 *)loc = val;
25731 + pax_close_kernel();
25732 +
25733 #if 0
25734 if ((s64)val != *(s32 *)loc)
25735 goto overflow;
25736 diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
25737 index c9603ac..9f88728 100644
25738 --- a/arch/x86/kernel/msr.c
25739 +++ b/arch/x86/kernel/msr.c
25740 @@ -37,6 +37,7 @@
25741 #include <linux/notifier.h>
25742 #include <linux/uaccess.h>
25743 #include <linux/gfp.h>
25744 +#include <linux/grsecurity.h>
25745
25746 #include <asm/processor.h>
25747 #include <asm/msr.h>
25748 @@ -103,6 +104,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
25749 int err = 0;
25750 ssize_t bytes = 0;
25751
25752 +#ifdef CONFIG_GRKERNSEC_KMEM
25753 + gr_handle_msr_write();
25754 + return -EPERM;
25755 +#endif
25756 +
25757 if (count % 8)
25758 return -EINVAL; /* Invalid chunk size */
25759
25760 @@ -150,6 +156,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
25761 err = -EBADF;
25762 break;
25763 }
25764 +#ifdef CONFIG_GRKERNSEC_KMEM
25765 + gr_handle_msr_write();
25766 + return -EPERM;
25767 +#endif
25768 if (copy_from_user(&regs, uregs, sizeof regs)) {
25769 err = -EFAULT;
25770 break;
25771 @@ -233,7 +243,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
25772 return notifier_from_errno(err);
25773 }
25774
25775 -static struct notifier_block __refdata msr_class_cpu_notifier = {
25776 +static struct notifier_block msr_class_cpu_notifier = {
25777 .notifier_call = msr_class_cpu_callback,
25778 };
25779
25780 diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
25781 index b4872b9..5bf0684 100644
25782 --- a/arch/x86/kernel/nmi.c
25783 +++ b/arch/x86/kernel/nmi.c
25784 @@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
25785
25786 static void nmi_max_handler(struct irq_work *w)
25787 {
25788 - struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
25789 + struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
25790 int remainder_ns, decimal_msecs;
25791 - u64 whole_msecs = ACCESS_ONCE(a->max_duration);
25792 + u64 whole_msecs = ACCESS_ONCE(n->max_duration);
25793
25794 remainder_ns = do_div(whole_msecs, (1000 * 1000));
25795 decimal_msecs = remainder_ns / 1000;
25796
25797 printk_ratelimited(KERN_INFO
25798 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
25799 - a->handler, whole_msecs, decimal_msecs);
25800 + n->action->handler, whole_msecs, decimal_msecs);
25801 }
25802
25803 static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
25804 @@ -134,11 +134,11 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
25805 delta = sched_clock() - delta;
25806 trace_nmi_handler(a->handler, (int)delta, thishandled);
25807
25808 - if (delta < nmi_longest_ns || delta < a->max_duration)
25809 + if (delta < nmi_longest_ns || delta < a->work->max_duration)
25810 continue;
25811
25812 - a->max_duration = delta;
25813 - irq_work_queue(&a->irq_work);
25814 + a->work->max_duration = delta;
25815 + irq_work_queue(&a->work->irq_work);
25816 }
25817
25818 rcu_read_unlock();
25819 @@ -147,7 +147,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
25820 return handled;
25821 }
25822
25823 -int __register_nmi_handler(unsigned int type, struct nmiaction *action)
25824 +int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
25825 {
25826 struct nmi_desc *desc = nmi_to_desc(type);
25827 unsigned long flags;
25828 @@ -155,7 +155,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
25829 if (!action->handler)
25830 return -EINVAL;
25831
25832 - init_irq_work(&action->irq_work, nmi_max_handler);
25833 + action->work->action = action;
25834 + init_irq_work(&action->work->irq_work, nmi_max_handler);
25835
25836 spin_lock_irqsave(&desc->lock, flags);
25837
25838 @@ -173,9 +174,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
25839 * event confuses some handlers (kdump uses this flag)
25840 */
25841 if (action->flags & NMI_FLAG_FIRST)
25842 - list_add_rcu(&action->list, &desc->head);
25843 + pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
25844 else
25845 - list_add_tail_rcu(&action->list, &desc->head);
25846 + pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
25847
25848 spin_unlock_irqrestore(&desc->lock, flags);
25849 return 0;
25850 @@ -198,7 +199,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
25851 if (!strcmp(n->name, name)) {
25852 WARN(in_nmi(),
25853 "Trying to free NMI (%s) from NMI context!\n", n->name);
25854 - list_del_rcu(&n->list);
25855 + pax_list_del_rcu((struct list_head *)&n->list);
25856 break;
25857 }
25858 }
25859 @@ -523,6 +524,17 @@ static inline void nmi_nesting_postprocess(void)
25860 dotraplinkage notrace __kprobes void
25861 do_nmi(struct pt_regs *regs, long error_code)
25862 {
25863 +
25864 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
25865 + if (!user_mode(regs)) {
25866 + unsigned long cs = regs->cs & 0xFFFF;
25867 + unsigned long ip = ktva_ktla(regs->ip);
25868 +
25869 + if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
25870 + regs->ip = ip;
25871 + }
25872 +#endif
25873 +
25874 nmi_nesting_preprocess(regs);
25875
25876 nmi_enter();
25877 diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
25878 index 6d9582e..f746287 100644
25879 --- a/arch/x86/kernel/nmi_selftest.c
25880 +++ b/arch/x86/kernel/nmi_selftest.c
25881 @@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
25882 {
25883 /* trap all the unknown NMIs we may generate */
25884 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
25885 - __initdata);
25886 + __initconst);
25887 }
25888
25889 static void __init cleanup_nmi_testsuite(void)
25890 @@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
25891 unsigned long timeout;
25892
25893 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
25894 - NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
25895 + NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
25896 nmi_fail = FAILURE;
25897 return;
25898 }
25899 diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
25900 index bbb6c73..24a58ef 100644
25901 --- a/arch/x86/kernel/paravirt-spinlocks.c
25902 +++ b/arch/x86/kernel/paravirt-spinlocks.c
25903 @@ -8,7 +8,7 @@
25904
25905 #include <asm/paravirt.h>
25906
25907 -struct pv_lock_ops pv_lock_ops = {
25908 +struct pv_lock_ops pv_lock_ops __read_only = {
25909 #ifdef CONFIG_SMP
25910 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
25911 .unlock_kick = paravirt_nop,
25912 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
25913 index 1b10af8..45bfbec 100644
25914 --- a/arch/x86/kernel/paravirt.c
25915 +++ b/arch/x86/kernel/paravirt.c
25916 @@ -55,6 +55,9 @@ u64 _paravirt_ident_64(u64 x)
25917 {
25918 return x;
25919 }
25920 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25921 +PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
25922 +#endif
25923
25924 void __init default_banner(void)
25925 {
25926 @@ -141,16 +144,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
25927
25928 if (opfunc == NULL)
25929 /* If there's no function, patch it with a ud2a (BUG) */
25930 - ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
25931 - else if (opfunc == _paravirt_nop)
25932 + ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
25933 + else if (opfunc == (void *)_paravirt_nop)
25934 /* If the operation is a nop, then nop the callsite */
25935 ret = paravirt_patch_nop();
25936
25937 /* identity functions just return their single argument */
25938 - else if (opfunc == _paravirt_ident_32)
25939 + else if (opfunc == (void *)_paravirt_ident_32)
25940 ret = paravirt_patch_ident_32(insnbuf, len);
25941 - else if (opfunc == _paravirt_ident_64)
25942 + else if (opfunc == (void *)_paravirt_ident_64)
25943 ret = paravirt_patch_ident_64(insnbuf, len);
25944 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25945 + else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
25946 + ret = paravirt_patch_ident_64(insnbuf, len);
25947 +#endif
25948
25949 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
25950 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
25951 @@ -175,7 +182,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
25952 if (insn_len > len || start == NULL)
25953 insn_len = len;
25954 else
25955 - memcpy(insnbuf, start, insn_len);
25956 + memcpy(insnbuf, ktla_ktva(start), insn_len);
25957
25958 return insn_len;
25959 }
25960 @@ -299,7 +306,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
25961 return this_cpu_read(paravirt_lazy_mode);
25962 }
25963
25964 -struct pv_info pv_info = {
25965 +struct pv_info pv_info __read_only = {
25966 .name = "bare hardware",
25967 .paravirt_enabled = 0,
25968 .kernel_rpl = 0,
25969 @@ -310,16 +317,16 @@ struct pv_info pv_info = {
25970 #endif
25971 };
25972
25973 -struct pv_init_ops pv_init_ops = {
25974 +struct pv_init_ops pv_init_ops __read_only = {
25975 .patch = native_patch,
25976 };
25977
25978 -struct pv_time_ops pv_time_ops = {
25979 +struct pv_time_ops pv_time_ops __read_only = {
25980 .sched_clock = native_sched_clock,
25981 .steal_clock = native_steal_clock,
25982 };
25983
25984 -__visible struct pv_irq_ops pv_irq_ops = {
25985 +__visible struct pv_irq_ops pv_irq_ops __read_only = {
25986 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
25987 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
25988 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
25989 @@ -331,7 +338,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
25990 #endif
25991 };
25992
25993 -__visible struct pv_cpu_ops pv_cpu_ops = {
25994 +__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
25995 .cpuid = native_cpuid,
25996 .get_debugreg = native_get_debugreg,
25997 .set_debugreg = native_set_debugreg,
25998 @@ -389,21 +396,26 @@ __visible struct pv_cpu_ops pv_cpu_ops = {
25999 .end_context_switch = paravirt_nop,
26000 };
26001
26002 -struct pv_apic_ops pv_apic_ops = {
26003 +struct pv_apic_ops pv_apic_ops __read_only= {
26004 #ifdef CONFIG_X86_LOCAL_APIC
26005 .startup_ipi_hook = paravirt_nop,
26006 #endif
26007 };
26008
26009 -#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26010 +#ifdef CONFIG_X86_32
26011 +#ifdef CONFIG_X86_PAE
26012 +/* 64-bit pagetable entries */
26013 +#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26014 +#else
26015 /* 32-bit pagetable entries */
26016 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26017 +#endif
26018 #else
26019 /* 64-bit pagetable entries */
26020 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26021 #endif
26022
26023 -struct pv_mmu_ops pv_mmu_ops = {
26024 +struct pv_mmu_ops pv_mmu_ops __read_only = {
26025
26026 .read_cr2 = native_read_cr2,
26027 .write_cr2 = native_write_cr2,
26028 @@ -453,6 +465,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26029 .make_pud = PTE_IDENT,
26030
26031 .set_pgd = native_set_pgd,
26032 + .set_pgd_batched = native_set_pgd_batched,
26033 #endif
26034 #endif /* PAGETABLE_LEVELS >= 3 */
26035
26036 @@ -473,6 +486,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26037 },
26038
26039 .set_fixmap = native_set_fixmap,
26040 +
26041 +#ifdef CONFIG_PAX_KERNEXEC
26042 + .pax_open_kernel = native_pax_open_kernel,
26043 + .pax_close_kernel = native_pax_close_kernel,
26044 +#endif
26045 +
26046 };
26047
26048 EXPORT_SYMBOL_GPL(pv_time_ops);
26049 diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26050 index 0497f71..7186c0d 100644
26051 --- a/arch/x86/kernel/pci-calgary_64.c
26052 +++ b/arch/x86/kernel/pci-calgary_64.c
26053 @@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26054 tce_space = be64_to_cpu(readq(target));
26055 tce_space = tce_space & TAR_SW_BITS;
26056
26057 - tce_space = tce_space & (~specified_table_size);
26058 + tce_space = tce_space & (~(unsigned long)specified_table_size);
26059 info->tce_space = (u64 *)__va(tce_space);
26060 }
26061 }
26062 diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26063 index 35ccf75..7a15747 100644
26064 --- a/arch/x86/kernel/pci-iommu_table.c
26065 +++ b/arch/x86/kernel/pci-iommu_table.c
26066 @@ -2,7 +2,7 @@
26067 #include <asm/iommu_table.h>
26068 #include <linux/string.h>
26069 #include <linux/kallsyms.h>
26070 -
26071 +#include <linux/sched.h>
26072
26073 #define DEBUG 1
26074
26075 diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26076 index 6c483ba..d10ce2f 100644
26077 --- a/arch/x86/kernel/pci-swiotlb.c
26078 +++ b/arch/x86/kernel/pci-swiotlb.c
26079 @@ -32,7 +32,7 @@ static void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26080 void *vaddr, dma_addr_t dma_addr,
26081 struct dma_attrs *attrs)
26082 {
26083 - swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26084 + swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26085 }
26086
26087 static struct dma_map_ops swiotlb_dma_ops = {
26088 diff --git a/arch/x86/kernel/preempt.S b/arch/x86/kernel/preempt.S
26089 index ca7f0d5..8996469 100644
26090 --- a/arch/x86/kernel/preempt.S
26091 +++ b/arch/x86/kernel/preempt.S
26092 @@ -3,12 +3,14 @@
26093 #include <asm/dwarf2.h>
26094 #include <asm/asm.h>
26095 #include <asm/calling.h>
26096 +#include <asm/alternative-asm.h>
26097
26098 ENTRY(___preempt_schedule)
26099 CFI_STARTPROC
26100 SAVE_ALL
26101 call preempt_schedule
26102 RESTORE_ALL
26103 + pax_force_retaddr
26104 ret
26105 CFI_ENDPROC
26106
26107 @@ -19,6 +21,7 @@ ENTRY(___preempt_schedule_context)
26108 SAVE_ALL
26109 call preempt_schedule_context
26110 RESTORE_ALL
26111 + pax_force_retaddr
26112 ret
26113 CFI_ENDPROC
26114
26115 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26116 index 4505e2a..ae28b0d 100644
26117 --- a/arch/x86/kernel/process.c
26118 +++ b/arch/x86/kernel/process.c
26119 @@ -36,7 +36,8 @@
26120 * section. Since TSS's are completely CPU-local, we want them
26121 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26122 */
26123 -__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26124 +struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26125 +EXPORT_SYMBOL(init_tss);
26126
26127 #ifdef CONFIG_X86_64
26128 static DEFINE_PER_CPU(unsigned char, is_idle);
26129 @@ -92,7 +93,7 @@ void arch_task_cache_init(void)
26130 task_xstate_cachep =
26131 kmem_cache_create("task_xstate", xstate_size,
26132 __alignof__(union thread_xstate),
26133 - SLAB_PANIC | SLAB_NOTRACK, NULL);
26134 + SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26135 }
26136
26137 /*
26138 @@ -105,7 +106,7 @@ void exit_thread(void)
26139 unsigned long *bp = t->io_bitmap_ptr;
26140
26141 if (bp) {
26142 - struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26143 + struct tss_struct *tss = init_tss + get_cpu();
26144
26145 t->io_bitmap_ptr = NULL;
26146 clear_thread_flag(TIF_IO_BITMAP);
26147 @@ -125,6 +126,9 @@ void flush_thread(void)
26148 {
26149 struct task_struct *tsk = current;
26150
26151 +#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26152 + loadsegment(gs, 0);
26153 +#endif
26154 flush_ptrace_hw_breakpoint(tsk);
26155 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26156 drop_init_fpu(tsk);
26157 @@ -271,7 +275,7 @@ static void __exit_idle(void)
26158 void exit_idle(void)
26159 {
26160 /* idle loop has pid 0 */
26161 - if (current->pid)
26162 + if (task_pid_nr(current))
26163 return;
26164 __exit_idle();
26165 }
26166 @@ -324,7 +328,7 @@ bool xen_set_default_idle(void)
26167 return ret;
26168 }
26169 #endif
26170 -void stop_this_cpu(void *dummy)
26171 +__noreturn void stop_this_cpu(void *dummy)
26172 {
26173 local_irq_disable();
26174 /*
26175 @@ -453,16 +457,37 @@ static int __init idle_setup(char *str)
26176 }
26177 early_param("idle", idle_setup);
26178
26179 -unsigned long arch_align_stack(unsigned long sp)
26180 +#ifdef CONFIG_PAX_RANDKSTACK
26181 +void pax_randomize_kstack(struct pt_regs *regs)
26182 {
26183 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26184 - sp -= get_random_int() % 8192;
26185 - return sp & ~0xf;
26186 -}
26187 + struct thread_struct *thread = &current->thread;
26188 + unsigned long time;
26189
26190 -unsigned long arch_randomize_brk(struct mm_struct *mm)
26191 -{
26192 - unsigned long range_end = mm->brk + 0x02000000;
26193 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26194 -}
26195 + if (!randomize_va_space)
26196 + return;
26197 +
26198 + if (v8086_mode(regs))
26199 + return;
26200
26201 + rdtscl(time);
26202 +
26203 + /* P4 seems to return a 0 LSB, ignore it */
26204 +#ifdef CONFIG_MPENTIUM4
26205 + time &= 0x3EUL;
26206 + time <<= 2;
26207 +#elif defined(CONFIG_X86_64)
26208 + time &= 0xFUL;
26209 + time <<= 4;
26210 +#else
26211 + time &= 0x1FUL;
26212 + time <<= 3;
26213 +#endif
26214 +
26215 + thread->sp0 ^= time;
26216 + load_sp0(init_tss + smp_processor_id(), thread);
26217 +
26218 +#ifdef CONFIG_X86_64
26219 + this_cpu_write(kernel_stack, thread->sp0);
26220 +#endif
26221 +}
26222 +#endif
26223 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26224 index 7bc86bb..0ea06e8 100644
26225 --- a/arch/x86/kernel/process_32.c
26226 +++ b/arch/x86/kernel/process_32.c
26227 @@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26228 unsigned long thread_saved_pc(struct task_struct *tsk)
26229 {
26230 return ((unsigned long *)tsk->thread.sp)[3];
26231 +//XXX return tsk->thread.eip;
26232 }
26233
26234 void __show_regs(struct pt_regs *regs, int all)
26235 @@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26236 unsigned long sp;
26237 unsigned short ss, gs;
26238
26239 - if (user_mode_vm(regs)) {
26240 + if (user_mode(regs)) {
26241 sp = regs->sp;
26242 ss = regs->ss & 0xffff;
26243 - gs = get_user_gs(regs);
26244 } else {
26245 sp = kernel_stack_pointer(regs);
26246 savesegment(ss, ss);
26247 - savesegment(gs, gs);
26248 }
26249 + gs = get_user_gs(regs);
26250
26251 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26252 (u16)regs->cs, regs->ip, regs->flags,
26253 - smp_processor_id());
26254 + raw_smp_processor_id());
26255 print_symbol("EIP is at %s\n", regs->ip);
26256
26257 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26258 @@ -132,20 +132,21 @@ void release_thread(struct task_struct *dead_task)
26259 int copy_thread(unsigned long clone_flags, unsigned long sp,
26260 unsigned long arg, struct task_struct *p)
26261 {
26262 - struct pt_regs *childregs = task_pt_regs(p);
26263 + struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26264 struct task_struct *tsk;
26265 int err;
26266
26267 p->thread.sp = (unsigned long) childregs;
26268 p->thread.sp0 = (unsigned long) (childregs+1);
26269 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
26270
26271 if (unlikely(p->flags & PF_KTHREAD)) {
26272 /* kernel thread */
26273 memset(childregs, 0, sizeof(struct pt_regs));
26274 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26275 - task_user_gs(p) = __KERNEL_STACK_CANARY;
26276 - childregs->ds = __USER_DS;
26277 - childregs->es = __USER_DS;
26278 + savesegment(gs, childregs->gs);
26279 + childregs->ds = __KERNEL_DS;
26280 + childregs->es = __KERNEL_DS;
26281 childregs->fs = __KERNEL_PERCPU;
26282 childregs->bx = sp; /* function */
26283 childregs->bp = arg;
26284 @@ -252,7 +253,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26285 struct thread_struct *prev = &prev_p->thread,
26286 *next = &next_p->thread;
26287 int cpu = smp_processor_id();
26288 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
26289 + struct tss_struct *tss = init_tss + cpu;
26290 fpu_switch_t fpu;
26291
26292 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26293 @@ -276,6 +277,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26294 */
26295 lazy_save_gs(prev->gs);
26296
26297 +#ifdef CONFIG_PAX_MEMORY_UDEREF
26298 + __set_fs(task_thread_info(next_p)->addr_limit);
26299 +#endif
26300 +
26301 /*
26302 * Load the per-thread Thread-Local Storage descriptor.
26303 */
26304 @@ -314,9 +319,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26305 */
26306 arch_end_context_switch(next_p);
26307
26308 - this_cpu_write(kernel_stack,
26309 - (unsigned long)task_stack_page(next_p) +
26310 - THREAD_SIZE - KERNEL_STACK_OFFSET);
26311 + this_cpu_write(current_task, next_p);
26312 + this_cpu_write(current_tinfo, &next_p->tinfo);
26313 + this_cpu_write(kernel_stack, next->sp0);
26314
26315 /*
26316 * Restore %gs if needed (which is common)
26317 @@ -326,8 +331,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26318
26319 switch_fpu_finish(next_p, fpu);
26320
26321 - this_cpu_write(current_task, next_p);
26322 -
26323 return prev_p;
26324 }
26325
26326 @@ -357,4 +360,3 @@ unsigned long get_wchan(struct task_struct *p)
26327 } while (count++ < 16);
26328 return 0;
26329 }
26330 -
26331 diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26332 index 898d077..4c458ff 100644
26333 --- a/arch/x86/kernel/process_64.c
26334 +++ b/arch/x86/kernel/process_64.c
26335 @@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26336 struct pt_regs *childregs;
26337 struct task_struct *me = current;
26338
26339 - p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26340 + p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26341 childregs = task_pt_regs(p);
26342 p->thread.sp = (unsigned long) childregs;
26343 p->thread.usersp = me->thread.usersp;
26344 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
26345 set_tsk_thread_flag(p, TIF_FORK);
26346 p->thread.fpu_counter = 0;
26347 p->thread.io_bitmap_ptr = NULL;
26348 @@ -172,6 +173,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26349 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26350 savesegment(es, p->thread.es);
26351 savesegment(ds, p->thread.ds);
26352 + savesegment(ss, p->thread.ss);
26353 + BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26354 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26355
26356 if (unlikely(p->flags & PF_KTHREAD)) {
26357 @@ -280,7 +283,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26358 struct thread_struct *prev = &prev_p->thread;
26359 struct thread_struct *next = &next_p->thread;
26360 int cpu = smp_processor_id();
26361 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
26362 + struct tss_struct *tss = init_tss + cpu;
26363 unsigned fsindex, gsindex;
26364 fpu_switch_t fpu;
26365
26366 @@ -303,6 +306,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26367 if (unlikely(next->ds | prev->ds))
26368 loadsegment(ds, next->ds);
26369
26370 + savesegment(ss, prev->ss);
26371 + if (unlikely(next->ss != prev->ss))
26372 + loadsegment(ss, next->ss);
26373
26374 /* We must save %fs and %gs before load_TLS() because
26375 * %fs and %gs may be cleared by load_TLS().
26376 @@ -362,6 +368,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26377 prev->usersp = this_cpu_read(old_rsp);
26378 this_cpu_write(old_rsp, next->usersp);
26379 this_cpu_write(current_task, next_p);
26380 + this_cpu_write(current_tinfo, &next_p->tinfo);
26381
26382 /*
26383 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26384 @@ -371,9 +378,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26385 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26386 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26387
26388 - this_cpu_write(kernel_stack,
26389 - (unsigned long)task_stack_page(next_p) +
26390 - THREAD_SIZE - KERNEL_STACK_OFFSET);
26391 + this_cpu_write(kernel_stack, next->sp0);
26392
26393 /*
26394 * Now maybe reload the debug registers and handle I/O bitmaps
26395 @@ -442,12 +447,11 @@ unsigned long get_wchan(struct task_struct *p)
26396 if (!p || p == current || p->state == TASK_RUNNING)
26397 return 0;
26398 stack = (unsigned long)task_stack_page(p);
26399 - if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26400 + if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26401 return 0;
26402 fp = *(u64 *)(p->thread.sp);
26403 do {
26404 - if (fp < (unsigned long)stack ||
26405 - fp >= (unsigned long)stack+THREAD_SIZE)
26406 + if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26407 return 0;
26408 ip = *(u64 *)(fp+8);
26409 if (!in_sched_functions(ip))
26410 diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26411 index 678c0ad..2fc2a7b 100644
26412 --- a/arch/x86/kernel/ptrace.c
26413 +++ b/arch/x86/kernel/ptrace.c
26414 @@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26415 unsigned long sp = (unsigned long)&regs->sp;
26416 u32 *prev_esp;
26417
26418 - if (context == (sp & ~(THREAD_SIZE - 1)))
26419 + if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26420 return sp;
26421
26422 - prev_esp = (u32 *)(context);
26423 + prev_esp = *(u32 **)(context);
26424 if (prev_esp)
26425 return (unsigned long)prev_esp;
26426
26427 @@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26428 if (child->thread.gs != value)
26429 return do_arch_prctl(child, ARCH_SET_GS, value);
26430 return 0;
26431 +
26432 + case offsetof(struct user_regs_struct,ip):
26433 + /*
26434 + * Protect against any attempt to set ip to an
26435 + * impossible address. There are dragons lurking if the
26436 + * address is noncanonical. (This explicitly allows
26437 + * setting ip to TASK_SIZE_MAX, because user code can do
26438 + * that all by itself by running off the end of its
26439 + * address space.
26440 + */
26441 + if (value > TASK_SIZE_MAX)
26442 + return -EIO;
26443 + break;
26444 +
26445 #endif
26446 }
26447
26448 @@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26449 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26450 {
26451 int i;
26452 - int dr7 = 0;
26453 + unsigned long dr7 = 0;
26454 struct arch_hw_breakpoint *info;
26455
26456 for (i = 0; i < HBP_NUM; i++) {
26457 @@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26458 unsigned long addr, unsigned long data)
26459 {
26460 int ret;
26461 - unsigned long __user *datap = (unsigned long __user *)data;
26462 + unsigned long __user *datap = (__force unsigned long __user *)data;
26463
26464 switch (request) {
26465 /* read the word at location addr in the USER area. */
26466 @@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26467 if ((int) addr < 0)
26468 return -EIO;
26469 ret = do_get_thread_area(child, addr,
26470 - (struct user_desc __user *)data);
26471 + (__force struct user_desc __user *) data);
26472 break;
26473
26474 case PTRACE_SET_THREAD_AREA:
26475 if ((int) addr < 0)
26476 return -EIO;
26477 ret = do_set_thread_area(child, addr,
26478 - (struct user_desc __user *)data, 0);
26479 + (__force struct user_desc __user *) data, 0);
26480 break;
26481 #endif
26482
26483 @@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26484
26485 #ifdef CONFIG_X86_64
26486
26487 -static struct user_regset x86_64_regsets[] __read_mostly = {
26488 +static user_regset_no_const x86_64_regsets[] __read_only = {
26489 [REGSET_GENERAL] = {
26490 .core_note_type = NT_PRSTATUS,
26491 .n = sizeof(struct user_regs_struct) / sizeof(long),
26492 @@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26493 #endif /* CONFIG_X86_64 */
26494
26495 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26496 -static struct user_regset x86_32_regsets[] __read_mostly = {
26497 +static user_regset_no_const x86_32_regsets[] __read_only = {
26498 [REGSET_GENERAL] = {
26499 .core_note_type = NT_PRSTATUS,
26500 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26501 @@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26502 */
26503 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26504
26505 -void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26506 +void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26507 {
26508 #ifdef CONFIG_X86_64
26509 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26510 @@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26511 memset(info, 0, sizeof(*info));
26512 info->si_signo = SIGTRAP;
26513 info->si_code = si_code;
26514 - info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26515 + info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26516 }
26517
26518 void user_single_step_siginfo(struct task_struct *tsk,
26519 @@ -1450,6 +1464,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
26520 # define IS_IA32 0
26521 #endif
26522
26523 +#ifdef CONFIG_GRKERNSEC_SETXID
26524 +extern void gr_delayed_cred_worker(void);
26525 +#endif
26526 +
26527 /*
26528 * We must return the syscall number to actually look up in the table.
26529 * This can be -1L to skip running any syscall at all.
26530 @@ -1460,6 +1478,11 @@ long syscall_trace_enter(struct pt_regs *regs)
26531
26532 user_exit();
26533
26534 +#ifdef CONFIG_GRKERNSEC_SETXID
26535 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26536 + gr_delayed_cred_worker();
26537 +#endif
26538 +
26539 /*
26540 * If we stepped into a sysenter/syscall insn, it trapped in
26541 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26542 @@ -1515,6 +1538,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26543 */
26544 user_exit();
26545
26546 +#ifdef CONFIG_GRKERNSEC_SETXID
26547 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26548 + gr_delayed_cred_worker();
26549 +#endif
26550 +
26551 audit_syscall_exit(regs);
26552
26553 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26554 diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26555 index 2f355d2..e75ed0a 100644
26556 --- a/arch/x86/kernel/pvclock.c
26557 +++ b/arch/x86/kernel/pvclock.c
26558 @@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26559 reset_hung_task_detector();
26560 }
26561
26562 -static atomic64_t last_value = ATOMIC64_INIT(0);
26563 +static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26564
26565 void pvclock_resume(void)
26566 {
26567 - atomic64_set(&last_value, 0);
26568 + atomic64_set_unchecked(&last_value, 0);
26569 }
26570
26571 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26572 @@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26573 * updating at the same time, and one of them could be slightly behind,
26574 * making the assumption that last_value always go forward fail to hold.
26575 */
26576 - last = atomic64_read(&last_value);
26577 + last = atomic64_read_unchecked(&last_value);
26578 do {
26579 if (ret < last)
26580 return last;
26581 - last = atomic64_cmpxchg(&last_value, last, ret);
26582 + last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
26583 } while (unlikely(last != ret));
26584
26585 return ret;
26586 diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
26587 index 52b1157..c6e67c4 100644
26588 --- a/arch/x86/kernel/reboot.c
26589 +++ b/arch/x86/kernel/reboot.c
26590 @@ -68,6 +68,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
26591
26592 void __noreturn machine_real_restart(unsigned int type)
26593 {
26594 +
26595 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
26596 + struct desc_struct *gdt;
26597 +#endif
26598 +
26599 local_irq_disable();
26600
26601 /*
26602 @@ -95,7 +100,29 @@ void __noreturn machine_real_restart(unsigned int type)
26603
26604 /* Jump to the identity-mapped low memory code */
26605 #ifdef CONFIG_X86_32
26606 - asm volatile("jmpl *%0" : :
26607 +
26608 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
26609 + gdt = get_cpu_gdt_table(smp_processor_id());
26610 + pax_open_kernel();
26611 +#ifdef CONFIG_PAX_MEMORY_UDEREF
26612 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
26613 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
26614 + loadsegment(ds, __KERNEL_DS);
26615 + loadsegment(es, __KERNEL_DS);
26616 + loadsegment(ss, __KERNEL_DS);
26617 +#endif
26618 +#ifdef CONFIG_PAX_KERNEXEC
26619 + gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
26620 + gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
26621 + gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
26622 + gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
26623 + gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
26624 + gdt[GDT_ENTRY_KERNEL_CS].g = 1;
26625 +#endif
26626 + pax_close_kernel();
26627 +#endif
26628 +
26629 + asm volatile("ljmpl *%0" : :
26630 "rm" (real_mode_header->machine_real_restart_asm),
26631 "a" (type));
26632 #else
26633 @@ -486,7 +513,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
26634 * This means that this function can never return, it can misbehave
26635 * by not rebooting properly and hanging.
26636 */
26637 -static void native_machine_emergency_restart(void)
26638 +static void __noreturn native_machine_emergency_restart(void)
26639 {
26640 int i;
26641 int attempt = 0;
26642 @@ -610,13 +637,13 @@ void native_machine_shutdown(void)
26643 #endif
26644 }
26645
26646 -static void __machine_emergency_restart(int emergency)
26647 +static void __noreturn __machine_emergency_restart(int emergency)
26648 {
26649 reboot_emergency = emergency;
26650 machine_ops.emergency_restart();
26651 }
26652
26653 -static void native_machine_restart(char *__unused)
26654 +static void __noreturn native_machine_restart(char *__unused)
26655 {
26656 pr_notice("machine restart\n");
26657
26658 @@ -625,7 +652,7 @@ static void native_machine_restart(char *__unused)
26659 __machine_emergency_restart(0);
26660 }
26661
26662 -static void native_machine_halt(void)
26663 +static void __noreturn native_machine_halt(void)
26664 {
26665 /* Stop other cpus and apics */
26666 machine_shutdown();
26667 @@ -635,7 +662,7 @@ static void native_machine_halt(void)
26668 stop_this_cpu(NULL);
26669 }
26670
26671 -static void native_machine_power_off(void)
26672 +static void __noreturn native_machine_power_off(void)
26673 {
26674 if (pm_power_off) {
26675 if (!reboot_force)
26676 @@ -644,9 +671,10 @@ static void native_machine_power_off(void)
26677 }
26678 /* A fallback in case there is no PM info available */
26679 tboot_shutdown(TB_SHUTDOWN_HALT);
26680 + unreachable();
26681 }
26682
26683 -struct machine_ops machine_ops = {
26684 +struct machine_ops machine_ops __read_only = {
26685 .power_off = native_machine_power_off,
26686 .shutdown = native_machine_shutdown,
26687 .emergency_restart = native_machine_emergency_restart,
26688 diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
26689 index c8e41e9..64049ef 100644
26690 --- a/arch/x86/kernel/reboot_fixups_32.c
26691 +++ b/arch/x86/kernel/reboot_fixups_32.c
26692 @@ -57,7 +57,7 @@ struct device_fixup {
26693 unsigned int vendor;
26694 unsigned int device;
26695 void (*reboot_fixup)(struct pci_dev *);
26696 -};
26697 +} __do_const;
26698
26699 /*
26700 * PCI ids solely used for fixups_table go here
26701 diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
26702 index 3fd2c69..a444264 100644
26703 --- a/arch/x86/kernel/relocate_kernel_64.S
26704 +++ b/arch/x86/kernel/relocate_kernel_64.S
26705 @@ -96,8 +96,7 @@ relocate_kernel:
26706
26707 /* jump to identity mapped page */
26708 addq $(identity_mapped - relocate_kernel), %r8
26709 - pushq %r8
26710 - ret
26711 + jmp *%r8
26712
26713 identity_mapped:
26714 /* set return address to 0 if not preserving context */
26715 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
26716 index 09c76d2..7f33fc2 100644
26717 --- a/arch/x86/kernel/setup.c
26718 +++ b/arch/x86/kernel/setup.c
26719 @@ -110,6 +110,7 @@
26720 #include <asm/mce.h>
26721 #include <asm/alternative.h>
26722 #include <asm/prom.h>
26723 +#include <asm/boot.h>
26724
26725 /*
26726 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
26727 @@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
26728 #endif
26729
26730
26731 -#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
26732 -__visible unsigned long mmu_cr4_features;
26733 +#ifdef CONFIG_X86_64
26734 +__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
26735 +#elif defined(CONFIG_X86_PAE)
26736 +__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
26737 #else
26738 -__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
26739 +__visible unsigned long mmu_cr4_features __read_only;
26740 #endif
26741
26742 +void set_in_cr4(unsigned long mask)
26743 +{
26744 + unsigned long cr4 = read_cr4();
26745 +
26746 + if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
26747 + return;
26748 +
26749 + pax_open_kernel();
26750 + mmu_cr4_features |= mask;
26751 + pax_close_kernel();
26752 +
26753 + if (trampoline_cr4_features)
26754 + *trampoline_cr4_features = mmu_cr4_features;
26755 + cr4 |= mask;
26756 + write_cr4(cr4);
26757 +}
26758 +EXPORT_SYMBOL(set_in_cr4);
26759 +
26760 +void clear_in_cr4(unsigned long mask)
26761 +{
26762 + unsigned long cr4 = read_cr4();
26763 +
26764 + if (!(cr4 & mask) && cr4 == mmu_cr4_features)
26765 + return;
26766 +
26767 + pax_open_kernel();
26768 + mmu_cr4_features &= ~mask;
26769 + pax_close_kernel();
26770 +
26771 + if (trampoline_cr4_features)
26772 + *trampoline_cr4_features = mmu_cr4_features;
26773 + cr4 &= ~mask;
26774 + write_cr4(cr4);
26775 +}
26776 +EXPORT_SYMBOL(clear_in_cr4);
26777 +
26778 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
26779 int bootloader_type, bootloader_version;
26780
26781 @@ -772,7 +811,7 @@ static void __init trim_bios_range(void)
26782 * area (640->1Mb) as ram even though it is not.
26783 * take them out.
26784 */
26785 - e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
26786 + e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
26787
26788 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
26789 }
26790 @@ -780,7 +819,7 @@ static void __init trim_bios_range(void)
26791 /* called before trim_bios_range() to spare extra sanitize */
26792 static void __init e820_add_kernel_range(void)
26793 {
26794 - u64 start = __pa_symbol(_text);
26795 + u64 start = __pa_symbol(ktla_ktva(_text));
26796 u64 size = __pa_symbol(_end) - start;
26797
26798 /*
26799 @@ -856,8 +895,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
26800
26801 void __init setup_arch(char **cmdline_p)
26802 {
26803 +#ifdef CONFIG_X86_32
26804 + memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
26805 +#else
26806 memblock_reserve(__pa_symbol(_text),
26807 (unsigned long)__bss_stop - (unsigned long)_text);
26808 +#endif
26809
26810 early_reserve_initrd();
26811
26812 @@ -946,14 +989,14 @@ void __init setup_arch(char **cmdline_p)
26813
26814 if (!boot_params.hdr.root_flags)
26815 root_mountflags &= ~MS_RDONLY;
26816 - init_mm.start_code = (unsigned long) _text;
26817 - init_mm.end_code = (unsigned long) _etext;
26818 + init_mm.start_code = ktla_ktva((unsigned long) _text);
26819 + init_mm.end_code = ktla_ktva((unsigned long) _etext);
26820 init_mm.end_data = (unsigned long) _edata;
26821 init_mm.brk = _brk_end;
26822
26823 - code_resource.start = __pa_symbol(_text);
26824 - code_resource.end = __pa_symbol(_etext)-1;
26825 - data_resource.start = __pa_symbol(_etext);
26826 + code_resource.start = __pa_symbol(ktla_ktva(_text));
26827 + code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
26828 + data_resource.start = __pa_symbol(_sdata);
26829 data_resource.end = __pa_symbol(_edata)-1;
26830 bss_resource.start = __pa_symbol(__bss_start);
26831 bss_resource.end = __pa_symbol(__bss_stop)-1;
26832 diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
26833 index 5cdff03..80fa283 100644
26834 --- a/arch/x86/kernel/setup_percpu.c
26835 +++ b/arch/x86/kernel/setup_percpu.c
26836 @@ -21,19 +21,17 @@
26837 #include <asm/cpu.h>
26838 #include <asm/stackprotector.h>
26839
26840 -DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
26841 +#ifdef CONFIG_SMP
26842 +DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
26843 EXPORT_PER_CPU_SYMBOL(cpu_number);
26844 +#endif
26845
26846 -#ifdef CONFIG_X86_64
26847 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
26848 -#else
26849 -#define BOOT_PERCPU_OFFSET 0
26850 -#endif
26851
26852 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
26853 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
26854
26855 -unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
26856 +unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
26857 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
26858 };
26859 EXPORT_SYMBOL(__per_cpu_offset);
26860 @@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
26861 {
26862 #ifdef CONFIG_NEED_MULTIPLE_NODES
26863 pg_data_t *last = NULL;
26864 - unsigned int cpu;
26865 + int cpu;
26866
26867 for_each_possible_cpu(cpu) {
26868 int node = early_cpu_to_node(cpu);
26869 @@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
26870 {
26871 #ifdef CONFIG_X86_32
26872 struct desc_struct gdt;
26873 + unsigned long base = per_cpu_offset(cpu);
26874
26875 - pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
26876 - 0x2 | DESCTYPE_S, 0x8);
26877 - gdt.s = 1;
26878 + pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
26879 + 0x83 | DESCTYPE_S, 0xC);
26880 write_gdt_entry(get_cpu_gdt_table(cpu),
26881 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
26882 #endif
26883 @@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
26884 /* alrighty, percpu areas up and running */
26885 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
26886 for_each_possible_cpu(cpu) {
26887 +#ifdef CONFIG_CC_STACKPROTECTOR
26888 +#ifdef CONFIG_X86_32
26889 + unsigned long canary = per_cpu(stack_canary.canary, cpu);
26890 +#endif
26891 +#endif
26892 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
26893 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
26894 per_cpu(cpu_number, cpu) = cpu;
26895 @@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
26896 */
26897 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
26898 #endif
26899 +#ifdef CONFIG_CC_STACKPROTECTOR
26900 +#ifdef CONFIG_X86_32
26901 + if (!cpu)
26902 + per_cpu(stack_canary.canary, cpu) = canary;
26903 +#endif
26904 +#endif
26905 /*
26906 * Up to this point, the boot CPU has been using .init.data
26907 * area. Reload any changed state for the boot CPU.
26908 diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
26909 index 9e5de68..16c53cb 100644
26910 --- a/arch/x86/kernel/signal.c
26911 +++ b/arch/x86/kernel/signal.c
26912 @@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
26913 * Align the stack pointer according to the i386 ABI,
26914 * i.e. so that on function entry ((sp + 4) & 15) == 0.
26915 */
26916 - sp = ((sp + 4) & -16ul) - 4;
26917 + sp = ((sp - 12) & -16ul) - 4;
26918 #else /* !CONFIG_X86_32 */
26919 sp = round_down(sp, 16) - 8;
26920 #endif
26921 @@ -298,9 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
26922 }
26923
26924 if (current->mm->context.vdso)
26925 - restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
26926 + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
26927 else
26928 - restorer = &frame->retcode;
26929 + restorer = (void __user *)&frame->retcode;
26930 if (ksig->ka.sa.sa_flags & SA_RESTORER)
26931 restorer = ksig->ka.sa.sa_restorer;
26932
26933 @@ -314,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
26934 * reasons and because gdb uses it as a signature to notice
26935 * signal handler stack frames.
26936 */
26937 - err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
26938 + err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
26939
26940 if (err)
26941 return -EFAULT;
26942 @@ -361,7 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
26943 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
26944
26945 /* Set up to return from userspace. */
26946 - restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
26947 + if (current->mm->context.vdso)
26948 + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
26949 + else
26950 + restorer = (void __user *)&frame->retcode;
26951 if (ksig->ka.sa.sa_flags & SA_RESTORER)
26952 restorer = ksig->ka.sa.sa_restorer;
26953 put_user_ex(restorer, &frame->pretcode);
26954 @@ -373,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
26955 * reasons and because gdb uses it as a signature to notice
26956 * signal handler stack frames.
26957 */
26958 - put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
26959 + put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
26960 } put_user_catch(err);
26961
26962 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
26963 @@ -609,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
26964 {
26965 int usig = signr_convert(ksig->sig);
26966 sigset_t *set = sigmask_to_save();
26967 - compat_sigset_t *cset = (compat_sigset_t *) set;
26968 + sigset_t sigcopy;
26969 + compat_sigset_t *cset;
26970 +
26971 + sigcopy = *set;
26972 +
26973 + cset = (compat_sigset_t *) &sigcopy;
26974
26975 /* Set up the stack frame */
26976 if (is_ia32_frame()) {
26977 @@ -620,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
26978 } else if (is_x32_frame()) {
26979 return x32_setup_rt_frame(ksig, cset, regs);
26980 } else {
26981 - return __setup_rt_frame(ksig->sig, ksig, set, regs);
26982 + return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
26983 }
26984 }
26985
26986 diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
26987 index be8e1bd..a3d93fa 100644
26988 --- a/arch/x86/kernel/smp.c
26989 +++ b/arch/x86/kernel/smp.c
26990 @@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
26991
26992 __setup("nonmi_ipi", nonmi_ipi_setup);
26993
26994 -struct smp_ops smp_ops = {
26995 +struct smp_ops smp_ops __read_only = {
26996 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
26997 .smp_prepare_cpus = native_smp_prepare_cpus,
26998 .smp_cpus_done = native_smp_cpus_done,
26999 diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27000 index ae2fd975..c0c8d10 100644
27001 --- a/arch/x86/kernel/smpboot.c
27002 +++ b/arch/x86/kernel/smpboot.c
27003 @@ -230,14 +230,17 @@ static void notrace start_secondary(void *unused)
27004
27005 enable_start_cpu0 = 0;
27006
27007 -#ifdef CONFIG_X86_32
27008 + /* otherwise gcc will move up smp_processor_id before the cpu_init */
27009 + barrier();
27010 +
27011 /* switch away from the initial page table */
27012 +#ifdef CONFIG_PAX_PER_CPU_PGD
27013 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27014 +#else
27015 load_cr3(swapper_pg_dir);
27016 +#endif
27017 __flush_tlb_all();
27018 -#endif
27019
27020 - /* otherwise gcc will move up smp_processor_id before the cpu_init */
27021 - barrier();
27022 /*
27023 * Check TSC synchronization with the BP:
27024 */
27025 @@ -757,8 +760,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27026 alternatives_enable_smp();
27027
27028 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27029 - (THREAD_SIZE + task_stack_page(idle))) - 1);
27030 + (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27031 per_cpu(current_task, cpu) = idle;
27032 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
27033
27034 #ifdef CONFIG_X86_32
27035 /* Stack for startup_32 can be just as for start_secondary onwards */
27036 @@ -767,10 +771,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27037 clear_tsk_thread_flag(idle, TIF_FORK);
27038 initial_gs = per_cpu_offset(cpu);
27039 #endif
27040 - per_cpu(kernel_stack, cpu) =
27041 - (unsigned long)task_stack_page(idle) -
27042 - KERNEL_STACK_OFFSET + THREAD_SIZE;
27043 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27044 + pax_open_kernel();
27045 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27046 + pax_close_kernel();
27047 initial_code = (unsigned long)start_secondary;
27048 stack_start = idle->thread.sp;
27049
27050 @@ -916,6 +920,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27051 /* the FPU context is blank, nobody can own it */
27052 __cpu_disable_lazy_restore(cpu);
27053
27054 +#ifdef CONFIG_PAX_PER_CPU_PGD
27055 + clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27056 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27057 + KERNEL_PGD_PTRS);
27058 + clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27059 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27060 + KERNEL_PGD_PTRS);
27061 +#endif
27062 +
27063 err = do_boot_cpu(apicid, cpu, tidle);
27064 if (err) {
27065 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27066 diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27067 index 9b4d51d..5d28b58 100644
27068 --- a/arch/x86/kernel/step.c
27069 +++ b/arch/x86/kernel/step.c
27070 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27071 struct desc_struct *desc;
27072 unsigned long base;
27073
27074 - seg &= ~7UL;
27075 + seg >>= 3;
27076
27077 mutex_lock(&child->mm->context.lock);
27078 - if (unlikely((seg >> 3) >= child->mm->context.size))
27079 + if (unlikely(seg >= child->mm->context.size))
27080 addr = -1L; /* bogus selector, access would fault */
27081 else {
27082 desc = child->mm->context.ldt + seg;
27083 @@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27084 addr += base;
27085 }
27086 mutex_unlock(&child->mm->context.lock);
27087 - }
27088 + } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27089 + addr = ktla_ktva(addr);
27090
27091 return addr;
27092 }
27093 @@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27094 unsigned char opcode[15];
27095 unsigned long addr = convert_ip_to_linear(child, regs);
27096
27097 + if (addr == -EINVAL)
27098 + return 0;
27099 +
27100 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27101 for (i = 0; i < copied; i++) {
27102 switch (opcode[i]) {
27103 diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27104 new file mode 100644
27105 index 0000000..5877189
27106 --- /dev/null
27107 +++ b/arch/x86/kernel/sys_i386_32.c
27108 @@ -0,0 +1,189 @@
27109 +/*
27110 + * This file contains various random system calls that
27111 + * have a non-standard calling sequence on the Linux/i386
27112 + * platform.
27113 + */
27114 +
27115 +#include <linux/errno.h>
27116 +#include <linux/sched.h>
27117 +#include <linux/mm.h>
27118 +#include <linux/fs.h>
27119 +#include <linux/smp.h>
27120 +#include <linux/sem.h>
27121 +#include <linux/msg.h>
27122 +#include <linux/shm.h>
27123 +#include <linux/stat.h>
27124 +#include <linux/syscalls.h>
27125 +#include <linux/mman.h>
27126 +#include <linux/file.h>
27127 +#include <linux/utsname.h>
27128 +#include <linux/ipc.h>
27129 +#include <linux/elf.h>
27130 +
27131 +#include <linux/uaccess.h>
27132 +#include <linux/unistd.h>
27133 +
27134 +#include <asm/syscalls.h>
27135 +
27136 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27137 +{
27138 + unsigned long pax_task_size = TASK_SIZE;
27139 +
27140 +#ifdef CONFIG_PAX_SEGMEXEC
27141 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27142 + pax_task_size = SEGMEXEC_TASK_SIZE;
27143 +#endif
27144 +
27145 + if (flags & MAP_FIXED)
27146 + if (len > pax_task_size || addr > pax_task_size - len)
27147 + return -EINVAL;
27148 +
27149 + return 0;
27150 +}
27151 +
27152 +/*
27153 + * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27154 + */
27155 +static unsigned long get_align_mask(void)
27156 +{
27157 + if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27158 + return 0;
27159 +
27160 + if (!(current->flags & PF_RANDOMIZE))
27161 + return 0;
27162 +
27163 + return va_align.mask;
27164 +}
27165 +
27166 +unsigned long
27167 +arch_get_unmapped_area(struct file *filp, unsigned long addr,
27168 + unsigned long len, unsigned long pgoff, unsigned long flags)
27169 +{
27170 + struct mm_struct *mm = current->mm;
27171 + struct vm_area_struct *vma;
27172 + unsigned long pax_task_size = TASK_SIZE;
27173 + struct vm_unmapped_area_info info;
27174 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27175 +
27176 +#ifdef CONFIG_PAX_SEGMEXEC
27177 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
27178 + pax_task_size = SEGMEXEC_TASK_SIZE;
27179 +#endif
27180 +
27181 + pax_task_size -= PAGE_SIZE;
27182 +
27183 + if (len > pax_task_size)
27184 + return -ENOMEM;
27185 +
27186 + if (flags & MAP_FIXED)
27187 + return addr;
27188 +
27189 +#ifdef CONFIG_PAX_RANDMMAP
27190 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27191 +#endif
27192 +
27193 + if (addr) {
27194 + addr = PAGE_ALIGN(addr);
27195 + if (pax_task_size - len >= addr) {
27196 + vma = find_vma(mm, addr);
27197 + if (check_heap_stack_gap(vma, addr, len, offset))
27198 + return addr;
27199 + }
27200 + }
27201 +
27202 + info.flags = 0;
27203 + info.length = len;
27204 + info.align_mask = filp ? get_align_mask() : 0;
27205 + info.align_offset = pgoff << PAGE_SHIFT;
27206 + info.threadstack_offset = offset;
27207 +
27208 +#ifdef CONFIG_PAX_PAGEEXEC
27209 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27210 + info.low_limit = 0x00110000UL;
27211 + info.high_limit = mm->start_code;
27212 +
27213 +#ifdef CONFIG_PAX_RANDMMAP
27214 + if (mm->pax_flags & MF_PAX_RANDMMAP)
27215 + info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27216 +#endif
27217 +
27218 + if (info.low_limit < info.high_limit) {
27219 + addr = vm_unmapped_area(&info);
27220 + if (!IS_ERR_VALUE(addr))
27221 + return addr;
27222 + }
27223 + } else
27224 +#endif
27225 +
27226 + info.low_limit = mm->mmap_base;
27227 + info.high_limit = pax_task_size;
27228 +
27229 + return vm_unmapped_area(&info);
27230 +}
27231 +
27232 +unsigned long
27233 +arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27234 + const unsigned long len, const unsigned long pgoff,
27235 + const unsigned long flags)
27236 +{
27237 + struct vm_area_struct *vma;
27238 + struct mm_struct *mm = current->mm;
27239 + unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27240 + struct vm_unmapped_area_info info;
27241 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27242 +
27243 +#ifdef CONFIG_PAX_SEGMEXEC
27244 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
27245 + pax_task_size = SEGMEXEC_TASK_SIZE;
27246 +#endif
27247 +
27248 + pax_task_size -= PAGE_SIZE;
27249 +
27250 + /* requested length too big for entire address space */
27251 + if (len > pax_task_size)
27252 + return -ENOMEM;
27253 +
27254 + if (flags & MAP_FIXED)
27255 + return addr;
27256 +
27257 +#ifdef CONFIG_PAX_PAGEEXEC
27258 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27259 + goto bottomup;
27260 +#endif
27261 +
27262 +#ifdef CONFIG_PAX_RANDMMAP
27263 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27264 +#endif
27265 +
27266 + /* requesting a specific address */
27267 + if (addr) {
27268 + addr = PAGE_ALIGN(addr);
27269 + if (pax_task_size - len >= addr) {
27270 + vma = find_vma(mm, addr);
27271 + if (check_heap_stack_gap(vma, addr, len, offset))
27272 + return addr;
27273 + }
27274 + }
27275 +
27276 + info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27277 + info.length = len;
27278 + info.low_limit = PAGE_SIZE;
27279 + info.high_limit = mm->mmap_base;
27280 + info.align_mask = filp ? get_align_mask() : 0;
27281 + info.align_offset = pgoff << PAGE_SHIFT;
27282 + info.threadstack_offset = offset;
27283 +
27284 + addr = vm_unmapped_area(&info);
27285 + if (!(addr & ~PAGE_MASK))
27286 + return addr;
27287 + VM_BUG_ON(addr != -ENOMEM);
27288 +
27289 +bottomup:
27290 + /*
27291 + * A failed mmap() very likely causes application failure,
27292 + * so fall back to the bottom-up function here. This scenario
27293 + * can happen with large stack limits and large mmap()
27294 + * allocations.
27295 + */
27296 + return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27297 +}
27298 diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27299 index 30277e2..5664a29 100644
27300 --- a/arch/x86/kernel/sys_x86_64.c
27301 +++ b/arch/x86/kernel/sys_x86_64.c
27302 @@ -81,8 +81,8 @@ out:
27303 return error;
27304 }
27305
27306 -static void find_start_end(unsigned long flags, unsigned long *begin,
27307 - unsigned long *end)
27308 +static void find_start_end(struct mm_struct *mm, unsigned long flags,
27309 + unsigned long *begin, unsigned long *end)
27310 {
27311 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27312 unsigned long new_begin;
27313 @@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27314 *begin = new_begin;
27315 }
27316 } else {
27317 - *begin = current->mm->mmap_legacy_base;
27318 + *begin = mm->mmap_legacy_base;
27319 *end = TASK_SIZE;
27320 }
27321 }
27322 @@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27323 struct vm_area_struct *vma;
27324 struct vm_unmapped_area_info info;
27325 unsigned long begin, end;
27326 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27327
27328 if (flags & MAP_FIXED)
27329 return addr;
27330
27331 - find_start_end(flags, &begin, &end);
27332 + find_start_end(mm, flags, &begin, &end);
27333
27334 if (len > end)
27335 return -ENOMEM;
27336
27337 +#ifdef CONFIG_PAX_RANDMMAP
27338 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27339 +#endif
27340 +
27341 if (addr) {
27342 addr = PAGE_ALIGN(addr);
27343 vma = find_vma(mm, addr);
27344 - if (end - len >= addr &&
27345 - (!vma || addr + len <= vma->vm_start))
27346 + if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27347 return addr;
27348 }
27349
27350 @@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27351 info.high_limit = end;
27352 info.align_mask = filp ? get_align_mask() : 0;
27353 info.align_offset = pgoff << PAGE_SHIFT;
27354 + info.threadstack_offset = offset;
27355 return vm_unmapped_area(&info);
27356 }
27357
27358 @@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27359 struct mm_struct *mm = current->mm;
27360 unsigned long addr = addr0;
27361 struct vm_unmapped_area_info info;
27362 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27363
27364 /* requested length too big for entire address space */
27365 if (len > TASK_SIZE)
27366 @@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27367 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27368 goto bottomup;
27369
27370 +#ifdef CONFIG_PAX_RANDMMAP
27371 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27372 +#endif
27373 +
27374 /* requesting a specific address */
27375 if (addr) {
27376 addr = PAGE_ALIGN(addr);
27377 vma = find_vma(mm, addr);
27378 - if (TASK_SIZE - len >= addr &&
27379 - (!vma || addr + len <= vma->vm_start))
27380 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27381 return addr;
27382 }
27383
27384 @@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27385 info.high_limit = mm->mmap_base;
27386 info.align_mask = filp ? get_align_mask() : 0;
27387 info.align_offset = pgoff << PAGE_SHIFT;
27388 + info.threadstack_offset = offset;
27389 addr = vm_unmapped_area(&info);
27390 if (!(addr & ~PAGE_MASK))
27391 return addr;
27392 diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27393 index 91a4496..bb87552 100644
27394 --- a/arch/x86/kernel/tboot.c
27395 +++ b/arch/x86/kernel/tboot.c
27396 @@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
27397
27398 void tboot_shutdown(u32 shutdown_type)
27399 {
27400 - void (*shutdown)(void);
27401 + void (* __noreturn shutdown)(void);
27402
27403 if (!tboot_enabled())
27404 return;
27405 @@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
27406
27407 switch_to_tboot_pt();
27408
27409 - shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27410 + shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27411 shutdown();
27412
27413 /* should not reach here */
27414 @@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27415 return -ENODEV;
27416 }
27417
27418 -static atomic_t ap_wfs_count;
27419 +static atomic_unchecked_t ap_wfs_count;
27420
27421 static int tboot_wait_for_aps(int num_aps)
27422 {
27423 @@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27424 {
27425 switch (action) {
27426 case CPU_DYING:
27427 - atomic_inc(&ap_wfs_count);
27428 + atomic_inc_unchecked(&ap_wfs_count);
27429 if (num_online_cpus() == 1)
27430 - if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27431 + if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27432 return NOTIFY_BAD;
27433 break;
27434 }
27435 @@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
27436
27437 tboot_create_trampoline();
27438
27439 - atomic_set(&ap_wfs_count, 0);
27440 + atomic_set_unchecked(&ap_wfs_count, 0);
27441 register_hotcpu_notifier(&tboot_cpu_notifier);
27442
27443 #ifdef CONFIG_DEBUG_FS
27444 diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27445 index bf7ef5c..59d0ac9 100644
27446 --- a/arch/x86/kernel/time.c
27447 +++ b/arch/x86/kernel/time.c
27448 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27449 {
27450 unsigned long pc = instruction_pointer(regs);
27451
27452 - if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27453 + if (!user_mode(regs) && in_lock_functions(pc)) {
27454 #ifdef CONFIG_FRAME_POINTER
27455 - return *(unsigned long *)(regs->bp + sizeof(long));
27456 + return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27457 #else
27458 unsigned long *sp =
27459 (unsigned long *)kernel_stack_pointer(regs);
27460 @@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27461 * or above a saved flags. Eflags has bits 22-31 zero,
27462 * kernel addresses don't.
27463 */
27464 +
27465 +#ifdef CONFIG_PAX_KERNEXEC
27466 + return ktla_ktva(sp[0]);
27467 +#else
27468 if (sp[0] >> 22)
27469 return sp[0];
27470 if (sp[1] >> 22)
27471 return sp[1];
27472 #endif
27473 +
27474 +#endif
27475 }
27476 return pc;
27477 }
27478 diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27479 index f7fec09..9991981 100644
27480 --- a/arch/x86/kernel/tls.c
27481 +++ b/arch/x86/kernel/tls.c
27482 @@ -84,6 +84,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27483 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27484 return -EINVAL;
27485
27486 +#ifdef CONFIG_PAX_SEGMEXEC
27487 + if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27488 + return -EINVAL;
27489 +#endif
27490 +
27491 set_tls_desc(p, idx, &info, 1);
27492
27493 return 0;
27494 @@ -200,7 +205,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27495
27496 if (kbuf)
27497 info = kbuf;
27498 - else if (__copy_from_user(infobuf, ubuf, count))
27499 + else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27500 return -EFAULT;
27501 else
27502 info = infobuf;
27503 diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27504 index 1c113db..287b42e 100644
27505 --- a/arch/x86/kernel/tracepoint.c
27506 +++ b/arch/x86/kernel/tracepoint.c
27507 @@ -9,11 +9,11 @@
27508 #include <linux/atomic.h>
27509
27510 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27511 -struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27512 +const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27513 (unsigned long) trace_idt_table };
27514
27515 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27516 -gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27517 +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27518
27519 static int trace_irq_vector_refcount;
27520 static DEFINE_MUTEX(irq_vector_mutex);
27521 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27522 index f73b5d4..0adcc9a 100644
27523 --- a/arch/x86/kernel/traps.c
27524 +++ b/arch/x86/kernel/traps.c
27525 @@ -66,7 +66,7 @@
27526 #include <asm/proto.h>
27527
27528 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27529 -gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27530 +gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27531 #else
27532 #include <asm/processor-flags.h>
27533 #include <asm/setup.h>
27534 @@ -75,7 +75,7 @@ asmlinkage int system_call(void);
27535 #endif
27536
27537 /* Must be page-aligned because the real IDT is used in a fixmap. */
27538 -gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27539 +gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27540
27541 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27542 EXPORT_SYMBOL_GPL(used_vectors);
27543 @@ -107,11 +107,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
27544 }
27545
27546 static int __kprobes
27547 -do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27548 +do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27549 struct pt_regs *regs, long error_code)
27550 {
27551 #ifdef CONFIG_X86_32
27552 - if (regs->flags & X86_VM_MASK) {
27553 + if (v8086_mode(regs)) {
27554 /*
27555 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27556 * On nmi (interrupt 2), do_trap should not be called.
27557 @@ -124,12 +124,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27558 return -1;
27559 }
27560 #endif
27561 - if (!user_mode(regs)) {
27562 + if (!user_mode_novm(regs)) {
27563 if (!fixup_exception(regs)) {
27564 tsk->thread.error_code = error_code;
27565 tsk->thread.trap_nr = trapnr;
27566 +
27567 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27568 + if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27569 + str = "PAX: suspicious stack segment fault";
27570 +#endif
27571 +
27572 die(str, regs, error_code);
27573 }
27574 +
27575 +#ifdef CONFIG_PAX_REFCOUNT
27576 + if (trapnr == X86_TRAP_OF)
27577 + pax_report_refcount_overflow(regs);
27578 +#endif
27579 +
27580 return 0;
27581 }
27582
27583 @@ -137,7 +149,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27584 }
27585
27586 static void __kprobes
27587 -do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27588 +do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
27589 long error_code, siginfo_t *info)
27590 {
27591 struct task_struct *tsk = current;
27592 @@ -161,7 +173,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27593 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
27594 printk_ratelimit()) {
27595 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
27596 - tsk->comm, tsk->pid, str,
27597 + tsk->comm, task_pid_nr(tsk), str,
27598 regs->ip, regs->sp, error_code);
27599 print_vma_addr(" in ", regs->ip);
27600 pr_cont("\n");
27601 @@ -251,6 +263,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
27602 tsk->thread.error_code = error_code;
27603 tsk->thread.trap_nr = X86_TRAP_DF;
27604
27605 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
27606 + if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
27607 + die("grsec: kernel stack overflow detected", regs, error_code);
27608 +#endif
27609 +
27610 #ifdef CONFIG_DOUBLEFAULT
27611 df_debug(regs, error_code);
27612 #endif
27613 @@ -273,7 +290,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
27614 conditional_sti(regs);
27615
27616 #ifdef CONFIG_X86_32
27617 - if (regs->flags & X86_VM_MASK) {
27618 + if (v8086_mode(regs)) {
27619 local_irq_enable();
27620 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
27621 goto exit;
27622 @@ -281,18 +298,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
27623 #endif
27624
27625 tsk = current;
27626 - if (!user_mode(regs)) {
27627 + if (!user_mode_novm(regs)) {
27628 if (fixup_exception(regs))
27629 goto exit;
27630
27631 tsk->thread.error_code = error_code;
27632 tsk->thread.trap_nr = X86_TRAP_GP;
27633 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
27634 - X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
27635 + X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
27636 +
27637 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27638 + if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
27639 + die("PAX: suspicious general protection fault", regs, error_code);
27640 + else
27641 +#endif
27642 +
27643 die("general protection fault", regs, error_code);
27644 + }
27645 goto exit;
27646 }
27647
27648 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
27649 + if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
27650 + struct mm_struct *mm = tsk->mm;
27651 + unsigned long limit;
27652 +
27653 + down_write(&mm->mmap_sem);
27654 + limit = mm->context.user_cs_limit;
27655 + if (limit < TASK_SIZE) {
27656 + track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
27657 + up_write(&mm->mmap_sem);
27658 + return;
27659 + }
27660 + up_write(&mm->mmap_sem);
27661 + }
27662 +#endif
27663 +
27664 tsk->thread.error_code = error_code;
27665 tsk->thread.trap_nr = X86_TRAP_GP;
27666
27667 @@ -453,7 +494,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
27668 /* It's safe to allow irq's after DR6 has been saved */
27669 preempt_conditional_sti(regs);
27670
27671 - if (regs->flags & X86_VM_MASK) {
27672 + if (v8086_mode(regs)) {
27673 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
27674 X86_TRAP_DB);
27675 preempt_conditional_cli(regs);
27676 @@ -468,7 +509,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
27677 * We already checked v86 mode above, so we can check for kernel mode
27678 * by just checking the CPL of CS.
27679 */
27680 - if ((dr6 & DR_STEP) && !user_mode(regs)) {
27681 + if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
27682 tsk->thread.debugreg6 &= ~DR_STEP;
27683 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
27684 regs->flags &= ~X86_EFLAGS_TF;
27685 @@ -500,7 +541,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
27686 return;
27687 conditional_sti(regs);
27688
27689 - if (!user_mode_vm(regs))
27690 + if (!user_mode(regs))
27691 {
27692 if (!fixup_exception(regs)) {
27693 task->thread.error_code = error_code;
27694 diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
27695 index 57e5ce1..20b0040 100644
27696 --- a/arch/x86/kernel/tsc.c
27697 +++ b/arch/x86/kernel/tsc.c
27698 @@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
27699 */
27700 smp_wmb();
27701
27702 - ACCESS_ONCE(c2n->head) = data;
27703 + ACCESS_ONCE_RW(c2n->head) = data;
27704 }
27705
27706 /*
27707 diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
27708 index 2ed8459..7cf329f 100644
27709 --- a/arch/x86/kernel/uprobes.c
27710 +++ b/arch/x86/kernel/uprobes.c
27711 @@ -629,7 +629,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
27712 int ret = NOTIFY_DONE;
27713
27714 /* We are only interested in userspace traps */
27715 - if (regs && !user_mode_vm(regs))
27716 + if (regs && !user_mode(regs))
27717 return NOTIFY_DONE;
27718
27719 switch (val) {
27720 @@ -719,7 +719,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
27721
27722 if (ncopied != rasize) {
27723 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
27724 - "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
27725 + "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
27726
27727 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
27728 }
27729 diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
27730 index b9242ba..50c5edd 100644
27731 --- a/arch/x86/kernel/verify_cpu.S
27732 +++ b/arch/x86/kernel/verify_cpu.S
27733 @@ -20,6 +20,7 @@
27734 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
27735 * arch/x86/kernel/trampoline_64.S: secondary processor verification
27736 * arch/x86/kernel/head_32.S: processor startup
27737 + * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
27738 *
27739 * verify_cpu, returns the status of longmode and SSE in register %eax.
27740 * 0: Success 1: Failure
27741 diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
27742 index e8edcf5..27f9344 100644
27743 --- a/arch/x86/kernel/vm86_32.c
27744 +++ b/arch/x86/kernel/vm86_32.c
27745 @@ -44,6 +44,7 @@
27746 #include <linux/ptrace.h>
27747 #include <linux/audit.h>
27748 #include <linux/stddef.h>
27749 +#include <linux/grsecurity.h>
27750
27751 #include <asm/uaccess.h>
27752 #include <asm/io.h>
27753 @@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
27754 do_exit(SIGSEGV);
27755 }
27756
27757 - tss = &per_cpu(init_tss, get_cpu());
27758 + tss = init_tss + get_cpu();
27759 current->thread.sp0 = current->thread.saved_sp0;
27760 current->thread.sysenter_cs = __KERNEL_CS;
27761 load_sp0(tss, &current->thread);
27762 @@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
27763
27764 if (tsk->thread.saved_sp0)
27765 return -EPERM;
27766 +
27767 +#ifdef CONFIG_GRKERNSEC_VM86
27768 + if (!capable(CAP_SYS_RAWIO)) {
27769 + gr_handle_vm86();
27770 + return -EPERM;
27771 + }
27772 +#endif
27773 +
27774 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
27775 offsetof(struct kernel_vm86_struct, vm86plus) -
27776 sizeof(info.regs));
27777 @@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
27778 int tmp;
27779 struct vm86plus_struct __user *v86;
27780
27781 +#ifdef CONFIG_GRKERNSEC_VM86
27782 + if (!capable(CAP_SYS_RAWIO)) {
27783 + gr_handle_vm86();
27784 + return -EPERM;
27785 + }
27786 +#endif
27787 +
27788 tsk = current;
27789 switch (cmd) {
27790 case VM86_REQUEST_IRQ:
27791 @@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
27792 tsk->thread.saved_fs = info->regs32->fs;
27793 tsk->thread.saved_gs = get_user_gs(info->regs32);
27794
27795 - tss = &per_cpu(init_tss, get_cpu());
27796 + tss = init_tss + get_cpu();
27797 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
27798 if (cpu_has_sep)
27799 tsk->thread.sysenter_cs = 0;
27800 @@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
27801 goto cannot_handle;
27802 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
27803 goto cannot_handle;
27804 - intr_ptr = (unsigned long __user *) (i << 2);
27805 + intr_ptr = (__force unsigned long __user *) (i << 2);
27806 if (get_user(segoffs, intr_ptr))
27807 goto cannot_handle;
27808 if ((segoffs >> 16) == BIOSSEG)
27809 diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
27810 index 49edf2d..c0d1362 100644
27811 --- a/arch/x86/kernel/vmlinux.lds.S
27812 +++ b/arch/x86/kernel/vmlinux.lds.S
27813 @@ -26,6 +26,13 @@
27814 #include <asm/page_types.h>
27815 #include <asm/cache.h>
27816 #include <asm/boot.h>
27817 +#include <asm/segment.h>
27818 +
27819 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27820 +#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
27821 +#else
27822 +#define __KERNEL_TEXT_OFFSET 0
27823 +#endif
27824
27825 #undef i386 /* in case the preprocessor is a 32bit one */
27826
27827 @@ -69,30 +76,43 @@ jiffies_64 = jiffies;
27828
27829 PHDRS {
27830 text PT_LOAD FLAGS(5); /* R_E */
27831 +#ifdef CONFIG_X86_32
27832 + module PT_LOAD FLAGS(5); /* R_E */
27833 +#endif
27834 +#ifdef CONFIG_XEN
27835 + rodata PT_LOAD FLAGS(5); /* R_E */
27836 +#else
27837 + rodata PT_LOAD FLAGS(4); /* R__ */
27838 +#endif
27839 data PT_LOAD FLAGS(6); /* RW_ */
27840 -#ifdef CONFIG_X86_64
27841 + init.begin PT_LOAD FLAGS(6); /* RW_ */
27842 #ifdef CONFIG_SMP
27843 percpu PT_LOAD FLAGS(6); /* RW_ */
27844 #endif
27845 + text.init PT_LOAD FLAGS(5); /* R_E */
27846 + text.exit PT_LOAD FLAGS(5); /* R_E */
27847 init PT_LOAD FLAGS(7); /* RWE */
27848 -#endif
27849 note PT_NOTE FLAGS(0); /* ___ */
27850 }
27851
27852 SECTIONS
27853 {
27854 #ifdef CONFIG_X86_32
27855 - . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
27856 - phys_startup_32 = startup_32 - LOAD_OFFSET;
27857 + . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
27858 #else
27859 - . = __START_KERNEL;
27860 - phys_startup_64 = startup_64 - LOAD_OFFSET;
27861 + . = __START_KERNEL;
27862 #endif
27863
27864 /* Text and read-only data */
27865 - .text : AT(ADDR(.text) - LOAD_OFFSET) {
27866 - _text = .;
27867 + .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
27868 /* bootstrapping code */
27869 +#ifdef CONFIG_X86_32
27870 + phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
27871 +#else
27872 + phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
27873 +#endif
27874 + __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
27875 + _text = .;
27876 HEAD_TEXT
27877 . = ALIGN(8);
27878 _stext = .;
27879 @@ -104,13 +124,47 @@ SECTIONS
27880 IRQENTRY_TEXT
27881 *(.fixup)
27882 *(.gnu.warning)
27883 - /* End of text section */
27884 - _etext = .;
27885 } :text = 0x9090
27886
27887 - NOTES :text :note
27888 + . += __KERNEL_TEXT_OFFSET;
27889
27890 - EXCEPTION_TABLE(16) :text = 0x9090
27891 +#ifdef CONFIG_X86_32
27892 + . = ALIGN(PAGE_SIZE);
27893 + .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
27894 +
27895 +#ifdef CONFIG_PAX_KERNEXEC
27896 + MODULES_EXEC_VADDR = .;
27897 + BYTE(0)
27898 + . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
27899 + . = ALIGN(HPAGE_SIZE) - 1;
27900 + MODULES_EXEC_END = .;
27901 +#endif
27902 +
27903 + } :module
27904 +#endif
27905 +
27906 + .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
27907 + /* End of text section */
27908 + BYTE(0)
27909 + _etext = . - __KERNEL_TEXT_OFFSET;
27910 + }
27911 +
27912 +#ifdef CONFIG_X86_32
27913 + . = ALIGN(PAGE_SIZE);
27914 + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
27915 + . = ALIGN(PAGE_SIZE);
27916 + *(.empty_zero_page)
27917 + *(.initial_pg_fixmap)
27918 + *(.initial_pg_pmd)
27919 + *(.initial_page_table)
27920 + *(.swapper_pg_dir)
27921 + } :rodata
27922 +#endif
27923 +
27924 + . = ALIGN(PAGE_SIZE);
27925 + NOTES :rodata :note
27926 +
27927 + EXCEPTION_TABLE(16) :rodata
27928
27929 #if defined(CONFIG_DEBUG_RODATA)
27930 /* .text should occupy whole number of pages */
27931 @@ -122,16 +176,20 @@ SECTIONS
27932
27933 /* Data */
27934 .data : AT(ADDR(.data) - LOAD_OFFSET) {
27935 +
27936 +#ifdef CONFIG_PAX_KERNEXEC
27937 + . = ALIGN(HPAGE_SIZE);
27938 +#else
27939 + . = ALIGN(PAGE_SIZE);
27940 +#endif
27941 +
27942 /* Start of data section */
27943 _sdata = .;
27944
27945 /* init_task */
27946 INIT_TASK_DATA(THREAD_SIZE)
27947
27948 -#ifdef CONFIG_X86_32
27949 - /* 32 bit has nosave before _edata */
27950 NOSAVE_DATA
27951 -#endif
27952
27953 PAGE_ALIGNED_DATA(PAGE_SIZE)
27954
27955 @@ -174,12 +232,19 @@ SECTIONS
27956 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
27957
27958 /* Init code and data - will be freed after init */
27959 - . = ALIGN(PAGE_SIZE);
27960 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
27961 + BYTE(0)
27962 +
27963 +#ifdef CONFIG_PAX_KERNEXEC
27964 + . = ALIGN(HPAGE_SIZE);
27965 +#else
27966 + . = ALIGN(PAGE_SIZE);
27967 +#endif
27968 +
27969 __init_begin = .; /* paired with __init_end */
27970 - }
27971 + } :init.begin
27972
27973 -#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
27974 +#ifdef CONFIG_SMP
27975 /*
27976 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
27977 * output PHDR, so the next output section - .init.text - should
27978 @@ -188,12 +253,27 @@ SECTIONS
27979 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
27980 #endif
27981
27982 - INIT_TEXT_SECTION(PAGE_SIZE)
27983 -#ifdef CONFIG_X86_64
27984 - :init
27985 -#endif
27986 + . = ALIGN(PAGE_SIZE);
27987 + init_begin = .;
27988 + .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
27989 + VMLINUX_SYMBOL(_sinittext) = .;
27990 + INIT_TEXT
27991 + VMLINUX_SYMBOL(_einittext) = .;
27992 + . = ALIGN(PAGE_SIZE);
27993 + } :text.init
27994
27995 - INIT_DATA_SECTION(16)
27996 + /*
27997 + * .exit.text is discard at runtime, not link time, to deal with
27998 + * references from .altinstructions and .eh_frame
27999 + */
28000 + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28001 + EXIT_TEXT
28002 + . = ALIGN(16);
28003 + } :text.exit
28004 + . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28005 +
28006 + . = ALIGN(PAGE_SIZE);
28007 + INIT_DATA_SECTION(16) :init
28008
28009 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28010 __x86_cpu_dev_start = .;
28011 @@ -264,19 +344,12 @@ SECTIONS
28012 }
28013
28014 . = ALIGN(8);
28015 - /*
28016 - * .exit.text is discard at runtime, not link time, to deal with
28017 - * references from .altinstructions and .eh_frame
28018 - */
28019 - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28020 - EXIT_TEXT
28021 - }
28022
28023 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28024 EXIT_DATA
28025 }
28026
28027 -#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28028 +#ifndef CONFIG_SMP
28029 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28030 #endif
28031
28032 @@ -295,16 +368,10 @@ SECTIONS
28033 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28034 __smp_locks = .;
28035 *(.smp_locks)
28036 - . = ALIGN(PAGE_SIZE);
28037 __smp_locks_end = .;
28038 + . = ALIGN(PAGE_SIZE);
28039 }
28040
28041 -#ifdef CONFIG_X86_64
28042 - .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28043 - NOSAVE_DATA
28044 - }
28045 -#endif
28046 -
28047 /* BSS */
28048 . = ALIGN(PAGE_SIZE);
28049 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28050 @@ -320,6 +387,7 @@ SECTIONS
28051 __brk_base = .;
28052 . += 64 * 1024; /* 64k alignment slop space */
28053 *(.brk_reservation) /* areas brk users have reserved */
28054 + . = ALIGN(HPAGE_SIZE);
28055 __brk_limit = .;
28056 }
28057
28058 @@ -346,13 +414,12 @@ SECTIONS
28059 * for the boot processor.
28060 */
28061 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28062 -INIT_PER_CPU(gdt_page);
28063 INIT_PER_CPU(irq_stack_union);
28064
28065 /*
28066 * Build-time check on the image size:
28067 */
28068 -. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28069 +. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28070 "kernel image bigger than KERNEL_IMAGE_SIZE");
28071
28072 #ifdef CONFIG_SMP
28073 diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28074 index 8b3b3eb..9395aa9 100644
28075 --- a/arch/x86/kernel/vsyscall_64.c
28076 +++ b/arch/x86/kernel/vsyscall_64.c
28077 @@ -54,15 +54,13 @@
28078
28079 DEFINE_VVAR(int, vgetcpu_mode);
28080
28081 -static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28082 +static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28083
28084 static int __init vsyscall_setup(char *str)
28085 {
28086 if (str) {
28087 if (!strcmp("emulate", str))
28088 vsyscall_mode = EMULATE;
28089 - else if (!strcmp("native", str))
28090 - vsyscall_mode = NATIVE;
28091 else if (!strcmp("none", str))
28092 vsyscall_mode = NONE;
28093 else
28094 @@ -279,8 +277,7 @@ do_ret:
28095 return true;
28096
28097 sigsegv:
28098 - force_sig(SIGSEGV, current);
28099 - return true;
28100 + do_group_exit(SIGKILL);
28101 }
28102
28103 /*
28104 @@ -332,10 +329,7 @@ void __init map_vsyscall(void)
28105 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28106 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
28107
28108 - __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
28109 - vsyscall_mode == NATIVE
28110 - ? PAGE_KERNEL_VSYSCALL
28111 - : PAGE_KERNEL_VVAR);
28112 + __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28113 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
28114 (unsigned long)VSYSCALL_START);
28115
28116 diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28117 index 04068192..4d75aa6 100644
28118 --- a/arch/x86/kernel/x8664_ksyms_64.c
28119 +++ b/arch/x86/kernel/x8664_ksyms_64.c
28120 @@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28121 EXPORT_SYMBOL(copy_user_generic_unrolled);
28122 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28123 EXPORT_SYMBOL(__copy_user_nocache);
28124 -EXPORT_SYMBOL(_copy_from_user);
28125 -EXPORT_SYMBOL(_copy_to_user);
28126
28127 EXPORT_SYMBOL(copy_page);
28128 EXPORT_SYMBOL(clear_page);
28129 @@ -73,3 +71,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28130 EXPORT_SYMBOL(___preempt_schedule_context);
28131 #endif
28132 #endif
28133 +
28134 +#ifdef CONFIG_PAX_PER_CPU_PGD
28135 +EXPORT_SYMBOL(cpu_pgd);
28136 +#endif
28137 diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28138 index e48b674..a451dd9 100644
28139 --- a/arch/x86/kernel/x86_init.c
28140 +++ b/arch/x86/kernel/x86_init.c
28141 @@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28142 static void default_nmi_init(void) { };
28143 static int default_i8042_detect(void) { return 1; };
28144
28145 -struct x86_platform_ops x86_platform = {
28146 +struct x86_platform_ops x86_platform __read_only = {
28147 .calibrate_tsc = native_calibrate_tsc,
28148 .get_wallclock = mach_get_cmos_time,
28149 .set_wallclock = mach_set_rtc_mmss,
28150 @@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28151 EXPORT_SYMBOL_GPL(x86_platform);
28152
28153 #if defined(CONFIG_PCI_MSI)
28154 -struct x86_msi_ops x86_msi = {
28155 +struct x86_msi_ops x86_msi __read_only = {
28156 .setup_msi_irqs = native_setup_msi_irqs,
28157 .compose_msi_msg = native_compose_msi_msg,
28158 .teardown_msi_irq = native_teardown_msi_irq,
28159 @@ -150,7 +150,7 @@ u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)
28160 }
28161 #endif
28162
28163 -struct x86_io_apic_ops x86_io_apic_ops = {
28164 +struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28165 .init = native_io_apic_init_mappings,
28166 .read = native_io_apic_read,
28167 .write = native_io_apic_write,
28168 diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28169 index a4b451c..8dfe1ad 100644
28170 --- a/arch/x86/kernel/xsave.c
28171 +++ b/arch/x86/kernel/xsave.c
28172 @@ -164,18 +164,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28173
28174 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28175 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28176 - err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28177 + err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28178
28179 if (!use_xsave())
28180 return err;
28181
28182 - err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28183 + err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28184
28185 /*
28186 * Read the xstate_bv which we copied (directly from the cpu or
28187 * from the state in task struct) to the user buffers.
28188 */
28189 - err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28190 + err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28191
28192 /*
28193 * For legacy compatible, we always set FP/SSE bits in the bit
28194 @@ -190,7 +190,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28195 */
28196 xstate_bv |= XSTATE_FPSSE;
28197
28198 - err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28199 + err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28200
28201 return err;
28202 }
28203 @@ -199,6 +199,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28204 {
28205 int err;
28206
28207 + buf = (struct xsave_struct __user *)____m(buf);
28208 if (use_xsave())
28209 err = xsave_user(buf);
28210 else if (use_fxsr())
28211 @@ -311,6 +312,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28212 */
28213 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28214 {
28215 + buf = (void __user *)____m(buf);
28216 if (use_xsave()) {
28217 if ((unsigned long)buf % 64 || fx_only) {
28218 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28219 diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28220 index f47a104..5ce59a8 100644
28221 --- a/arch/x86/kvm/cpuid.c
28222 +++ b/arch/x86/kvm/cpuid.c
28223 @@ -166,15 +166,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28224 struct kvm_cpuid2 *cpuid,
28225 struct kvm_cpuid_entry2 __user *entries)
28226 {
28227 - int r;
28228 + int r, i;
28229
28230 r = -E2BIG;
28231 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28232 goto out;
28233 r = -EFAULT;
28234 - if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28235 - cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28236 + if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28237 goto out;
28238 + for (i = 0; i < cpuid->nent; ++i) {
28239 + struct kvm_cpuid_entry2 cpuid_entry;
28240 + if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28241 + goto out;
28242 + vcpu->arch.cpuid_entries[i] = cpuid_entry;
28243 + }
28244 vcpu->arch.cpuid_nent = cpuid->nent;
28245 kvm_apic_set_version(vcpu);
28246 kvm_x86_ops->cpuid_update(vcpu);
28247 @@ -189,15 +194,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28248 struct kvm_cpuid2 *cpuid,
28249 struct kvm_cpuid_entry2 __user *entries)
28250 {
28251 - int r;
28252 + int r, i;
28253
28254 r = -E2BIG;
28255 if (cpuid->nent < vcpu->arch.cpuid_nent)
28256 goto out;
28257 r = -EFAULT;
28258 - if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28259 - vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28260 + if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28261 goto out;
28262 + for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28263 + struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28264 + if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28265 + goto out;
28266 + }
28267 return 0;
28268
28269 out:
28270 diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28271 index 0069118..c28ec0a 100644
28272 --- a/arch/x86/kvm/lapic.c
28273 +++ b/arch/x86/kvm/lapic.c
28274 @@ -55,7 +55,7 @@
28275 #define APIC_BUS_CYCLE_NS 1
28276
28277 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28278 -#define apic_debug(fmt, arg...)
28279 +#define apic_debug(fmt, arg...) do {} while (0)
28280
28281 #define APIC_LVT_NUM 6
28282 /* 14 is the version for Xeon and Pentium 8.4.8*/
28283 diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28284 index 123efd3..ad7726e 100644
28285 --- a/arch/x86/kvm/paging_tmpl.h
28286 +++ b/arch/x86/kvm/paging_tmpl.h
28287 @@ -331,7 +331,7 @@ retry_walk:
28288 if (unlikely(kvm_is_error_hva(host_addr)))
28289 goto error;
28290
28291 - ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28292 + ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28293 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28294 goto error;
28295 walker->ptep_user[walker->level - 1] = ptep_user;
28296 diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28297 index 7f4f9c2..67b1db0 100644
28298 --- a/arch/x86/kvm/svm.c
28299 +++ b/arch/x86/kvm/svm.c
28300 @@ -3535,7 +3535,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28301 int cpu = raw_smp_processor_id();
28302
28303 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28304 +
28305 + pax_open_kernel();
28306 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28307 + pax_close_kernel();
28308 +
28309 load_TR_desc();
28310 }
28311
28312 @@ -3936,6 +3940,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28313 #endif
28314 #endif
28315
28316 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28317 + __set_fs(current_thread_info()->addr_limit);
28318 +#endif
28319 +
28320 reload_tss(vcpu);
28321
28322 local_irq_disable();
28323 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28324 index 138ceff..2e584f0 100644
28325 --- a/arch/x86/kvm/vmx.c
28326 +++ b/arch/x86/kvm/vmx.c
28327 @@ -1339,12 +1339,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28328 #endif
28329 }
28330
28331 -static void vmcs_clear_bits(unsigned long field, u32 mask)
28332 +static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28333 {
28334 vmcs_writel(field, vmcs_readl(field) & ~mask);
28335 }
28336
28337 -static void vmcs_set_bits(unsigned long field, u32 mask)
28338 +static void vmcs_set_bits(unsigned long field, unsigned long mask)
28339 {
28340 vmcs_writel(field, vmcs_readl(field) | mask);
28341 }
28342 @@ -1604,7 +1604,11 @@ static void reload_tss(void)
28343 struct desc_struct *descs;
28344
28345 descs = (void *)gdt->address;
28346 +
28347 + pax_open_kernel();
28348 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28349 + pax_close_kernel();
28350 +
28351 load_TR_desc();
28352 }
28353
28354 @@ -1832,6 +1836,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28355 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28356 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28357
28358 +#ifdef CONFIG_PAX_PER_CPU_PGD
28359 + vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28360 +#endif
28361 +
28362 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28363 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28364 vmx->loaded_vmcs->cpu = cpu;
28365 @@ -2121,7 +2129,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28366 * reads and returns guest's timestamp counter "register"
28367 * guest_tsc = host_tsc + tsc_offset -- 21.3
28368 */
28369 -static u64 guest_read_tsc(void)
28370 +static u64 __intentional_overflow(-1) guest_read_tsc(void)
28371 {
28372 u64 host_tsc, tsc_offset;
28373
28374 @@ -3093,8 +3101,11 @@ static __init int hardware_setup(void)
28375 if (!cpu_has_vmx_flexpriority())
28376 flexpriority_enabled = 0;
28377
28378 - if (!cpu_has_vmx_tpr_shadow())
28379 - kvm_x86_ops->update_cr8_intercept = NULL;
28380 + if (!cpu_has_vmx_tpr_shadow()) {
28381 + pax_open_kernel();
28382 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28383 + pax_close_kernel();
28384 + }
28385
28386 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28387 kvm_disable_largepages();
28388 @@ -3105,13 +3116,15 @@ static __init int hardware_setup(void)
28389 if (!cpu_has_vmx_apicv())
28390 enable_apicv = 0;
28391
28392 + pax_open_kernel();
28393 if (enable_apicv)
28394 - kvm_x86_ops->update_cr8_intercept = NULL;
28395 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28396 else {
28397 - kvm_x86_ops->hwapic_irr_update = NULL;
28398 - kvm_x86_ops->deliver_posted_interrupt = NULL;
28399 - kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28400 + *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28401 + *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28402 + *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28403 }
28404 + pax_close_kernel();
28405
28406 if (nested)
28407 nested_vmx_setup_ctls_msrs();
28408 @@ -4235,7 +4248,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28409
28410 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28411 vmcs_writel(HOST_CR4, read_cr4()); /* 22.2.3, 22.2.5 */
28412 +
28413 +#ifndef CONFIG_PAX_PER_CPU_PGD
28414 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28415 +#endif
28416
28417 vmcs_write16(HOST_CS_SELECTOR, __KERNEL_CS); /* 22.2.4 */
28418 #ifdef CONFIG_X86_64
28419 @@ -4257,7 +4273,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28420 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28421 vmx->host_idt_base = dt.address;
28422
28423 - vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28424 + vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28425
28426 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28427 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28428 @@ -7333,6 +7349,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28429 "jmp 2f \n\t"
28430 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28431 "2: "
28432 +
28433 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28434 + "ljmp %[cs],$3f\n\t"
28435 + "3: "
28436 +#endif
28437 +
28438 /* Save guest registers, load host registers, keep flags */
28439 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28440 "pop %0 \n\t"
28441 @@ -7385,6 +7407,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28442 #endif
28443 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28444 [wordsize]"i"(sizeof(ulong))
28445 +
28446 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28447 + ,[cs]"i"(__KERNEL_CS)
28448 +#endif
28449 +
28450 : "cc", "memory"
28451 #ifdef CONFIG_X86_64
28452 , "rax", "rbx", "rdi", "rsi"
28453 @@ -7398,7 +7425,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28454 if (debugctlmsr)
28455 update_debugctlmsr(debugctlmsr);
28456
28457 -#ifndef CONFIG_X86_64
28458 +#ifdef CONFIG_X86_32
28459 /*
28460 * The sysexit path does not restore ds/es, so we must set them to
28461 * a reasonable value ourselves.
28462 @@ -7407,8 +7434,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28463 * may be executed in interrupt context, which saves and restore segments
28464 * around it, nullifying its effect.
28465 */
28466 - loadsegment(ds, __USER_DS);
28467 - loadsegment(es, __USER_DS);
28468 + loadsegment(ds, __KERNEL_DS);
28469 + loadsegment(es, __KERNEL_DS);
28470 + loadsegment(ss, __KERNEL_DS);
28471 +
28472 +#ifdef CONFIG_PAX_KERNEXEC
28473 + loadsegment(fs, __KERNEL_PERCPU);
28474 +#endif
28475 +
28476 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28477 + __set_fs(current_thread_info()->addr_limit);
28478 +#endif
28479 +
28480 #endif
28481
28482 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28483 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28484 index 5521f7c..691b7a3 100644
28485 --- a/arch/x86/kvm/x86.c
28486 +++ b/arch/x86/kvm/x86.c
28487 @@ -1822,8 +1822,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28488 {
28489 struct kvm *kvm = vcpu->kvm;
28490 int lm = is_long_mode(vcpu);
28491 - u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28492 - : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28493 + u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28494 + : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28495 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28496 : kvm->arch.xen_hvm_config.blob_size_32;
28497 u32 page_num = data & ~PAGE_MASK;
28498 @@ -2738,6 +2738,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28499 if (n < msr_list.nmsrs)
28500 goto out;
28501 r = -EFAULT;
28502 + if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28503 + goto out;
28504 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28505 num_msrs_to_save * sizeof(u32)))
28506 goto out;
28507 @@ -5574,7 +5576,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28508 };
28509 #endif
28510
28511 -int kvm_arch_init(void *opaque)
28512 +int kvm_arch_init(const void *opaque)
28513 {
28514 int r;
28515 struct kvm_x86_ops *ops = opaque;
28516 diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28517 index aae9413..d11e829 100644
28518 --- a/arch/x86/lguest/boot.c
28519 +++ b/arch/x86/lguest/boot.c
28520 @@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
28521 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
28522 * Launcher to reboot us.
28523 */
28524 -static void lguest_restart(char *reason)
28525 +static __noreturn void lguest_restart(char *reason)
28526 {
28527 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
28528 + BUG();
28529 }
28530
28531 /*G:050
28532 diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
28533 index 00933d5..3a64af9 100644
28534 --- a/arch/x86/lib/atomic64_386_32.S
28535 +++ b/arch/x86/lib/atomic64_386_32.S
28536 @@ -48,6 +48,10 @@ BEGIN(read)
28537 movl (v), %eax
28538 movl 4(v), %edx
28539 RET_ENDP
28540 +BEGIN(read_unchecked)
28541 + movl (v), %eax
28542 + movl 4(v), %edx
28543 +RET_ENDP
28544 #undef v
28545
28546 #define v %esi
28547 @@ -55,6 +59,10 @@ BEGIN(set)
28548 movl %ebx, (v)
28549 movl %ecx, 4(v)
28550 RET_ENDP
28551 +BEGIN(set_unchecked)
28552 + movl %ebx, (v)
28553 + movl %ecx, 4(v)
28554 +RET_ENDP
28555 #undef v
28556
28557 #define v %esi
28558 @@ -70,6 +78,20 @@ RET_ENDP
28559 BEGIN(add)
28560 addl %eax, (v)
28561 adcl %edx, 4(v)
28562 +
28563 +#ifdef CONFIG_PAX_REFCOUNT
28564 + jno 0f
28565 + subl %eax, (v)
28566 + sbbl %edx, 4(v)
28567 + int $4
28568 +0:
28569 + _ASM_EXTABLE(0b, 0b)
28570 +#endif
28571 +
28572 +RET_ENDP
28573 +BEGIN(add_unchecked)
28574 + addl %eax, (v)
28575 + adcl %edx, 4(v)
28576 RET_ENDP
28577 #undef v
28578
28579 @@ -77,6 +99,24 @@ RET_ENDP
28580 BEGIN(add_return)
28581 addl (v), %eax
28582 adcl 4(v), %edx
28583 +
28584 +#ifdef CONFIG_PAX_REFCOUNT
28585 + into
28586 +1234:
28587 + _ASM_EXTABLE(1234b, 2f)
28588 +#endif
28589 +
28590 + movl %eax, (v)
28591 + movl %edx, 4(v)
28592 +
28593 +#ifdef CONFIG_PAX_REFCOUNT
28594 +2:
28595 +#endif
28596 +
28597 +RET_ENDP
28598 +BEGIN(add_return_unchecked)
28599 + addl (v), %eax
28600 + adcl 4(v), %edx
28601 movl %eax, (v)
28602 movl %edx, 4(v)
28603 RET_ENDP
28604 @@ -86,6 +126,20 @@ RET_ENDP
28605 BEGIN(sub)
28606 subl %eax, (v)
28607 sbbl %edx, 4(v)
28608 +
28609 +#ifdef CONFIG_PAX_REFCOUNT
28610 + jno 0f
28611 + addl %eax, (v)
28612 + adcl %edx, 4(v)
28613 + int $4
28614 +0:
28615 + _ASM_EXTABLE(0b, 0b)
28616 +#endif
28617 +
28618 +RET_ENDP
28619 +BEGIN(sub_unchecked)
28620 + subl %eax, (v)
28621 + sbbl %edx, 4(v)
28622 RET_ENDP
28623 #undef v
28624
28625 @@ -96,6 +150,27 @@ BEGIN(sub_return)
28626 sbbl $0, %edx
28627 addl (v), %eax
28628 adcl 4(v), %edx
28629 +
28630 +#ifdef CONFIG_PAX_REFCOUNT
28631 + into
28632 +1234:
28633 + _ASM_EXTABLE(1234b, 2f)
28634 +#endif
28635 +
28636 + movl %eax, (v)
28637 + movl %edx, 4(v)
28638 +
28639 +#ifdef CONFIG_PAX_REFCOUNT
28640 +2:
28641 +#endif
28642 +
28643 +RET_ENDP
28644 +BEGIN(sub_return_unchecked)
28645 + negl %edx
28646 + negl %eax
28647 + sbbl $0, %edx
28648 + addl (v), %eax
28649 + adcl 4(v), %edx
28650 movl %eax, (v)
28651 movl %edx, 4(v)
28652 RET_ENDP
28653 @@ -105,6 +180,20 @@ RET_ENDP
28654 BEGIN(inc)
28655 addl $1, (v)
28656 adcl $0, 4(v)
28657 +
28658 +#ifdef CONFIG_PAX_REFCOUNT
28659 + jno 0f
28660 + subl $1, (v)
28661 + sbbl $0, 4(v)
28662 + int $4
28663 +0:
28664 + _ASM_EXTABLE(0b, 0b)
28665 +#endif
28666 +
28667 +RET_ENDP
28668 +BEGIN(inc_unchecked)
28669 + addl $1, (v)
28670 + adcl $0, 4(v)
28671 RET_ENDP
28672 #undef v
28673
28674 @@ -114,6 +203,26 @@ BEGIN(inc_return)
28675 movl 4(v), %edx
28676 addl $1, %eax
28677 adcl $0, %edx
28678 +
28679 +#ifdef CONFIG_PAX_REFCOUNT
28680 + into
28681 +1234:
28682 + _ASM_EXTABLE(1234b, 2f)
28683 +#endif
28684 +
28685 + movl %eax, (v)
28686 + movl %edx, 4(v)
28687 +
28688 +#ifdef CONFIG_PAX_REFCOUNT
28689 +2:
28690 +#endif
28691 +
28692 +RET_ENDP
28693 +BEGIN(inc_return_unchecked)
28694 + movl (v), %eax
28695 + movl 4(v), %edx
28696 + addl $1, %eax
28697 + adcl $0, %edx
28698 movl %eax, (v)
28699 movl %edx, 4(v)
28700 RET_ENDP
28701 @@ -123,6 +232,20 @@ RET_ENDP
28702 BEGIN(dec)
28703 subl $1, (v)
28704 sbbl $0, 4(v)
28705 +
28706 +#ifdef CONFIG_PAX_REFCOUNT
28707 + jno 0f
28708 + addl $1, (v)
28709 + adcl $0, 4(v)
28710 + int $4
28711 +0:
28712 + _ASM_EXTABLE(0b, 0b)
28713 +#endif
28714 +
28715 +RET_ENDP
28716 +BEGIN(dec_unchecked)
28717 + subl $1, (v)
28718 + sbbl $0, 4(v)
28719 RET_ENDP
28720 #undef v
28721
28722 @@ -132,6 +255,26 @@ BEGIN(dec_return)
28723 movl 4(v), %edx
28724 subl $1, %eax
28725 sbbl $0, %edx
28726 +
28727 +#ifdef CONFIG_PAX_REFCOUNT
28728 + into
28729 +1234:
28730 + _ASM_EXTABLE(1234b, 2f)
28731 +#endif
28732 +
28733 + movl %eax, (v)
28734 + movl %edx, 4(v)
28735 +
28736 +#ifdef CONFIG_PAX_REFCOUNT
28737 +2:
28738 +#endif
28739 +
28740 +RET_ENDP
28741 +BEGIN(dec_return_unchecked)
28742 + movl (v), %eax
28743 + movl 4(v), %edx
28744 + subl $1, %eax
28745 + sbbl $0, %edx
28746 movl %eax, (v)
28747 movl %edx, 4(v)
28748 RET_ENDP
28749 @@ -143,6 +286,13 @@ BEGIN(add_unless)
28750 adcl %edx, %edi
28751 addl (v), %eax
28752 adcl 4(v), %edx
28753 +
28754 +#ifdef CONFIG_PAX_REFCOUNT
28755 + into
28756 +1234:
28757 + _ASM_EXTABLE(1234b, 2f)
28758 +#endif
28759 +
28760 cmpl %eax, %ecx
28761 je 3f
28762 1:
28763 @@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
28764 1:
28765 addl $1, %eax
28766 adcl $0, %edx
28767 +
28768 +#ifdef CONFIG_PAX_REFCOUNT
28769 + into
28770 +1234:
28771 + _ASM_EXTABLE(1234b, 2f)
28772 +#endif
28773 +
28774 movl %eax, (v)
28775 movl %edx, 4(v)
28776 movl $1, %eax
28777 @@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
28778 movl 4(v), %edx
28779 subl $1, %eax
28780 sbbl $0, %edx
28781 +
28782 +#ifdef CONFIG_PAX_REFCOUNT
28783 + into
28784 +1234:
28785 + _ASM_EXTABLE(1234b, 1f)
28786 +#endif
28787 +
28788 js 1f
28789 movl %eax, (v)
28790 movl %edx, 4(v)
28791 diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
28792 index f5cc9eb..51fa319 100644
28793 --- a/arch/x86/lib/atomic64_cx8_32.S
28794 +++ b/arch/x86/lib/atomic64_cx8_32.S
28795 @@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
28796 CFI_STARTPROC
28797
28798 read64 %ecx
28799 + pax_force_retaddr
28800 ret
28801 CFI_ENDPROC
28802 ENDPROC(atomic64_read_cx8)
28803
28804 +ENTRY(atomic64_read_unchecked_cx8)
28805 + CFI_STARTPROC
28806 +
28807 + read64 %ecx
28808 + pax_force_retaddr
28809 + ret
28810 + CFI_ENDPROC
28811 +ENDPROC(atomic64_read_unchecked_cx8)
28812 +
28813 ENTRY(atomic64_set_cx8)
28814 CFI_STARTPROC
28815
28816 @@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
28817 cmpxchg8b (%esi)
28818 jne 1b
28819
28820 + pax_force_retaddr
28821 ret
28822 CFI_ENDPROC
28823 ENDPROC(atomic64_set_cx8)
28824
28825 +ENTRY(atomic64_set_unchecked_cx8)
28826 + CFI_STARTPROC
28827 +
28828 +1:
28829 +/* we don't need LOCK_PREFIX since aligned 64-bit writes
28830 + * are atomic on 586 and newer */
28831 + cmpxchg8b (%esi)
28832 + jne 1b
28833 +
28834 + pax_force_retaddr
28835 + ret
28836 + CFI_ENDPROC
28837 +ENDPROC(atomic64_set_unchecked_cx8)
28838 +
28839 ENTRY(atomic64_xchg_cx8)
28840 CFI_STARTPROC
28841
28842 @@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
28843 cmpxchg8b (%esi)
28844 jne 1b
28845
28846 + pax_force_retaddr
28847 ret
28848 CFI_ENDPROC
28849 ENDPROC(atomic64_xchg_cx8)
28850
28851 -.macro addsub_return func ins insc
28852 -ENTRY(atomic64_\func\()_return_cx8)
28853 +.macro addsub_return func ins insc unchecked=""
28854 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
28855 CFI_STARTPROC
28856 SAVE ebp
28857 SAVE ebx
28858 @@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
28859 movl %edx, %ecx
28860 \ins\()l %esi, %ebx
28861 \insc\()l %edi, %ecx
28862 +
28863 +.ifb \unchecked
28864 +#ifdef CONFIG_PAX_REFCOUNT
28865 + into
28866 +2:
28867 + _ASM_EXTABLE(2b, 3f)
28868 +#endif
28869 +.endif
28870 +
28871 LOCK_PREFIX
28872 cmpxchg8b (%ebp)
28873 jne 1b
28874 -
28875 -10:
28876 movl %ebx, %eax
28877 movl %ecx, %edx
28878 +
28879 +.ifb \unchecked
28880 +#ifdef CONFIG_PAX_REFCOUNT
28881 +3:
28882 +#endif
28883 +.endif
28884 +
28885 RESTORE edi
28886 RESTORE esi
28887 RESTORE ebx
28888 RESTORE ebp
28889 + pax_force_retaddr
28890 ret
28891 CFI_ENDPROC
28892 -ENDPROC(atomic64_\func\()_return_cx8)
28893 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
28894 .endm
28895
28896 addsub_return add add adc
28897 addsub_return sub sub sbb
28898 +addsub_return add add adc _unchecked
28899 +addsub_return sub sub sbb _unchecked
28900
28901 -.macro incdec_return func ins insc
28902 -ENTRY(atomic64_\func\()_return_cx8)
28903 +.macro incdec_return func ins insc unchecked=""
28904 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
28905 CFI_STARTPROC
28906 SAVE ebx
28907
28908 @@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
28909 movl %edx, %ecx
28910 \ins\()l $1, %ebx
28911 \insc\()l $0, %ecx
28912 +
28913 +.ifb \unchecked
28914 +#ifdef CONFIG_PAX_REFCOUNT
28915 + into
28916 +2:
28917 + _ASM_EXTABLE(2b, 3f)
28918 +#endif
28919 +.endif
28920 +
28921 LOCK_PREFIX
28922 cmpxchg8b (%esi)
28923 jne 1b
28924
28925 -10:
28926 movl %ebx, %eax
28927 movl %ecx, %edx
28928 +
28929 +.ifb \unchecked
28930 +#ifdef CONFIG_PAX_REFCOUNT
28931 +3:
28932 +#endif
28933 +.endif
28934 +
28935 RESTORE ebx
28936 + pax_force_retaddr
28937 ret
28938 CFI_ENDPROC
28939 -ENDPROC(atomic64_\func\()_return_cx8)
28940 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
28941 .endm
28942
28943 incdec_return inc add adc
28944 incdec_return dec sub sbb
28945 +incdec_return inc add adc _unchecked
28946 +incdec_return dec sub sbb _unchecked
28947
28948 ENTRY(atomic64_dec_if_positive_cx8)
28949 CFI_STARTPROC
28950 @@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
28951 movl %edx, %ecx
28952 subl $1, %ebx
28953 sbb $0, %ecx
28954 +
28955 +#ifdef CONFIG_PAX_REFCOUNT
28956 + into
28957 +1234:
28958 + _ASM_EXTABLE(1234b, 2f)
28959 +#endif
28960 +
28961 js 2f
28962 LOCK_PREFIX
28963 cmpxchg8b (%esi)
28964 @@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
28965 movl %ebx, %eax
28966 movl %ecx, %edx
28967 RESTORE ebx
28968 + pax_force_retaddr
28969 ret
28970 CFI_ENDPROC
28971 ENDPROC(atomic64_dec_if_positive_cx8)
28972 @@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
28973 movl %edx, %ecx
28974 addl %ebp, %ebx
28975 adcl %edi, %ecx
28976 +
28977 +#ifdef CONFIG_PAX_REFCOUNT
28978 + into
28979 +1234:
28980 + _ASM_EXTABLE(1234b, 3f)
28981 +#endif
28982 +
28983 LOCK_PREFIX
28984 cmpxchg8b (%esi)
28985 jne 1b
28986 @@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
28987 CFI_ADJUST_CFA_OFFSET -8
28988 RESTORE ebx
28989 RESTORE ebp
28990 + pax_force_retaddr
28991 ret
28992 4:
28993 cmpl %edx, 4(%esp)
28994 @@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
28995 xorl %ecx, %ecx
28996 addl $1, %ebx
28997 adcl %edx, %ecx
28998 +
28999 +#ifdef CONFIG_PAX_REFCOUNT
29000 + into
29001 +1234:
29002 + _ASM_EXTABLE(1234b, 3f)
29003 +#endif
29004 +
29005 LOCK_PREFIX
29006 cmpxchg8b (%esi)
29007 jne 1b
29008 @@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29009 movl $1, %eax
29010 3:
29011 RESTORE ebx
29012 + pax_force_retaddr
29013 ret
29014 CFI_ENDPROC
29015 ENDPROC(atomic64_inc_not_zero_cx8)
29016 diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29017 index e78b8ee..7e173a8 100644
29018 --- a/arch/x86/lib/checksum_32.S
29019 +++ b/arch/x86/lib/checksum_32.S
29020 @@ -29,7 +29,8 @@
29021 #include <asm/dwarf2.h>
29022 #include <asm/errno.h>
29023 #include <asm/asm.h>
29024 -
29025 +#include <asm/segment.h>
29026 +
29027 /*
29028 * computes a partial checksum, e.g. for TCP/UDP fragments
29029 */
29030 @@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29031
29032 #define ARGBASE 16
29033 #define FP 12
29034 -
29035 -ENTRY(csum_partial_copy_generic)
29036 +
29037 +ENTRY(csum_partial_copy_generic_to_user)
29038 CFI_STARTPROC
29039 +
29040 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29041 + pushl_cfi %gs
29042 + popl_cfi %es
29043 + jmp csum_partial_copy_generic
29044 +#endif
29045 +
29046 +ENTRY(csum_partial_copy_generic_from_user)
29047 +
29048 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29049 + pushl_cfi %gs
29050 + popl_cfi %ds
29051 +#endif
29052 +
29053 +ENTRY(csum_partial_copy_generic)
29054 subl $4,%esp
29055 CFI_ADJUST_CFA_OFFSET 4
29056 pushl_cfi %edi
29057 @@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29058 jmp 4f
29059 SRC(1: movw (%esi), %bx )
29060 addl $2, %esi
29061 -DST( movw %bx, (%edi) )
29062 +DST( movw %bx, %es:(%edi) )
29063 addl $2, %edi
29064 addw %bx, %ax
29065 adcl $0, %eax
29066 @@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29067 SRC(1: movl (%esi), %ebx )
29068 SRC( movl 4(%esi), %edx )
29069 adcl %ebx, %eax
29070 -DST( movl %ebx, (%edi) )
29071 +DST( movl %ebx, %es:(%edi) )
29072 adcl %edx, %eax
29073 -DST( movl %edx, 4(%edi) )
29074 +DST( movl %edx, %es:4(%edi) )
29075
29076 SRC( movl 8(%esi), %ebx )
29077 SRC( movl 12(%esi), %edx )
29078 adcl %ebx, %eax
29079 -DST( movl %ebx, 8(%edi) )
29080 +DST( movl %ebx, %es:8(%edi) )
29081 adcl %edx, %eax
29082 -DST( movl %edx, 12(%edi) )
29083 +DST( movl %edx, %es:12(%edi) )
29084
29085 SRC( movl 16(%esi), %ebx )
29086 SRC( movl 20(%esi), %edx )
29087 adcl %ebx, %eax
29088 -DST( movl %ebx, 16(%edi) )
29089 +DST( movl %ebx, %es:16(%edi) )
29090 adcl %edx, %eax
29091 -DST( movl %edx, 20(%edi) )
29092 +DST( movl %edx, %es:20(%edi) )
29093
29094 SRC( movl 24(%esi), %ebx )
29095 SRC( movl 28(%esi), %edx )
29096 adcl %ebx, %eax
29097 -DST( movl %ebx, 24(%edi) )
29098 +DST( movl %ebx, %es:24(%edi) )
29099 adcl %edx, %eax
29100 -DST( movl %edx, 28(%edi) )
29101 +DST( movl %edx, %es:28(%edi) )
29102
29103 lea 32(%esi), %esi
29104 lea 32(%edi), %edi
29105 @@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29106 shrl $2, %edx # This clears CF
29107 SRC(3: movl (%esi), %ebx )
29108 adcl %ebx, %eax
29109 -DST( movl %ebx, (%edi) )
29110 +DST( movl %ebx, %es:(%edi) )
29111 lea 4(%esi), %esi
29112 lea 4(%edi), %edi
29113 dec %edx
29114 @@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29115 jb 5f
29116 SRC( movw (%esi), %cx )
29117 leal 2(%esi), %esi
29118 -DST( movw %cx, (%edi) )
29119 +DST( movw %cx, %es:(%edi) )
29120 leal 2(%edi), %edi
29121 je 6f
29122 shll $16,%ecx
29123 SRC(5: movb (%esi), %cl )
29124 -DST( movb %cl, (%edi) )
29125 +DST( movb %cl, %es:(%edi) )
29126 6: addl %ecx, %eax
29127 adcl $0, %eax
29128 7:
29129 @@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29130
29131 6001:
29132 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29133 - movl $-EFAULT, (%ebx)
29134 + movl $-EFAULT, %ss:(%ebx)
29135
29136 # zero the complete destination - computing the rest
29137 # is too much work
29138 @@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29139
29140 6002:
29141 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29142 - movl $-EFAULT,(%ebx)
29143 + movl $-EFAULT,%ss:(%ebx)
29144 jmp 5000b
29145
29146 .previous
29147
29148 + pushl_cfi %ss
29149 + popl_cfi %ds
29150 + pushl_cfi %ss
29151 + popl_cfi %es
29152 popl_cfi %ebx
29153 CFI_RESTORE ebx
29154 popl_cfi %esi
29155 @@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29156 popl_cfi %ecx # equivalent to addl $4,%esp
29157 ret
29158 CFI_ENDPROC
29159 -ENDPROC(csum_partial_copy_generic)
29160 +ENDPROC(csum_partial_copy_generic_to_user)
29161
29162 #else
29163
29164 /* Version for PentiumII/PPro */
29165
29166 #define ROUND1(x) \
29167 + nop; nop; nop; \
29168 SRC(movl x(%esi), %ebx ) ; \
29169 addl %ebx, %eax ; \
29170 - DST(movl %ebx, x(%edi) ) ;
29171 + DST(movl %ebx, %es:x(%edi)) ;
29172
29173 #define ROUND(x) \
29174 + nop; nop; nop; \
29175 SRC(movl x(%esi), %ebx ) ; \
29176 adcl %ebx, %eax ; \
29177 - DST(movl %ebx, x(%edi) ) ;
29178 + DST(movl %ebx, %es:x(%edi)) ;
29179
29180 #define ARGBASE 12
29181 -
29182 -ENTRY(csum_partial_copy_generic)
29183 +
29184 +ENTRY(csum_partial_copy_generic_to_user)
29185 CFI_STARTPROC
29186 +
29187 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29188 + pushl_cfi %gs
29189 + popl_cfi %es
29190 + jmp csum_partial_copy_generic
29191 +#endif
29192 +
29193 +ENTRY(csum_partial_copy_generic_from_user)
29194 +
29195 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29196 + pushl_cfi %gs
29197 + popl_cfi %ds
29198 +#endif
29199 +
29200 +ENTRY(csum_partial_copy_generic)
29201 pushl_cfi %ebx
29202 CFI_REL_OFFSET ebx, 0
29203 pushl_cfi %edi
29204 @@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29205 subl %ebx, %edi
29206 lea -1(%esi),%edx
29207 andl $-32,%edx
29208 - lea 3f(%ebx,%ebx), %ebx
29209 + lea 3f(%ebx,%ebx,2), %ebx
29210 testl %esi, %esi
29211 jmp *%ebx
29212 1: addl $64,%esi
29213 @@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29214 jb 5f
29215 SRC( movw (%esi), %dx )
29216 leal 2(%esi), %esi
29217 -DST( movw %dx, (%edi) )
29218 +DST( movw %dx, %es:(%edi) )
29219 leal 2(%edi), %edi
29220 je 6f
29221 shll $16,%edx
29222 5:
29223 SRC( movb (%esi), %dl )
29224 -DST( movb %dl, (%edi) )
29225 +DST( movb %dl, %es:(%edi) )
29226 6: addl %edx, %eax
29227 adcl $0, %eax
29228 7:
29229 .section .fixup, "ax"
29230 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29231 - movl $-EFAULT, (%ebx)
29232 + movl $-EFAULT, %ss:(%ebx)
29233 # zero the complete destination (computing the rest is too much work)
29234 movl ARGBASE+8(%esp),%edi # dst
29235 movl ARGBASE+12(%esp),%ecx # len
29236 @@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29237 rep; stosb
29238 jmp 7b
29239 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29240 - movl $-EFAULT, (%ebx)
29241 + movl $-EFAULT, %ss:(%ebx)
29242 jmp 7b
29243 .previous
29244
29245 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29246 + pushl_cfi %ss
29247 + popl_cfi %ds
29248 + pushl_cfi %ss
29249 + popl_cfi %es
29250 +#endif
29251 +
29252 popl_cfi %esi
29253 CFI_RESTORE esi
29254 popl_cfi %edi
29255 @@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29256 CFI_RESTORE ebx
29257 ret
29258 CFI_ENDPROC
29259 -ENDPROC(csum_partial_copy_generic)
29260 +ENDPROC(csum_partial_copy_generic_to_user)
29261
29262 #undef ROUND
29263 #undef ROUND1
29264 diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29265 index f2145cf..cea889d 100644
29266 --- a/arch/x86/lib/clear_page_64.S
29267 +++ b/arch/x86/lib/clear_page_64.S
29268 @@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29269 movl $4096/8,%ecx
29270 xorl %eax,%eax
29271 rep stosq
29272 + pax_force_retaddr
29273 ret
29274 CFI_ENDPROC
29275 ENDPROC(clear_page_c)
29276 @@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29277 movl $4096,%ecx
29278 xorl %eax,%eax
29279 rep stosb
29280 + pax_force_retaddr
29281 ret
29282 CFI_ENDPROC
29283 ENDPROC(clear_page_c_e)
29284 @@ -43,6 +45,7 @@ ENTRY(clear_page)
29285 leaq 64(%rdi),%rdi
29286 jnz .Lloop
29287 nop
29288 + pax_force_retaddr
29289 ret
29290 CFI_ENDPROC
29291 .Lclear_page_end:
29292 @@ -58,7 +61,7 @@ ENDPROC(clear_page)
29293
29294 #include <asm/cpufeature.h>
29295
29296 - .section .altinstr_replacement,"ax"
29297 + .section .altinstr_replacement,"a"
29298 1: .byte 0xeb /* jmp <disp8> */
29299 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29300 2: .byte 0xeb /* jmp <disp8> */
29301 diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29302 index 1e572c5..2a162cd 100644
29303 --- a/arch/x86/lib/cmpxchg16b_emu.S
29304 +++ b/arch/x86/lib/cmpxchg16b_emu.S
29305 @@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
29306
29307 popf
29308 mov $1, %al
29309 + pax_force_retaddr
29310 ret
29311
29312 not_same:
29313 popf
29314 xor %al,%al
29315 + pax_force_retaddr
29316 ret
29317
29318 CFI_ENDPROC
29319 diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29320 index 176cca6..e0d658e 100644
29321 --- a/arch/x86/lib/copy_page_64.S
29322 +++ b/arch/x86/lib/copy_page_64.S
29323 @@ -9,6 +9,7 @@ copy_page_rep:
29324 CFI_STARTPROC
29325 movl $4096/8, %ecx
29326 rep movsq
29327 + pax_force_retaddr
29328 ret
29329 CFI_ENDPROC
29330 ENDPROC(copy_page_rep)
29331 @@ -24,8 +25,8 @@ ENTRY(copy_page)
29332 CFI_ADJUST_CFA_OFFSET 2*8
29333 movq %rbx, (%rsp)
29334 CFI_REL_OFFSET rbx, 0
29335 - movq %r12, 1*8(%rsp)
29336 - CFI_REL_OFFSET r12, 1*8
29337 + movq %r13, 1*8(%rsp)
29338 + CFI_REL_OFFSET r13, 1*8
29339
29340 movl $(4096/64)-5, %ecx
29341 .p2align 4
29342 @@ -38,7 +39,7 @@ ENTRY(copy_page)
29343 movq 0x8*4(%rsi), %r9
29344 movq 0x8*5(%rsi), %r10
29345 movq 0x8*6(%rsi), %r11
29346 - movq 0x8*7(%rsi), %r12
29347 + movq 0x8*7(%rsi), %r13
29348
29349 prefetcht0 5*64(%rsi)
29350
29351 @@ -49,7 +50,7 @@ ENTRY(copy_page)
29352 movq %r9, 0x8*4(%rdi)
29353 movq %r10, 0x8*5(%rdi)
29354 movq %r11, 0x8*6(%rdi)
29355 - movq %r12, 0x8*7(%rdi)
29356 + movq %r13, 0x8*7(%rdi)
29357
29358 leaq 64 (%rsi), %rsi
29359 leaq 64 (%rdi), %rdi
29360 @@ -68,7 +69,7 @@ ENTRY(copy_page)
29361 movq 0x8*4(%rsi), %r9
29362 movq 0x8*5(%rsi), %r10
29363 movq 0x8*6(%rsi), %r11
29364 - movq 0x8*7(%rsi), %r12
29365 + movq 0x8*7(%rsi), %r13
29366
29367 movq %rax, 0x8*0(%rdi)
29368 movq %rbx, 0x8*1(%rdi)
29369 @@ -77,7 +78,7 @@ ENTRY(copy_page)
29370 movq %r9, 0x8*4(%rdi)
29371 movq %r10, 0x8*5(%rdi)
29372 movq %r11, 0x8*6(%rdi)
29373 - movq %r12, 0x8*7(%rdi)
29374 + movq %r13, 0x8*7(%rdi)
29375
29376 leaq 64(%rdi), %rdi
29377 leaq 64(%rsi), %rsi
29378 @@ -85,10 +86,11 @@ ENTRY(copy_page)
29379
29380 movq (%rsp), %rbx
29381 CFI_RESTORE rbx
29382 - movq 1*8(%rsp), %r12
29383 - CFI_RESTORE r12
29384 + movq 1*8(%rsp), %r13
29385 + CFI_RESTORE r13
29386 addq $2*8, %rsp
29387 CFI_ADJUST_CFA_OFFSET -2*8
29388 + pax_force_retaddr
29389 ret
29390 .Lcopy_page_end:
29391 CFI_ENDPROC
29392 @@ -99,7 +101,7 @@ ENDPROC(copy_page)
29393
29394 #include <asm/cpufeature.h>
29395
29396 - .section .altinstr_replacement,"ax"
29397 + .section .altinstr_replacement,"a"
29398 1: .byte 0xeb /* jmp <disp8> */
29399 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29400 2:
29401 diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29402 index dee945d..a84067b 100644
29403 --- a/arch/x86/lib/copy_user_64.S
29404 +++ b/arch/x86/lib/copy_user_64.S
29405 @@ -18,31 +18,7 @@
29406 #include <asm/alternative-asm.h>
29407 #include <asm/asm.h>
29408 #include <asm/smap.h>
29409 -
29410 -/*
29411 - * By placing feature2 after feature1 in altinstructions section, we logically
29412 - * implement:
29413 - * If CPU has feature2, jmp to alt2 is used
29414 - * else if CPU has feature1, jmp to alt1 is used
29415 - * else jmp to orig is used.
29416 - */
29417 - .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29418 -0:
29419 - .byte 0xe9 /* 32bit jump */
29420 - .long \orig-1f /* by default jump to orig */
29421 -1:
29422 - .section .altinstr_replacement,"ax"
29423 -2: .byte 0xe9 /* near jump with 32bit immediate */
29424 - .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29425 -3: .byte 0xe9 /* near jump with 32bit immediate */
29426 - .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29427 - .previous
29428 -
29429 - .section .altinstructions,"a"
29430 - altinstruction_entry 0b,2b,\feature1,5,5
29431 - altinstruction_entry 0b,3b,\feature2,5,5
29432 - .previous
29433 - .endm
29434 +#include <asm/pgtable.h>
29435
29436 .macro ALIGN_DESTINATION
29437 #ifdef FIX_ALIGNMENT
29438 @@ -70,52 +46,6 @@
29439 #endif
29440 .endm
29441
29442 -/* Standard copy_to_user with segment limit checking */
29443 -ENTRY(_copy_to_user)
29444 - CFI_STARTPROC
29445 - GET_THREAD_INFO(%rax)
29446 - movq %rdi,%rcx
29447 - addq %rdx,%rcx
29448 - jc bad_to_user
29449 - cmpq TI_addr_limit(%rax),%rcx
29450 - ja bad_to_user
29451 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29452 - copy_user_generic_unrolled,copy_user_generic_string, \
29453 - copy_user_enhanced_fast_string
29454 - CFI_ENDPROC
29455 -ENDPROC(_copy_to_user)
29456 -
29457 -/* Standard copy_from_user with segment limit checking */
29458 -ENTRY(_copy_from_user)
29459 - CFI_STARTPROC
29460 - GET_THREAD_INFO(%rax)
29461 - movq %rsi,%rcx
29462 - addq %rdx,%rcx
29463 - jc bad_from_user
29464 - cmpq TI_addr_limit(%rax),%rcx
29465 - ja bad_from_user
29466 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29467 - copy_user_generic_unrolled,copy_user_generic_string, \
29468 - copy_user_enhanced_fast_string
29469 - CFI_ENDPROC
29470 -ENDPROC(_copy_from_user)
29471 -
29472 - .section .fixup,"ax"
29473 - /* must zero dest */
29474 -ENTRY(bad_from_user)
29475 -bad_from_user:
29476 - CFI_STARTPROC
29477 - movl %edx,%ecx
29478 - xorl %eax,%eax
29479 - rep
29480 - stosb
29481 -bad_to_user:
29482 - movl %edx,%eax
29483 - ret
29484 - CFI_ENDPROC
29485 -ENDPROC(bad_from_user)
29486 - .previous
29487 -
29488 /*
29489 * copy_user_generic_unrolled - memory copy with exception handling.
29490 * This version is for CPUs like P4 that don't have efficient micro
29491 @@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
29492 */
29493 ENTRY(copy_user_generic_unrolled)
29494 CFI_STARTPROC
29495 + ASM_PAX_OPEN_USERLAND
29496 ASM_STAC
29497 cmpl $8,%edx
29498 jb 20f /* less then 8 bytes, go to byte copy loop */
29499 @@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
29500 jnz 21b
29501 23: xor %eax,%eax
29502 ASM_CLAC
29503 + ASM_PAX_CLOSE_USERLAND
29504 + pax_force_retaddr
29505 ret
29506
29507 .section .fixup,"ax"
29508 @@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
29509 */
29510 ENTRY(copy_user_generic_string)
29511 CFI_STARTPROC
29512 + ASM_PAX_OPEN_USERLAND
29513 ASM_STAC
29514 cmpl $8,%edx
29515 jb 2f /* less than 8 bytes, go to byte copy loop */
29516 @@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
29517 movsb
29518 xorl %eax,%eax
29519 ASM_CLAC
29520 + ASM_PAX_CLOSE_USERLAND
29521 + pax_force_retaddr
29522 ret
29523
29524 .section .fixup,"ax"
29525 @@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
29526 */
29527 ENTRY(copy_user_enhanced_fast_string)
29528 CFI_STARTPROC
29529 + ASM_PAX_OPEN_USERLAND
29530 ASM_STAC
29531 movl %edx,%ecx
29532 1: rep
29533 movsb
29534 xorl %eax,%eax
29535 ASM_CLAC
29536 + ASM_PAX_CLOSE_USERLAND
29537 + pax_force_retaddr
29538 ret
29539
29540 .section .fixup,"ax"
29541 diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
29542 index 6a4f43c..c70fb52 100644
29543 --- a/arch/x86/lib/copy_user_nocache_64.S
29544 +++ b/arch/x86/lib/copy_user_nocache_64.S
29545 @@ -8,6 +8,7 @@
29546
29547 #include <linux/linkage.h>
29548 #include <asm/dwarf2.h>
29549 +#include <asm/alternative-asm.h>
29550
29551 #define FIX_ALIGNMENT 1
29552
29553 @@ -16,6 +17,7 @@
29554 #include <asm/thread_info.h>
29555 #include <asm/asm.h>
29556 #include <asm/smap.h>
29557 +#include <asm/pgtable.h>
29558
29559 .macro ALIGN_DESTINATION
29560 #ifdef FIX_ALIGNMENT
29561 @@ -49,6 +51,16 @@
29562 */
29563 ENTRY(__copy_user_nocache)
29564 CFI_STARTPROC
29565 +
29566 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29567 + mov pax_user_shadow_base,%rcx
29568 + cmp %rcx,%rsi
29569 + jae 1f
29570 + add %rcx,%rsi
29571 +1:
29572 +#endif
29573 +
29574 + ASM_PAX_OPEN_USERLAND
29575 ASM_STAC
29576 cmpl $8,%edx
29577 jb 20f /* less then 8 bytes, go to byte copy loop */
29578 @@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
29579 jnz 21b
29580 23: xorl %eax,%eax
29581 ASM_CLAC
29582 + ASM_PAX_CLOSE_USERLAND
29583 sfence
29584 + pax_force_retaddr
29585 ret
29586
29587 .section .fixup,"ax"
29588 diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
29589 index 2419d5f..fe52d0e 100644
29590 --- a/arch/x86/lib/csum-copy_64.S
29591 +++ b/arch/x86/lib/csum-copy_64.S
29592 @@ -9,6 +9,7 @@
29593 #include <asm/dwarf2.h>
29594 #include <asm/errno.h>
29595 #include <asm/asm.h>
29596 +#include <asm/alternative-asm.h>
29597
29598 /*
29599 * Checksum copy with exception handling.
29600 @@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
29601 CFI_ADJUST_CFA_OFFSET 7*8
29602 movq %rbx, 2*8(%rsp)
29603 CFI_REL_OFFSET rbx, 2*8
29604 - movq %r12, 3*8(%rsp)
29605 - CFI_REL_OFFSET r12, 3*8
29606 + movq %r15, 3*8(%rsp)
29607 + CFI_REL_OFFSET r15, 3*8
29608 movq %r14, 4*8(%rsp)
29609 CFI_REL_OFFSET r14, 4*8
29610 movq %r13, 5*8(%rsp)
29611 @@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
29612 movl %edx, %ecx
29613
29614 xorl %r9d, %r9d
29615 - movq %rcx, %r12
29616 + movq %rcx, %r15
29617
29618 - shrq $6, %r12
29619 + shrq $6, %r15
29620 jz .Lhandle_tail /* < 64 */
29621
29622 clc
29623
29624 /* main loop. clear in 64 byte blocks */
29625 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
29626 - /* r11: temp3, rdx: temp4, r12 loopcnt */
29627 + /* r11: temp3, rdx: temp4, r15 loopcnt */
29628 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
29629 .p2align 4
29630 .Lloop:
29631 @@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
29632 adcq %r14, %rax
29633 adcq %r13, %rax
29634
29635 - decl %r12d
29636 + decl %r15d
29637
29638 dest
29639 movq %rbx, (%rsi)
29640 @@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
29641 .Lende:
29642 movq 2*8(%rsp), %rbx
29643 CFI_RESTORE rbx
29644 - movq 3*8(%rsp), %r12
29645 - CFI_RESTORE r12
29646 + movq 3*8(%rsp), %r15
29647 + CFI_RESTORE r15
29648 movq 4*8(%rsp), %r14
29649 CFI_RESTORE r14
29650 movq 5*8(%rsp), %r13
29651 @@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
29652 CFI_RESTORE rbp
29653 addq $7*8, %rsp
29654 CFI_ADJUST_CFA_OFFSET -7*8
29655 + pax_force_retaddr
29656 ret
29657 CFI_RESTORE_STATE
29658
29659 diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
29660 index 7609e0e..b449b98 100644
29661 --- a/arch/x86/lib/csum-wrappers_64.c
29662 +++ b/arch/x86/lib/csum-wrappers_64.c
29663 @@ -53,10 +53,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
29664 len -= 2;
29665 }
29666 }
29667 + pax_open_userland();
29668 stac();
29669 - isum = csum_partial_copy_generic((__force const void *)src,
29670 + isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
29671 dst, len, isum, errp, NULL);
29672 clac();
29673 + pax_close_userland();
29674 if (unlikely(*errp))
29675 goto out_err;
29676
29677 @@ -110,10 +112,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
29678 }
29679
29680 *errp = 0;
29681 + pax_open_userland();
29682 stac();
29683 - ret = csum_partial_copy_generic(src, (void __force *)dst,
29684 + ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
29685 len, isum, NULL, errp);
29686 clac();
29687 + pax_close_userland();
29688 return ret;
29689 }
29690 EXPORT_SYMBOL(csum_partial_copy_to_user);
29691 diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
29692 index a451235..1daa956 100644
29693 --- a/arch/x86/lib/getuser.S
29694 +++ b/arch/x86/lib/getuser.S
29695 @@ -33,17 +33,40 @@
29696 #include <asm/thread_info.h>
29697 #include <asm/asm.h>
29698 #include <asm/smap.h>
29699 +#include <asm/segment.h>
29700 +#include <asm/pgtable.h>
29701 +#include <asm/alternative-asm.h>
29702 +
29703 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
29704 +#define __copyuser_seg gs;
29705 +#else
29706 +#define __copyuser_seg
29707 +#endif
29708
29709 .text
29710 ENTRY(__get_user_1)
29711 CFI_STARTPROC
29712 +
29713 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29714 GET_THREAD_INFO(%_ASM_DX)
29715 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29716 jae bad_get_user
29717 ASM_STAC
29718 -1: movzbl (%_ASM_AX),%edx
29719 +
29720 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29721 + mov pax_user_shadow_base,%_ASM_DX
29722 + cmp %_ASM_DX,%_ASM_AX
29723 + jae 1234f
29724 + add %_ASM_DX,%_ASM_AX
29725 +1234:
29726 +#endif
29727 +
29728 +#endif
29729 +
29730 +1: __copyuser_seg movzbl (%_ASM_AX),%edx
29731 xor %eax,%eax
29732 ASM_CLAC
29733 + pax_force_retaddr
29734 ret
29735 CFI_ENDPROC
29736 ENDPROC(__get_user_1)
29737 @@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
29738 ENTRY(__get_user_2)
29739 CFI_STARTPROC
29740 add $1,%_ASM_AX
29741 +
29742 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29743 jc bad_get_user
29744 GET_THREAD_INFO(%_ASM_DX)
29745 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29746 jae bad_get_user
29747 ASM_STAC
29748 -2: movzwl -1(%_ASM_AX),%edx
29749 +
29750 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29751 + mov pax_user_shadow_base,%_ASM_DX
29752 + cmp %_ASM_DX,%_ASM_AX
29753 + jae 1234f
29754 + add %_ASM_DX,%_ASM_AX
29755 +1234:
29756 +#endif
29757 +
29758 +#endif
29759 +
29760 +2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
29761 xor %eax,%eax
29762 ASM_CLAC
29763 + pax_force_retaddr
29764 ret
29765 CFI_ENDPROC
29766 ENDPROC(__get_user_2)
29767 @@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
29768 ENTRY(__get_user_4)
29769 CFI_STARTPROC
29770 add $3,%_ASM_AX
29771 +
29772 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29773 jc bad_get_user
29774 GET_THREAD_INFO(%_ASM_DX)
29775 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29776 jae bad_get_user
29777 ASM_STAC
29778 -3: movl -3(%_ASM_AX),%edx
29779 +
29780 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29781 + mov pax_user_shadow_base,%_ASM_DX
29782 + cmp %_ASM_DX,%_ASM_AX
29783 + jae 1234f
29784 + add %_ASM_DX,%_ASM_AX
29785 +1234:
29786 +#endif
29787 +
29788 +#endif
29789 +
29790 +3: __copyuser_seg movl -3(%_ASM_AX),%edx
29791 xor %eax,%eax
29792 ASM_CLAC
29793 + pax_force_retaddr
29794 ret
29795 CFI_ENDPROC
29796 ENDPROC(__get_user_4)
29797 @@ -86,10 +137,20 @@ ENTRY(__get_user_8)
29798 GET_THREAD_INFO(%_ASM_DX)
29799 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29800 jae bad_get_user
29801 +
29802 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29803 + mov pax_user_shadow_base,%_ASM_DX
29804 + cmp %_ASM_DX,%_ASM_AX
29805 + jae 1234f
29806 + add %_ASM_DX,%_ASM_AX
29807 +1234:
29808 +#endif
29809 +
29810 ASM_STAC
29811 4: movq -7(%_ASM_AX),%rdx
29812 xor %eax,%eax
29813 ASM_CLAC
29814 + pax_force_retaddr
29815 ret
29816 #else
29817 add $7,%_ASM_AX
29818 @@ -98,10 +159,11 @@ ENTRY(__get_user_8)
29819 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29820 jae bad_get_user_8
29821 ASM_STAC
29822 -4: movl -7(%_ASM_AX),%edx
29823 -5: movl -3(%_ASM_AX),%ecx
29824 +4: __copyuser_seg movl -7(%_ASM_AX),%edx
29825 +5: __copyuser_seg movl -3(%_ASM_AX),%ecx
29826 xor %eax,%eax
29827 ASM_CLAC
29828 + pax_force_retaddr
29829 ret
29830 #endif
29831 CFI_ENDPROC
29832 @@ -113,6 +175,7 @@ bad_get_user:
29833 xor %edx,%edx
29834 mov $(-EFAULT),%_ASM_AX
29835 ASM_CLAC
29836 + pax_force_retaddr
29837 ret
29838 CFI_ENDPROC
29839 END(bad_get_user)
29840 @@ -124,6 +187,7 @@ bad_get_user_8:
29841 xor %ecx,%ecx
29842 mov $(-EFAULT),%_ASM_AX
29843 ASM_CLAC
29844 + pax_force_retaddr
29845 ret
29846 CFI_ENDPROC
29847 END(bad_get_user_8)
29848 diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
29849 index 54fcffe..7be149e 100644
29850 --- a/arch/x86/lib/insn.c
29851 +++ b/arch/x86/lib/insn.c
29852 @@ -20,8 +20,10 @@
29853
29854 #ifdef __KERNEL__
29855 #include <linux/string.h>
29856 +#include <asm/pgtable_types.h>
29857 #else
29858 #include <string.h>
29859 +#define ktla_ktva(addr) addr
29860 #endif
29861 #include <asm/inat.h>
29862 #include <asm/insn.h>
29863 @@ -53,8 +55,8 @@
29864 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
29865 {
29866 memset(insn, 0, sizeof(*insn));
29867 - insn->kaddr = kaddr;
29868 - insn->next_byte = kaddr;
29869 + insn->kaddr = ktla_ktva(kaddr);
29870 + insn->next_byte = ktla_ktva(kaddr);
29871 insn->x86_64 = x86_64 ? 1 : 0;
29872 insn->opnd_bytes = 4;
29873 if (x86_64)
29874 diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
29875 index 05a95e7..326f2fa 100644
29876 --- a/arch/x86/lib/iomap_copy_64.S
29877 +++ b/arch/x86/lib/iomap_copy_64.S
29878 @@ -17,6 +17,7 @@
29879
29880 #include <linux/linkage.h>
29881 #include <asm/dwarf2.h>
29882 +#include <asm/alternative-asm.h>
29883
29884 /*
29885 * override generic version in lib/iomap_copy.c
29886 @@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
29887 CFI_STARTPROC
29888 movl %edx,%ecx
29889 rep movsd
29890 + pax_force_retaddr
29891 ret
29892 CFI_ENDPROC
29893 ENDPROC(__iowrite32_copy)
29894 diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
29895 index 56313a3..0db417e 100644
29896 --- a/arch/x86/lib/memcpy_64.S
29897 +++ b/arch/x86/lib/memcpy_64.S
29898 @@ -24,7 +24,7 @@
29899 * This gets patched over the unrolled variant (below) via the
29900 * alternative instructions framework:
29901 */
29902 - .section .altinstr_replacement, "ax", @progbits
29903 + .section .altinstr_replacement, "a", @progbits
29904 .Lmemcpy_c:
29905 movq %rdi, %rax
29906 movq %rdx, %rcx
29907 @@ -33,6 +33,7 @@
29908 rep movsq
29909 movl %edx, %ecx
29910 rep movsb
29911 + pax_force_retaddr
29912 ret
29913 .Lmemcpy_e:
29914 .previous
29915 @@ -44,11 +45,12 @@
29916 * This gets patched over the unrolled variant (below) via the
29917 * alternative instructions framework:
29918 */
29919 - .section .altinstr_replacement, "ax", @progbits
29920 + .section .altinstr_replacement, "a", @progbits
29921 .Lmemcpy_c_e:
29922 movq %rdi, %rax
29923 movq %rdx, %rcx
29924 rep movsb
29925 + pax_force_retaddr
29926 ret
29927 .Lmemcpy_e_e:
29928 .previous
29929 @@ -136,6 +138,7 @@ ENTRY(memcpy)
29930 movq %r9, 1*8(%rdi)
29931 movq %r10, -2*8(%rdi, %rdx)
29932 movq %r11, -1*8(%rdi, %rdx)
29933 + pax_force_retaddr
29934 retq
29935 .p2align 4
29936 .Lless_16bytes:
29937 @@ -148,6 +151,7 @@ ENTRY(memcpy)
29938 movq -1*8(%rsi, %rdx), %r9
29939 movq %r8, 0*8(%rdi)
29940 movq %r9, -1*8(%rdi, %rdx)
29941 + pax_force_retaddr
29942 retq
29943 .p2align 4
29944 .Lless_8bytes:
29945 @@ -161,6 +165,7 @@ ENTRY(memcpy)
29946 movl -4(%rsi, %rdx), %r8d
29947 movl %ecx, (%rdi)
29948 movl %r8d, -4(%rdi, %rdx)
29949 + pax_force_retaddr
29950 retq
29951 .p2align 4
29952 .Lless_3bytes:
29953 @@ -179,6 +184,7 @@ ENTRY(memcpy)
29954 movb %cl, (%rdi)
29955
29956 .Lend:
29957 + pax_force_retaddr
29958 retq
29959 CFI_ENDPROC
29960 ENDPROC(memcpy)
29961 diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
29962 index 65268a6..dd1de11 100644
29963 --- a/arch/x86/lib/memmove_64.S
29964 +++ b/arch/x86/lib/memmove_64.S
29965 @@ -202,14 +202,16 @@ ENTRY(memmove)
29966 movb (%rsi), %r11b
29967 movb %r11b, (%rdi)
29968 13:
29969 + pax_force_retaddr
29970 retq
29971 CFI_ENDPROC
29972
29973 - .section .altinstr_replacement,"ax"
29974 + .section .altinstr_replacement,"a"
29975 .Lmemmove_begin_forward_efs:
29976 /* Forward moving data. */
29977 movq %rdx, %rcx
29978 rep movsb
29979 + pax_force_retaddr
29980 retq
29981 .Lmemmove_end_forward_efs:
29982 .previous
29983 diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
29984 index 2dcb380..2eb79fe 100644
29985 --- a/arch/x86/lib/memset_64.S
29986 +++ b/arch/x86/lib/memset_64.S
29987 @@ -16,7 +16,7 @@
29988 *
29989 * rax original destination
29990 */
29991 - .section .altinstr_replacement, "ax", @progbits
29992 + .section .altinstr_replacement, "a", @progbits
29993 .Lmemset_c:
29994 movq %rdi,%r9
29995 movq %rdx,%rcx
29996 @@ -30,6 +30,7 @@
29997 movl %edx,%ecx
29998 rep stosb
29999 movq %r9,%rax
30000 + pax_force_retaddr
30001 ret
30002 .Lmemset_e:
30003 .previous
30004 @@ -45,13 +46,14 @@
30005 *
30006 * rax original destination
30007 */
30008 - .section .altinstr_replacement, "ax", @progbits
30009 + .section .altinstr_replacement, "a", @progbits
30010 .Lmemset_c_e:
30011 movq %rdi,%r9
30012 movb %sil,%al
30013 movq %rdx,%rcx
30014 rep stosb
30015 movq %r9,%rax
30016 + pax_force_retaddr
30017 ret
30018 .Lmemset_e_e:
30019 .previous
30020 @@ -118,6 +120,7 @@ ENTRY(__memset)
30021
30022 .Lende:
30023 movq %r10,%rax
30024 + pax_force_retaddr
30025 ret
30026
30027 CFI_RESTORE_STATE
30028 diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30029 index c9f2d9b..e7fd2c0 100644
30030 --- a/arch/x86/lib/mmx_32.c
30031 +++ b/arch/x86/lib/mmx_32.c
30032 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30033 {
30034 void *p;
30035 int i;
30036 + unsigned long cr0;
30037
30038 if (unlikely(in_interrupt()))
30039 return __memcpy(to, from, len);
30040 @@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30041 kernel_fpu_begin();
30042
30043 __asm__ __volatile__ (
30044 - "1: prefetch (%0)\n" /* This set is 28 bytes */
30045 - " prefetch 64(%0)\n"
30046 - " prefetch 128(%0)\n"
30047 - " prefetch 192(%0)\n"
30048 - " prefetch 256(%0)\n"
30049 + "1: prefetch (%1)\n" /* This set is 28 bytes */
30050 + " prefetch 64(%1)\n"
30051 + " prefetch 128(%1)\n"
30052 + " prefetch 192(%1)\n"
30053 + " prefetch 256(%1)\n"
30054 "2: \n"
30055 ".section .fixup, \"ax\"\n"
30056 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30057 + "3: \n"
30058 +
30059 +#ifdef CONFIG_PAX_KERNEXEC
30060 + " movl %%cr0, %0\n"
30061 + " movl %0, %%eax\n"
30062 + " andl $0xFFFEFFFF, %%eax\n"
30063 + " movl %%eax, %%cr0\n"
30064 +#endif
30065 +
30066 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30067 +
30068 +#ifdef CONFIG_PAX_KERNEXEC
30069 + " movl %0, %%cr0\n"
30070 +#endif
30071 +
30072 " jmp 2b\n"
30073 ".previous\n"
30074 _ASM_EXTABLE(1b, 3b)
30075 - : : "r" (from));
30076 + : "=&r" (cr0) : "r" (from) : "ax");
30077
30078 for ( ; i > 5; i--) {
30079 __asm__ __volatile__ (
30080 - "1: prefetch 320(%0)\n"
30081 - "2: movq (%0), %%mm0\n"
30082 - " movq 8(%0), %%mm1\n"
30083 - " movq 16(%0), %%mm2\n"
30084 - " movq 24(%0), %%mm3\n"
30085 - " movq %%mm0, (%1)\n"
30086 - " movq %%mm1, 8(%1)\n"
30087 - " movq %%mm2, 16(%1)\n"
30088 - " movq %%mm3, 24(%1)\n"
30089 - " movq 32(%0), %%mm0\n"
30090 - " movq 40(%0), %%mm1\n"
30091 - " movq 48(%0), %%mm2\n"
30092 - " movq 56(%0), %%mm3\n"
30093 - " movq %%mm0, 32(%1)\n"
30094 - " movq %%mm1, 40(%1)\n"
30095 - " movq %%mm2, 48(%1)\n"
30096 - " movq %%mm3, 56(%1)\n"
30097 + "1: prefetch 320(%1)\n"
30098 + "2: movq (%1), %%mm0\n"
30099 + " movq 8(%1), %%mm1\n"
30100 + " movq 16(%1), %%mm2\n"
30101 + " movq 24(%1), %%mm3\n"
30102 + " movq %%mm0, (%2)\n"
30103 + " movq %%mm1, 8(%2)\n"
30104 + " movq %%mm2, 16(%2)\n"
30105 + " movq %%mm3, 24(%2)\n"
30106 + " movq 32(%1), %%mm0\n"
30107 + " movq 40(%1), %%mm1\n"
30108 + " movq 48(%1), %%mm2\n"
30109 + " movq 56(%1), %%mm3\n"
30110 + " movq %%mm0, 32(%2)\n"
30111 + " movq %%mm1, 40(%2)\n"
30112 + " movq %%mm2, 48(%2)\n"
30113 + " movq %%mm3, 56(%2)\n"
30114 ".section .fixup, \"ax\"\n"
30115 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30116 + "3:\n"
30117 +
30118 +#ifdef CONFIG_PAX_KERNEXEC
30119 + " movl %%cr0, %0\n"
30120 + " movl %0, %%eax\n"
30121 + " andl $0xFFFEFFFF, %%eax\n"
30122 + " movl %%eax, %%cr0\n"
30123 +#endif
30124 +
30125 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30126 +
30127 +#ifdef CONFIG_PAX_KERNEXEC
30128 + " movl %0, %%cr0\n"
30129 +#endif
30130 +
30131 " jmp 2b\n"
30132 ".previous\n"
30133 _ASM_EXTABLE(1b, 3b)
30134 - : : "r" (from), "r" (to) : "memory");
30135 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30136
30137 from += 64;
30138 to += 64;
30139 @@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30140 static void fast_copy_page(void *to, void *from)
30141 {
30142 int i;
30143 + unsigned long cr0;
30144
30145 kernel_fpu_begin();
30146
30147 @@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30148 * but that is for later. -AV
30149 */
30150 __asm__ __volatile__(
30151 - "1: prefetch (%0)\n"
30152 - " prefetch 64(%0)\n"
30153 - " prefetch 128(%0)\n"
30154 - " prefetch 192(%0)\n"
30155 - " prefetch 256(%0)\n"
30156 + "1: prefetch (%1)\n"
30157 + " prefetch 64(%1)\n"
30158 + " prefetch 128(%1)\n"
30159 + " prefetch 192(%1)\n"
30160 + " prefetch 256(%1)\n"
30161 "2: \n"
30162 ".section .fixup, \"ax\"\n"
30163 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30164 + "3: \n"
30165 +
30166 +#ifdef CONFIG_PAX_KERNEXEC
30167 + " movl %%cr0, %0\n"
30168 + " movl %0, %%eax\n"
30169 + " andl $0xFFFEFFFF, %%eax\n"
30170 + " movl %%eax, %%cr0\n"
30171 +#endif
30172 +
30173 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30174 +
30175 +#ifdef CONFIG_PAX_KERNEXEC
30176 + " movl %0, %%cr0\n"
30177 +#endif
30178 +
30179 " jmp 2b\n"
30180 ".previous\n"
30181 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
30182 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30183
30184 for (i = 0; i < (4096-320)/64; i++) {
30185 __asm__ __volatile__ (
30186 - "1: prefetch 320(%0)\n"
30187 - "2: movq (%0), %%mm0\n"
30188 - " movntq %%mm0, (%1)\n"
30189 - " movq 8(%0), %%mm1\n"
30190 - " movntq %%mm1, 8(%1)\n"
30191 - " movq 16(%0), %%mm2\n"
30192 - " movntq %%mm2, 16(%1)\n"
30193 - " movq 24(%0), %%mm3\n"
30194 - " movntq %%mm3, 24(%1)\n"
30195 - " movq 32(%0), %%mm4\n"
30196 - " movntq %%mm4, 32(%1)\n"
30197 - " movq 40(%0), %%mm5\n"
30198 - " movntq %%mm5, 40(%1)\n"
30199 - " movq 48(%0), %%mm6\n"
30200 - " movntq %%mm6, 48(%1)\n"
30201 - " movq 56(%0), %%mm7\n"
30202 - " movntq %%mm7, 56(%1)\n"
30203 + "1: prefetch 320(%1)\n"
30204 + "2: movq (%1), %%mm0\n"
30205 + " movntq %%mm0, (%2)\n"
30206 + " movq 8(%1), %%mm1\n"
30207 + " movntq %%mm1, 8(%2)\n"
30208 + " movq 16(%1), %%mm2\n"
30209 + " movntq %%mm2, 16(%2)\n"
30210 + " movq 24(%1), %%mm3\n"
30211 + " movntq %%mm3, 24(%2)\n"
30212 + " movq 32(%1), %%mm4\n"
30213 + " movntq %%mm4, 32(%2)\n"
30214 + " movq 40(%1), %%mm5\n"
30215 + " movntq %%mm5, 40(%2)\n"
30216 + " movq 48(%1), %%mm6\n"
30217 + " movntq %%mm6, 48(%2)\n"
30218 + " movq 56(%1), %%mm7\n"
30219 + " movntq %%mm7, 56(%2)\n"
30220 ".section .fixup, \"ax\"\n"
30221 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30222 + "3:\n"
30223 +
30224 +#ifdef CONFIG_PAX_KERNEXEC
30225 + " movl %%cr0, %0\n"
30226 + " movl %0, %%eax\n"
30227 + " andl $0xFFFEFFFF, %%eax\n"
30228 + " movl %%eax, %%cr0\n"
30229 +#endif
30230 +
30231 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30232 +
30233 +#ifdef CONFIG_PAX_KERNEXEC
30234 + " movl %0, %%cr0\n"
30235 +#endif
30236 +
30237 " jmp 2b\n"
30238 ".previous\n"
30239 - _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30240 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30241
30242 from += 64;
30243 to += 64;
30244 @@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30245 static void fast_copy_page(void *to, void *from)
30246 {
30247 int i;
30248 + unsigned long cr0;
30249
30250 kernel_fpu_begin();
30251
30252 __asm__ __volatile__ (
30253 - "1: prefetch (%0)\n"
30254 - " prefetch 64(%0)\n"
30255 - " prefetch 128(%0)\n"
30256 - " prefetch 192(%0)\n"
30257 - " prefetch 256(%0)\n"
30258 + "1: prefetch (%1)\n"
30259 + " prefetch 64(%1)\n"
30260 + " prefetch 128(%1)\n"
30261 + " prefetch 192(%1)\n"
30262 + " prefetch 256(%1)\n"
30263 "2: \n"
30264 ".section .fixup, \"ax\"\n"
30265 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30266 + "3: \n"
30267 +
30268 +#ifdef CONFIG_PAX_KERNEXEC
30269 + " movl %%cr0, %0\n"
30270 + " movl %0, %%eax\n"
30271 + " andl $0xFFFEFFFF, %%eax\n"
30272 + " movl %%eax, %%cr0\n"
30273 +#endif
30274 +
30275 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30276 +
30277 +#ifdef CONFIG_PAX_KERNEXEC
30278 + " movl %0, %%cr0\n"
30279 +#endif
30280 +
30281 " jmp 2b\n"
30282 ".previous\n"
30283 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
30284 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30285
30286 for (i = 0; i < 4096/64; i++) {
30287 __asm__ __volatile__ (
30288 - "1: prefetch 320(%0)\n"
30289 - "2: movq (%0), %%mm0\n"
30290 - " movq 8(%0), %%mm1\n"
30291 - " movq 16(%0), %%mm2\n"
30292 - " movq 24(%0), %%mm3\n"
30293 - " movq %%mm0, (%1)\n"
30294 - " movq %%mm1, 8(%1)\n"
30295 - " movq %%mm2, 16(%1)\n"
30296 - " movq %%mm3, 24(%1)\n"
30297 - " movq 32(%0), %%mm0\n"
30298 - " movq 40(%0), %%mm1\n"
30299 - " movq 48(%0), %%mm2\n"
30300 - " movq 56(%0), %%mm3\n"
30301 - " movq %%mm0, 32(%1)\n"
30302 - " movq %%mm1, 40(%1)\n"
30303 - " movq %%mm2, 48(%1)\n"
30304 - " movq %%mm3, 56(%1)\n"
30305 + "1: prefetch 320(%1)\n"
30306 + "2: movq (%1), %%mm0\n"
30307 + " movq 8(%1), %%mm1\n"
30308 + " movq 16(%1), %%mm2\n"
30309 + " movq 24(%1), %%mm3\n"
30310 + " movq %%mm0, (%2)\n"
30311 + " movq %%mm1, 8(%2)\n"
30312 + " movq %%mm2, 16(%2)\n"
30313 + " movq %%mm3, 24(%2)\n"
30314 + " movq 32(%1), %%mm0\n"
30315 + " movq 40(%1), %%mm1\n"
30316 + " movq 48(%1), %%mm2\n"
30317 + " movq 56(%1), %%mm3\n"
30318 + " movq %%mm0, 32(%2)\n"
30319 + " movq %%mm1, 40(%2)\n"
30320 + " movq %%mm2, 48(%2)\n"
30321 + " movq %%mm3, 56(%2)\n"
30322 ".section .fixup, \"ax\"\n"
30323 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30324 + "3:\n"
30325 +
30326 +#ifdef CONFIG_PAX_KERNEXEC
30327 + " movl %%cr0, %0\n"
30328 + " movl %0, %%eax\n"
30329 + " andl $0xFFFEFFFF, %%eax\n"
30330 + " movl %%eax, %%cr0\n"
30331 +#endif
30332 +
30333 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30334 +
30335 +#ifdef CONFIG_PAX_KERNEXEC
30336 + " movl %0, %%cr0\n"
30337 +#endif
30338 +
30339 " jmp 2b\n"
30340 ".previous\n"
30341 _ASM_EXTABLE(1b, 3b)
30342 - : : "r" (from), "r" (to) : "memory");
30343 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30344
30345 from += 64;
30346 to += 64;
30347 diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30348 index f6d13ee..d789440 100644
30349 --- a/arch/x86/lib/msr-reg.S
30350 +++ b/arch/x86/lib/msr-reg.S
30351 @@ -3,6 +3,7 @@
30352 #include <asm/dwarf2.h>
30353 #include <asm/asm.h>
30354 #include <asm/msr.h>
30355 +#include <asm/alternative-asm.h>
30356
30357 #ifdef CONFIG_X86_64
30358 /*
30359 @@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30360 movl %edi, 28(%r10)
30361 popq_cfi %rbp
30362 popq_cfi %rbx
30363 + pax_force_retaddr
30364 ret
30365 3:
30366 CFI_RESTORE_STATE
30367 diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30368 index fc6ba17..d4d989d 100644
30369 --- a/arch/x86/lib/putuser.S
30370 +++ b/arch/x86/lib/putuser.S
30371 @@ -16,7 +16,9 @@
30372 #include <asm/errno.h>
30373 #include <asm/asm.h>
30374 #include <asm/smap.h>
30375 -
30376 +#include <asm/segment.h>
30377 +#include <asm/pgtable.h>
30378 +#include <asm/alternative-asm.h>
30379
30380 /*
30381 * __put_user_X
30382 @@ -30,57 +32,125 @@
30383 * as they get called from within inline assembly.
30384 */
30385
30386 -#define ENTER CFI_STARTPROC ; \
30387 - GET_THREAD_INFO(%_ASM_BX)
30388 -#define EXIT ASM_CLAC ; \
30389 - ret ; \
30390 +#define ENTER CFI_STARTPROC
30391 +#define EXIT ASM_CLAC ; \
30392 + pax_force_retaddr ; \
30393 + ret ; \
30394 CFI_ENDPROC
30395
30396 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30397 +#define _DEST %_ASM_CX,%_ASM_BX
30398 +#else
30399 +#define _DEST %_ASM_CX
30400 +#endif
30401 +
30402 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30403 +#define __copyuser_seg gs;
30404 +#else
30405 +#define __copyuser_seg
30406 +#endif
30407 +
30408 .text
30409 ENTRY(__put_user_1)
30410 ENTER
30411 +
30412 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30413 + GET_THREAD_INFO(%_ASM_BX)
30414 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30415 jae bad_put_user
30416 ASM_STAC
30417 -1: movb %al,(%_ASM_CX)
30418 +
30419 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30420 + mov pax_user_shadow_base,%_ASM_BX
30421 + cmp %_ASM_BX,%_ASM_CX
30422 + jb 1234f
30423 + xor %ebx,%ebx
30424 +1234:
30425 +#endif
30426 +
30427 +#endif
30428 +
30429 +1: __copyuser_seg movb %al,(_DEST)
30430 xor %eax,%eax
30431 EXIT
30432 ENDPROC(__put_user_1)
30433
30434 ENTRY(__put_user_2)
30435 ENTER
30436 +
30437 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30438 + GET_THREAD_INFO(%_ASM_BX)
30439 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30440 sub $1,%_ASM_BX
30441 cmp %_ASM_BX,%_ASM_CX
30442 jae bad_put_user
30443 ASM_STAC
30444 -2: movw %ax,(%_ASM_CX)
30445 +
30446 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30447 + mov pax_user_shadow_base,%_ASM_BX
30448 + cmp %_ASM_BX,%_ASM_CX
30449 + jb 1234f
30450 + xor %ebx,%ebx
30451 +1234:
30452 +#endif
30453 +
30454 +#endif
30455 +
30456 +2: __copyuser_seg movw %ax,(_DEST)
30457 xor %eax,%eax
30458 EXIT
30459 ENDPROC(__put_user_2)
30460
30461 ENTRY(__put_user_4)
30462 ENTER
30463 +
30464 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30465 + GET_THREAD_INFO(%_ASM_BX)
30466 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30467 sub $3,%_ASM_BX
30468 cmp %_ASM_BX,%_ASM_CX
30469 jae bad_put_user
30470 ASM_STAC
30471 -3: movl %eax,(%_ASM_CX)
30472 +
30473 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30474 + mov pax_user_shadow_base,%_ASM_BX
30475 + cmp %_ASM_BX,%_ASM_CX
30476 + jb 1234f
30477 + xor %ebx,%ebx
30478 +1234:
30479 +#endif
30480 +
30481 +#endif
30482 +
30483 +3: __copyuser_seg movl %eax,(_DEST)
30484 xor %eax,%eax
30485 EXIT
30486 ENDPROC(__put_user_4)
30487
30488 ENTRY(__put_user_8)
30489 ENTER
30490 +
30491 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30492 + GET_THREAD_INFO(%_ASM_BX)
30493 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30494 sub $7,%_ASM_BX
30495 cmp %_ASM_BX,%_ASM_CX
30496 jae bad_put_user
30497 ASM_STAC
30498 -4: mov %_ASM_AX,(%_ASM_CX)
30499 +
30500 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30501 + mov pax_user_shadow_base,%_ASM_BX
30502 + cmp %_ASM_BX,%_ASM_CX
30503 + jb 1234f
30504 + xor %ebx,%ebx
30505 +1234:
30506 +#endif
30507 +
30508 +#endif
30509 +
30510 +4: __copyuser_seg mov %_ASM_AX,(_DEST)
30511 #ifdef CONFIG_X86_32
30512 -5: movl %edx,4(%_ASM_CX)
30513 +5: __copyuser_seg movl %edx,4(_DEST)
30514 #endif
30515 xor %eax,%eax
30516 EXIT
30517 diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
30518 index 1cad221..de671ee 100644
30519 --- a/arch/x86/lib/rwlock.S
30520 +++ b/arch/x86/lib/rwlock.S
30521 @@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
30522 FRAME
30523 0: LOCK_PREFIX
30524 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
30525 +
30526 +#ifdef CONFIG_PAX_REFCOUNT
30527 + jno 1234f
30528 + LOCK_PREFIX
30529 + WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
30530 + int $4
30531 +1234:
30532 + _ASM_EXTABLE(1234b, 1234b)
30533 +#endif
30534 +
30535 1: rep; nop
30536 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
30537 jne 1b
30538 LOCK_PREFIX
30539 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
30540 +
30541 +#ifdef CONFIG_PAX_REFCOUNT
30542 + jno 1234f
30543 + LOCK_PREFIX
30544 + WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
30545 + int $4
30546 +1234:
30547 + _ASM_EXTABLE(1234b, 1234b)
30548 +#endif
30549 +
30550 jnz 0b
30551 ENDFRAME
30552 + pax_force_retaddr
30553 ret
30554 CFI_ENDPROC
30555 END(__write_lock_failed)
30556 @@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
30557 FRAME
30558 0: LOCK_PREFIX
30559 READ_LOCK_SIZE(inc) (%__lock_ptr)
30560 +
30561 +#ifdef CONFIG_PAX_REFCOUNT
30562 + jno 1234f
30563 + LOCK_PREFIX
30564 + READ_LOCK_SIZE(dec) (%__lock_ptr)
30565 + int $4
30566 +1234:
30567 + _ASM_EXTABLE(1234b, 1234b)
30568 +#endif
30569 +
30570 1: rep; nop
30571 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
30572 js 1b
30573 LOCK_PREFIX
30574 READ_LOCK_SIZE(dec) (%__lock_ptr)
30575 +
30576 +#ifdef CONFIG_PAX_REFCOUNT
30577 + jno 1234f
30578 + LOCK_PREFIX
30579 + READ_LOCK_SIZE(inc) (%__lock_ptr)
30580 + int $4
30581 +1234:
30582 + _ASM_EXTABLE(1234b, 1234b)
30583 +#endif
30584 +
30585 js 0b
30586 ENDFRAME
30587 + pax_force_retaddr
30588 ret
30589 CFI_ENDPROC
30590 END(__read_lock_failed)
30591 diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30592 index 5dff5f0..cadebf4 100644
30593 --- a/arch/x86/lib/rwsem.S
30594 +++ b/arch/x86/lib/rwsem.S
30595 @@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
30596 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30597 CFI_RESTORE __ASM_REG(dx)
30598 restore_common_regs
30599 + pax_force_retaddr
30600 ret
30601 CFI_ENDPROC
30602 ENDPROC(call_rwsem_down_read_failed)
30603 @@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
30604 movq %rax,%rdi
30605 call rwsem_down_write_failed
30606 restore_common_regs
30607 + pax_force_retaddr
30608 ret
30609 CFI_ENDPROC
30610 ENDPROC(call_rwsem_down_write_failed)
30611 @@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
30612 movq %rax,%rdi
30613 call rwsem_wake
30614 restore_common_regs
30615 -1: ret
30616 +1: pax_force_retaddr
30617 + ret
30618 CFI_ENDPROC
30619 ENDPROC(call_rwsem_wake)
30620
30621 @@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
30622 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30623 CFI_RESTORE __ASM_REG(dx)
30624 restore_common_regs
30625 + pax_force_retaddr
30626 ret
30627 CFI_ENDPROC
30628 ENDPROC(call_rwsem_downgrade_wake)
30629 diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
30630 index a63efd6..8149fbe 100644
30631 --- a/arch/x86/lib/thunk_64.S
30632 +++ b/arch/x86/lib/thunk_64.S
30633 @@ -8,6 +8,7 @@
30634 #include <linux/linkage.h>
30635 #include <asm/dwarf2.h>
30636 #include <asm/calling.h>
30637 +#include <asm/alternative-asm.h>
30638
30639 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
30640 .macro THUNK name, func, put_ret_addr_in_rdi=0
30641 @@ -15,11 +16,11 @@
30642 \name:
30643 CFI_STARTPROC
30644
30645 - /* this one pushes 9 elems, the next one would be %rIP */
30646 - SAVE_ARGS
30647 + /* this one pushes 15+1 elems, the next one would be %rIP */
30648 + SAVE_ARGS 8
30649
30650 .if \put_ret_addr_in_rdi
30651 - movq_cfi_restore 9*8, rdi
30652 + movq_cfi_restore RIP, rdi
30653 .endif
30654
30655 call \func
30656 @@ -38,8 +39,9 @@
30657
30658 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
30659 CFI_STARTPROC
30660 - SAVE_ARGS
30661 + SAVE_ARGS 8
30662 restore:
30663 - RESTORE_ARGS
30664 + RESTORE_ARGS 1,8
30665 + pax_force_retaddr
30666 ret
30667 CFI_ENDPROC
30668 diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
30669 index e2f5e21..4b22130 100644
30670 --- a/arch/x86/lib/usercopy_32.c
30671 +++ b/arch/x86/lib/usercopy_32.c
30672 @@ -42,11 +42,13 @@ do { \
30673 int __d0; \
30674 might_fault(); \
30675 __asm__ __volatile__( \
30676 + __COPYUSER_SET_ES \
30677 ASM_STAC "\n" \
30678 "0: rep; stosl\n" \
30679 " movl %2,%0\n" \
30680 "1: rep; stosb\n" \
30681 "2: " ASM_CLAC "\n" \
30682 + __COPYUSER_RESTORE_ES \
30683 ".section .fixup,\"ax\"\n" \
30684 "3: lea 0(%2,%0,4),%0\n" \
30685 " jmp 2b\n" \
30686 @@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
30687
30688 #ifdef CONFIG_X86_INTEL_USERCOPY
30689 static unsigned long
30690 -__copy_user_intel(void __user *to, const void *from, unsigned long size)
30691 +__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
30692 {
30693 int d0, d1;
30694 __asm__ __volatile__(
30695 @@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
30696 " .align 2,0x90\n"
30697 "3: movl 0(%4), %%eax\n"
30698 "4: movl 4(%4), %%edx\n"
30699 - "5: movl %%eax, 0(%3)\n"
30700 - "6: movl %%edx, 4(%3)\n"
30701 + "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
30702 + "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
30703 "7: movl 8(%4), %%eax\n"
30704 "8: movl 12(%4),%%edx\n"
30705 - "9: movl %%eax, 8(%3)\n"
30706 - "10: movl %%edx, 12(%3)\n"
30707 + "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
30708 + "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
30709 "11: movl 16(%4), %%eax\n"
30710 "12: movl 20(%4), %%edx\n"
30711 - "13: movl %%eax, 16(%3)\n"
30712 - "14: movl %%edx, 20(%3)\n"
30713 + "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
30714 + "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
30715 "15: movl 24(%4), %%eax\n"
30716 "16: movl 28(%4), %%edx\n"
30717 - "17: movl %%eax, 24(%3)\n"
30718 - "18: movl %%edx, 28(%3)\n"
30719 + "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
30720 + "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
30721 "19: movl 32(%4), %%eax\n"
30722 "20: movl 36(%4), %%edx\n"
30723 - "21: movl %%eax, 32(%3)\n"
30724 - "22: movl %%edx, 36(%3)\n"
30725 + "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
30726 + "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
30727 "23: movl 40(%4), %%eax\n"
30728 "24: movl 44(%4), %%edx\n"
30729 - "25: movl %%eax, 40(%3)\n"
30730 - "26: movl %%edx, 44(%3)\n"
30731 + "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
30732 + "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
30733 "27: movl 48(%4), %%eax\n"
30734 "28: movl 52(%4), %%edx\n"
30735 - "29: movl %%eax, 48(%3)\n"
30736 - "30: movl %%edx, 52(%3)\n"
30737 + "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
30738 + "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
30739 "31: movl 56(%4), %%eax\n"
30740 "32: movl 60(%4), %%edx\n"
30741 - "33: movl %%eax, 56(%3)\n"
30742 - "34: movl %%edx, 60(%3)\n"
30743 + "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
30744 + "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
30745 " addl $-64, %0\n"
30746 " addl $64, %4\n"
30747 " addl $64, %3\n"
30748 @@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
30749 " shrl $2, %0\n"
30750 " andl $3, %%eax\n"
30751 " cld\n"
30752 + __COPYUSER_SET_ES
30753 "99: rep; movsl\n"
30754 "36: movl %%eax, %0\n"
30755 "37: rep; movsb\n"
30756 "100:\n"
30757 + __COPYUSER_RESTORE_ES
30758 + ".section .fixup,\"ax\"\n"
30759 + "101: lea 0(%%eax,%0,4),%0\n"
30760 + " jmp 100b\n"
30761 + ".previous\n"
30762 + _ASM_EXTABLE(1b,100b)
30763 + _ASM_EXTABLE(2b,100b)
30764 + _ASM_EXTABLE(3b,100b)
30765 + _ASM_EXTABLE(4b,100b)
30766 + _ASM_EXTABLE(5b,100b)
30767 + _ASM_EXTABLE(6b,100b)
30768 + _ASM_EXTABLE(7b,100b)
30769 + _ASM_EXTABLE(8b,100b)
30770 + _ASM_EXTABLE(9b,100b)
30771 + _ASM_EXTABLE(10b,100b)
30772 + _ASM_EXTABLE(11b,100b)
30773 + _ASM_EXTABLE(12b,100b)
30774 + _ASM_EXTABLE(13b,100b)
30775 + _ASM_EXTABLE(14b,100b)
30776 + _ASM_EXTABLE(15b,100b)
30777 + _ASM_EXTABLE(16b,100b)
30778 + _ASM_EXTABLE(17b,100b)
30779 + _ASM_EXTABLE(18b,100b)
30780 + _ASM_EXTABLE(19b,100b)
30781 + _ASM_EXTABLE(20b,100b)
30782 + _ASM_EXTABLE(21b,100b)
30783 + _ASM_EXTABLE(22b,100b)
30784 + _ASM_EXTABLE(23b,100b)
30785 + _ASM_EXTABLE(24b,100b)
30786 + _ASM_EXTABLE(25b,100b)
30787 + _ASM_EXTABLE(26b,100b)
30788 + _ASM_EXTABLE(27b,100b)
30789 + _ASM_EXTABLE(28b,100b)
30790 + _ASM_EXTABLE(29b,100b)
30791 + _ASM_EXTABLE(30b,100b)
30792 + _ASM_EXTABLE(31b,100b)
30793 + _ASM_EXTABLE(32b,100b)
30794 + _ASM_EXTABLE(33b,100b)
30795 + _ASM_EXTABLE(34b,100b)
30796 + _ASM_EXTABLE(35b,100b)
30797 + _ASM_EXTABLE(36b,100b)
30798 + _ASM_EXTABLE(37b,100b)
30799 + _ASM_EXTABLE(99b,101b)
30800 + : "=&c"(size), "=&D" (d0), "=&S" (d1)
30801 + : "1"(to), "2"(from), "0"(size)
30802 + : "eax", "edx", "memory");
30803 + return size;
30804 +}
30805 +
30806 +static unsigned long
30807 +__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
30808 +{
30809 + int d0, d1;
30810 + __asm__ __volatile__(
30811 + " .align 2,0x90\n"
30812 + "1: "__copyuser_seg" movl 32(%4), %%eax\n"
30813 + " cmpl $67, %0\n"
30814 + " jbe 3f\n"
30815 + "2: "__copyuser_seg" movl 64(%4), %%eax\n"
30816 + " .align 2,0x90\n"
30817 + "3: "__copyuser_seg" movl 0(%4), %%eax\n"
30818 + "4: "__copyuser_seg" movl 4(%4), %%edx\n"
30819 + "5: movl %%eax, 0(%3)\n"
30820 + "6: movl %%edx, 4(%3)\n"
30821 + "7: "__copyuser_seg" movl 8(%4), %%eax\n"
30822 + "8: "__copyuser_seg" movl 12(%4),%%edx\n"
30823 + "9: movl %%eax, 8(%3)\n"
30824 + "10: movl %%edx, 12(%3)\n"
30825 + "11: "__copyuser_seg" movl 16(%4), %%eax\n"
30826 + "12: "__copyuser_seg" movl 20(%4), %%edx\n"
30827 + "13: movl %%eax, 16(%3)\n"
30828 + "14: movl %%edx, 20(%3)\n"
30829 + "15: "__copyuser_seg" movl 24(%4), %%eax\n"
30830 + "16: "__copyuser_seg" movl 28(%4), %%edx\n"
30831 + "17: movl %%eax, 24(%3)\n"
30832 + "18: movl %%edx, 28(%3)\n"
30833 + "19: "__copyuser_seg" movl 32(%4), %%eax\n"
30834 + "20: "__copyuser_seg" movl 36(%4), %%edx\n"
30835 + "21: movl %%eax, 32(%3)\n"
30836 + "22: movl %%edx, 36(%3)\n"
30837 + "23: "__copyuser_seg" movl 40(%4), %%eax\n"
30838 + "24: "__copyuser_seg" movl 44(%4), %%edx\n"
30839 + "25: movl %%eax, 40(%3)\n"
30840 + "26: movl %%edx, 44(%3)\n"
30841 + "27: "__copyuser_seg" movl 48(%4), %%eax\n"
30842 + "28: "__copyuser_seg" movl 52(%4), %%edx\n"
30843 + "29: movl %%eax, 48(%3)\n"
30844 + "30: movl %%edx, 52(%3)\n"
30845 + "31: "__copyuser_seg" movl 56(%4), %%eax\n"
30846 + "32: "__copyuser_seg" movl 60(%4), %%edx\n"
30847 + "33: movl %%eax, 56(%3)\n"
30848 + "34: movl %%edx, 60(%3)\n"
30849 + " addl $-64, %0\n"
30850 + " addl $64, %4\n"
30851 + " addl $64, %3\n"
30852 + " cmpl $63, %0\n"
30853 + " ja 1b\n"
30854 + "35: movl %0, %%eax\n"
30855 + " shrl $2, %0\n"
30856 + " andl $3, %%eax\n"
30857 + " cld\n"
30858 + "99: rep; "__copyuser_seg" movsl\n"
30859 + "36: movl %%eax, %0\n"
30860 + "37: rep; "__copyuser_seg" movsb\n"
30861 + "100:\n"
30862 ".section .fixup,\"ax\"\n"
30863 "101: lea 0(%%eax,%0,4),%0\n"
30864 " jmp 100b\n"
30865 @@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
30866 int d0, d1;
30867 __asm__ __volatile__(
30868 " .align 2,0x90\n"
30869 - "0: movl 32(%4), %%eax\n"
30870 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
30871 " cmpl $67, %0\n"
30872 " jbe 2f\n"
30873 - "1: movl 64(%4), %%eax\n"
30874 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
30875 " .align 2,0x90\n"
30876 - "2: movl 0(%4), %%eax\n"
30877 - "21: movl 4(%4), %%edx\n"
30878 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
30879 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
30880 " movl %%eax, 0(%3)\n"
30881 " movl %%edx, 4(%3)\n"
30882 - "3: movl 8(%4), %%eax\n"
30883 - "31: movl 12(%4),%%edx\n"
30884 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
30885 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
30886 " movl %%eax, 8(%3)\n"
30887 " movl %%edx, 12(%3)\n"
30888 - "4: movl 16(%4), %%eax\n"
30889 - "41: movl 20(%4), %%edx\n"
30890 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
30891 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
30892 " movl %%eax, 16(%3)\n"
30893 " movl %%edx, 20(%3)\n"
30894 - "10: movl 24(%4), %%eax\n"
30895 - "51: movl 28(%4), %%edx\n"
30896 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
30897 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
30898 " movl %%eax, 24(%3)\n"
30899 " movl %%edx, 28(%3)\n"
30900 - "11: movl 32(%4), %%eax\n"
30901 - "61: movl 36(%4), %%edx\n"
30902 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
30903 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
30904 " movl %%eax, 32(%3)\n"
30905 " movl %%edx, 36(%3)\n"
30906 - "12: movl 40(%4), %%eax\n"
30907 - "71: movl 44(%4), %%edx\n"
30908 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
30909 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
30910 " movl %%eax, 40(%3)\n"
30911 " movl %%edx, 44(%3)\n"
30912 - "13: movl 48(%4), %%eax\n"
30913 - "81: movl 52(%4), %%edx\n"
30914 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
30915 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
30916 " movl %%eax, 48(%3)\n"
30917 " movl %%edx, 52(%3)\n"
30918 - "14: movl 56(%4), %%eax\n"
30919 - "91: movl 60(%4), %%edx\n"
30920 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
30921 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
30922 " movl %%eax, 56(%3)\n"
30923 " movl %%edx, 60(%3)\n"
30924 " addl $-64, %0\n"
30925 @@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
30926 " shrl $2, %0\n"
30927 " andl $3, %%eax\n"
30928 " cld\n"
30929 - "6: rep; movsl\n"
30930 + "6: rep; "__copyuser_seg" movsl\n"
30931 " movl %%eax,%0\n"
30932 - "7: rep; movsb\n"
30933 + "7: rep; "__copyuser_seg" movsb\n"
30934 "8:\n"
30935 ".section .fixup,\"ax\"\n"
30936 "9: lea 0(%%eax,%0,4),%0\n"
30937 @@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
30938
30939 __asm__ __volatile__(
30940 " .align 2,0x90\n"
30941 - "0: movl 32(%4), %%eax\n"
30942 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
30943 " cmpl $67, %0\n"
30944 " jbe 2f\n"
30945 - "1: movl 64(%4), %%eax\n"
30946 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
30947 " .align 2,0x90\n"
30948 - "2: movl 0(%4), %%eax\n"
30949 - "21: movl 4(%4), %%edx\n"
30950 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
30951 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
30952 " movnti %%eax, 0(%3)\n"
30953 " movnti %%edx, 4(%3)\n"
30954 - "3: movl 8(%4), %%eax\n"
30955 - "31: movl 12(%4),%%edx\n"
30956 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
30957 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
30958 " movnti %%eax, 8(%3)\n"
30959 " movnti %%edx, 12(%3)\n"
30960 - "4: movl 16(%4), %%eax\n"
30961 - "41: movl 20(%4), %%edx\n"
30962 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
30963 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
30964 " movnti %%eax, 16(%3)\n"
30965 " movnti %%edx, 20(%3)\n"
30966 - "10: movl 24(%4), %%eax\n"
30967 - "51: movl 28(%4), %%edx\n"
30968 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
30969 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
30970 " movnti %%eax, 24(%3)\n"
30971 " movnti %%edx, 28(%3)\n"
30972 - "11: movl 32(%4), %%eax\n"
30973 - "61: movl 36(%4), %%edx\n"
30974 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
30975 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
30976 " movnti %%eax, 32(%3)\n"
30977 " movnti %%edx, 36(%3)\n"
30978 - "12: movl 40(%4), %%eax\n"
30979 - "71: movl 44(%4), %%edx\n"
30980 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
30981 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
30982 " movnti %%eax, 40(%3)\n"
30983 " movnti %%edx, 44(%3)\n"
30984 - "13: movl 48(%4), %%eax\n"
30985 - "81: movl 52(%4), %%edx\n"
30986 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
30987 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
30988 " movnti %%eax, 48(%3)\n"
30989 " movnti %%edx, 52(%3)\n"
30990 - "14: movl 56(%4), %%eax\n"
30991 - "91: movl 60(%4), %%edx\n"
30992 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
30993 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
30994 " movnti %%eax, 56(%3)\n"
30995 " movnti %%edx, 60(%3)\n"
30996 " addl $-64, %0\n"
30997 @@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
30998 " shrl $2, %0\n"
30999 " andl $3, %%eax\n"
31000 " cld\n"
31001 - "6: rep; movsl\n"
31002 + "6: rep; "__copyuser_seg" movsl\n"
31003 " movl %%eax,%0\n"
31004 - "7: rep; movsb\n"
31005 + "7: rep; "__copyuser_seg" movsb\n"
31006 "8:\n"
31007 ".section .fixup,\"ax\"\n"
31008 "9: lea 0(%%eax,%0,4),%0\n"
31009 @@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31010
31011 __asm__ __volatile__(
31012 " .align 2,0x90\n"
31013 - "0: movl 32(%4), %%eax\n"
31014 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31015 " cmpl $67, %0\n"
31016 " jbe 2f\n"
31017 - "1: movl 64(%4), %%eax\n"
31018 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31019 " .align 2,0x90\n"
31020 - "2: movl 0(%4), %%eax\n"
31021 - "21: movl 4(%4), %%edx\n"
31022 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31023 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31024 " movnti %%eax, 0(%3)\n"
31025 " movnti %%edx, 4(%3)\n"
31026 - "3: movl 8(%4), %%eax\n"
31027 - "31: movl 12(%4),%%edx\n"
31028 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31029 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31030 " movnti %%eax, 8(%3)\n"
31031 " movnti %%edx, 12(%3)\n"
31032 - "4: movl 16(%4), %%eax\n"
31033 - "41: movl 20(%4), %%edx\n"
31034 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31035 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31036 " movnti %%eax, 16(%3)\n"
31037 " movnti %%edx, 20(%3)\n"
31038 - "10: movl 24(%4), %%eax\n"
31039 - "51: movl 28(%4), %%edx\n"
31040 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31041 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31042 " movnti %%eax, 24(%3)\n"
31043 " movnti %%edx, 28(%3)\n"
31044 - "11: movl 32(%4), %%eax\n"
31045 - "61: movl 36(%4), %%edx\n"
31046 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31047 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31048 " movnti %%eax, 32(%3)\n"
31049 " movnti %%edx, 36(%3)\n"
31050 - "12: movl 40(%4), %%eax\n"
31051 - "71: movl 44(%4), %%edx\n"
31052 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31053 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31054 " movnti %%eax, 40(%3)\n"
31055 " movnti %%edx, 44(%3)\n"
31056 - "13: movl 48(%4), %%eax\n"
31057 - "81: movl 52(%4), %%edx\n"
31058 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31059 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31060 " movnti %%eax, 48(%3)\n"
31061 " movnti %%edx, 52(%3)\n"
31062 - "14: movl 56(%4), %%eax\n"
31063 - "91: movl 60(%4), %%edx\n"
31064 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31065 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31066 " movnti %%eax, 56(%3)\n"
31067 " movnti %%edx, 60(%3)\n"
31068 " addl $-64, %0\n"
31069 @@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31070 " shrl $2, %0\n"
31071 " andl $3, %%eax\n"
31072 " cld\n"
31073 - "6: rep; movsl\n"
31074 + "6: rep; "__copyuser_seg" movsl\n"
31075 " movl %%eax,%0\n"
31076 - "7: rep; movsb\n"
31077 + "7: rep; "__copyuser_seg" movsb\n"
31078 "8:\n"
31079 ".section .fixup,\"ax\"\n"
31080 "9: lea 0(%%eax,%0,4),%0\n"
31081 @@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31082 */
31083 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31084 unsigned long size);
31085 -unsigned long __copy_user_intel(void __user *to, const void *from,
31086 +unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31087 + unsigned long size);
31088 +unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31089 unsigned long size);
31090 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31091 const void __user *from, unsigned long size);
31092 #endif /* CONFIG_X86_INTEL_USERCOPY */
31093
31094 /* Generic arbitrary sized copy. */
31095 -#define __copy_user(to, from, size) \
31096 +#define __copy_user(to, from, size, prefix, set, restore) \
31097 do { \
31098 int __d0, __d1, __d2; \
31099 __asm__ __volatile__( \
31100 + set \
31101 " cmp $7,%0\n" \
31102 " jbe 1f\n" \
31103 " movl %1,%0\n" \
31104 " negl %0\n" \
31105 " andl $7,%0\n" \
31106 " subl %0,%3\n" \
31107 - "4: rep; movsb\n" \
31108 + "4: rep; "prefix"movsb\n" \
31109 " movl %3,%0\n" \
31110 " shrl $2,%0\n" \
31111 " andl $3,%3\n" \
31112 " .align 2,0x90\n" \
31113 - "0: rep; movsl\n" \
31114 + "0: rep; "prefix"movsl\n" \
31115 " movl %3,%0\n" \
31116 - "1: rep; movsb\n" \
31117 + "1: rep; "prefix"movsb\n" \
31118 "2:\n" \
31119 + restore \
31120 ".section .fixup,\"ax\"\n" \
31121 "5: addl %3,%0\n" \
31122 " jmp 2b\n" \
31123 @@ -538,14 +650,14 @@ do { \
31124 " negl %0\n" \
31125 " andl $7,%0\n" \
31126 " subl %0,%3\n" \
31127 - "4: rep; movsb\n" \
31128 + "4: rep; "__copyuser_seg"movsb\n" \
31129 " movl %3,%0\n" \
31130 " shrl $2,%0\n" \
31131 " andl $3,%3\n" \
31132 " .align 2,0x90\n" \
31133 - "0: rep; movsl\n" \
31134 + "0: rep; "__copyuser_seg"movsl\n" \
31135 " movl %3,%0\n" \
31136 - "1: rep; movsb\n" \
31137 + "1: rep; "__copyuser_seg"movsb\n" \
31138 "2:\n" \
31139 ".section .fixup,\"ax\"\n" \
31140 "5: addl %3,%0\n" \
31141 @@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31142 {
31143 stac();
31144 if (movsl_is_ok(to, from, n))
31145 - __copy_user(to, from, n);
31146 + __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31147 else
31148 - n = __copy_user_intel(to, from, n);
31149 + n = __generic_copy_to_user_intel(to, from, n);
31150 clac();
31151 return n;
31152 }
31153 @@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31154 {
31155 stac();
31156 if (movsl_is_ok(to, from, n))
31157 - __copy_user(to, from, n);
31158 + __copy_user(to, from, n, __copyuser_seg, "", "");
31159 else
31160 - n = __copy_user_intel((void __user *)to,
31161 - (const void *)from, n);
31162 + n = __generic_copy_from_user_intel(to, from, n);
31163 clac();
31164 return n;
31165 }
31166 @@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31167 if (n > 64 && cpu_has_xmm2)
31168 n = __copy_user_intel_nocache(to, from, n);
31169 else
31170 - __copy_user(to, from, n);
31171 + __copy_user(to, from, n, __copyuser_seg, "", "");
31172 #else
31173 - __copy_user(to, from, n);
31174 + __copy_user(to, from, n, __copyuser_seg, "", "");
31175 #endif
31176 clac();
31177 return n;
31178 }
31179 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31180
31181 -/**
31182 - * copy_to_user: - Copy a block of data into user space.
31183 - * @to: Destination address, in user space.
31184 - * @from: Source address, in kernel space.
31185 - * @n: Number of bytes to copy.
31186 - *
31187 - * Context: User context only. This function may sleep.
31188 - *
31189 - * Copy data from kernel space to user space.
31190 - *
31191 - * Returns number of bytes that could not be copied.
31192 - * On success, this will be zero.
31193 - */
31194 -unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31195 +#ifdef CONFIG_PAX_MEMORY_UDEREF
31196 +void __set_fs(mm_segment_t x)
31197 {
31198 - if (access_ok(VERIFY_WRITE, to, n))
31199 - n = __copy_to_user(to, from, n);
31200 - return n;
31201 + switch (x.seg) {
31202 + case 0:
31203 + loadsegment(gs, 0);
31204 + break;
31205 + case TASK_SIZE_MAX:
31206 + loadsegment(gs, __USER_DS);
31207 + break;
31208 + case -1UL:
31209 + loadsegment(gs, __KERNEL_DS);
31210 + break;
31211 + default:
31212 + BUG();
31213 + }
31214 }
31215 -EXPORT_SYMBOL(_copy_to_user);
31216 +EXPORT_SYMBOL(__set_fs);
31217
31218 -/**
31219 - * copy_from_user: - Copy a block of data from user space.
31220 - * @to: Destination address, in kernel space.
31221 - * @from: Source address, in user space.
31222 - * @n: Number of bytes to copy.
31223 - *
31224 - * Context: User context only. This function may sleep.
31225 - *
31226 - * Copy data from user space to kernel space.
31227 - *
31228 - * Returns number of bytes that could not be copied.
31229 - * On success, this will be zero.
31230 - *
31231 - * If some data could not be copied, this function will pad the copied
31232 - * data to the requested size using zero bytes.
31233 - */
31234 -unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31235 +void set_fs(mm_segment_t x)
31236 {
31237 - if (access_ok(VERIFY_READ, from, n))
31238 - n = __copy_from_user(to, from, n);
31239 - else
31240 - memset(to, 0, n);
31241 - return n;
31242 + current_thread_info()->addr_limit = x;
31243 + __set_fs(x);
31244 }
31245 -EXPORT_SYMBOL(_copy_from_user);
31246 +EXPORT_SYMBOL(set_fs);
31247 +#endif
31248 diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31249 index c905e89..01ab928 100644
31250 --- a/arch/x86/lib/usercopy_64.c
31251 +++ b/arch/x86/lib/usercopy_64.c
31252 @@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31253 might_fault();
31254 /* no memory constraint because it doesn't change any memory gcc knows
31255 about */
31256 + pax_open_userland();
31257 stac();
31258 asm volatile(
31259 " testq %[size8],%[size8]\n"
31260 @@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31261 _ASM_EXTABLE(0b,3b)
31262 _ASM_EXTABLE(1b,2b)
31263 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31264 - : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31265 + : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31266 [zero] "r" (0UL), [eight] "r" (8UL));
31267 clac();
31268 + pax_close_userland();
31269 return size;
31270 }
31271 EXPORT_SYMBOL(__clear_user);
31272 @@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31273 }
31274 EXPORT_SYMBOL(clear_user);
31275
31276 -unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31277 +unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31278 {
31279 - if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31280 - return copy_user_generic((__force void *)to, (__force void *)from, len);
31281 - }
31282 - return len;
31283 + if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31284 + return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31285 + return len;
31286 }
31287 EXPORT_SYMBOL(copy_in_user);
31288
31289 @@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
31290 * it is not necessary to optimize tail handling.
31291 */
31292 __visible unsigned long
31293 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31294 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
31295 {
31296 char c;
31297 unsigned zero_len;
31298
31299 + clac();
31300 + pax_close_userland();
31301 for (; len; --len, to++) {
31302 if (__get_user_nocheck(c, from++, sizeof(char)))
31303 break;
31304 @@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31305 for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
31306 if (__put_user_nocheck(c, to++, sizeof(char)))
31307 break;
31308 - clac();
31309 return len;
31310 }
31311 diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31312 index 6a19ad9..1c48f9a 100644
31313 --- a/arch/x86/mm/Makefile
31314 +++ b/arch/x86/mm/Makefile
31315 @@ -30,3 +30,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
31316 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31317
31318 obj-$(CONFIG_MEMTEST) += memtest.o
31319 +
31320 +quote:="
31321 +obj-$(CONFIG_X86_64) += uderef_64.o
31322 +CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31323 diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31324 index 903ec1e..c4166b2 100644
31325 --- a/arch/x86/mm/extable.c
31326 +++ b/arch/x86/mm/extable.c
31327 @@ -6,12 +6,24 @@
31328 static inline unsigned long
31329 ex_insn_addr(const struct exception_table_entry *x)
31330 {
31331 - return (unsigned long)&x->insn + x->insn;
31332 + unsigned long reloc = 0;
31333 +
31334 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31335 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31336 +#endif
31337 +
31338 + return (unsigned long)&x->insn + x->insn + reloc;
31339 }
31340 static inline unsigned long
31341 ex_fixup_addr(const struct exception_table_entry *x)
31342 {
31343 - return (unsigned long)&x->fixup + x->fixup;
31344 + unsigned long reloc = 0;
31345 +
31346 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31347 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31348 +#endif
31349 +
31350 + return (unsigned long)&x->fixup + x->fixup + reloc;
31351 }
31352
31353 int fixup_exception(struct pt_regs *regs)
31354 @@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31355 unsigned long new_ip;
31356
31357 #ifdef CONFIG_PNPBIOS
31358 - if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31359 + if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31360 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31361 extern u32 pnp_bios_is_utter_crap;
31362 pnp_bios_is_utter_crap = 1;
31363 @@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31364 i += 4;
31365 p->fixup -= i;
31366 i += 4;
31367 +
31368 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31369 + BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31370 + p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31371 + p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31372 +#endif
31373 +
31374 }
31375 }
31376
31377 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31378 index 8e57229..31cce89 100644
31379 --- a/arch/x86/mm/fault.c
31380 +++ b/arch/x86/mm/fault.c
31381 @@ -14,11 +14,18 @@
31382 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31383 #include <linux/prefetch.h> /* prefetchw */
31384 #include <linux/context_tracking.h> /* exception_enter(), ... */
31385 +#include <linux/unistd.h>
31386 +#include <linux/compiler.h>
31387
31388 #include <asm/traps.h> /* dotraplinkage, ... */
31389 #include <asm/pgalloc.h> /* pgd_*(), ... */
31390 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31391 #include <asm/fixmap.h> /* VSYSCALL_START */
31392 +#include <asm/tlbflush.h>
31393 +
31394 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31395 +#include <asm/stacktrace.h>
31396 +#endif
31397
31398 #define CREATE_TRACE_POINTS
31399 #include <asm/trace/exceptions.h>
31400 @@ -59,7 +66,7 @@ static inline int __kprobes kprobes_fault(struct pt_regs *regs)
31401 int ret = 0;
31402
31403 /* kprobe_running() needs smp_processor_id() */
31404 - if (kprobes_built_in() && !user_mode_vm(regs)) {
31405 + if (kprobes_built_in() && !user_mode(regs)) {
31406 preempt_disable();
31407 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31408 ret = 1;
31409 @@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31410 return !instr_lo || (instr_lo>>1) == 1;
31411 case 0x00:
31412 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31413 - if (probe_kernel_address(instr, opcode))
31414 + if (user_mode(regs)) {
31415 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31416 + return 0;
31417 + } else if (probe_kernel_address(instr, opcode))
31418 return 0;
31419
31420 *prefetch = (instr_lo == 0xF) &&
31421 @@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31422 while (instr < max_instr) {
31423 unsigned char opcode;
31424
31425 - if (probe_kernel_address(instr, opcode))
31426 + if (user_mode(regs)) {
31427 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31428 + break;
31429 + } else if (probe_kernel_address(instr, opcode))
31430 break;
31431
31432 instr++;
31433 @@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31434 force_sig_info(si_signo, &info, tsk);
31435 }
31436
31437 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31438 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31439 +#endif
31440 +
31441 +#ifdef CONFIG_PAX_EMUTRAMP
31442 +static int pax_handle_fetch_fault(struct pt_regs *regs);
31443 +#endif
31444 +
31445 +#ifdef CONFIG_PAX_PAGEEXEC
31446 +static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31447 +{
31448 + pgd_t *pgd;
31449 + pud_t *pud;
31450 + pmd_t *pmd;
31451 +
31452 + pgd = pgd_offset(mm, address);
31453 + if (!pgd_present(*pgd))
31454 + return NULL;
31455 + pud = pud_offset(pgd, address);
31456 + if (!pud_present(*pud))
31457 + return NULL;
31458 + pmd = pmd_offset(pud, address);
31459 + if (!pmd_present(*pmd))
31460 + return NULL;
31461 + return pmd;
31462 +}
31463 +#endif
31464 +
31465 DEFINE_SPINLOCK(pgd_lock);
31466 LIST_HEAD(pgd_list);
31467
31468 @@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31469 for (address = VMALLOC_START & PMD_MASK;
31470 address >= TASK_SIZE && address < FIXADDR_TOP;
31471 address += PMD_SIZE) {
31472 +
31473 +#ifdef CONFIG_PAX_PER_CPU_PGD
31474 + unsigned long cpu;
31475 +#else
31476 struct page *page;
31477 +#endif
31478
31479 spin_lock(&pgd_lock);
31480 +
31481 +#ifdef CONFIG_PAX_PER_CPU_PGD
31482 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31483 + pgd_t *pgd = get_cpu_pgd(cpu, user);
31484 + pmd_t *ret;
31485 +
31486 + ret = vmalloc_sync_one(pgd, address);
31487 + if (!ret)
31488 + break;
31489 + pgd = get_cpu_pgd(cpu, kernel);
31490 +#else
31491 list_for_each_entry(page, &pgd_list, lru) {
31492 + pgd_t *pgd;
31493 spinlock_t *pgt_lock;
31494 pmd_t *ret;
31495
31496 @@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31497 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31498
31499 spin_lock(pgt_lock);
31500 - ret = vmalloc_sync_one(page_address(page), address);
31501 + pgd = page_address(page);
31502 +#endif
31503 +
31504 + ret = vmalloc_sync_one(pgd, address);
31505 +
31506 +#ifndef CONFIG_PAX_PER_CPU_PGD
31507 spin_unlock(pgt_lock);
31508 +#endif
31509
31510 if (!ret)
31511 break;
31512 @@ -281,6 +345,12 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
31513 * an interrupt in the middle of a task switch..
31514 */
31515 pgd_paddr = read_cr3();
31516 +
31517 +#ifdef CONFIG_PAX_PER_CPU_PGD
31518 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31519 + vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31520 +#endif
31521 +
31522 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31523 if (!pmd_k)
31524 return -1;
31525 @@ -376,11 +446,25 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
31526 * happen within a race in page table update. In the later
31527 * case just flush:
31528 */
31529 - pgd = pgd_offset(current->active_mm, address);
31530 +
31531 pgd_ref = pgd_offset_k(address);
31532 if (pgd_none(*pgd_ref))
31533 return -1;
31534
31535 +#ifdef CONFIG_PAX_PER_CPU_PGD
31536 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31537 + pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31538 + if (pgd_none(*pgd)) {
31539 + set_pgd(pgd, *pgd_ref);
31540 + arch_flush_lazy_mmu_mode();
31541 + } else {
31542 + BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31543 + }
31544 + pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31545 +#else
31546 + pgd = pgd_offset(current->active_mm, address);
31547 +#endif
31548 +
31549 if (pgd_none(*pgd)) {
31550 set_pgd(pgd, *pgd_ref);
31551 arch_flush_lazy_mmu_mode();
31552 @@ -546,7 +630,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31553 static int is_errata100(struct pt_regs *regs, unsigned long address)
31554 {
31555 #ifdef CONFIG_X86_64
31556 - if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31557 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31558 return 1;
31559 #endif
31560 return 0;
31561 @@ -573,7 +657,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31562 }
31563
31564 static const char nx_warning[] = KERN_CRIT
31565 -"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31566 +"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31567
31568 static void
31569 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31570 @@ -582,7 +666,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31571 if (!oops_may_print())
31572 return;
31573
31574 - if (error_code & PF_INSTR) {
31575 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31576 unsigned int level;
31577 pgd_t *pgd;
31578 pte_t *pte;
31579 @@ -593,9 +677,21 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31580 pte = lookup_address_in_pgd(pgd, address, &level);
31581
31582 if (pte && pte_present(*pte) && !pte_exec(*pte))
31583 - printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31584 + printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31585 }
31586
31587 +#ifdef CONFIG_PAX_KERNEXEC
31588 + if (init_mm.start_code <= address && address < init_mm.end_code) {
31589 + if (current->signal->curr_ip)
31590 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
31591 + &current->signal->curr_ip, current->comm, task_pid_nr(current),
31592 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31593 + else
31594 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
31595 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31596 + }
31597 +#endif
31598 +
31599 printk(KERN_ALERT "BUG: unable to handle kernel ");
31600 if (address < PAGE_SIZE)
31601 printk(KERN_CONT "NULL pointer dereference");
31602 @@ -776,6 +872,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
31603 return;
31604 }
31605 #endif
31606 +
31607 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31608 + if (pax_is_fetch_fault(regs, error_code, address)) {
31609 +
31610 +#ifdef CONFIG_PAX_EMUTRAMP
31611 + switch (pax_handle_fetch_fault(regs)) {
31612 + case 2:
31613 + return;
31614 + }
31615 +#endif
31616 +
31617 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31618 + do_group_exit(SIGKILL);
31619 + }
31620 +#endif
31621 +
31622 /* Kernel addresses are always protection faults: */
31623 if (address >= TASK_SIZE)
31624 error_code |= PF_PROT;
31625 @@ -861,7 +973,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
31626 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
31627 printk(KERN_ERR
31628 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
31629 - tsk->comm, tsk->pid, address);
31630 + tsk->comm, task_pid_nr(tsk), address);
31631 code = BUS_MCEERR_AR;
31632 }
31633 #endif
31634 @@ -915,6 +1027,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
31635 return 1;
31636 }
31637
31638 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
31639 +static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
31640 +{
31641 + pte_t *pte;
31642 + pmd_t *pmd;
31643 + spinlock_t *ptl;
31644 + unsigned char pte_mask;
31645 +
31646 + if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
31647 + !(mm->pax_flags & MF_PAX_PAGEEXEC))
31648 + return 0;
31649 +
31650 + /* PaX: it's our fault, let's handle it if we can */
31651 +
31652 + /* PaX: take a look at read faults before acquiring any locks */
31653 + if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
31654 + /* instruction fetch attempt from a protected page in user mode */
31655 + up_read(&mm->mmap_sem);
31656 +
31657 +#ifdef CONFIG_PAX_EMUTRAMP
31658 + switch (pax_handle_fetch_fault(regs)) {
31659 + case 2:
31660 + return 1;
31661 + }
31662 +#endif
31663 +
31664 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31665 + do_group_exit(SIGKILL);
31666 + }
31667 +
31668 + pmd = pax_get_pmd(mm, address);
31669 + if (unlikely(!pmd))
31670 + return 0;
31671 +
31672 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
31673 + if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
31674 + pte_unmap_unlock(pte, ptl);
31675 + return 0;
31676 + }
31677 +
31678 + if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
31679 + /* write attempt to a protected page in user mode */
31680 + pte_unmap_unlock(pte, ptl);
31681 + return 0;
31682 + }
31683 +
31684 +#ifdef CONFIG_SMP
31685 + if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
31686 +#else
31687 + if (likely(address > get_limit(regs->cs)))
31688 +#endif
31689 + {
31690 + set_pte(pte, pte_mkread(*pte));
31691 + __flush_tlb_one(address);
31692 + pte_unmap_unlock(pte, ptl);
31693 + up_read(&mm->mmap_sem);
31694 + return 1;
31695 + }
31696 +
31697 + pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
31698 +
31699 + /*
31700 + * PaX: fill DTLB with user rights and retry
31701 + */
31702 + __asm__ __volatile__ (
31703 + "orb %2,(%1)\n"
31704 +#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
31705 +/*
31706 + * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
31707 + * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
31708 + * page fault when examined during a TLB load attempt. this is true not only
31709 + * for PTEs holding a non-present entry but also present entries that will
31710 + * raise a page fault (such as those set up by PaX, or the copy-on-write
31711 + * mechanism). in effect it means that we do *not* need to flush the TLBs
31712 + * for our target pages since their PTEs are simply not in the TLBs at all.
31713 +
31714 + * the best thing in omitting it is that we gain around 15-20% speed in the
31715 + * fast path of the page fault handler and can get rid of tracing since we
31716 + * can no longer flush unintended entries.
31717 + */
31718 + "invlpg (%0)\n"
31719 +#endif
31720 + __copyuser_seg"testb $0,(%0)\n"
31721 + "xorb %3,(%1)\n"
31722 + :
31723 + : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
31724 + : "memory", "cc");
31725 + pte_unmap_unlock(pte, ptl);
31726 + up_read(&mm->mmap_sem);
31727 + return 1;
31728 +}
31729 +#endif
31730 +
31731 /*
31732 * Handle a spurious fault caused by a stale TLB entry.
31733 *
31734 @@ -981,6 +1186,9 @@ int show_unhandled_signals = 1;
31735 static inline int
31736 access_error(unsigned long error_code, struct vm_area_struct *vma)
31737 {
31738 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
31739 + return 1;
31740 +
31741 if (error_code & PF_WRITE) {
31742 /* write, present and write, not present: */
31743 if (unlikely(!(vma->vm_flags & VM_WRITE)))
31744 @@ -1015,7 +1223,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
31745 if (error_code & PF_USER)
31746 return false;
31747
31748 - if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
31749 + if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
31750 return false;
31751
31752 return true;
31753 @@ -1043,6 +1251,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
31754 tsk = current;
31755 mm = tsk->mm;
31756
31757 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31758 + if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
31759 + if (!search_exception_tables(regs->ip)) {
31760 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
31761 + bad_area_nosemaphore(regs, error_code, address);
31762 + return;
31763 + }
31764 + if (address < pax_user_shadow_base) {
31765 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
31766 + printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
31767 + show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
31768 + } else
31769 + address -= pax_user_shadow_base;
31770 + }
31771 +#endif
31772 +
31773 /*
31774 * Detect and handle instructions that would cause a page fault for
31775 * both a tracked kernel page and a userspace page.
31776 @@ -1120,7 +1344,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
31777 * User-mode registers count as a user access even for any
31778 * potential system fault or CPU buglet:
31779 */
31780 - if (user_mode_vm(regs)) {
31781 + if (user_mode(regs)) {
31782 local_irq_enable();
31783 error_code |= PF_USER;
31784 flags |= FAULT_FLAG_USER;
31785 @@ -1167,6 +1391,11 @@ retry:
31786 might_sleep();
31787 }
31788
31789 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
31790 + if (pax_handle_pageexec_fault(regs, mm, address, error_code))
31791 + return;
31792 +#endif
31793 +
31794 vma = find_vma(mm, address);
31795 if (unlikely(!vma)) {
31796 bad_area(regs, error_code, address);
31797 @@ -1178,18 +1407,24 @@ retry:
31798 bad_area(regs, error_code, address);
31799 return;
31800 }
31801 - if (error_code & PF_USER) {
31802 - /*
31803 - * Accessing the stack below %sp is always a bug.
31804 - * The large cushion allows instructions like enter
31805 - * and pusha to work. ("enter $65535, $31" pushes
31806 - * 32 pointers and then decrements %sp by 65535.)
31807 - */
31808 - if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
31809 - bad_area(regs, error_code, address);
31810 - return;
31811 - }
31812 + /*
31813 + * Accessing the stack below %sp is always a bug.
31814 + * The large cushion allows instructions like enter
31815 + * and pusha to work. ("enter $65535, $31" pushes
31816 + * 32 pointers and then decrements %sp by 65535.)
31817 + */
31818 + if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
31819 + bad_area(regs, error_code, address);
31820 + return;
31821 }
31822 +
31823 +#ifdef CONFIG_PAX_SEGMEXEC
31824 + if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
31825 + bad_area(regs, error_code, address);
31826 + return;
31827 + }
31828 +#endif
31829 +
31830 if (unlikely(expand_stack(vma, address))) {
31831 bad_area(regs, error_code, address);
31832 return;
31833 @@ -1301,3 +1536,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
31834 exception_exit(prev_state);
31835 }
31836 #endif /* CONFIG_TRACING */
31837 +
31838 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31839 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
31840 +{
31841 + struct mm_struct *mm = current->mm;
31842 + unsigned long ip = regs->ip;
31843 +
31844 + if (v8086_mode(regs))
31845 + ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
31846 +
31847 +#ifdef CONFIG_PAX_PAGEEXEC
31848 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
31849 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
31850 + return true;
31851 + if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
31852 + return true;
31853 + return false;
31854 + }
31855 +#endif
31856 +
31857 +#ifdef CONFIG_PAX_SEGMEXEC
31858 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
31859 + if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
31860 + return true;
31861 + return false;
31862 + }
31863 +#endif
31864 +
31865 + return false;
31866 +}
31867 +#endif
31868 +
31869 +#ifdef CONFIG_PAX_EMUTRAMP
31870 +static int pax_handle_fetch_fault_32(struct pt_regs *regs)
31871 +{
31872 + int err;
31873 +
31874 + do { /* PaX: libffi trampoline emulation */
31875 + unsigned char mov, jmp;
31876 + unsigned int addr1, addr2;
31877 +
31878 +#ifdef CONFIG_X86_64
31879 + if ((regs->ip + 9) >> 32)
31880 + break;
31881 +#endif
31882 +
31883 + err = get_user(mov, (unsigned char __user *)regs->ip);
31884 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
31885 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
31886 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
31887 +
31888 + if (err)
31889 + break;
31890 +
31891 + if (mov == 0xB8 && jmp == 0xE9) {
31892 + regs->ax = addr1;
31893 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
31894 + return 2;
31895 + }
31896 + } while (0);
31897 +
31898 + do { /* PaX: gcc trampoline emulation #1 */
31899 + unsigned char mov1, mov2;
31900 + unsigned short jmp;
31901 + unsigned int addr1, addr2;
31902 +
31903 +#ifdef CONFIG_X86_64
31904 + if ((regs->ip + 11) >> 32)
31905 + break;
31906 +#endif
31907 +
31908 + err = get_user(mov1, (unsigned char __user *)regs->ip);
31909 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
31910 + err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
31911 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
31912 + err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
31913 +
31914 + if (err)
31915 + break;
31916 +
31917 + if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
31918 + regs->cx = addr1;
31919 + regs->ax = addr2;
31920 + regs->ip = addr2;
31921 + return 2;
31922 + }
31923 + } while (0);
31924 +
31925 + do { /* PaX: gcc trampoline emulation #2 */
31926 + unsigned char mov, jmp;
31927 + unsigned int addr1, addr2;
31928 +
31929 +#ifdef CONFIG_X86_64
31930 + if ((regs->ip + 9) >> 32)
31931 + break;
31932 +#endif
31933 +
31934 + err = get_user(mov, (unsigned char __user *)regs->ip);
31935 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
31936 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
31937 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
31938 +
31939 + if (err)
31940 + break;
31941 +
31942 + if (mov == 0xB9 && jmp == 0xE9) {
31943 + regs->cx = addr1;
31944 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
31945 + return 2;
31946 + }
31947 + } while (0);
31948 +
31949 + return 1; /* PaX in action */
31950 +}
31951 +
31952 +#ifdef CONFIG_X86_64
31953 +static int pax_handle_fetch_fault_64(struct pt_regs *regs)
31954 +{
31955 + int err;
31956 +
31957 + do { /* PaX: libffi trampoline emulation */
31958 + unsigned short mov1, mov2, jmp1;
31959 + unsigned char stcclc, jmp2;
31960 + unsigned long addr1, addr2;
31961 +
31962 + err = get_user(mov1, (unsigned short __user *)regs->ip);
31963 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
31964 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
31965 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
31966 + err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
31967 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
31968 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
31969 +
31970 + if (err)
31971 + break;
31972 +
31973 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
31974 + regs->r11 = addr1;
31975 + regs->r10 = addr2;
31976 + if (stcclc == 0xF8)
31977 + regs->flags &= ~X86_EFLAGS_CF;
31978 + else
31979 + regs->flags |= X86_EFLAGS_CF;
31980 + regs->ip = addr1;
31981 + return 2;
31982 + }
31983 + } while (0);
31984 +
31985 + do { /* PaX: gcc trampoline emulation #1 */
31986 + unsigned short mov1, mov2, jmp1;
31987 + unsigned char jmp2;
31988 + unsigned int addr1;
31989 + unsigned long addr2;
31990 +
31991 + err = get_user(mov1, (unsigned short __user *)regs->ip);
31992 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
31993 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
31994 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
31995 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
31996 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
31997 +
31998 + if (err)
31999 + break;
32000 +
32001 + if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32002 + regs->r11 = addr1;
32003 + regs->r10 = addr2;
32004 + regs->ip = addr1;
32005 + return 2;
32006 + }
32007 + } while (0);
32008 +
32009 + do { /* PaX: gcc trampoline emulation #2 */
32010 + unsigned short mov1, mov2, jmp1;
32011 + unsigned char jmp2;
32012 + unsigned long addr1, addr2;
32013 +
32014 + err = get_user(mov1, (unsigned short __user *)regs->ip);
32015 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32016 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32017 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32018 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32019 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32020 +
32021 + if (err)
32022 + break;
32023 +
32024 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32025 + regs->r11 = addr1;
32026 + regs->r10 = addr2;
32027 + regs->ip = addr1;
32028 + return 2;
32029 + }
32030 + } while (0);
32031 +
32032 + return 1; /* PaX in action */
32033 +}
32034 +#endif
32035 +
32036 +/*
32037 + * PaX: decide what to do with offenders (regs->ip = fault address)
32038 + *
32039 + * returns 1 when task should be killed
32040 + * 2 when gcc trampoline was detected
32041 + */
32042 +static int pax_handle_fetch_fault(struct pt_regs *regs)
32043 +{
32044 + if (v8086_mode(regs))
32045 + return 1;
32046 +
32047 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32048 + return 1;
32049 +
32050 +#ifdef CONFIG_X86_32
32051 + return pax_handle_fetch_fault_32(regs);
32052 +#else
32053 + if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32054 + return pax_handle_fetch_fault_32(regs);
32055 + else
32056 + return pax_handle_fetch_fault_64(regs);
32057 +#endif
32058 +}
32059 +#endif
32060 +
32061 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32062 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32063 +{
32064 + long i;
32065 +
32066 + printk(KERN_ERR "PAX: bytes at PC: ");
32067 + for (i = 0; i < 20; i++) {
32068 + unsigned char c;
32069 + if (get_user(c, (unsigned char __force_user *)pc+i))
32070 + printk(KERN_CONT "?? ");
32071 + else
32072 + printk(KERN_CONT "%02x ", c);
32073 + }
32074 + printk("\n");
32075 +
32076 + printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32077 + for (i = -1; i < 80 / (long)sizeof(long); i++) {
32078 + unsigned long c;
32079 + if (get_user(c, (unsigned long __force_user *)sp+i)) {
32080 +#ifdef CONFIG_X86_32
32081 + printk(KERN_CONT "???????? ");
32082 +#else
32083 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32084 + printk(KERN_CONT "???????? ???????? ");
32085 + else
32086 + printk(KERN_CONT "???????????????? ");
32087 +#endif
32088 + } else {
32089 +#ifdef CONFIG_X86_64
32090 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32091 + printk(KERN_CONT "%08x ", (unsigned int)c);
32092 + printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32093 + } else
32094 +#endif
32095 + printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32096 + }
32097 + }
32098 + printk("\n");
32099 +}
32100 +#endif
32101 +
32102 +/**
32103 + * probe_kernel_write(): safely attempt to write to a location
32104 + * @dst: address to write to
32105 + * @src: pointer to the data that shall be written
32106 + * @size: size of the data chunk
32107 + *
32108 + * Safely write to address @dst from the buffer at @src. If a kernel fault
32109 + * happens, handle that and return -EFAULT.
32110 + */
32111 +long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32112 +{
32113 + long ret;
32114 + mm_segment_t old_fs = get_fs();
32115 +
32116 + set_fs(KERNEL_DS);
32117 + pagefault_disable();
32118 + pax_open_kernel();
32119 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32120 + pax_close_kernel();
32121 + pagefault_enable();
32122 + set_fs(old_fs);
32123 +
32124 + return ret ? -EFAULT : 0;
32125 +}
32126 diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32127 index 207d9aef..69030980 100644
32128 --- a/arch/x86/mm/gup.c
32129 +++ b/arch/x86/mm/gup.c
32130 @@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32131 addr = start;
32132 len = (unsigned long) nr_pages << PAGE_SHIFT;
32133 end = start + len;
32134 - if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32135 + if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32136 (void __user *)start, len)))
32137 return 0;
32138
32139 @@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32140 goto slow_irqon;
32141 #endif
32142
32143 + if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32144 + (void __user *)start, len)))
32145 + return 0;
32146 +
32147 /*
32148 * XXX: batch / limit 'nr', to avoid large irq off latency
32149 * needs some instrumenting to determine the common sizes used by
32150 diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32151 index 4500142..53a363c 100644
32152 --- a/arch/x86/mm/highmem_32.c
32153 +++ b/arch/x86/mm/highmem_32.c
32154 @@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32155 idx = type + KM_TYPE_NR*smp_processor_id();
32156 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32157 BUG_ON(!pte_none(*(kmap_pte-idx)));
32158 +
32159 + pax_open_kernel();
32160 set_pte(kmap_pte-idx, mk_pte(page, prot));
32161 + pax_close_kernel();
32162 +
32163 arch_flush_lazy_mmu_mode();
32164
32165 return (void *)vaddr;
32166 diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32167 index 8b977eb..4732c33 100644
32168 --- a/arch/x86/mm/hugetlbpage.c
32169 +++ b/arch/x86/mm/hugetlbpage.c
32170 @@ -80,23 +80,24 @@ int pud_huge(pud_t pud)
32171 #ifdef CONFIG_HUGETLB_PAGE
32172 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32173 unsigned long addr, unsigned long len,
32174 - unsigned long pgoff, unsigned long flags)
32175 + unsigned long pgoff, unsigned long flags, unsigned long offset)
32176 {
32177 struct hstate *h = hstate_file(file);
32178 struct vm_unmapped_area_info info;
32179 -
32180 +
32181 info.flags = 0;
32182 info.length = len;
32183 info.low_limit = current->mm->mmap_legacy_base;
32184 info.high_limit = TASK_SIZE;
32185 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32186 info.align_offset = 0;
32187 + info.threadstack_offset = offset;
32188 return vm_unmapped_area(&info);
32189 }
32190
32191 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32192 unsigned long addr0, unsigned long len,
32193 - unsigned long pgoff, unsigned long flags)
32194 + unsigned long pgoff, unsigned long flags, unsigned long offset)
32195 {
32196 struct hstate *h = hstate_file(file);
32197 struct vm_unmapped_area_info info;
32198 @@ -108,6 +109,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32199 info.high_limit = current->mm->mmap_base;
32200 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32201 info.align_offset = 0;
32202 + info.threadstack_offset = offset;
32203 addr = vm_unmapped_area(&info);
32204
32205 /*
32206 @@ -120,6 +122,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32207 VM_BUG_ON(addr != -ENOMEM);
32208 info.flags = 0;
32209 info.low_limit = TASK_UNMAPPED_BASE;
32210 +
32211 +#ifdef CONFIG_PAX_RANDMMAP
32212 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32213 + info.low_limit += current->mm->delta_mmap;
32214 +#endif
32215 +
32216 info.high_limit = TASK_SIZE;
32217 addr = vm_unmapped_area(&info);
32218 }
32219 @@ -134,10 +142,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32220 struct hstate *h = hstate_file(file);
32221 struct mm_struct *mm = current->mm;
32222 struct vm_area_struct *vma;
32223 + unsigned long pax_task_size = TASK_SIZE;
32224 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32225
32226 if (len & ~huge_page_mask(h))
32227 return -EINVAL;
32228 - if (len > TASK_SIZE)
32229 +
32230 +#ifdef CONFIG_PAX_SEGMEXEC
32231 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
32232 + pax_task_size = SEGMEXEC_TASK_SIZE;
32233 +#endif
32234 +
32235 + pax_task_size -= PAGE_SIZE;
32236 +
32237 + if (len > pax_task_size)
32238 return -ENOMEM;
32239
32240 if (flags & MAP_FIXED) {
32241 @@ -146,19 +164,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32242 return addr;
32243 }
32244
32245 +#ifdef CONFIG_PAX_RANDMMAP
32246 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32247 +#endif
32248 +
32249 if (addr) {
32250 addr = ALIGN(addr, huge_page_size(h));
32251 vma = find_vma(mm, addr);
32252 - if (TASK_SIZE - len >= addr &&
32253 - (!vma || addr + len <= vma->vm_start))
32254 + if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32255 return addr;
32256 }
32257 if (mm->get_unmapped_area == arch_get_unmapped_area)
32258 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32259 - pgoff, flags);
32260 + pgoff, flags, offset);
32261 else
32262 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32263 - pgoff, flags);
32264 + pgoff, flags, offset);
32265 }
32266 #endif /* CONFIG_HUGETLB_PAGE */
32267
32268 diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32269 index f971306..e83e0f6 100644
32270 --- a/arch/x86/mm/init.c
32271 +++ b/arch/x86/mm/init.c
32272 @@ -4,6 +4,7 @@
32273 #include <linux/swap.h>
32274 #include <linux/memblock.h>
32275 #include <linux/bootmem.h> /* for max_low_pfn */
32276 +#include <linux/tboot.h>
32277
32278 #include <asm/cacheflush.h>
32279 #include <asm/e820.h>
32280 @@ -17,6 +18,8 @@
32281 #include <asm/proto.h>
32282 #include <asm/dma.h> /* for MAX_DMA_PFN */
32283 #include <asm/microcode.h>
32284 +#include <asm/desc.h>
32285 +#include <asm/bios_ebda.h>
32286
32287 #include "mm_internal.h"
32288
32289 @@ -563,7 +566,18 @@ void __init init_mem_mapping(void)
32290 early_ioremap_page_table_range_init();
32291 #endif
32292
32293 +#ifdef CONFIG_PAX_PER_CPU_PGD
32294 + clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32295 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32296 + KERNEL_PGD_PTRS);
32297 + clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32298 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32299 + KERNEL_PGD_PTRS);
32300 + load_cr3(get_cpu_pgd(0, kernel));
32301 +#else
32302 load_cr3(swapper_pg_dir);
32303 +#endif
32304 +
32305 __flush_tlb_all();
32306
32307 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32308 @@ -579,10 +593,40 @@ void __init init_mem_mapping(void)
32309 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32310 * mmio resources as well as potential bios/acpi data regions.
32311 */
32312 +
32313 +#ifdef CONFIG_GRKERNSEC_KMEM
32314 +static unsigned int ebda_start __read_only;
32315 +static unsigned int ebda_end __read_only;
32316 +#endif
32317 +
32318 int devmem_is_allowed(unsigned long pagenr)
32319 {
32320 - if (pagenr < 256)
32321 +#ifdef CONFIG_GRKERNSEC_KMEM
32322 + /* allow BDA */
32323 + if (!pagenr)
32324 return 1;
32325 + /* allow EBDA */
32326 + if (pagenr >= ebda_start && pagenr < ebda_end)
32327 + return 1;
32328 + /* if tboot is in use, allow access to its hardcoded serial log range */
32329 + if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32330 + return 1;
32331 +#else
32332 + if (!pagenr)
32333 + return 1;
32334 +#ifdef CONFIG_VM86
32335 + if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32336 + return 1;
32337 +#endif
32338 +#endif
32339 +
32340 + if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32341 + return 1;
32342 +#ifdef CONFIG_GRKERNSEC_KMEM
32343 + /* throw out everything else below 1MB */
32344 + if (pagenr <= 256)
32345 + return 0;
32346 +#endif
32347 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32348 return 0;
32349 if (!page_is_ram(pagenr))
32350 @@ -628,8 +672,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32351 #endif
32352 }
32353
32354 +#ifdef CONFIG_GRKERNSEC_KMEM
32355 +static inline void gr_init_ebda(void)
32356 +{
32357 + unsigned int ebda_addr;
32358 + unsigned int ebda_size = 0;
32359 +
32360 + ebda_addr = get_bios_ebda();
32361 + if (ebda_addr) {
32362 + ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32363 + ebda_size <<= 10;
32364 + }
32365 + if (ebda_addr && ebda_size) {
32366 + ebda_start = ebda_addr >> PAGE_SHIFT;
32367 + ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32368 + } else {
32369 + ebda_start = 0x9f000 >> PAGE_SHIFT;
32370 + ebda_end = 0xa0000 >> PAGE_SHIFT;
32371 + }
32372 +}
32373 +#else
32374 +static inline void gr_init_ebda(void) { }
32375 +#endif
32376 +
32377 void free_initmem(void)
32378 {
32379 +#ifdef CONFIG_PAX_KERNEXEC
32380 +#ifdef CONFIG_X86_32
32381 + /* PaX: limit KERNEL_CS to actual size */
32382 + unsigned long addr, limit;
32383 + struct desc_struct d;
32384 + int cpu;
32385 +#else
32386 + pgd_t *pgd;
32387 + pud_t *pud;
32388 + pmd_t *pmd;
32389 + unsigned long addr, end;
32390 +#endif
32391 +#endif
32392 +
32393 + gr_init_ebda();
32394 +
32395 +#ifdef CONFIG_PAX_KERNEXEC
32396 +#ifdef CONFIG_X86_32
32397 + limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32398 + limit = (limit - 1UL) >> PAGE_SHIFT;
32399 +
32400 + memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32401 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32402 + pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32403 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32404 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32405 + }
32406 +
32407 + /* PaX: make KERNEL_CS read-only */
32408 + addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32409 + if (!paravirt_enabled())
32410 + set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32411 +/*
32412 + for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32413 + pgd = pgd_offset_k(addr);
32414 + pud = pud_offset(pgd, addr);
32415 + pmd = pmd_offset(pud, addr);
32416 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32417 + }
32418 +*/
32419 +#ifdef CONFIG_X86_PAE
32420 + set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32421 +/*
32422 + for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32423 + pgd = pgd_offset_k(addr);
32424 + pud = pud_offset(pgd, addr);
32425 + pmd = pmd_offset(pud, addr);
32426 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32427 + }
32428 +*/
32429 +#endif
32430 +
32431 +#ifdef CONFIG_MODULES
32432 + set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32433 +#endif
32434 +
32435 +#else
32436 + /* PaX: make kernel code/rodata read-only, rest non-executable */
32437 + for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32438 + pgd = pgd_offset_k(addr);
32439 + pud = pud_offset(pgd, addr);
32440 + pmd = pmd_offset(pud, addr);
32441 + if (!pmd_present(*pmd))
32442 + continue;
32443 + if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32444 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32445 + else
32446 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32447 + }
32448 +
32449 + addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32450 + end = addr + KERNEL_IMAGE_SIZE;
32451 + for (; addr < end; addr += PMD_SIZE) {
32452 + pgd = pgd_offset_k(addr);
32453 + pud = pud_offset(pgd, addr);
32454 + pmd = pmd_offset(pud, addr);
32455 + if (!pmd_present(*pmd))
32456 + continue;
32457 + if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32458 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32459 + }
32460 +#endif
32461 +
32462 + flush_tlb_all();
32463 +#endif
32464 +
32465 free_init_pages("unused kernel",
32466 (unsigned long)(&__init_begin),
32467 (unsigned long)(&__init_end));
32468 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32469 index e395048..cd38278 100644
32470 --- a/arch/x86/mm/init_32.c
32471 +++ b/arch/x86/mm/init_32.c
32472 @@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32473 bool __read_mostly __vmalloc_start_set = false;
32474
32475 /*
32476 - * Creates a middle page table and puts a pointer to it in the
32477 - * given global directory entry. This only returns the gd entry
32478 - * in non-PAE compilation mode, since the middle layer is folded.
32479 - */
32480 -static pmd_t * __init one_md_table_init(pgd_t *pgd)
32481 -{
32482 - pud_t *pud;
32483 - pmd_t *pmd_table;
32484 -
32485 -#ifdef CONFIG_X86_PAE
32486 - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32487 - pmd_table = (pmd_t *)alloc_low_page();
32488 - paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32489 - set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32490 - pud = pud_offset(pgd, 0);
32491 - BUG_ON(pmd_table != pmd_offset(pud, 0));
32492 -
32493 - return pmd_table;
32494 - }
32495 -#endif
32496 - pud = pud_offset(pgd, 0);
32497 - pmd_table = pmd_offset(pud, 0);
32498 -
32499 - return pmd_table;
32500 -}
32501 -
32502 -/*
32503 * Create a page table and place a pointer to it in a middle page
32504 * directory entry:
32505 */
32506 @@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32507 pte_t *page_table = (pte_t *)alloc_low_page();
32508
32509 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32510 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32511 + set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32512 +#else
32513 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32514 +#endif
32515 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32516 }
32517
32518 return pte_offset_kernel(pmd, 0);
32519 }
32520
32521 +static pmd_t * __init one_md_table_init(pgd_t *pgd)
32522 +{
32523 + pud_t *pud;
32524 + pmd_t *pmd_table;
32525 +
32526 + pud = pud_offset(pgd, 0);
32527 + pmd_table = pmd_offset(pud, 0);
32528 +
32529 + return pmd_table;
32530 +}
32531 +
32532 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32533 {
32534 int pgd_idx = pgd_index(vaddr);
32535 @@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32536 int pgd_idx, pmd_idx;
32537 unsigned long vaddr;
32538 pgd_t *pgd;
32539 + pud_t *pud;
32540 pmd_t *pmd;
32541 pte_t *pte = NULL;
32542 unsigned long count = page_table_range_init_count(start, end);
32543 @@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32544 pgd = pgd_base + pgd_idx;
32545
32546 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32547 - pmd = one_md_table_init(pgd);
32548 - pmd = pmd + pmd_index(vaddr);
32549 + pud = pud_offset(pgd, vaddr);
32550 + pmd = pmd_offset(pud, vaddr);
32551 +
32552 +#ifdef CONFIG_X86_PAE
32553 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32554 +#endif
32555 +
32556 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32557 pmd++, pmd_idx++) {
32558 pte = page_table_kmap_check(one_page_table_init(pmd),
32559 @@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32560 }
32561 }
32562
32563 -static inline int is_kernel_text(unsigned long addr)
32564 +static inline int is_kernel_text(unsigned long start, unsigned long end)
32565 {
32566 - if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32567 - return 1;
32568 - return 0;
32569 + if ((start >= ktla_ktva((unsigned long)_etext) ||
32570 + end <= ktla_ktva((unsigned long)_stext)) &&
32571 + (start >= ktla_ktva((unsigned long)_einittext) ||
32572 + end <= ktla_ktva((unsigned long)_sinittext)) &&
32573 +
32574 +#ifdef CONFIG_ACPI_SLEEP
32575 + (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32576 +#endif
32577 +
32578 + (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32579 + return 0;
32580 + return 1;
32581 }
32582
32583 /*
32584 @@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
32585 unsigned long last_map_addr = end;
32586 unsigned long start_pfn, end_pfn;
32587 pgd_t *pgd_base = swapper_pg_dir;
32588 - int pgd_idx, pmd_idx, pte_ofs;
32589 + unsigned int pgd_idx, pmd_idx, pte_ofs;
32590 unsigned long pfn;
32591 pgd_t *pgd;
32592 + pud_t *pud;
32593 pmd_t *pmd;
32594 pte_t *pte;
32595 unsigned pages_2m, pages_4k;
32596 @@ -291,8 +295,13 @@ repeat:
32597 pfn = start_pfn;
32598 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32599 pgd = pgd_base + pgd_idx;
32600 - for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
32601 - pmd = one_md_table_init(pgd);
32602 + for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
32603 + pud = pud_offset(pgd, 0);
32604 + pmd = pmd_offset(pud, 0);
32605 +
32606 +#ifdef CONFIG_X86_PAE
32607 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32608 +#endif
32609
32610 if (pfn >= end_pfn)
32611 continue;
32612 @@ -304,14 +313,13 @@ repeat:
32613 #endif
32614 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
32615 pmd++, pmd_idx++) {
32616 - unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
32617 + unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
32618
32619 /*
32620 * Map with big pages if possible, otherwise
32621 * create normal page tables:
32622 */
32623 if (use_pse) {
32624 - unsigned int addr2;
32625 pgprot_t prot = PAGE_KERNEL_LARGE;
32626 /*
32627 * first pass will use the same initial
32628 @@ -322,11 +330,7 @@ repeat:
32629 _PAGE_PSE);
32630
32631 pfn &= PMD_MASK >> PAGE_SHIFT;
32632 - addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
32633 - PAGE_OFFSET + PAGE_SIZE-1;
32634 -
32635 - if (is_kernel_text(addr) ||
32636 - is_kernel_text(addr2))
32637 + if (is_kernel_text(address, address + PMD_SIZE))
32638 prot = PAGE_KERNEL_LARGE_EXEC;
32639
32640 pages_2m++;
32641 @@ -343,7 +347,7 @@ repeat:
32642 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32643 pte += pte_ofs;
32644 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
32645 - pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
32646 + pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
32647 pgprot_t prot = PAGE_KERNEL;
32648 /*
32649 * first pass will use the same initial
32650 @@ -351,7 +355,7 @@ repeat:
32651 */
32652 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
32653
32654 - if (is_kernel_text(addr))
32655 + if (is_kernel_text(address, address + PAGE_SIZE))
32656 prot = PAGE_KERNEL_EXEC;
32657
32658 pages_4k++;
32659 @@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
32660
32661 pud = pud_offset(pgd, va);
32662 pmd = pmd_offset(pud, va);
32663 - if (!pmd_present(*pmd))
32664 + if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
32665 break;
32666
32667 /* should not be large page here */
32668 @@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
32669
32670 static void __init pagetable_init(void)
32671 {
32672 - pgd_t *pgd_base = swapper_pg_dir;
32673 -
32674 - permanent_kmaps_init(pgd_base);
32675 + permanent_kmaps_init(swapper_pg_dir);
32676 }
32677
32678 -pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
32679 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
32680 EXPORT_SYMBOL_GPL(__supported_pte_mask);
32681
32682 /* user-defined highmem size */
32683 @@ -787,10 +789,10 @@ void __init mem_init(void)
32684 ((unsigned long)&__init_end -
32685 (unsigned long)&__init_begin) >> 10,
32686
32687 - (unsigned long)&_etext, (unsigned long)&_edata,
32688 - ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
32689 + (unsigned long)&_sdata, (unsigned long)&_edata,
32690 + ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
32691
32692 - (unsigned long)&_text, (unsigned long)&_etext,
32693 + ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
32694 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
32695
32696 /*
32697 @@ -883,6 +885,7 @@ void set_kernel_text_rw(void)
32698 if (!kernel_set_to_readonly)
32699 return;
32700
32701 + start = ktla_ktva(start);
32702 pr_debug("Set kernel text: %lx - %lx for read write\n",
32703 start, start+size);
32704
32705 @@ -897,6 +900,7 @@ void set_kernel_text_ro(void)
32706 if (!kernel_set_to_readonly)
32707 return;
32708
32709 + start = ktla_ktva(start);
32710 pr_debug("Set kernel text: %lx - %lx for read only\n",
32711 start, start+size);
32712
32713 @@ -925,6 +929,7 @@ void mark_rodata_ro(void)
32714 unsigned long start = PFN_ALIGN(_text);
32715 unsigned long size = PFN_ALIGN(_etext) - start;
32716
32717 + start = ktla_ktva(start);
32718 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
32719 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
32720 size >> 10);
32721 diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
32722 index f35c66c..84b95ef 100644
32723 --- a/arch/x86/mm/init_64.c
32724 +++ b/arch/x86/mm/init_64.c
32725 @@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
32726 * around without checking the pgd every time.
32727 */
32728
32729 -pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
32730 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
32731 EXPORT_SYMBOL_GPL(__supported_pte_mask);
32732
32733 int force_personality32;
32734 @@ -184,12 +184,29 @@ void sync_global_pgds(unsigned long start, unsigned long end)
32735
32736 for (address = start; address <= end; address += PGDIR_SIZE) {
32737 const pgd_t *pgd_ref = pgd_offset_k(address);
32738 +
32739 +#ifdef CONFIG_PAX_PER_CPU_PGD
32740 + unsigned long cpu;
32741 +#else
32742 struct page *page;
32743 +#endif
32744
32745 if (pgd_none(*pgd_ref))
32746 continue;
32747
32748 spin_lock(&pgd_lock);
32749 +
32750 +#ifdef CONFIG_PAX_PER_CPU_PGD
32751 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
32752 + pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
32753 +
32754 + if (pgd_none(*pgd))
32755 + set_pgd(pgd, *pgd_ref);
32756 + else
32757 + BUG_ON(pgd_page_vaddr(*pgd)
32758 + != pgd_page_vaddr(*pgd_ref));
32759 + pgd = pgd_offset_cpu(cpu, kernel, address);
32760 +#else
32761 list_for_each_entry(page, &pgd_list, lru) {
32762 pgd_t *pgd;
32763 spinlock_t *pgt_lock;
32764 @@ -198,6 +215,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
32765 /* the pgt_lock only for Xen */
32766 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
32767 spin_lock(pgt_lock);
32768 +#endif
32769
32770 if (pgd_none(*pgd))
32771 set_pgd(pgd, *pgd_ref);
32772 @@ -205,7 +223,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
32773 BUG_ON(pgd_page_vaddr(*pgd)
32774 != pgd_page_vaddr(*pgd_ref));
32775
32776 +#ifndef CONFIG_PAX_PER_CPU_PGD
32777 spin_unlock(pgt_lock);
32778 +#endif
32779 +
32780 }
32781 spin_unlock(&pgd_lock);
32782 }
32783 @@ -238,7 +259,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
32784 {
32785 if (pgd_none(*pgd)) {
32786 pud_t *pud = (pud_t *)spp_getpage();
32787 - pgd_populate(&init_mm, pgd, pud);
32788 + pgd_populate_kernel(&init_mm, pgd, pud);
32789 if (pud != pud_offset(pgd, 0))
32790 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
32791 pud, pud_offset(pgd, 0));
32792 @@ -250,7 +271,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
32793 {
32794 if (pud_none(*pud)) {
32795 pmd_t *pmd = (pmd_t *) spp_getpage();
32796 - pud_populate(&init_mm, pud, pmd);
32797 + pud_populate_kernel(&init_mm, pud, pmd);
32798 if (pmd != pmd_offset(pud, 0))
32799 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
32800 pmd, pmd_offset(pud, 0));
32801 @@ -279,7 +300,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
32802 pmd = fill_pmd(pud, vaddr);
32803 pte = fill_pte(pmd, vaddr);
32804
32805 + pax_open_kernel();
32806 set_pte(pte, new_pte);
32807 + pax_close_kernel();
32808
32809 /*
32810 * It's enough to flush this one mapping.
32811 @@ -338,14 +361,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
32812 pgd = pgd_offset_k((unsigned long)__va(phys));
32813 if (pgd_none(*pgd)) {
32814 pud = (pud_t *) spp_getpage();
32815 - set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
32816 - _PAGE_USER));
32817 + set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
32818 }
32819 pud = pud_offset(pgd, (unsigned long)__va(phys));
32820 if (pud_none(*pud)) {
32821 pmd = (pmd_t *) spp_getpage();
32822 - set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
32823 - _PAGE_USER));
32824 + set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
32825 }
32826 pmd = pmd_offset(pud, phys);
32827 BUG_ON(!pmd_none(*pmd));
32828 @@ -586,7 +607,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
32829 prot);
32830
32831 spin_lock(&init_mm.page_table_lock);
32832 - pud_populate(&init_mm, pud, pmd);
32833 + pud_populate_kernel(&init_mm, pud, pmd);
32834 spin_unlock(&init_mm.page_table_lock);
32835 }
32836 __flush_tlb_all();
32837 @@ -627,7 +648,7 @@ kernel_physical_mapping_init(unsigned long start,
32838 page_size_mask);
32839
32840 spin_lock(&init_mm.page_table_lock);
32841 - pgd_populate(&init_mm, pgd, pud);
32842 + pgd_populate_kernel(&init_mm, pgd, pud);
32843 spin_unlock(&init_mm.page_table_lock);
32844 pgd_changed = true;
32845 }
32846 @@ -1188,8 +1209,8 @@ int kern_addr_valid(unsigned long addr)
32847 static struct vm_area_struct gate_vma = {
32848 .vm_start = VSYSCALL_START,
32849 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
32850 - .vm_page_prot = PAGE_READONLY_EXEC,
32851 - .vm_flags = VM_READ | VM_EXEC
32852 + .vm_page_prot = PAGE_READONLY,
32853 + .vm_flags = VM_READ
32854 };
32855
32856 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
32857 @@ -1223,7 +1244,7 @@ int in_gate_area_no_mm(unsigned long addr)
32858
32859 const char *arch_vma_name(struct vm_area_struct *vma)
32860 {
32861 - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
32862 + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
32863 return "[vdso]";
32864 if (vma == &gate_vma)
32865 return "[vsyscall]";
32866 diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
32867 index 7b179b4..6bd17777 100644
32868 --- a/arch/x86/mm/iomap_32.c
32869 +++ b/arch/x86/mm/iomap_32.c
32870 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
32871 type = kmap_atomic_idx_push();
32872 idx = type + KM_TYPE_NR * smp_processor_id();
32873 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32874 +
32875 + pax_open_kernel();
32876 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
32877 + pax_close_kernel();
32878 +
32879 arch_flush_lazy_mmu_mode();
32880
32881 return (void *)vaddr;
32882 diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
32883 index 597ac15..49841be 100644
32884 --- a/arch/x86/mm/ioremap.c
32885 +++ b/arch/x86/mm/ioremap.c
32886 @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
32887 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
32888 int is_ram = page_is_ram(pfn);
32889
32890 - if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
32891 + if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
32892 return NULL;
32893 WARN_ON_ONCE(is_ram);
32894 }
32895 @@ -256,7 +256,7 @@ EXPORT_SYMBOL(ioremap_prot);
32896 *
32897 * Caller must ensure there is only one unmapping for the same pointer.
32898 */
32899 -void iounmap(volatile void __iomem *addr)
32900 +void iounmap(const volatile void __iomem *addr)
32901 {
32902 struct vm_struct *p, *o;
32903
32904 @@ -310,6 +310,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
32905
32906 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
32907 if (page_is_ram(start >> PAGE_SHIFT))
32908 +#ifdef CONFIG_HIGHMEM
32909 + if ((start >> PAGE_SHIFT) < max_low_pfn)
32910 +#endif
32911 return __va(phys);
32912
32913 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
32914 @@ -322,13 +325,16 @@ void *xlate_dev_mem_ptr(unsigned long phys)
32915 void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
32916 {
32917 if (page_is_ram(phys >> PAGE_SHIFT))
32918 +#ifdef CONFIG_HIGHMEM
32919 + if ((phys >> PAGE_SHIFT) < max_low_pfn)
32920 +#endif
32921 return;
32922
32923 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
32924 return;
32925 }
32926
32927 -static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
32928 +static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
32929
32930 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
32931 {
32932 @@ -358,8 +364,7 @@ void __init early_ioremap_init(void)
32933 early_ioremap_setup();
32934
32935 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
32936 - memset(bm_pte, 0, sizeof(bm_pte));
32937 - pmd_populate_kernel(&init_mm, pmd, bm_pte);
32938 + pmd_populate_user(&init_mm, pmd, bm_pte);
32939
32940 /*
32941 * The boot-ioremap range spans multiple pmds, for which
32942 diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
32943 index dd89a13..d77bdcc 100644
32944 --- a/arch/x86/mm/kmemcheck/kmemcheck.c
32945 +++ b/arch/x86/mm/kmemcheck/kmemcheck.c
32946 @@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
32947 * memory (e.g. tracked pages)? For now, we need this to avoid
32948 * invoking kmemcheck for PnP BIOS calls.
32949 */
32950 - if (regs->flags & X86_VM_MASK)
32951 + if (v8086_mode(regs))
32952 return false;
32953 - if (regs->cs != __KERNEL_CS)
32954 + if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
32955 return false;
32956
32957 pte = kmemcheck_pte_lookup(address);
32958 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
32959 index 25e7e13..1964579 100644
32960 --- a/arch/x86/mm/mmap.c
32961 +++ b/arch/x86/mm/mmap.c
32962 @@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
32963 * Leave an at least ~128 MB hole with possible stack randomization.
32964 */
32965 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
32966 -#define MAX_GAP (TASK_SIZE/6*5)
32967 +#define MAX_GAP (pax_task_size/6*5)
32968
32969 static int mmap_is_legacy(void)
32970 {
32971 @@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
32972 return rnd << PAGE_SHIFT;
32973 }
32974
32975 -static unsigned long mmap_base(void)
32976 +static unsigned long mmap_base(struct mm_struct *mm)
32977 {
32978 unsigned long gap = rlimit(RLIMIT_STACK);
32979 + unsigned long pax_task_size = TASK_SIZE;
32980 +
32981 +#ifdef CONFIG_PAX_SEGMEXEC
32982 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
32983 + pax_task_size = SEGMEXEC_TASK_SIZE;
32984 +#endif
32985
32986 if (gap < MIN_GAP)
32987 gap = MIN_GAP;
32988 else if (gap > MAX_GAP)
32989 gap = MAX_GAP;
32990
32991 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
32992 + return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
32993 }
32994
32995 /*
32996 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
32997 * does, but not when emulating X86_32
32998 */
32999 -static unsigned long mmap_legacy_base(void)
33000 +static unsigned long mmap_legacy_base(struct mm_struct *mm)
33001 {
33002 - if (mmap_is_ia32())
33003 + if (mmap_is_ia32()) {
33004 +
33005 +#ifdef CONFIG_PAX_SEGMEXEC
33006 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
33007 + return SEGMEXEC_TASK_UNMAPPED_BASE;
33008 + else
33009 +#endif
33010 +
33011 return TASK_UNMAPPED_BASE;
33012 - else
33013 + } else
33014 return TASK_UNMAPPED_BASE + mmap_rnd();
33015 }
33016
33017 @@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33018 */
33019 void arch_pick_mmap_layout(struct mm_struct *mm)
33020 {
33021 - mm->mmap_legacy_base = mmap_legacy_base();
33022 - mm->mmap_base = mmap_base();
33023 + mm->mmap_legacy_base = mmap_legacy_base(mm);
33024 + mm->mmap_base = mmap_base(mm);
33025 +
33026 +#ifdef CONFIG_PAX_RANDMMAP
33027 + if (mm->pax_flags & MF_PAX_RANDMMAP) {
33028 + mm->mmap_legacy_base += mm->delta_mmap;
33029 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33030 + }
33031 +#endif
33032
33033 if (mmap_is_legacy()) {
33034 mm->mmap_base = mm->mmap_legacy_base;
33035 diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33036 index 0057a7a..95c7edd 100644
33037 --- a/arch/x86/mm/mmio-mod.c
33038 +++ b/arch/x86/mm/mmio-mod.c
33039 @@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33040 break;
33041 default:
33042 {
33043 - unsigned char *ip = (unsigned char *)instptr;
33044 + unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33045 my_trace->opcode = MMIO_UNKNOWN_OP;
33046 my_trace->width = 0;
33047 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33048 @@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33049 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33050 void __iomem *addr)
33051 {
33052 - static atomic_t next_id;
33053 + static atomic_unchecked_t next_id;
33054 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33055 /* These are page-unaligned. */
33056 struct mmiotrace_map map = {
33057 @@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33058 .private = trace
33059 },
33060 .phys = offset,
33061 - .id = atomic_inc_return(&next_id)
33062 + .id = atomic_inc_return_unchecked(&next_id)
33063 };
33064 map.map_id = trace->id;
33065
33066 @@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33067 ioremap_trace_core(offset, size, addr);
33068 }
33069
33070 -static void iounmap_trace_core(volatile void __iomem *addr)
33071 +static void iounmap_trace_core(const volatile void __iomem *addr)
33072 {
33073 struct mmiotrace_map map = {
33074 .phys = 0,
33075 @@ -328,7 +328,7 @@ not_enabled:
33076 }
33077 }
33078
33079 -void mmiotrace_iounmap(volatile void __iomem *addr)
33080 +void mmiotrace_iounmap(const volatile void __iomem *addr)
33081 {
33082 might_sleep();
33083 if (is_enabled()) /* recheck and proper locking in *_core() */
33084 diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33085 index 1d045f9..3a00249 100644
33086 --- a/arch/x86/mm/numa.c
33087 +++ b/arch/x86/mm/numa.c
33088 @@ -478,7 +478,7 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
33089 return true;
33090 }
33091
33092 -static int __init numa_register_memblks(struct numa_meminfo *mi)
33093 +static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33094 {
33095 unsigned long uninitialized_var(pfn_align);
33096 int i, nid;
33097 diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
33098 index 461bc82..4e091a3 100644
33099 --- a/arch/x86/mm/pageattr-test.c
33100 +++ b/arch/x86/mm/pageattr-test.c
33101 @@ -35,7 +35,7 @@ enum {
33102
33103 static int pte_testbit(pte_t pte)
33104 {
33105 - return pte_flags(pte) & _PAGE_UNUSED1;
33106 + return pte_flags(pte) & _PAGE_CPA_TEST;
33107 }
33108
33109 struct split_state {
33110 diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33111 index ae242a7..1c7998f 100644
33112 --- a/arch/x86/mm/pageattr.c
33113 +++ b/arch/x86/mm/pageattr.c
33114 @@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33115 */
33116 #ifdef CONFIG_PCI_BIOS
33117 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33118 - pgprot_val(forbidden) |= _PAGE_NX;
33119 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33120 #endif
33121
33122 /*
33123 @@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33124 * Does not cover __inittext since that is gone later on. On
33125 * 64bit we do not enforce !NX on the low mapping
33126 */
33127 - if (within(address, (unsigned long)_text, (unsigned long)_etext))
33128 - pgprot_val(forbidden) |= _PAGE_NX;
33129 + if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33130 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33131
33132 +#ifdef CONFIG_DEBUG_RODATA
33133 /*
33134 * The .rodata section needs to be read-only. Using the pfn
33135 * catches all aliases.
33136 @@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33137 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33138 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33139 pgprot_val(forbidden) |= _PAGE_RW;
33140 +#endif
33141
33142 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33143 /*
33144 @@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33145 }
33146 #endif
33147
33148 +#ifdef CONFIG_PAX_KERNEXEC
33149 + if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33150 + pgprot_val(forbidden) |= _PAGE_RW;
33151 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33152 + }
33153 +#endif
33154 +
33155 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33156
33157 return prot;
33158 @@ -420,23 +429,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33159 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33160 {
33161 /* change init_mm */
33162 + pax_open_kernel();
33163 set_pte_atomic(kpte, pte);
33164 +
33165 #ifdef CONFIG_X86_32
33166 if (!SHARED_KERNEL_PMD) {
33167 +
33168 +#ifdef CONFIG_PAX_PER_CPU_PGD
33169 + unsigned long cpu;
33170 +#else
33171 struct page *page;
33172 +#endif
33173
33174 +#ifdef CONFIG_PAX_PER_CPU_PGD
33175 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33176 + pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33177 +#else
33178 list_for_each_entry(page, &pgd_list, lru) {
33179 - pgd_t *pgd;
33180 + pgd_t *pgd = (pgd_t *)page_address(page);
33181 +#endif
33182 +
33183 pud_t *pud;
33184 pmd_t *pmd;
33185
33186 - pgd = (pgd_t *)page_address(page) + pgd_index(address);
33187 + pgd += pgd_index(address);
33188 pud = pud_offset(pgd, address);
33189 pmd = pmd_offset(pud, address);
33190 set_pte_atomic((pte_t *)pmd, pte);
33191 }
33192 }
33193 #endif
33194 + pax_close_kernel();
33195 }
33196
33197 static int
33198 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33199 index 6574388..87e9bef 100644
33200 --- a/arch/x86/mm/pat.c
33201 +++ b/arch/x86/mm/pat.c
33202 @@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
33203
33204 if (!entry) {
33205 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33206 - current->comm, current->pid, start, end - 1);
33207 + current->comm, task_pid_nr(current), start, end - 1);
33208 return -EINVAL;
33209 }
33210
33211 @@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33212
33213 while (cursor < to) {
33214 if (!devmem_is_allowed(pfn)) {
33215 - printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33216 - current->comm, from, to - 1);
33217 + printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33218 + current->comm, from, to - 1, cursor);
33219 return 0;
33220 }
33221 cursor += PAGE_SIZE;
33222 @@ -577,7 +577,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
33223 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
33224 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33225 "for [mem %#010Lx-%#010Lx]\n",
33226 - current->comm, current->pid,
33227 + current->comm, task_pid_nr(current),
33228 cattr_name(flags),
33229 base, (unsigned long long)(base + size-1));
33230 return -EINVAL;
33231 @@ -612,7 +612,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33232 flags = lookup_memtype(paddr);
33233 if (want_flags != flags) {
33234 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33235 - current->comm, current->pid,
33236 + current->comm, task_pid_nr(current),
33237 cattr_name(want_flags),
33238 (unsigned long long)paddr,
33239 (unsigned long long)(paddr + size - 1),
33240 @@ -634,7 +634,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33241 free_memtype(paddr, paddr + size);
33242 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33243 " for [mem %#010Lx-%#010Lx], got %s\n",
33244 - current->comm, current->pid,
33245 + current->comm, task_pid_nr(current),
33246 cattr_name(want_flags),
33247 (unsigned long long)paddr,
33248 (unsigned long long)(paddr + size - 1),
33249 diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33250 index 415f6c4..d319983 100644
33251 --- a/arch/x86/mm/pat_rbtree.c
33252 +++ b/arch/x86/mm/pat_rbtree.c
33253 @@ -160,7 +160,7 @@ success:
33254
33255 failure:
33256 printk(KERN_INFO "%s:%d conflicting memory types "
33257 - "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33258 + "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33259 end, cattr_name(found_type), cattr_name(match->type));
33260 return -EBUSY;
33261 }
33262 diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33263 index 9f0614d..92ae64a 100644
33264 --- a/arch/x86/mm/pf_in.c
33265 +++ b/arch/x86/mm/pf_in.c
33266 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33267 int i;
33268 enum reason_type rv = OTHERS;
33269
33270 - p = (unsigned char *)ins_addr;
33271 + p = (unsigned char *)ktla_ktva(ins_addr);
33272 p += skip_prefix(p, &prf);
33273 p += get_opcode(p, &opcode);
33274
33275 @@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33276 struct prefix_bits prf;
33277 int i;
33278
33279 - p = (unsigned char *)ins_addr;
33280 + p = (unsigned char *)ktla_ktva(ins_addr);
33281 p += skip_prefix(p, &prf);
33282 p += get_opcode(p, &opcode);
33283
33284 @@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33285 struct prefix_bits prf;
33286 int i;
33287
33288 - p = (unsigned char *)ins_addr;
33289 + p = (unsigned char *)ktla_ktva(ins_addr);
33290 p += skip_prefix(p, &prf);
33291 p += get_opcode(p, &opcode);
33292
33293 @@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33294 struct prefix_bits prf;
33295 int i;
33296
33297 - p = (unsigned char *)ins_addr;
33298 + p = (unsigned char *)ktla_ktva(ins_addr);
33299 p += skip_prefix(p, &prf);
33300 p += get_opcode(p, &opcode);
33301 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33302 @@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33303 struct prefix_bits prf;
33304 int i;
33305
33306 - p = (unsigned char *)ins_addr;
33307 + p = (unsigned char *)ktla_ktva(ins_addr);
33308 p += skip_prefix(p, &prf);
33309 p += get_opcode(p, &opcode);
33310 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33311 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33312 index c96314a..433b127 100644
33313 --- a/arch/x86/mm/pgtable.c
33314 +++ b/arch/x86/mm/pgtable.c
33315 @@ -97,10 +97,71 @@ static inline void pgd_list_del(pgd_t *pgd)
33316 list_del(&page->lru);
33317 }
33318
33319 -#define UNSHARED_PTRS_PER_PGD \
33320 - (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33321 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33322 +pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33323
33324 +void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33325 +{
33326 + unsigned int count = USER_PGD_PTRS;
33327
33328 + if (!pax_user_shadow_base)
33329 + return;
33330 +
33331 + while (count--)
33332 + *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33333 +}
33334 +#endif
33335 +
33336 +#ifdef CONFIG_PAX_PER_CPU_PGD
33337 +void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33338 +{
33339 + unsigned int count = USER_PGD_PTRS;
33340 +
33341 + while (count--) {
33342 + pgd_t pgd;
33343 +
33344 +#ifdef CONFIG_X86_64
33345 + pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33346 +#else
33347 + pgd = *src++;
33348 +#endif
33349 +
33350 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33351 + pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33352 +#endif
33353 +
33354 + *dst++ = pgd;
33355 + }
33356 +
33357 +}
33358 +#endif
33359 +
33360 +#ifdef CONFIG_X86_64
33361 +#define pxd_t pud_t
33362 +#define pyd_t pgd_t
33363 +#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33364 +#define pgtable_pxd_page_ctor(page) true
33365 +#define pgtable_pxd_page_dtor(page)
33366 +#define pxd_free(mm, pud) pud_free((mm), (pud))
33367 +#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33368 +#define pyd_offset(mm, address) pgd_offset((mm), (address))
33369 +#define PYD_SIZE PGDIR_SIZE
33370 +#else
33371 +#define pxd_t pmd_t
33372 +#define pyd_t pud_t
33373 +#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33374 +#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33375 +#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33376 +#define pxd_free(mm, pud) pmd_free((mm), (pud))
33377 +#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33378 +#define pyd_offset(mm, address) pud_offset((mm), (address))
33379 +#define PYD_SIZE PUD_SIZE
33380 +#endif
33381 +
33382 +#ifdef CONFIG_PAX_PER_CPU_PGD
33383 +static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33384 +static inline void pgd_dtor(pgd_t *pgd) {}
33385 +#else
33386 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33387 {
33388 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33389 @@ -141,6 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
33390 pgd_list_del(pgd);
33391 spin_unlock(&pgd_lock);
33392 }
33393 +#endif
33394
33395 /*
33396 * List of all pgd's needed for non-PAE so it can invalidate entries
33397 @@ -153,7 +215,7 @@ static void pgd_dtor(pgd_t *pgd)
33398 * -- nyc
33399 */
33400
33401 -#ifdef CONFIG_X86_PAE
33402 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33403 /*
33404 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33405 * updating the top-level pagetable entries to guarantee the
33406 @@ -165,7 +227,7 @@ static void pgd_dtor(pgd_t *pgd)
33407 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33408 * and initialize the kernel pmds here.
33409 */
33410 -#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33411 +#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33412
33413 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33414 {
33415 @@ -183,43 +245,45 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33416 */
33417 flush_tlb_mm(mm);
33418 }
33419 +#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33420 +#define PREALLOCATED_PXDS USER_PGD_PTRS
33421 #else /* !CONFIG_X86_PAE */
33422
33423 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33424 -#define PREALLOCATED_PMDS 0
33425 +#define PREALLOCATED_PXDS 0
33426
33427 #endif /* CONFIG_X86_PAE */
33428
33429 -static void free_pmds(pmd_t *pmds[])
33430 +static void free_pxds(pxd_t *pxds[])
33431 {
33432 int i;
33433
33434 - for(i = 0; i < PREALLOCATED_PMDS; i++)
33435 - if (pmds[i]) {
33436 - pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33437 - free_page((unsigned long)pmds[i]);
33438 + for(i = 0; i < PREALLOCATED_PXDS; i++)
33439 + if (pxds[i]) {
33440 + pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33441 + free_page((unsigned long)pxds[i]);
33442 }
33443 }
33444
33445 -static int preallocate_pmds(pmd_t *pmds[])
33446 +static int preallocate_pxds(pxd_t *pxds[])
33447 {
33448 int i;
33449 bool failed = false;
33450
33451 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
33452 - pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33453 - if (!pmd)
33454 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
33455 + pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33456 + if (!pxd)
33457 failed = true;
33458 - if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33459 - free_page((unsigned long)pmd);
33460 - pmd = NULL;
33461 + if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33462 + free_page((unsigned long)pxd);
33463 + pxd = NULL;
33464 failed = true;
33465 }
33466 - pmds[i] = pmd;
33467 + pxds[i] = pxd;
33468 }
33469
33470 if (failed) {
33471 - free_pmds(pmds);
33472 + free_pxds(pxds);
33473 return -ENOMEM;
33474 }
33475
33476 @@ -232,49 +296,52 @@ static int preallocate_pmds(pmd_t *pmds[])
33477 * preallocate which never got a corresponding vma will need to be
33478 * freed manually.
33479 */
33480 -static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33481 +static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33482 {
33483 int i;
33484
33485 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
33486 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
33487 pgd_t pgd = pgdp[i];
33488
33489 if (pgd_val(pgd) != 0) {
33490 - pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33491 + pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33492
33493 - pgdp[i] = native_make_pgd(0);
33494 + set_pgd(pgdp + i, native_make_pgd(0));
33495
33496 - paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33497 - pmd_free(mm, pmd);
33498 + paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33499 + pxd_free(mm, pxd);
33500 }
33501 }
33502 }
33503
33504 -static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33505 +static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33506 {
33507 - pud_t *pud;
33508 + pyd_t *pyd;
33509 int i;
33510
33511 - if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33512 + if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33513 return;
33514
33515 - pud = pud_offset(pgd, 0);
33516 -
33517 - for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33518 - pmd_t *pmd = pmds[i];
33519 +#ifdef CONFIG_X86_64
33520 + pyd = pyd_offset(mm, 0L);
33521 +#else
33522 + pyd = pyd_offset(pgd, 0L);
33523 +#endif
33524
33525 + for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33526 + pxd_t *pxd = pxds[i];
33527 if (i >= KERNEL_PGD_BOUNDARY)
33528 - memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33529 - sizeof(pmd_t) * PTRS_PER_PMD);
33530 + memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33531 + sizeof(pxd_t) * PTRS_PER_PMD);
33532
33533 - pud_populate(mm, pud, pmd);
33534 + pyd_populate(mm, pyd, pxd);
33535 }
33536 }
33537
33538 pgd_t *pgd_alloc(struct mm_struct *mm)
33539 {
33540 pgd_t *pgd;
33541 - pmd_t *pmds[PREALLOCATED_PMDS];
33542 + pxd_t *pxds[PREALLOCATED_PXDS];
33543
33544 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
33545
33546 @@ -283,11 +350,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33547
33548 mm->pgd = pgd;
33549
33550 - if (preallocate_pmds(pmds) != 0)
33551 + if (preallocate_pxds(pxds) != 0)
33552 goto out_free_pgd;
33553
33554 if (paravirt_pgd_alloc(mm) != 0)
33555 - goto out_free_pmds;
33556 + goto out_free_pxds;
33557
33558 /*
33559 * Make sure that pre-populating the pmds is atomic with
33560 @@ -297,14 +364,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33561 spin_lock(&pgd_lock);
33562
33563 pgd_ctor(mm, pgd);
33564 - pgd_prepopulate_pmd(mm, pgd, pmds);
33565 + pgd_prepopulate_pxd(mm, pgd, pxds);
33566
33567 spin_unlock(&pgd_lock);
33568
33569 return pgd;
33570
33571 -out_free_pmds:
33572 - free_pmds(pmds);
33573 +out_free_pxds:
33574 + free_pxds(pxds);
33575 out_free_pgd:
33576 free_page((unsigned long)pgd);
33577 out:
33578 @@ -313,7 +380,7 @@ out:
33579
33580 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
33581 {
33582 - pgd_mop_up_pmds(mm, pgd);
33583 + pgd_mop_up_pxds(mm, pgd);
33584 pgd_dtor(pgd);
33585 paravirt_pgd_free(mm, pgd);
33586 free_page((unsigned long)pgd);
33587 diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
33588 index 4dd8cf6..f9d143e 100644
33589 --- a/arch/x86/mm/pgtable_32.c
33590 +++ b/arch/x86/mm/pgtable_32.c
33591 @@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
33592 return;
33593 }
33594 pte = pte_offset_kernel(pmd, vaddr);
33595 +
33596 + pax_open_kernel();
33597 if (pte_val(pteval))
33598 set_pte_at(&init_mm, vaddr, pte, pteval);
33599 else
33600 pte_clear(&init_mm, vaddr, pte);
33601 + pax_close_kernel();
33602
33603 /*
33604 * It's enough to flush this one mapping.
33605 diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
33606 index e666cbb..61788c45 100644
33607 --- a/arch/x86/mm/physaddr.c
33608 +++ b/arch/x86/mm/physaddr.c
33609 @@ -10,7 +10,7 @@
33610 #ifdef CONFIG_X86_64
33611
33612 #ifdef CONFIG_DEBUG_VIRTUAL
33613 -unsigned long __phys_addr(unsigned long x)
33614 +unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33615 {
33616 unsigned long y = x - __START_KERNEL_map;
33617
33618 @@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
33619 #else
33620
33621 #ifdef CONFIG_DEBUG_VIRTUAL
33622 -unsigned long __phys_addr(unsigned long x)
33623 +unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33624 {
33625 unsigned long phys_addr = x - PAGE_OFFSET;
33626 /* VMALLOC_* aren't constants */
33627 diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
33628 index 90555bf..f5f1828 100644
33629 --- a/arch/x86/mm/setup_nx.c
33630 +++ b/arch/x86/mm/setup_nx.c
33631 @@ -5,8 +5,10 @@
33632 #include <asm/pgtable.h>
33633 #include <asm/proto.h>
33634
33635 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33636 static int disable_nx;
33637
33638 +#ifndef CONFIG_PAX_PAGEEXEC
33639 /*
33640 * noexec = on|off
33641 *
33642 @@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
33643 return 0;
33644 }
33645 early_param("noexec", noexec_setup);
33646 +#endif
33647 +
33648 +#endif
33649
33650 void x86_configure_nx(void)
33651 {
33652 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33653 if (cpu_has_nx && !disable_nx)
33654 __supported_pte_mask |= _PAGE_NX;
33655 else
33656 +#endif
33657 __supported_pte_mask &= ~_PAGE_NX;
33658 }
33659
33660 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
33661 index dd8dda1..9e9b0f6 100644
33662 --- a/arch/x86/mm/tlb.c
33663 +++ b/arch/x86/mm/tlb.c
33664 @@ -48,7 +48,11 @@ void leave_mm(int cpu)
33665 BUG();
33666 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
33667 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
33668 +
33669 +#ifndef CONFIG_PAX_PER_CPU_PGD
33670 load_cr3(swapper_pg_dir);
33671 +#endif
33672 +
33673 }
33674 }
33675 EXPORT_SYMBOL_GPL(leave_mm);
33676 diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
33677 new file mode 100644
33678 index 0000000..dace51c
33679 --- /dev/null
33680 +++ b/arch/x86/mm/uderef_64.c
33681 @@ -0,0 +1,37 @@
33682 +#include <linux/mm.h>
33683 +#include <asm/pgtable.h>
33684 +#include <asm/uaccess.h>
33685 +
33686 +#ifdef CONFIG_PAX_MEMORY_UDEREF
33687 +/* PaX: due to the special call convention these functions must
33688 + * - remain leaf functions under all configurations,
33689 + * - never be called directly, only dereferenced from the wrappers.
33690 + */
33691 +void __pax_open_userland(void)
33692 +{
33693 + unsigned int cpu;
33694 +
33695 + if (unlikely(!segment_eq(get_fs(), USER_DS)))
33696 + return;
33697 +
33698 + cpu = raw_get_cpu();
33699 + BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
33700 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
33701 + raw_put_cpu_no_resched();
33702 +}
33703 +EXPORT_SYMBOL(__pax_open_userland);
33704 +
33705 +void __pax_close_userland(void)
33706 +{
33707 + unsigned int cpu;
33708 +
33709 + if (unlikely(!segment_eq(get_fs(), USER_DS)))
33710 + return;
33711 +
33712 + cpu = raw_get_cpu();
33713 + BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
33714 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
33715 + raw_put_cpu_no_resched();
33716 +}
33717 +EXPORT_SYMBOL(__pax_close_userland);
33718 +#endif
33719 diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
33720 index 0149575..f746de8 100644
33721 --- a/arch/x86/net/bpf_jit.S
33722 +++ b/arch/x86/net/bpf_jit.S
33723 @@ -9,6 +9,7 @@
33724 */
33725 #include <linux/linkage.h>
33726 #include <asm/dwarf2.h>
33727 +#include <asm/alternative-asm.h>
33728
33729 /*
33730 * Calling convention :
33731 @@ -35,6 +36,7 @@ sk_load_word_positive_offset:
33732 jle bpf_slow_path_word
33733 mov (SKBDATA,%rsi),%eax
33734 bswap %eax /* ntohl() */
33735 + pax_force_retaddr
33736 ret
33737
33738 sk_load_half:
33739 @@ -52,6 +54,7 @@ sk_load_half_positive_offset:
33740 jle bpf_slow_path_half
33741 movzwl (SKBDATA,%rsi),%eax
33742 rol $8,%ax # ntohs()
33743 + pax_force_retaddr
33744 ret
33745
33746 sk_load_byte:
33747 @@ -66,6 +69,7 @@ sk_load_byte_positive_offset:
33748 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
33749 jle bpf_slow_path_byte
33750 movzbl (SKBDATA,%rsi),%eax
33751 + pax_force_retaddr
33752 ret
33753
33754 /**
33755 @@ -87,6 +91,7 @@ sk_load_byte_msh_positive_offset:
33756 movzbl (SKBDATA,%rsi),%ebx
33757 and $15,%bl
33758 shl $2,%bl
33759 + pax_force_retaddr
33760 ret
33761
33762 /* rsi contains offset and can be scratched */
33763 @@ -109,6 +114,7 @@ bpf_slow_path_word:
33764 js bpf_error
33765 mov -12(%rbp),%eax
33766 bswap %eax
33767 + pax_force_retaddr
33768 ret
33769
33770 bpf_slow_path_half:
33771 @@ -117,12 +123,14 @@ bpf_slow_path_half:
33772 mov -12(%rbp),%ax
33773 rol $8,%ax
33774 movzwl %ax,%eax
33775 + pax_force_retaddr
33776 ret
33777
33778 bpf_slow_path_byte:
33779 bpf_slow_path_common(1)
33780 js bpf_error
33781 movzbl -12(%rbp),%eax
33782 + pax_force_retaddr
33783 ret
33784
33785 bpf_slow_path_byte_msh:
33786 @@ -133,6 +141,7 @@ bpf_slow_path_byte_msh:
33787 and $15,%al
33788 shl $2,%al
33789 xchg %eax,%ebx
33790 + pax_force_retaddr
33791 ret
33792
33793 #define sk_negative_common(SIZE) \
33794 @@ -157,6 +166,7 @@ sk_load_word_negative_offset:
33795 sk_negative_common(4)
33796 mov (%rax), %eax
33797 bswap %eax
33798 + pax_force_retaddr
33799 ret
33800
33801 bpf_slow_path_half_neg:
33802 @@ -168,6 +178,7 @@ sk_load_half_negative_offset:
33803 mov (%rax),%ax
33804 rol $8,%ax
33805 movzwl %ax,%eax
33806 + pax_force_retaddr
33807 ret
33808
33809 bpf_slow_path_byte_neg:
33810 @@ -177,6 +188,7 @@ sk_load_byte_negative_offset:
33811 .globl sk_load_byte_negative_offset
33812 sk_negative_common(1)
33813 movzbl (%rax), %eax
33814 + pax_force_retaddr
33815 ret
33816
33817 bpf_slow_path_byte_msh_neg:
33818 @@ -190,6 +202,7 @@ sk_load_byte_msh_negative_offset:
33819 and $15,%al
33820 shl $2,%al
33821 xchg %eax,%ebx
33822 + pax_force_retaddr
33823 ret
33824
33825 bpf_error:
33826 @@ -197,4 +210,5 @@ bpf_error:
33827 xor %eax,%eax
33828 mov -8(%rbp),%rbx
33829 leaveq
33830 + pax_force_retaddr
33831 ret
33832 diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
33833 index 6d5663a..f1ec380 100644
33834 --- a/arch/x86/net/bpf_jit_comp.c
33835 +++ b/arch/x86/net/bpf_jit_comp.c
33836 @@ -50,13 +50,90 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
33837 return ptr + len;
33838 }
33839
33840 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33841 +#define MAX_INSTR_CODE_SIZE 96
33842 +#else
33843 +#define MAX_INSTR_CODE_SIZE 64
33844 +#endif
33845 +
33846 #define EMIT(bytes, len) do { prog = emit_code(prog, bytes, len); } while (0)
33847
33848 #define EMIT1(b1) EMIT(b1, 1)
33849 #define EMIT2(b1, b2) EMIT((b1) + ((b2) << 8), 2)
33850 #define EMIT3(b1, b2, b3) EMIT((b1) + ((b2) << 8) + ((b3) << 16), 3)
33851 #define EMIT4(b1, b2, b3, b4) EMIT((b1) + ((b2) << 8) + ((b3) << 16) + ((b4) << 24), 4)
33852 +
33853 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33854 +/* original constant will appear in ecx */
33855 +#define DILUTE_CONST_SEQUENCE(_off, _key) \
33856 +do { \
33857 + /* mov ecx, randkey */ \
33858 + EMIT1(0xb9); \
33859 + EMIT(_key, 4); \
33860 + /* xor ecx, randkey ^ off */ \
33861 + EMIT2(0x81, 0xf1); \
33862 + EMIT((_key) ^ (_off), 4); \
33863 +} while (0)
33864 +
33865 +#define EMIT1_off32(b1, _off) \
33866 +do { \
33867 + switch (b1) { \
33868 + case 0x05: /* add eax, imm32 */ \
33869 + case 0x2d: /* sub eax, imm32 */ \
33870 + case 0x25: /* and eax, imm32 */ \
33871 + case 0x0d: /* or eax, imm32 */ \
33872 + case 0xb8: /* mov eax, imm32 */ \
33873 + case 0x35: /* xor eax, imm32 */ \
33874 + case 0x3d: /* cmp eax, imm32 */ \
33875 + case 0xa9: /* test eax, imm32 */ \
33876 + DILUTE_CONST_SEQUENCE(_off, randkey); \
33877 + EMIT2((b1) - 4, 0xc8); /* convert imm instruction to eax, ecx */\
33878 + break; \
33879 + case 0xbb: /* mov ebx, imm32 */ \
33880 + DILUTE_CONST_SEQUENCE(_off, randkey); \
33881 + /* mov ebx, ecx */ \
33882 + EMIT2(0x89, 0xcb); \
33883 + break; \
33884 + case 0xbe: /* mov esi, imm32 */ \
33885 + DILUTE_CONST_SEQUENCE(_off, randkey); \
33886 + /* mov esi, ecx */ \
33887 + EMIT2(0x89, 0xce); \
33888 + break; \
33889 + case 0xe8: /* call rel imm32, always to known funcs */ \
33890 + EMIT1(b1); \
33891 + EMIT(_off, 4); \
33892 + break; \
33893 + case 0xe9: /* jmp rel imm32 */ \
33894 + EMIT1(b1); \
33895 + EMIT(_off, 4); \
33896 + /* prevent fall-through, we're not called if off = 0 */ \
33897 + EMIT(0xcccccccc, 4); \
33898 + EMIT(0xcccccccc, 4); \
33899 + break; \
33900 + default: \
33901 + BUILD_BUG(); \
33902 + } \
33903 +} while (0)
33904 +
33905 +#define EMIT2_off32(b1, b2, _off) \
33906 +do { \
33907 + if ((b1) == 0x8d && (b2) == 0xb3) { /* lea esi, [rbx+imm32] */ \
33908 + EMIT2(0x8d, 0xb3); /* lea esi, [rbx+randkey] */ \
33909 + EMIT(randkey, 4); \
33910 + EMIT2(0x8d, 0xb6); /* lea esi, [esi+off-randkey] */ \
33911 + EMIT((_off) - randkey, 4); \
33912 + } else if ((b1) == 0x69 && (b2) == 0xc0) { /* imul eax, imm32 */\
33913 + DILUTE_CONST_SEQUENCE(_off, randkey); \
33914 + /* imul eax, ecx */ \
33915 + EMIT3(0x0f, 0xaf, 0xc1); \
33916 + } else { \
33917 + BUILD_BUG(); \
33918 + } \
33919 +} while (0)
33920 +#else
33921 #define EMIT1_off32(b1, off) do { EMIT1(b1); EMIT(off, 4);} while (0)
33922 +#define EMIT2_off32(b1, b2, off) do { EMIT2(b1, b2); EMIT(off, 4);} while (0)
33923 +#endif
33924
33925 #define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */
33926 #define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */
33927 @@ -91,6 +168,24 @@ do { \
33928 #define X86_JBE 0x76
33929 #define X86_JA 0x77
33930
33931 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33932 +#define APPEND_FLOW_VERIFY() \
33933 +do { \
33934 + /* mov ecx, randkey */ \
33935 + EMIT1(0xb9); \
33936 + EMIT(randkey, 4); \
33937 + /* cmp ecx, randkey */ \
33938 + EMIT2(0x81, 0xf9); \
33939 + EMIT(randkey, 4); \
33940 + /* jz after 8 int 3s */ \
33941 + EMIT2(0x74, 0x08); \
33942 + EMIT(0xcccccccc, 4); \
33943 + EMIT(0xcccccccc, 4); \
33944 +} while (0)
33945 +#else
33946 +#define APPEND_FLOW_VERIFY() do { } while (0)
33947 +#endif
33948 +
33949 #define EMIT_COND_JMP(op, offset) \
33950 do { \
33951 if (is_near(offset)) \
33952 @@ -98,6 +193,7 @@ do { \
33953 else { \
33954 EMIT2(0x0f, op + 0x10); \
33955 EMIT(offset, 4); /* jxx .+off32 */ \
33956 + APPEND_FLOW_VERIFY(); \
33957 } \
33958 } while (0)
33959
33960 @@ -145,55 +241,54 @@ static int pkt_type_offset(void)
33961 return -1;
33962 }
33963
33964 -struct bpf_binary_header {
33965 - unsigned int pages;
33966 - /* Note : for security reasons, bpf code will follow a randomly
33967 - * sized amount of int3 instructions
33968 - */
33969 - u8 image[];
33970 -};
33971 -
33972 -static struct bpf_binary_header *bpf_alloc_binary(unsigned int proglen,
33973 +/* Note : for security reasons, bpf code will follow a randomly
33974 + * sized amount of int3 instructions
33975 + */
33976 +static u8 *bpf_alloc_binary(unsigned int proglen,
33977 u8 **image_ptr)
33978 {
33979 unsigned int sz, hole;
33980 - struct bpf_binary_header *header;
33981 + u8 *header;
33982
33983 /* Most of BPF filters are really small,
33984 * but if some of them fill a page, allow at least
33985 * 128 extra bytes to insert a random section of int3
33986 */
33987 - sz = round_up(proglen + sizeof(*header) + 128, PAGE_SIZE);
33988 - header = module_alloc(sz);
33989 + sz = round_up(proglen + 128, PAGE_SIZE);
33990 + header = module_alloc_exec(sz);
33991 if (!header)
33992 return NULL;
33993
33994 + pax_open_kernel();
33995 memset(header, 0xcc, sz); /* fill whole space with int3 instructions */
33996 + pax_close_kernel();
33997
33998 - header->pages = sz / PAGE_SIZE;
33999 - hole = min(sz - (proglen + sizeof(*header)), PAGE_SIZE - sizeof(*header));
34000 + hole = PAGE_SIZE - (proglen & ~PAGE_MASK);
34001
34002 /* insert a random number of int3 instructions before BPF code */
34003 - *image_ptr = &header->image[prandom_u32() % hole];
34004 + *image_ptr = &header[prandom_u32() % hole];
34005 return header;
34006 }
34007
34008 void bpf_jit_compile(struct sk_filter *fp)
34009 {
34010 - u8 temp[64];
34011 + u8 temp[MAX_INSTR_CODE_SIZE];
34012 u8 *prog;
34013 unsigned int proglen, oldproglen = 0;
34014 int ilen, i;
34015 int t_offset, f_offset;
34016 u8 t_op, f_op, seen = 0, pass;
34017 u8 *image = NULL;
34018 - struct bpf_binary_header *header = NULL;
34019 + u8 *header = NULL;
34020 u8 *func;
34021 int pc_ret0 = -1; /* bpf index of first RET #0 instruction (if any) */
34022 unsigned int cleanup_addr; /* epilogue code offset */
34023 unsigned int *addrs;
34024 const struct sock_filter *filter = fp->insns;
34025 int flen = fp->len;
34026 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
34027 + unsigned int randkey;
34028 +#endif
34029
34030 if (!bpf_jit_enable)
34031 return;
34032 @@ -203,10 +298,10 @@ void bpf_jit_compile(struct sk_filter *fp)
34033 return;
34034
34035 /* Before first pass, make a rough estimation of addrs[]
34036 - * each bpf instruction is translated to less than 64 bytes
34037 + * each bpf instruction is translated to less than MAX_INSTR_CODE_SIZE bytes
34038 */
34039 for (proglen = 0, i = 0; i < flen; i++) {
34040 - proglen += 64;
34041 + proglen += MAX_INSTR_CODE_SIZE;
34042 addrs[i] = proglen;
34043 }
34044 cleanup_addr = proglen; /* epilogue address */
34045 @@ -285,6 +380,10 @@ void bpf_jit_compile(struct sk_filter *fp)
34046 for (i = 0; i < flen; i++) {
34047 unsigned int K = filter[i].k;
34048
34049 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
34050 + randkey = prandom_u32();
34051 +#endif
34052 +
34053 switch (filter[i].code) {
34054 case BPF_S_ALU_ADD_X: /* A += X; */
34055 seen |= SEEN_XREG;
34056 @@ -317,10 +416,8 @@ void bpf_jit_compile(struct sk_filter *fp)
34057 case BPF_S_ALU_MUL_K: /* A *= K */
34058 if (is_imm8(K))
34059 EMIT3(0x6b, 0xc0, K); /* imul imm8,%eax,%eax */
34060 - else {
34061 - EMIT2(0x69, 0xc0); /* imul imm32,%eax */
34062 - EMIT(K, 4);
34063 - }
34064 + else
34065 + EMIT2_off32(0x69, 0xc0, K); /* imul imm32,%eax */
34066 break;
34067 case BPF_S_ALU_DIV_X: /* A /= X; */
34068 seen |= SEEN_XREG;
34069 @@ -364,7 +461,11 @@ void bpf_jit_compile(struct sk_filter *fp)
34070 break;
34071 }
34072 EMIT2(0x31, 0xd2); /* xor %edx,%edx */
34073 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
34074 + DILUTE_CONST_SEQUENCE(K, randkey);
34075 +#else
34076 EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
34077 +#endif
34078 EMIT2(0xf7, 0xf1); /* div %ecx */
34079 EMIT2(0x89, 0xd0); /* mov %edx,%eax */
34080 break;
34081 @@ -372,7 +473,11 @@ void bpf_jit_compile(struct sk_filter *fp)
34082 if (K == 1)
34083 break;
34084 EMIT2(0x31, 0xd2); /* xor %edx,%edx */
34085 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
34086 + DILUTE_CONST_SEQUENCE(K, randkey);
34087 +#else
34088 EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
34089 +#endif
34090 EMIT2(0xf7, 0xf1); /* div %ecx */
34091 break;
34092 case BPF_S_ALU_AND_X:
34093 @@ -643,8 +748,7 @@ common_load_ind: seen |= SEEN_DATAREF | SEEN_XREG;
34094 if (is_imm8(K)) {
34095 EMIT3(0x8d, 0x73, K); /* lea imm8(%rbx), %esi */
34096 } else {
34097 - EMIT2(0x8d, 0xb3); /* lea imm32(%rbx),%esi */
34098 - EMIT(K, 4);
34099 + EMIT2_off32(0x8d, 0xb3, K); /* lea imm32(%rbx),%esi */
34100 }
34101 } else {
34102 EMIT2(0x89,0xde); /* mov %ebx,%esi */
34103 @@ -734,10 +838,12 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
34104 if (unlikely(proglen + ilen > oldproglen)) {
34105 pr_err("bpb_jit_compile fatal error\n");
34106 kfree(addrs);
34107 - module_free(NULL, header);
34108 + module_free_exec(NULL, image);
34109 return;
34110 }
34111 + pax_open_kernel();
34112 memcpy(image + proglen, temp, ilen);
34113 + pax_close_kernel();
34114 }
34115 proglen += ilen;
34116 addrs[i] = proglen;
34117 @@ -770,7 +876,6 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
34118
34119 if (image) {
34120 bpf_flush_icache(header, image + proglen);
34121 - set_memory_ro((unsigned long)header, header->pages);
34122 fp->bpf_func = (void *)image;
34123 fp->jited = 1;
34124 }
34125 @@ -783,10 +888,9 @@ static void bpf_jit_free_deferred(struct work_struct *work)
34126 {
34127 struct sk_filter *fp = container_of(work, struct sk_filter, work);
34128 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34129 - struct bpf_binary_header *header = (void *)addr;
34130
34131 - set_memory_rw(addr, header->pages);
34132 - module_free(NULL, header);
34133 + set_memory_rw(addr, 1);
34134 + module_free_exec(NULL, (void *)addr);
34135 kfree(fp);
34136 }
34137
34138 diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34139 index 5d04be5..2beeaa2 100644
34140 --- a/arch/x86/oprofile/backtrace.c
34141 +++ b/arch/x86/oprofile/backtrace.c
34142 @@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34143 struct stack_frame_ia32 *fp;
34144 unsigned long bytes;
34145
34146 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34147 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34148 if (bytes != 0)
34149 return NULL;
34150
34151 - fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34152 + fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34153
34154 oprofile_add_trace(bufhead[0].return_address);
34155
34156 @@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34157 struct stack_frame bufhead[2];
34158 unsigned long bytes;
34159
34160 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34161 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34162 if (bytes != 0)
34163 return NULL;
34164
34165 @@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34166 {
34167 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34168
34169 - if (!user_mode_vm(regs)) {
34170 + if (!user_mode(regs)) {
34171 unsigned long stack = kernel_stack_pointer(regs);
34172 if (depth)
34173 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34174 diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34175 index 379e8bd..6386e09 100644
34176 --- a/arch/x86/oprofile/nmi_int.c
34177 +++ b/arch/x86/oprofile/nmi_int.c
34178 @@ -23,6 +23,7 @@
34179 #include <asm/nmi.h>
34180 #include <asm/msr.h>
34181 #include <asm/apic.h>
34182 +#include <asm/pgtable.h>
34183
34184 #include "op_counter.h"
34185 #include "op_x86_model.h"
34186 @@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34187 if (ret)
34188 return ret;
34189
34190 - if (!model->num_virt_counters)
34191 - model->num_virt_counters = model->num_counters;
34192 + if (!model->num_virt_counters) {
34193 + pax_open_kernel();
34194 + *(unsigned int *)&model->num_virt_counters = model->num_counters;
34195 + pax_close_kernel();
34196 + }
34197
34198 mux_init(ops);
34199
34200 diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34201 index 50d86c0..7985318 100644
34202 --- a/arch/x86/oprofile/op_model_amd.c
34203 +++ b/arch/x86/oprofile/op_model_amd.c
34204 @@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34205 num_counters = AMD64_NUM_COUNTERS;
34206 }
34207
34208 - op_amd_spec.num_counters = num_counters;
34209 - op_amd_spec.num_controls = num_counters;
34210 - op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34211 + pax_open_kernel();
34212 + *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34213 + *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34214 + *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34215 + pax_close_kernel();
34216
34217 return 0;
34218 }
34219 diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34220 index d90528e..0127e2b 100644
34221 --- a/arch/x86/oprofile/op_model_ppro.c
34222 +++ b/arch/x86/oprofile/op_model_ppro.c
34223 @@ -19,6 +19,7 @@
34224 #include <asm/msr.h>
34225 #include <asm/apic.h>
34226 #include <asm/nmi.h>
34227 +#include <asm/pgtable.h>
34228
34229 #include "op_x86_model.h"
34230 #include "op_counter.h"
34231 @@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34232
34233 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34234
34235 - op_arch_perfmon_spec.num_counters = num_counters;
34236 - op_arch_perfmon_spec.num_controls = num_counters;
34237 + pax_open_kernel();
34238 + *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34239 + *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34240 + pax_close_kernel();
34241 }
34242
34243 static int arch_perfmon_init(struct oprofile_operations *ignore)
34244 diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34245 index 71e8a67..6a313bb 100644
34246 --- a/arch/x86/oprofile/op_x86_model.h
34247 +++ b/arch/x86/oprofile/op_x86_model.h
34248 @@ -52,7 +52,7 @@ struct op_x86_model_spec {
34249 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34250 struct op_msrs const * const msrs);
34251 #endif
34252 -};
34253 +} __do_const;
34254
34255 struct op_counter_config;
34256
34257 diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34258 index 84b9d67..260e5ff 100644
34259 --- a/arch/x86/pci/intel_mid_pci.c
34260 +++ b/arch/x86/pci/intel_mid_pci.c
34261 @@ -245,7 +245,7 @@ int __init intel_mid_pci_init(void)
34262 pr_info("Intel MID platform detected, using MID PCI ops\n");
34263 pci_mmcfg_late_init();
34264 pcibios_enable_irq = intel_mid_pci_irq_enable;
34265 - pci_root_ops = intel_mid_pci_ops;
34266 + memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34267 pci_soc_mode = 1;
34268 /* Continue with standard init */
34269 return 1;
34270 diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34271 index 84112f5..6334d60 100644
34272 --- a/arch/x86/pci/irq.c
34273 +++ b/arch/x86/pci/irq.c
34274 @@ -50,7 +50,7 @@ struct irq_router {
34275 struct irq_router_handler {
34276 u16 vendor;
34277 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34278 -};
34279 +} __do_const;
34280
34281 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34282 void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
34283 @@ -790,7 +790,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34284 return 0;
34285 }
34286
34287 -static __initdata struct irq_router_handler pirq_routers[] = {
34288 +static __initconst const struct irq_router_handler pirq_routers[] = {
34289 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34290 { PCI_VENDOR_ID_AL, ali_router_probe },
34291 { PCI_VENDOR_ID_ITE, ite_router_probe },
34292 @@ -817,7 +817,7 @@ static struct pci_dev *pirq_router_dev;
34293 static void __init pirq_find_router(struct irq_router *r)
34294 {
34295 struct irq_routing_table *rt = pirq_table;
34296 - struct irq_router_handler *h;
34297 + const struct irq_router_handler *h;
34298
34299 #ifdef CONFIG_PCI_BIOS
34300 if (!rt->signature) {
34301 @@ -1090,7 +1090,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34302 return 0;
34303 }
34304
34305 -static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34306 +static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34307 {
34308 .callback = fix_broken_hp_bios_irq9,
34309 .ident = "HP Pavilion N5400 Series Laptop",
34310 diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34311 index c77b24a..c979855 100644
34312 --- a/arch/x86/pci/pcbios.c
34313 +++ b/arch/x86/pci/pcbios.c
34314 @@ -79,7 +79,7 @@ union bios32 {
34315 static struct {
34316 unsigned long address;
34317 unsigned short segment;
34318 -} bios32_indirect = { 0, __KERNEL_CS };
34319 +} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
34320
34321 /*
34322 * Returns the entry point for the given service, NULL on error
34323 @@ -92,37 +92,80 @@ static unsigned long bios32_service(unsigned long service)
34324 unsigned long length; /* %ecx */
34325 unsigned long entry; /* %edx */
34326 unsigned long flags;
34327 + struct desc_struct d, *gdt;
34328
34329 local_irq_save(flags);
34330 - __asm__("lcall *(%%edi); cld"
34331 +
34332 + gdt = get_cpu_gdt_table(smp_processor_id());
34333 +
34334 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34335 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34336 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34337 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34338 +
34339 + __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34340 : "=a" (return_code),
34341 "=b" (address),
34342 "=c" (length),
34343 "=d" (entry)
34344 : "0" (service),
34345 "1" (0),
34346 - "D" (&bios32_indirect));
34347 + "D" (&bios32_indirect),
34348 + "r"(__PCIBIOS_DS)
34349 + : "memory");
34350 +
34351 + pax_open_kernel();
34352 + gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34353 + gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34354 + gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34355 + gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34356 + pax_close_kernel();
34357 +
34358 local_irq_restore(flags);
34359
34360 switch (return_code) {
34361 - case 0:
34362 - return address + entry;
34363 - case 0x80: /* Not present */
34364 - printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34365 - return 0;
34366 - default: /* Shouldn't happen */
34367 - printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34368 - service, return_code);
34369 + case 0: {
34370 + int cpu;
34371 + unsigned char flags;
34372 +
34373 + printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34374 + if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34375 + printk(KERN_WARNING "bios32_service: not valid\n");
34376 return 0;
34377 + }
34378 + address = address + PAGE_OFFSET;
34379 + length += 16UL; /* some BIOSs underreport this... */
34380 + flags = 4;
34381 + if (length >= 64*1024*1024) {
34382 + length >>= PAGE_SHIFT;
34383 + flags |= 8;
34384 + }
34385 +
34386 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34387 + gdt = get_cpu_gdt_table(cpu);
34388 + pack_descriptor(&d, address, length, 0x9b, flags);
34389 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34390 + pack_descriptor(&d, address, length, 0x93, flags);
34391 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34392 + }
34393 + return entry;
34394 + }
34395 + case 0x80: /* Not present */
34396 + printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34397 + return 0;
34398 + default: /* Shouldn't happen */
34399 + printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34400 + service, return_code);
34401 + return 0;
34402 }
34403 }
34404
34405 static struct {
34406 unsigned long address;
34407 unsigned short segment;
34408 -} pci_indirect = { 0, __KERNEL_CS };
34409 +} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34410
34411 -static int pci_bios_present;
34412 +static int pci_bios_present __read_only;
34413
34414 static int check_pcibios(void)
34415 {
34416 @@ -131,11 +174,13 @@ static int check_pcibios(void)
34417 unsigned long flags, pcibios_entry;
34418
34419 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34420 - pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34421 + pci_indirect.address = pcibios_entry;
34422
34423 local_irq_save(flags);
34424 - __asm__(
34425 - "lcall *(%%edi); cld\n\t"
34426 + __asm__("movw %w6, %%ds\n\t"
34427 + "lcall *%%ss:(%%edi); cld\n\t"
34428 + "push %%ss\n\t"
34429 + "pop %%ds\n\t"
34430 "jc 1f\n\t"
34431 "xor %%ah, %%ah\n"
34432 "1:"
34433 @@ -144,7 +189,8 @@ static int check_pcibios(void)
34434 "=b" (ebx),
34435 "=c" (ecx)
34436 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34437 - "D" (&pci_indirect)
34438 + "D" (&pci_indirect),
34439 + "r" (__PCIBIOS_DS)
34440 : "memory");
34441 local_irq_restore(flags);
34442
34443 @@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34444
34445 switch (len) {
34446 case 1:
34447 - __asm__("lcall *(%%esi); cld\n\t"
34448 + __asm__("movw %w6, %%ds\n\t"
34449 + "lcall *%%ss:(%%esi); cld\n\t"
34450 + "push %%ss\n\t"
34451 + "pop %%ds\n\t"
34452 "jc 1f\n\t"
34453 "xor %%ah, %%ah\n"
34454 "1:"
34455 @@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34456 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34457 "b" (bx),
34458 "D" ((long)reg),
34459 - "S" (&pci_indirect));
34460 + "S" (&pci_indirect),
34461 + "r" (__PCIBIOS_DS));
34462 /*
34463 * Zero-extend the result beyond 8 bits, do not trust the
34464 * BIOS having done it:
34465 @@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34466 *value &= 0xff;
34467 break;
34468 case 2:
34469 - __asm__("lcall *(%%esi); cld\n\t"
34470 + __asm__("movw %w6, %%ds\n\t"
34471 + "lcall *%%ss:(%%esi); cld\n\t"
34472 + "push %%ss\n\t"
34473 + "pop %%ds\n\t"
34474 "jc 1f\n\t"
34475 "xor %%ah, %%ah\n"
34476 "1:"
34477 @@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34478 : "1" (PCIBIOS_READ_CONFIG_WORD),
34479 "b" (bx),
34480 "D" ((long)reg),
34481 - "S" (&pci_indirect));
34482 + "S" (&pci_indirect),
34483 + "r" (__PCIBIOS_DS));
34484 /*
34485 * Zero-extend the result beyond 16 bits, do not trust the
34486 * BIOS having done it:
34487 @@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34488 *value &= 0xffff;
34489 break;
34490 case 4:
34491 - __asm__("lcall *(%%esi); cld\n\t"
34492 + __asm__("movw %w6, %%ds\n\t"
34493 + "lcall *%%ss:(%%esi); cld\n\t"
34494 + "push %%ss\n\t"
34495 + "pop %%ds\n\t"
34496 "jc 1f\n\t"
34497 "xor %%ah, %%ah\n"
34498 "1:"
34499 @@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34500 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34501 "b" (bx),
34502 "D" ((long)reg),
34503 - "S" (&pci_indirect));
34504 + "S" (&pci_indirect),
34505 + "r" (__PCIBIOS_DS));
34506 break;
34507 }
34508
34509 @@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34510
34511 switch (len) {
34512 case 1:
34513 - __asm__("lcall *(%%esi); cld\n\t"
34514 + __asm__("movw %w6, %%ds\n\t"
34515 + "lcall *%%ss:(%%esi); cld\n\t"
34516 + "push %%ss\n\t"
34517 + "pop %%ds\n\t"
34518 "jc 1f\n\t"
34519 "xor %%ah, %%ah\n"
34520 "1:"
34521 @@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34522 "c" (value),
34523 "b" (bx),
34524 "D" ((long)reg),
34525 - "S" (&pci_indirect));
34526 + "S" (&pci_indirect),
34527 + "r" (__PCIBIOS_DS));
34528 break;
34529 case 2:
34530 - __asm__("lcall *(%%esi); cld\n\t"
34531 + __asm__("movw %w6, %%ds\n\t"
34532 + "lcall *%%ss:(%%esi); cld\n\t"
34533 + "push %%ss\n\t"
34534 + "pop %%ds\n\t"
34535 "jc 1f\n\t"
34536 "xor %%ah, %%ah\n"
34537 "1:"
34538 @@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34539 "c" (value),
34540 "b" (bx),
34541 "D" ((long)reg),
34542 - "S" (&pci_indirect));
34543 + "S" (&pci_indirect),
34544 + "r" (__PCIBIOS_DS));
34545 break;
34546 case 4:
34547 - __asm__("lcall *(%%esi); cld\n\t"
34548 + __asm__("movw %w6, %%ds\n\t"
34549 + "lcall *%%ss:(%%esi); cld\n\t"
34550 + "push %%ss\n\t"
34551 + "pop %%ds\n\t"
34552 "jc 1f\n\t"
34553 "xor %%ah, %%ah\n"
34554 "1:"
34555 @@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34556 "c" (value),
34557 "b" (bx),
34558 "D" ((long)reg),
34559 - "S" (&pci_indirect));
34560 + "S" (&pci_indirect),
34561 + "r" (__PCIBIOS_DS));
34562 break;
34563 }
34564
34565 @@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34566
34567 DBG("PCI: Fetching IRQ routing table... ");
34568 __asm__("push %%es\n\t"
34569 + "movw %w8, %%ds\n\t"
34570 "push %%ds\n\t"
34571 "pop %%es\n\t"
34572 - "lcall *(%%esi); cld\n\t"
34573 + "lcall *%%ss:(%%esi); cld\n\t"
34574 "pop %%es\n\t"
34575 + "push %%ss\n\t"
34576 + "pop %%ds\n"
34577 "jc 1f\n\t"
34578 "xor %%ah, %%ah\n"
34579 "1:"
34580 @@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34581 "1" (0),
34582 "D" ((long) &opt),
34583 "S" (&pci_indirect),
34584 - "m" (opt)
34585 + "m" (opt),
34586 + "r" (__PCIBIOS_DS)
34587 : "memory");
34588 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34589 if (ret & 0xff00)
34590 @@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34591 {
34592 int ret;
34593
34594 - __asm__("lcall *(%%esi); cld\n\t"
34595 + __asm__("movw %w5, %%ds\n\t"
34596 + "lcall *%%ss:(%%esi); cld\n\t"
34597 + "push %%ss\n\t"
34598 + "pop %%ds\n"
34599 "jc 1f\n\t"
34600 "xor %%ah, %%ah\n"
34601 "1:"
34602 @@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34603 : "0" (PCIBIOS_SET_PCI_HW_INT),
34604 "b" ((dev->bus->number << 8) | dev->devfn),
34605 "c" ((irq << 8) | (pin + 10)),
34606 - "S" (&pci_indirect));
34607 + "S" (&pci_indirect),
34608 + "r" (__PCIBIOS_DS));
34609 return !(ret & 0xff00);
34610 }
34611 EXPORT_SYMBOL(pcibios_set_irq_routing);
34612 diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34613 index 9ee3491..872192f 100644
34614 --- a/arch/x86/platform/efi/efi_32.c
34615 +++ b/arch/x86/platform/efi/efi_32.c
34616 @@ -59,11 +59,22 @@ void efi_call_phys_prelog(void)
34617 {
34618 struct desc_ptr gdt_descr;
34619
34620 +#ifdef CONFIG_PAX_KERNEXEC
34621 + struct desc_struct d;
34622 +#endif
34623 +
34624 local_irq_save(efi_rt_eflags);
34625
34626 load_cr3(initial_page_table);
34627 __flush_tlb_all();
34628
34629 +#ifdef CONFIG_PAX_KERNEXEC
34630 + pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34631 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34632 + pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34633 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34634 +#endif
34635 +
34636 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34637 gdt_descr.size = GDT_SIZE - 1;
34638 load_gdt(&gdt_descr);
34639 @@ -73,11 +84,24 @@ void efi_call_phys_epilog(void)
34640 {
34641 struct desc_ptr gdt_descr;
34642
34643 +#ifdef CONFIG_PAX_KERNEXEC
34644 + struct desc_struct d;
34645 +
34646 + memset(&d, 0, sizeof d);
34647 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34648 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34649 +#endif
34650 +
34651 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34652 gdt_descr.size = GDT_SIZE - 1;
34653 load_gdt(&gdt_descr);
34654
34655 +#ifdef CONFIG_PAX_PER_CPU_PGD
34656 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34657 +#else
34658 load_cr3(swapper_pg_dir);
34659 +#endif
34660 +
34661 __flush_tlb_all();
34662
34663 local_irq_restore(efi_rt_eflags);
34664 diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34665 index 290d397..3906bcd 100644
34666 --- a/arch/x86/platform/efi/efi_64.c
34667 +++ b/arch/x86/platform/efi/efi_64.c
34668 @@ -99,6 +99,11 @@ void __init efi_call_phys_prelog(void)
34669 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34670 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34671 }
34672 +
34673 +#ifdef CONFIG_PAX_PER_CPU_PGD
34674 + load_cr3(swapper_pg_dir);
34675 +#endif
34676 +
34677 __flush_tlb_all();
34678 }
34679
34680 @@ -116,6 +121,11 @@ void __init efi_call_phys_epilog(void)
34681 for (pgd = 0; pgd < n_pgds; pgd++)
34682 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34683 kfree(save_pgd);
34684 +
34685 +#ifdef CONFIG_PAX_PER_CPU_PGD
34686 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34687 +#endif
34688 +
34689 __flush_tlb_all();
34690 local_irq_restore(efi_flags);
34691 early_code_mapping_set_exec(0);
34692 diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34693 index fbe66e6..eae5e38 100644
34694 --- a/arch/x86/platform/efi/efi_stub_32.S
34695 +++ b/arch/x86/platform/efi/efi_stub_32.S
34696 @@ -6,7 +6,9 @@
34697 */
34698
34699 #include <linux/linkage.h>
34700 +#include <linux/init.h>
34701 #include <asm/page_types.h>
34702 +#include <asm/segment.h>
34703
34704 /*
34705 * efi_call_phys(void *, ...) is a function with variable parameters.
34706 @@ -20,7 +22,7 @@
34707 * service functions will comply with gcc calling convention, too.
34708 */
34709
34710 -.text
34711 +__INIT
34712 ENTRY(efi_call_phys)
34713 /*
34714 * 0. The function can only be called in Linux kernel. So CS has been
34715 @@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34716 * The mapping of lower virtual memory has been created in prelog and
34717 * epilog.
34718 */
34719 - movl $1f, %edx
34720 - subl $__PAGE_OFFSET, %edx
34721 - jmp *%edx
34722 +#ifdef CONFIG_PAX_KERNEXEC
34723 + movl $(__KERNEXEC_EFI_DS), %edx
34724 + mov %edx, %ds
34725 + mov %edx, %es
34726 + mov %edx, %ss
34727 + addl $2f,(1f)
34728 + ljmp *(1f)
34729 +
34730 +__INITDATA
34731 +1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34732 +.previous
34733 +
34734 +2:
34735 + subl $2b,(1b)
34736 +#else
34737 + jmp 1f-__PAGE_OFFSET
34738 1:
34739 +#endif
34740
34741 /*
34742 * 2. Now on the top of stack is the return
34743 @@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34744 * parameter 2, ..., param n. To make things easy, we save the return
34745 * address of efi_call_phys in a global variable.
34746 */
34747 - popl %edx
34748 - movl %edx, saved_return_addr
34749 - /* get the function pointer into ECX*/
34750 - popl %ecx
34751 - movl %ecx, efi_rt_function_ptr
34752 - movl $2f, %edx
34753 - subl $__PAGE_OFFSET, %edx
34754 - pushl %edx
34755 + popl (saved_return_addr)
34756 + popl (efi_rt_function_ptr)
34757
34758 /*
34759 * 3. Clear PG bit in %CR0.
34760 @@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
34761 /*
34762 * 5. Call the physical function.
34763 */
34764 - jmp *%ecx
34765 + call *(efi_rt_function_ptr-__PAGE_OFFSET)
34766
34767 -2:
34768 /*
34769 * 6. After EFI runtime service returns, control will return to
34770 * following instruction. We'd better readjust stack pointer first.
34771 @@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
34772 movl %cr0, %edx
34773 orl $0x80000000, %edx
34774 movl %edx, %cr0
34775 - jmp 1f
34776 -1:
34777 +
34778 /*
34779 * 8. Now restore the virtual mode from flat mode by
34780 * adding EIP with PAGE_OFFSET.
34781 */
34782 - movl $1f, %edx
34783 - jmp *%edx
34784 +#ifdef CONFIG_PAX_KERNEXEC
34785 + movl $(__KERNEL_DS), %edx
34786 + mov %edx, %ds
34787 + mov %edx, %es
34788 + mov %edx, %ss
34789 + ljmp $(__KERNEL_CS),$1f
34790 +#else
34791 + jmp 1f+__PAGE_OFFSET
34792 +#endif
34793 1:
34794
34795 /*
34796 * 9. Balance the stack. And because EAX contain the return value,
34797 * we'd better not clobber it.
34798 */
34799 - leal efi_rt_function_ptr, %edx
34800 - movl (%edx), %ecx
34801 - pushl %ecx
34802 + pushl (efi_rt_function_ptr)
34803
34804 /*
34805 - * 10. Push the saved return address onto the stack and return.
34806 + * 10. Return to the saved return address.
34807 */
34808 - leal saved_return_addr, %edx
34809 - movl (%edx), %ecx
34810 - pushl %ecx
34811 - ret
34812 + jmpl *(saved_return_addr)
34813 ENDPROC(efi_call_phys)
34814 .previous
34815
34816 -.data
34817 +__INITDATA
34818 saved_return_addr:
34819 .long 0
34820 efi_rt_function_ptr:
34821 diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
34822 index e0984ef..a062dac 100644
34823 --- a/arch/x86/platform/efi/efi_stub_64.S
34824 +++ b/arch/x86/platform/efi/efi_stub_64.S
34825 @@ -11,6 +11,7 @@
34826 #include <asm/msr.h>
34827 #include <asm/processor-flags.h>
34828 #include <asm/page_types.h>
34829 +#include <asm/alternative-asm.h>
34830
34831 #define SAVE_XMM \
34832 mov %rsp, %rax; \
34833 @@ -81,6 +82,7 @@ ENTRY(efi_call0)
34834 RESTORE_PGT
34835 addq $32, %rsp
34836 RESTORE_XMM
34837 + pax_force_retaddr 0, 1
34838 ret
34839 ENDPROC(efi_call0)
34840
34841 @@ -93,6 +95,7 @@ ENTRY(efi_call1)
34842 RESTORE_PGT
34843 addq $32, %rsp
34844 RESTORE_XMM
34845 + pax_force_retaddr 0, 1
34846 ret
34847 ENDPROC(efi_call1)
34848
34849 @@ -105,6 +108,7 @@ ENTRY(efi_call2)
34850 RESTORE_PGT
34851 addq $32, %rsp
34852 RESTORE_XMM
34853 + pax_force_retaddr 0, 1
34854 ret
34855 ENDPROC(efi_call2)
34856
34857 @@ -118,6 +122,7 @@ ENTRY(efi_call3)
34858 RESTORE_PGT
34859 addq $32, %rsp
34860 RESTORE_XMM
34861 + pax_force_retaddr 0, 1
34862 ret
34863 ENDPROC(efi_call3)
34864
34865 @@ -132,6 +137,7 @@ ENTRY(efi_call4)
34866 RESTORE_PGT
34867 addq $32, %rsp
34868 RESTORE_XMM
34869 + pax_force_retaddr 0, 1
34870 ret
34871 ENDPROC(efi_call4)
34872
34873 @@ -147,6 +153,7 @@ ENTRY(efi_call5)
34874 RESTORE_PGT
34875 addq $48, %rsp
34876 RESTORE_XMM
34877 + pax_force_retaddr 0, 1
34878 ret
34879 ENDPROC(efi_call5)
34880
34881 @@ -165,6 +172,7 @@ ENTRY(efi_call6)
34882 RESTORE_PGT
34883 addq $48, %rsp
34884 RESTORE_XMM
34885 + pax_force_retaddr 0, 1
34886 ret
34887 ENDPROC(efi_call6)
34888
34889 diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
34890 index 1bbedc4..eb795b5 100644
34891 --- a/arch/x86/platform/intel-mid/intel-mid.c
34892 +++ b/arch/x86/platform/intel-mid/intel-mid.c
34893 @@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
34894 {
34895 };
34896
34897 -static void intel_mid_reboot(void)
34898 +static void __noreturn intel_mid_reboot(void)
34899 {
34900 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
34901 + BUG();
34902 }
34903
34904 static unsigned long __init intel_mid_calibrate_tsc(void)
34905 diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
34906 index d6ee929..3637cb5 100644
34907 --- a/arch/x86/platform/olpc/olpc_dt.c
34908 +++ b/arch/x86/platform/olpc/olpc_dt.c
34909 @@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
34910 return res;
34911 }
34912
34913 -static struct of_pdt_ops prom_olpc_ops __initdata = {
34914 +static struct of_pdt_ops prom_olpc_ops __initconst = {
34915 .nextprop = olpc_dt_nextprop,
34916 .getproplen = olpc_dt_getproplen,
34917 .getproperty = olpc_dt_getproperty,
34918 diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
34919 index 424f4c9..f2a2988 100644
34920 --- a/arch/x86/power/cpu.c
34921 +++ b/arch/x86/power/cpu.c
34922 @@ -137,11 +137,8 @@ static void do_fpu_end(void)
34923 static void fix_processor_context(void)
34924 {
34925 int cpu = smp_processor_id();
34926 - struct tss_struct *t = &per_cpu(init_tss, cpu);
34927 -#ifdef CONFIG_X86_64
34928 - struct desc_struct *desc = get_cpu_gdt_table(cpu);
34929 - tss_desc tss;
34930 -#endif
34931 + struct tss_struct *t = init_tss + cpu;
34932 +
34933 set_tss_desc(cpu, t); /*
34934 * This just modifies memory; should not be
34935 * necessary. But... This is necessary, because
34936 @@ -150,10 +147,6 @@ static void fix_processor_context(void)
34937 */
34938
34939 #ifdef CONFIG_X86_64
34940 - memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
34941 - tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
34942 - write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
34943 -
34944 syscall_init(); /* This sets MSR_*STAR and related */
34945 #endif
34946 load_TR_desc(); /* This does ltr */
34947 diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
34948 index bad628a..a102610 100644
34949 --- a/arch/x86/realmode/init.c
34950 +++ b/arch/x86/realmode/init.c
34951 @@ -68,7 +68,13 @@ void __init setup_real_mode(void)
34952 __va(real_mode_header->trampoline_header);
34953
34954 #ifdef CONFIG_X86_32
34955 - trampoline_header->start = __pa_symbol(startup_32_smp);
34956 + trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
34957 +
34958 +#ifdef CONFIG_PAX_KERNEXEC
34959 + trampoline_header->start -= LOAD_PHYSICAL_ADDR;
34960 +#endif
34961 +
34962 + trampoline_header->boot_cs = __BOOT_CS;
34963 trampoline_header->gdt_limit = __BOOT_DS + 7;
34964 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
34965 #else
34966 @@ -84,7 +90,7 @@ void __init setup_real_mode(void)
34967 *trampoline_cr4_features = read_cr4();
34968
34969 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
34970 - trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
34971 + trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
34972 trampoline_pgd[511] = init_level4_pgt[511].pgd;
34973 #endif
34974 }
34975 diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
34976 index 3497f14..cc73b92 100644
34977 --- a/arch/x86/realmode/rm/Makefile
34978 +++ b/arch/x86/realmode/rm/Makefile
34979 @@ -66,5 +66,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
34980
34981 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
34982 -I$(srctree)/arch/x86/boot
34983 +ifdef CONSTIFY_PLUGIN
34984 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
34985 +endif
34986 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
34987 GCOV_PROFILE := n
34988 diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
34989 index a28221d..93c40f1 100644
34990 --- a/arch/x86/realmode/rm/header.S
34991 +++ b/arch/x86/realmode/rm/header.S
34992 @@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
34993 #endif
34994 /* APM/BIOS reboot */
34995 .long pa_machine_real_restart_asm
34996 -#ifdef CONFIG_X86_64
34997 +#ifdef CONFIG_X86_32
34998 + .long __KERNEL_CS
34999 +#else
35000 .long __KERNEL32_CS
35001 #endif
35002 END(real_mode_header)
35003 diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35004 index 48ddd76..c26749f 100644
35005 --- a/arch/x86/realmode/rm/trampoline_32.S
35006 +++ b/arch/x86/realmode/rm/trampoline_32.S
35007 @@ -24,6 +24,12 @@
35008 #include <asm/page_types.h>
35009 #include "realmode.h"
35010
35011 +#ifdef CONFIG_PAX_KERNEXEC
35012 +#define ta(X) (X)
35013 +#else
35014 +#define ta(X) (pa_ ## X)
35015 +#endif
35016 +
35017 .text
35018 .code16
35019
35020 @@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35021
35022 cli # We should be safe anyway
35023
35024 - movl tr_start, %eax # where we need to go
35025 -
35026 movl $0xA5A5A5A5, trampoline_status
35027 # write marker for master knows we're running
35028
35029 @@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35030 movw $1, %dx # protected mode (PE) bit
35031 lmsw %dx # into protected mode
35032
35033 - ljmpl $__BOOT_CS, $pa_startup_32
35034 + ljmpl *(trampoline_header)
35035
35036 .section ".text32","ax"
35037 .code32
35038 @@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35039 .balign 8
35040 GLOBAL(trampoline_header)
35041 tr_start: .space 4
35042 - tr_gdt_pad: .space 2
35043 + tr_boot_cs: .space 2
35044 tr_gdt: .space 6
35045 END(trampoline_header)
35046
35047 diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35048 index dac7b20..72dbaca 100644
35049 --- a/arch/x86/realmode/rm/trampoline_64.S
35050 +++ b/arch/x86/realmode/rm/trampoline_64.S
35051 @@ -93,6 +93,7 @@ ENTRY(startup_32)
35052 movl %edx, %gs
35053
35054 movl pa_tr_cr4, %eax
35055 + andl $~X86_CR4_PCIDE, %eax
35056 movl %eax, %cr4 # Enable PAE mode
35057
35058 # Setup trampoline 4 level pagetables
35059 @@ -106,7 +107,7 @@ ENTRY(startup_32)
35060 wrmsr
35061
35062 # Enable paging and in turn activate Long Mode
35063 - movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35064 + movl $(X86_CR0_PG | X86_CR0_PE), %eax
35065 movl %eax, %cr0
35066
35067 /*
35068 diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35069 index 9e7e147..25a4158 100644
35070 --- a/arch/x86/realmode/rm/wakeup_asm.S
35071 +++ b/arch/x86/realmode/rm/wakeup_asm.S
35072 @@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35073 lgdtl pmode_gdt
35074
35075 /* This really couldn't... */
35076 - movl pmode_entry, %eax
35077 movl pmode_cr0, %ecx
35078 movl %ecx, %cr0
35079 - ljmpl $__KERNEL_CS, $pa_startup_32
35080 - /* -> jmp *%eax in trampoline_32.S */
35081 +
35082 + ljmpl *pmode_entry
35083 #else
35084 jmp trampoline_start
35085 #endif
35086 diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35087 index 604a37e..e49702a 100644
35088 --- a/arch/x86/tools/Makefile
35089 +++ b/arch/x86/tools/Makefile
35090 @@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35091
35092 $(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
35093
35094 -HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35095 +HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35096 hostprogs-y += relocs
35097 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35098 PHONY += relocs
35099 diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35100 index bbb1d22..e505211 100644
35101 --- a/arch/x86/tools/relocs.c
35102 +++ b/arch/x86/tools/relocs.c
35103 @@ -1,5 +1,7 @@
35104 /* This is included from relocs_32/64.c */
35105
35106 +#include "../../../include/generated/autoconf.h"
35107 +
35108 #define ElfW(type) _ElfW(ELF_BITS, type)
35109 #define _ElfW(bits, type) __ElfW(bits, type)
35110 #define __ElfW(bits, type) Elf##bits##_##type
35111 @@ -11,6 +13,7 @@
35112 #define Elf_Sym ElfW(Sym)
35113
35114 static Elf_Ehdr ehdr;
35115 +static Elf_Phdr *phdr;
35116
35117 struct relocs {
35118 uint32_t *offset;
35119 @@ -383,9 +386,39 @@ static void read_ehdr(FILE *fp)
35120 }
35121 }
35122
35123 +static void read_phdrs(FILE *fp)
35124 +{
35125 + unsigned int i;
35126 +
35127 + phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35128 + if (!phdr) {
35129 + die("Unable to allocate %d program headers\n",
35130 + ehdr.e_phnum);
35131 + }
35132 + if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35133 + die("Seek to %d failed: %s\n",
35134 + ehdr.e_phoff, strerror(errno));
35135 + }
35136 + if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35137 + die("Cannot read ELF program headers: %s\n",
35138 + strerror(errno));
35139 + }
35140 + for(i = 0; i < ehdr.e_phnum; i++) {
35141 + phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35142 + phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35143 + phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35144 + phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35145 + phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35146 + phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35147 + phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35148 + phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35149 + }
35150 +
35151 +}
35152 +
35153 static void read_shdrs(FILE *fp)
35154 {
35155 - int i;
35156 + unsigned int i;
35157 Elf_Shdr shdr;
35158
35159 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35160 @@ -420,7 +453,7 @@ static void read_shdrs(FILE *fp)
35161
35162 static void read_strtabs(FILE *fp)
35163 {
35164 - int i;
35165 + unsigned int i;
35166 for (i = 0; i < ehdr.e_shnum; i++) {
35167 struct section *sec = &secs[i];
35168 if (sec->shdr.sh_type != SHT_STRTAB) {
35169 @@ -445,7 +478,7 @@ static void read_strtabs(FILE *fp)
35170
35171 static void read_symtabs(FILE *fp)
35172 {
35173 - int i,j;
35174 + unsigned int i,j;
35175 for (i = 0; i < ehdr.e_shnum; i++) {
35176 struct section *sec = &secs[i];
35177 if (sec->shdr.sh_type != SHT_SYMTAB) {
35178 @@ -476,9 +509,11 @@ static void read_symtabs(FILE *fp)
35179 }
35180
35181
35182 -static void read_relocs(FILE *fp)
35183 +static void read_relocs(FILE *fp, int use_real_mode)
35184 {
35185 - int i,j;
35186 + unsigned int i,j;
35187 + uint32_t base;
35188 +
35189 for (i = 0; i < ehdr.e_shnum; i++) {
35190 struct section *sec = &secs[i];
35191 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35192 @@ -498,9 +533,22 @@ static void read_relocs(FILE *fp)
35193 die("Cannot read symbol table: %s\n",
35194 strerror(errno));
35195 }
35196 + base = 0;
35197 +
35198 +#ifdef CONFIG_X86_32
35199 + for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35200 + if (phdr[j].p_type != PT_LOAD )
35201 + continue;
35202 + 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)
35203 + continue;
35204 + base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35205 + break;
35206 + }
35207 +#endif
35208 +
35209 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35210 Elf_Rel *rel = &sec->reltab[j];
35211 - rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35212 + rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35213 rel->r_info = elf_xword_to_cpu(rel->r_info);
35214 #if (SHT_REL_TYPE == SHT_RELA)
35215 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35216 @@ -512,7 +560,7 @@ static void read_relocs(FILE *fp)
35217
35218 static void print_absolute_symbols(void)
35219 {
35220 - int i;
35221 + unsigned int i;
35222 const char *format;
35223
35224 if (ELF_BITS == 64)
35225 @@ -525,7 +573,7 @@ static void print_absolute_symbols(void)
35226 for (i = 0; i < ehdr.e_shnum; i++) {
35227 struct section *sec = &secs[i];
35228 char *sym_strtab;
35229 - int j;
35230 + unsigned int j;
35231
35232 if (sec->shdr.sh_type != SHT_SYMTAB) {
35233 continue;
35234 @@ -552,7 +600,7 @@ static void print_absolute_symbols(void)
35235
35236 static void print_absolute_relocs(void)
35237 {
35238 - int i, printed = 0;
35239 + unsigned int i, printed = 0;
35240 const char *format;
35241
35242 if (ELF_BITS == 64)
35243 @@ -565,7 +613,7 @@ static void print_absolute_relocs(void)
35244 struct section *sec_applies, *sec_symtab;
35245 char *sym_strtab;
35246 Elf_Sym *sh_symtab;
35247 - int j;
35248 + unsigned int j;
35249 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35250 continue;
35251 }
35252 @@ -642,13 +690,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35253 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35254 Elf_Sym *sym, const char *symname))
35255 {
35256 - int i;
35257 + unsigned int i;
35258 /* Walk through the relocations */
35259 for (i = 0; i < ehdr.e_shnum; i++) {
35260 char *sym_strtab;
35261 Elf_Sym *sh_symtab;
35262 struct section *sec_applies, *sec_symtab;
35263 - int j;
35264 + unsigned int j;
35265 struct section *sec = &secs[i];
35266
35267 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35268 @@ -822,6 +870,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35269 {
35270 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35271 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35272 + char *sym_strtab = sec->link->link->strtab;
35273 +
35274 + /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35275 + if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35276 + return 0;
35277 +
35278 +#ifdef CONFIG_PAX_KERNEXEC
35279 + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35280 + if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35281 + return 0;
35282 + if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35283 + return 0;
35284 + if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35285 + return 0;
35286 + if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35287 + return 0;
35288 +#endif
35289
35290 switch (r_type) {
35291 case R_386_NONE:
35292 @@ -960,7 +1025,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35293
35294 static void emit_relocs(int as_text, int use_real_mode)
35295 {
35296 - int i;
35297 + unsigned int i;
35298 int (*write_reloc)(uint32_t, FILE *) = write32;
35299 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35300 const char *symname);
35301 @@ -1060,10 +1125,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35302 {
35303 regex_init(use_real_mode);
35304 read_ehdr(fp);
35305 + read_phdrs(fp);
35306 read_shdrs(fp);
35307 read_strtabs(fp);
35308 read_symtabs(fp);
35309 - read_relocs(fp);
35310 + read_relocs(fp, use_real_mode);
35311 if (ELF_BITS == 64)
35312 percpu_init();
35313 if (show_absolute_syms) {
35314 diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35315 index f40281e..92728c9 100644
35316 --- a/arch/x86/um/mem_32.c
35317 +++ b/arch/x86/um/mem_32.c
35318 @@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35319 gate_vma.vm_start = FIXADDR_USER_START;
35320 gate_vma.vm_end = FIXADDR_USER_END;
35321 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35322 - gate_vma.vm_page_prot = __P101;
35323 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35324
35325 return 0;
35326 }
35327 diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35328 index 80ffa5b..a33bd15 100644
35329 --- a/arch/x86/um/tls_32.c
35330 +++ b/arch/x86/um/tls_32.c
35331 @@ -260,7 +260,7 @@ out:
35332 if (unlikely(task == current &&
35333 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35334 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35335 - "without flushed TLS.", current->pid);
35336 + "without flushed TLS.", task_pid_nr(current));
35337 }
35338
35339 return 0;
35340 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35341 index c580d12..0a0ba35 100644
35342 --- a/arch/x86/vdso/Makefile
35343 +++ b/arch/x86/vdso/Makefile
35344 @@ -196,7 +196,7 @@ quiet_cmd_vdso = VDSO $@
35345 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35346 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35347
35348 -VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35349 +VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35350 $(LTO_CFLAGS)
35351 GCOV_PROFILE := n
35352
35353 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35354 index 310c5f0..766d0a7 100644
35355 --- a/arch/x86/vdso/vdso32-setup.c
35356 +++ b/arch/x86/vdso/vdso32-setup.c
35357 @@ -29,6 +29,7 @@
35358 #include <asm/fixmap.h>
35359 #include <asm/hpet.h>
35360 #include <asm/vvar.h>
35361 +#include <asm/mman.h>
35362
35363 #ifdef CONFIG_COMPAT_VDSO
35364 #define VDSO_DEFAULT 0
35365 @@ -99,7 +100,7 @@ void syscall32_cpu_init(void)
35366 void enable_sep_cpu(void)
35367 {
35368 int cpu = get_cpu();
35369 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
35370 + struct tss_struct *tss = init_tss + cpu;
35371
35372 if (!boot_cpu_has(X86_FEATURE_SEP)) {
35373 put_cpu();
35374 @@ -167,7 +168,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35375
35376 down_write(&mm->mmap_sem);
35377
35378 - addr = get_unmapped_area(NULL, 0, vdso32_size + VDSO_OFFSET(VDSO_PREV_PAGES), 0, 0);
35379 + addr = get_unmapped_area(NULL, 0, vdso32_size + VDSO_OFFSET(VDSO_PREV_PAGES), 0, MAP_EXECUTABLE);
35380 if (IS_ERR_VALUE(addr)) {
35381 ret = addr;
35382 goto up_fail;
35383 @@ -175,7 +176,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35384
35385 addr += VDSO_OFFSET(VDSO_PREV_PAGES);
35386
35387 - current->mm->context.vdso = (void *)addr;
35388 + current->mm->context.vdso = addr;
35389
35390 /*
35391 * MAYWRITE to allow gdb to COW and set breakpoints
35392 @@ -224,11 +225,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35393 #endif
35394
35395 current_thread_info()->sysenter_return =
35396 - VDSO32_SYMBOL(addr, SYSENTER_RETURN);
35397 + (void __force_user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
35398
35399 up_fail:
35400 if (ret)
35401 - current->mm->context.vdso = NULL;
35402 + current->mm->context.vdso = 0;
35403
35404 up_write(&mm->mmap_sem);
35405
35406 @@ -282,8 +283,14 @@ __initcall(ia32_binfmt_init);
35407
35408 const char *arch_vma_name(struct vm_area_struct *vma)
35409 {
35410 - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
35411 + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
35412 return "[vdso]";
35413 +
35414 +#ifdef CONFIG_PAX_SEGMEXEC
35415 + if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
35416 + return "[vdso]";
35417 +#endif
35418 +
35419 return NULL;
35420 }
35421
35422 diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35423 index 1ad1026..1a08abe 100644
35424 --- a/arch/x86/vdso/vma.c
35425 +++ b/arch/x86/vdso/vma.c
35426 @@ -17,8 +17,6 @@
35427 #include <asm/page.h>
35428
35429 #if defined(CONFIG_X86_64)
35430 -unsigned int __read_mostly vdso_enabled = 1;
35431 -
35432 DECLARE_VDSO_IMAGE(vdso);
35433 extern unsigned short vdso_sync_cpuid;
35434 static unsigned vdso_size;
35435 @@ -144,7 +142,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
35436 * unaligned here as a result of stack start randomization.
35437 */
35438 addr = PAGE_ALIGN(addr);
35439 - addr = align_vdso_addr(addr);
35440
35441 return addr;
35442 }
35443 @@ -157,30 +154,31 @@ static int setup_additional_pages(struct linux_binprm *bprm,
35444 unsigned size)
35445 {
35446 struct mm_struct *mm = current->mm;
35447 - unsigned long addr;
35448 + unsigned long addr = 0;
35449 int ret;
35450
35451 - if (!vdso_enabled)
35452 - return 0;
35453 -
35454 down_write(&mm->mmap_sem);
35455 +
35456 +#ifdef CONFIG_PAX_RANDMMAP
35457 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
35458 +#endif
35459 +
35460 addr = vdso_addr(mm->start_stack, size);
35461 + addr = align_vdso_addr(addr);
35462 addr = get_unmapped_area(NULL, addr, size, 0, 0);
35463 if (IS_ERR_VALUE(addr)) {
35464 ret = addr;
35465 goto up_fail;
35466 }
35467
35468 - current->mm->context.vdso = (void *)addr;
35469 + mm->context.vdso = addr;
35470
35471 ret = install_special_mapping(mm, addr, size,
35472 VM_READ|VM_EXEC|
35473 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
35474 pages);
35475 - if (ret) {
35476 - current->mm->context.vdso = NULL;
35477 - goto up_fail;
35478 - }
35479 + if (ret)
35480 + mm->context.vdso = 0;
35481
35482 up_fail:
35483 up_write(&mm->mmap_sem);
35484 @@ -200,11 +198,4 @@ int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35485 vdsox32_size);
35486 }
35487 #endif
35488 -
35489 -static __init int vdso_setup(char *s)
35490 -{
35491 - vdso_enabled = simple_strtoul(s, NULL, 0);
35492 - return 0;
35493 -}
35494 -__setup("vdso=", vdso_setup);
35495 #endif
35496 diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35497 index e88fda8..76ce7ce 100644
35498 --- a/arch/x86/xen/Kconfig
35499 +++ b/arch/x86/xen/Kconfig
35500 @@ -9,6 +9,7 @@ config XEN
35501 select XEN_HAVE_PVMMU
35502 depends on X86_64 || (X86_32 && X86_PAE)
35503 depends on X86_TSC
35504 + depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35505 help
35506 This is the Linux Xen port. Enabling this will allow the
35507 kernel to boot in a paravirtualized environment under the
35508 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35509 index c34bfc4..e599673 100644
35510 --- a/arch/x86/xen/enlighten.c
35511 +++ b/arch/x86/xen/enlighten.c
35512 @@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35513
35514 struct shared_info xen_dummy_shared_info;
35515
35516 -void *xen_initial_gdt;
35517 -
35518 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35519 __read_mostly int xen_have_vector_callback;
35520 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35521 @@ -542,8 +540,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35522 {
35523 unsigned long va = dtr->address;
35524 unsigned int size = dtr->size + 1;
35525 - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35526 - unsigned long frames[pages];
35527 + unsigned long frames[65536 / PAGE_SIZE];
35528 int f;
35529
35530 /*
35531 @@ -591,8 +588,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35532 {
35533 unsigned long va = dtr->address;
35534 unsigned int size = dtr->size + 1;
35535 - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35536 - unsigned long frames[pages];
35537 + unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35538 int f;
35539
35540 /*
35541 @@ -600,7 +596,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35542 * 8-byte entries, or 16 4k pages..
35543 */
35544
35545 - BUG_ON(size > 65536);
35546 + BUG_ON(size > GDT_SIZE);
35547 BUG_ON(va & ~PAGE_MASK);
35548
35549 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35550 @@ -989,7 +985,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35551 return 0;
35552 }
35553
35554 -static void set_xen_basic_apic_ops(void)
35555 +static void __init set_xen_basic_apic_ops(void)
35556 {
35557 apic->read = xen_apic_read;
35558 apic->write = xen_apic_write;
35559 @@ -1295,30 +1291,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35560 #endif
35561 };
35562
35563 -static void xen_reboot(int reason)
35564 +static __noreturn void xen_reboot(int reason)
35565 {
35566 struct sched_shutdown r = { .reason = reason };
35567
35568 - if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35569 - BUG();
35570 + HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35571 + BUG();
35572 }
35573
35574 -static void xen_restart(char *msg)
35575 +static __noreturn void xen_restart(char *msg)
35576 {
35577 xen_reboot(SHUTDOWN_reboot);
35578 }
35579
35580 -static void xen_emergency_restart(void)
35581 +static __noreturn void xen_emergency_restart(void)
35582 {
35583 xen_reboot(SHUTDOWN_reboot);
35584 }
35585
35586 -static void xen_machine_halt(void)
35587 +static __noreturn void xen_machine_halt(void)
35588 {
35589 xen_reboot(SHUTDOWN_poweroff);
35590 }
35591
35592 -static void xen_machine_power_off(void)
35593 +static __noreturn void xen_machine_power_off(void)
35594 {
35595 if (pm_power_off)
35596 pm_power_off();
35597 @@ -1564,7 +1560,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35598 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35599
35600 /* Work out if we support NX */
35601 - x86_configure_nx();
35602 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35603 + if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35604 + (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35605 + unsigned l, h;
35606 +
35607 + __supported_pte_mask |= _PAGE_NX;
35608 + rdmsr(MSR_EFER, l, h);
35609 + l |= EFER_NX;
35610 + wrmsr(MSR_EFER, l, h);
35611 + }
35612 +#endif
35613
35614 /* Get mfn list */
35615 xen_build_dynamic_phys_to_machine();
35616 @@ -1592,13 +1598,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35617
35618 machine_ops = xen_machine_ops;
35619
35620 - /*
35621 - * The only reliable way to retain the initial address of the
35622 - * percpu gdt_page is to remember it here, so we can go and
35623 - * mark it RW later, when the initial percpu area is freed.
35624 - */
35625 - xen_initial_gdt = &per_cpu(gdt_page, 0);
35626 -
35627 xen_smp_init();
35628
35629 #ifdef CONFIG_ACPI_NUMA
35630 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35631 index 86e02ea..e3705ca 100644
35632 --- a/arch/x86/xen/mmu.c
35633 +++ b/arch/x86/xen/mmu.c
35634 @@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35635 return val;
35636 }
35637
35638 -static pteval_t pte_pfn_to_mfn(pteval_t val)
35639 +static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35640 {
35641 if (val & _PAGE_PRESENT) {
35642 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35643 @@ -1904,6 +1904,9 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35644 /* L3_k[510] -> level2_kernel_pgt
35645 * L3_i[511] -> level2_fixmap_pgt */
35646 convert_pfn_mfn(level3_kernel_pgt);
35647 + convert_pfn_mfn(level3_vmalloc_start_pgt);
35648 + convert_pfn_mfn(level3_vmalloc_end_pgt);
35649 + convert_pfn_mfn(level3_vmemmap_pgt);
35650 }
35651 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35652 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
35653 @@ -1933,8 +1936,12 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35654 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35655 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35656 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35657 + set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35658 + set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35659 + set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35660 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35661 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35662 + set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35663 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35664 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35665
35666 @@ -2122,6 +2129,7 @@ static void __init xen_post_allocator_init(void)
35667 pv_mmu_ops.set_pud = xen_set_pud;
35668 #if PAGETABLE_LEVELS == 4
35669 pv_mmu_ops.set_pgd = xen_set_pgd;
35670 + pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35671 #endif
35672
35673 /* This will work as long as patching hasn't happened yet
35674 @@ -2200,6 +2208,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35675 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35676 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35677 .set_pgd = xen_set_pgd_hyper,
35678 + .set_pgd_batched = xen_set_pgd_hyper,
35679
35680 .alloc_pud = xen_alloc_pmd_init,
35681 .release_pud = xen_release_pmd_init,
35682 diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35683 index 7005974..54fb05f 100644
35684 --- a/arch/x86/xen/smp.c
35685 +++ b/arch/x86/xen/smp.c
35686 @@ -283,17 +283,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35687
35688 if (xen_pv_domain()) {
35689 if (!xen_feature(XENFEAT_writable_page_tables))
35690 - /* We've switched to the "real" per-cpu gdt, so make
35691 - * sure the old memory can be recycled. */
35692 - make_lowmem_page_readwrite(xen_initial_gdt);
35693 -
35694 #ifdef CONFIG_X86_32
35695 /*
35696 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35697 * expects __USER_DS
35698 */
35699 - loadsegment(ds, __USER_DS);
35700 - loadsegment(es, __USER_DS);
35701 + loadsegment(ds, __KERNEL_DS);
35702 + loadsegment(es, __KERNEL_DS);
35703 #endif
35704
35705 xen_filter_cpu_maps();
35706 @@ -372,7 +368,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35707 #ifdef CONFIG_X86_32
35708 /* Note: PVH is not yet supported on x86_32. */
35709 ctxt->user_regs.fs = __KERNEL_PERCPU;
35710 - ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
35711 + savesegment(gs, ctxt->user_regs.gs);
35712 #endif
35713 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
35714
35715 @@ -381,8 +377,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35716 if (!xen_feature(XENFEAT_auto_translated_physmap)) {
35717 ctxt->flags = VGCF_IN_KERNEL;
35718 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
35719 - ctxt->user_regs.ds = __USER_DS;
35720 - ctxt->user_regs.es = __USER_DS;
35721 + ctxt->user_regs.ds = __KERNEL_DS;
35722 + ctxt->user_regs.es = __KERNEL_DS;
35723 ctxt->user_regs.ss = __KERNEL_DS;
35724
35725 xen_copy_trap_info(ctxt->trap_ctxt);
35726 @@ -437,14 +433,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
35727 int rc;
35728
35729 per_cpu(current_task, cpu) = idle;
35730 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
35731 #ifdef CONFIG_X86_32
35732 irq_ctx_init(cpu);
35733 #else
35734 clear_tsk_thread_flag(idle, TIF_FORK);
35735 #endif
35736 - per_cpu(kernel_stack, cpu) =
35737 - (unsigned long)task_stack_page(idle) -
35738 - KERNEL_STACK_OFFSET + THREAD_SIZE;
35739 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
35740
35741 xen_setup_runstate_info(cpu);
35742 xen_setup_timer(cpu);
35743 @@ -720,7 +715,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
35744
35745 void __init xen_smp_init(void)
35746 {
35747 - smp_ops = xen_smp_ops;
35748 + memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
35749 xen_fill_possible_map();
35750 }
35751
35752 diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
35753 index fd92a64..1f72641 100644
35754 --- a/arch/x86/xen/xen-asm_32.S
35755 +++ b/arch/x86/xen/xen-asm_32.S
35756 @@ -99,7 +99,7 @@ ENTRY(xen_iret)
35757 pushw %fs
35758 movl $(__KERNEL_PERCPU), %eax
35759 movl %eax, %fs
35760 - movl %fs:xen_vcpu, %eax
35761 + mov PER_CPU_VAR(xen_vcpu), %eax
35762 POP_FS
35763 #else
35764 movl %ss:xen_vcpu, %eax
35765 diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
35766 index 485b695..fda3e7c 100644
35767 --- a/arch/x86/xen/xen-head.S
35768 +++ b/arch/x86/xen/xen-head.S
35769 @@ -39,6 +39,17 @@ ENTRY(startup_xen)
35770 #ifdef CONFIG_X86_32
35771 mov %esi,xen_start_info
35772 mov $init_thread_union+THREAD_SIZE,%esp
35773 +#ifdef CONFIG_SMP
35774 + movl $cpu_gdt_table,%edi
35775 + movl $__per_cpu_load,%eax
35776 + movw %ax,__KERNEL_PERCPU + 2(%edi)
35777 + rorl $16,%eax
35778 + movb %al,__KERNEL_PERCPU + 4(%edi)
35779 + movb %ah,__KERNEL_PERCPU + 7(%edi)
35780 + movl $__per_cpu_end - 1,%eax
35781 + subl $__per_cpu_start,%eax
35782 + movw %ax,__KERNEL_PERCPU + 0(%edi)
35783 +#endif
35784 #else
35785 mov %rsi,xen_start_info
35786 mov $init_thread_union+THREAD_SIZE,%rsp
35787 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
35788 index 1cb6f4c..9981524 100644
35789 --- a/arch/x86/xen/xen-ops.h
35790 +++ b/arch/x86/xen/xen-ops.h
35791 @@ -10,8 +10,6 @@
35792 extern const char xen_hypervisor_callback[];
35793 extern const char xen_failsafe_callback[];
35794
35795 -extern void *xen_initial_gdt;
35796 -
35797 struct trap_info;
35798 void xen_copy_trap_info(struct trap_info *traps);
35799
35800 diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
35801 index 525bd3d..ef888b1 100644
35802 --- a/arch/xtensa/variants/dc232b/include/variant/core.h
35803 +++ b/arch/xtensa/variants/dc232b/include/variant/core.h
35804 @@ -119,9 +119,9 @@
35805 ----------------------------------------------------------------------*/
35806
35807 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
35808 -#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
35809 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
35810 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
35811 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35812
35813 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
35814 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
35815 diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
35816 index 2f33760..835e50a 100644
35817 --- a/arch/xtensa/variants/fsf/include/variant/core.h
35818 +++ b/arch/xtensa/variants/fsf/include/variant/core.h
35819 @@ -11,6 +11,7 @@
35820 #ifndef _XTENSA_CORE_H
35821 #define _XTENSA_CORE_H
35822
35823 +#include <linux/const.h>
35824
35825 /****************************************************************************
35826 Parameters Useful for Any Code, USER or PRIVILEGED
35827 @@ -112,9 +113,9 @@
35828 ----------------------------------------------------------------------*/
35829
35830 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35831 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35832 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35833 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35834 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35835
35836 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
35837 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
35838 diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
35839 index af00795..2bb8105 100644
35840 --- a/arch/xtensa/variants/s6000/include/variant/core.h
35841 +++ b/arch/xtensa/variants/s6000/include/variant/core.h
35842 @@ -11,6 +11,7 @@
35843 #ifndef _XTENSA_CORE_CONFIGURATION_H
35844 #define _XTENSA_CORE_CONFIGURATION_H
35845
35846 +#include <linux/const.h>
35847
35848 /****************************************************************************
35849 Parameters Useful for Any Code, USER or PRIVILEGED
35850 @@ -118,9 +119,9 @@
35851 ----------------------------------------------------------------------*/
35852
35853 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35854 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35855 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35856 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35857 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35858
35859 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
35860 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
35861 diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
35862 index 95ee425..c9c7237 100644
35863 --- a/block/blk-cgroup.c
35864 +++ b/block/blk-cgroup.c
35865 @@ -822,7 +822,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css)
35866 static struct cgroup_subsys_state *
35867 blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
35868 {
35869 - static atomic64_t id_seq = ATOMIC64_INIT(0);
35870 + static atomic64_unchecked_t id_seq = ATOMIC64_INIT(0);
35871 struct blkcg *blkcg;
35872
35873 if (!parent_css) {
35874 @@ -836,7 +836,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
35875
35876 blkcg->cfq_weight = CFQ_WEIGHT_DEFAULT;
35877 blkcg->cfq_leaf_weight = CFQ_WEIGHT_DEFAULT;
35878 - blkcg->id = atomic64_inc_return(&id_seq); /* root is 0, start from 1 */
35879 + blkcg->id = atomic64_inc_return_unchecked(&id_seq); /* root is 0, start from 1 */
35880 done:
35881 spin_lock_init(&blkcg->lock);
35882 INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_ATOMIC);
35883 diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
35884 index c11d24e..e915d24 100644
35885 --- a/block/blk-iopoll.c
35886 +++ b/block/blk-iopoll.c
35887 @@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
35888 }
35889 EXPORT_SYMBOL(blk_iopoll_complete);
35890
35891 -static void blk_iopoll_softirq(struct softirq_action *h)
35892 +static __latent_entropy void blk_iopoll_softirq(void)
35893 {
35894 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
35895 int rearm = 0, budget = blk_iopoll_budget;
35896 diff --git a/block/blk-map.c b/block/blk-map.c
35897 index f7b22bc..ec2ddf4 100644
35898 --- a/block/blk-map.c
35899 +++ b/block/blk-map.c
35900 @@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
35901 if (!len || !kbuf)
35902 return -EINVAL;
35903
35904 - do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
35905 + do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
35906 if (do_copy)
35907 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
35908 else
35909 diff --git a/block/blk-softirq.c b/block/blk-softirq.c
35910 index 53b1737..08177d2e 100644
35911 --- a/block/blk-softirq.c
35912 +++ b/block/blk-softirq.c
35913 @@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
35914 * Softirq action handler - move entries to local list and loop over them
35915 * while passing them to the queue registered handler.
35916 */
35917 -static void blk_done_softirq(struct softirq_action *h)
35918 +static __latent_entropy void blk_done_softirq(void)
35919 {
35920 struct list_head *cpu_list, local_list;
35921
35922 diff --git a/block/bsg.c b/block/bsg.c
35923 index 420a5a9..23834aa 100644
35924 --- a/block/bsg.c
35925 +++ b/block/bsg.c
35926 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
35927 struct sg_io_v4 *hdr, struct bsg_device *bd,
35928 fmode_t has_write_perm)
35929 {
35930 + unsigned char tmpcmd[sizeof(rq->__cmd)];
35931 + unsigned char *cmdptr;
35932 +
35933 if (hdr->request_len > BLK_MAX_CDB) {
35934 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
35935 if (!rq->cmd)
35936 return -ENOMEM;
35937 - }
35938 + cmdptr = rq->cmd;
35939 + } else
35940 + cmdptr = tmpcmd;
35941
35942 - if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
35943 + if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
35944 hdr->request_len))
35945 return -EFAULT;
35946
35947 + if (cmdptr != rq->cmd)
35948 + memcpy(rq->cmd, cmdptr, hdr->request_len);
35949 +
35950 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
35951 if (blk_verify_command(rq->cmd, has_write_perm))
35952 return -EPERM;
35953 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
35954 index fbd5a67..f24fd95 100644
35955 --- a/block/compat_ioctl.c
35956 +++ b/block/compat_ioctl.c
35957 @@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
35958 cgc = compat_alloc_user_space(sizeof(*cgc));
35959 cgc32 = compat_ptr(arg);
35960
35961 - if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
35962 + if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
35963 get_user(data, &cgc32->buffer) ||
35964 put_user(compat_ptr(data), &cgc->buffer) ||
35965 copy_in_user(&cgc->buflen, &cgc32->buflen,
35966 @@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
35967 err |= __get_user(f->spec1, &uf->spec1);
35968 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
35969 err |= __get_user(name, &uf->name);
35970 - f->name = compat_ptr(name);
35971 + f->name = (void __force_kernel *)compat_ptr(name);
35972 if (err) {
35973 err = -EFAULT;
35974 goto out;
35975 diff --git a/block/genhd.c b/block/genhd.c
35976 index 791f419..89f21c4 100644
35977 --- a/block/genhd.c
35978 +++ b/block/genhd.c
35979 @@ -467,21 +467,24 @@ static char *bdevt_str(dev_t devt, char *buf)
35980
35981 /*
35982 * Register device numbers dev..(dev+range-1)
35983 - * range must be nonzero
35984 + * Noop if @range is zero.
35985 * The hash chain is sorted on range, so that subranges can override.
35986 */
35987 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
35988 struct kobject *(*probe)(dev_t, int *, void *),
35989 int (*lock)(dev_t, void *), void *data)
35990 {
35991 - kobj_map(bdev_map, devt, range, module, probe, lock, data);
35992 + if (range)
35993 + kobj_map(bdev_map, devt, range, module, probe, lock, data);
35994 }
35995
35996 EXPORT_SYMBOL(blk_register_region);
35997
35998 +/* undo blk_register_region(), noop if @range is zero */
35999 void blk_unregister_region(dev_t devt, unsigned long range)
36000 {
36001 - kobj_unmap(bdev_map, devt, range);
36002 + if (range)
36003 + kobj_unmap(bdev_map, devt, range);
36004 }
36005
36006 EXPORT_SYMBOL(blk_unregister_region);
36007 diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36008 index dc51f46..d5446a8 100644
36009 --- a/block/partitions/efi.c
36010 +++ b/block/partitions/efi.c
36011 @@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36012 if (!gpt)
36013 return NULL;
36014
36015 + if (!le32_to_cpu(gpt->num_partition_entries))
36016 + return NULL;
36017 + pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36018 + if (!pte)
36019 + return NULL;
36020 +
36021 count = le32_to_cpu(gpt->num_partition_entries) *
36022 le32_to_cpu(gpt->sizeof_partition_entry);
36023 - if (!count)
36024 - return NULL;
36025 - pte = kmalloc(count, GFP_KERNEL);
36026 - if (!pte)
36027 - return NULL;
36028 -
36029 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36030 (u8 *) pte, count) < count) {
36031 kfree(pte);
36032 diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36033 index 2648797..92ed21f 100644
36034 --- a/block/scsi_ioctl.c
36035 +++ b/block/scsi_ioctl.c
36036 @@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36037 return put_user(0, p);
36038 }
36039
36040 -static int sg_get_timeout(struct request_queue *q)
36041 +static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36042 {
36043 return jiffies_to_clock_t(q->sg_timeout);
36044 }
36045 @@ -224,8 +224,20 @@ EXPORT_SYMBOL(blk_verify_command);
36046 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36047 struct sg_io_hdr *hdr, fmode_t mode)
36048 {
36049 - if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36050 + unsigned char tmpcmd[sizeof(rq->__cmd)];
36051 + unsigned char *cmdptr;
36052 +
36053 + if (rq->cmd != rq->__cmd)
36054 + cmdptr = rq->cmd;
36055 + else
36056 + cmdptr = tmpcmd;
36057 +
36058 + if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36059 return -EFAULT;
36060 +
36061 + if (cmdptr != rq->cmd)
36062 + memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36063 +
36064 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36065 return -EPERM;
36066
36067 @@ -417,6 +429,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36068 int err;
36069 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36070 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36071 + unsigned char tmpcmd[sizeof(rq->__cmd)];
36072 + unsigned char *cmdptr;
36073
36074 if (!sic)
36075 return -EINVAL;
36076 @@ -450,9 +464,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36077 */
36078 err = -EFAULT;
36079 rq->cmd_len = cmdlen;
36080 - if (copy_from_user(rq->cmd, sic->data, cmdlen))
36081 +
36082 + if (rq->cmd != rq->__cmd)
36083 + cmdptr = rq->cmd;
36084 + else
36085 + cmdptr = tmpcmd;
36086 +
36087 + if (copy_from_user(cmdptr, sic->data, cmdlen))
36088 goto error;
36089
36090 + if (rq->cmd != cmdptr)
36091 + memcpy(rq->cmd, cmdptr, cmdlen);
36092 +
36093 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36094 goto error;
36095
36096 diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36097 index 7bdd61b..afec999 100644
36098 --- a/crypto/cryptd.c
36099 +++ b/crypto/cryptd.c
36100 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36101
36102 struct cryptd_blkcipher_request_ctx {
36103 crypto_completion_t complete;
36104 -};
36105 +} __no_const;
36106
36107 struct cryptd_hash_ctx {
36108 struct crypto_shash *child;
36109 @@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36110
36111 struct cryptd_aead_request_ctx {
36112 crypto_completion_t complete;
36113 -};
36114 +} __no_const;
36115
36116 static void cryptd_queue_worker(struct work_struct *work);
36117
36118 diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36119 index 309d345..1632720 100644
36120 --- a/crypto/pcrypt.c
36121 +++ b/crypto/pcrypt.c
36122 @@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36123 int ret;
36124
36125 pinst->kobj.kset = pcrypt_kset;
36126 - ret = kobject_add(&pinst->kobj, NULL, name);
36127 + ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36128 if (!ret)
36129 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36130
36131 diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36132 index 6921c7f..78e1af7 100644
36133 --- a/drivers/acpi/acpica/hwxfsleep.c
36134 +++ b/drivers/acpi/acpica/hwxfsleep.c
36135 @@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36136 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36137
36138 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36139 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36140 - acpi_hw_extended_sleep},
36141 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36142 - acpi_hw_extended_wake_prep},
36143 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36144 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36145 + .extended_function = acpi_hw_extended_sleep},
36146 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36147 + .extended_function = acpi_hw_extended_wake_prep},
36148 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36149 + .extended_function = acpi_hw_extended_wake}
36150 };
36151
36152 /*
36153 diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36154 index e5bcd91..74f050d 100644
36155 --- a/drivers/acpi/apei/apei-internal.h
36156 +++ b/drivers/acpi/apei/apei-internal.h
36157 @@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36158 struct apei_exec_ins_type {
36159 u32 flags;
36160 apei_exec_ins_func_t run;
36161 -};
36162 +} __do_const;
36163
36164 struct apei_exec_context {
36165 u32 ip;
36166 diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36167 index dab7cb7..f0d2994 100644
36168 --- a/drivers/acpi/apei/ghes.c
36169 +++ b/drivers/acpi/apei/ghes.c
36170 @@ -500,7 +500,7 @@ static void __ghes_print_estatus(const char *pfx,
36171 const struct acpi_hest_generic *generic,
36172 const struct acpi_generic_status *estatus)
36173 {
36174 - static atomic_t seqno;
36175 + static atomic_unchecked_t seqno;
36176 unsigned int curr_seqno;
36177 char pfx_seq[64];
36178
36179 @@ -511,7 +511,7 @@ static void __ghes_print_estatus(const char *pfx,
36180 else
36181 pfx = KERN_ERR;
36182 }
36183 - curr_seqno = atomic_inc_return(&seqno);
36184 + curr_seqno = atomic_inc_return_unchecked(&seqno);
36185 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36186 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36187 pfx_seq, generic->header.source_id);
36188 diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36189 index a83e3c6..c3d617f 100644
36190 --- a/drivers/acpi/bgrt.c
36191 +++ b/drivers/acpi/bgrt.c
36192 @@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36193 if (!bgrt_image)
36194 return -ENODEV;
36195
36196 - bin_attr_image.private = bgrt_image;
36197 - bin_attr_image.size = bgrt_image_size;
36198 + pax_open_kernel();
36199 + *(void **)&bin_attr_image.private = bgrt_image;
36200 + *(size_t *)&bin_attr_image.size = bgrt_image_size;
36201 + pax_close_kernel();
36202
36203 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36204 if (!bgrt_kobj)
36205 diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36206 index 3d8413d..95f638c 100644
36207 --- a/drivers/acpi/blacklist.c
36208 +++ b/drivers/acpi/blacklist.c
36209 @@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36210 u32 is_critical_error;
36211 };
36212
36213 -static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36214 +static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36215
36216 /*
36217 * POLICY: If *anything* doesn't work, put it on the blacklist.
36218 @@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36219 return 0;
36220 }
36221
36222 -static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36223 +static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36224 {
36225 .callback = dmi_disable_osi_vista,
36226 .ident = "Fujitsu Siemens",
36227 diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36228 index c68e724..e863008 100644
36229 --- a/drivers/acpi/custom_method.c
36230 +++ b/drivers/acpi/custom_method.c
36231 @@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36232 struct acpi_table_header table;
36233 acpi_status status;
36234
36235 +#ifdef CONFIG_GRKERNSEC_KMEM
36236 + return -EPERM;
36237 +#endif
36238 +
36239 if (!(*ppos)) {
36240 /* parse the table header to get the table length */
36241 if (count <= sizeof(struct acpi_table_header))
36242 diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36243 index 3dca36d..abaf070 100644
36244 --- a/drivers/acpi/processor_idle.c
36245 +++ b/drivers/acpi/processor_idle.c
36246 @@ -952,7 +952,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36247 {
36248 int i, count = CPUIDLE_DRIVER_STATE_START;
36249 struct acpi_processor_cx *cx;
36250 - struct cpuidle_state *state;
36251 + cpuidle_state_no_const *state;
36252 struct cpuidle_driver *drv = &acpi_idle_driver;
36253
36254 if (!pr->flags.power_setup_done)
36255 diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36256 index 38cb978..352c761 100644
36257 --- a/drivers/acpi/sysfs.c
36258 +++ b/drivers/acpi/sysfs.c
36259 @@ -423,11 +423,11 @@ static u32 num_counters;
36260 static struct attribute **all_attrs;
36261 static u32 acpi_gpe_count;
36262
36263 -static struct attribute_group interrupt_stats_attr_group = {
36264 +static attribute_group_no_const interrupt_stats_attr_group = {
36265 .name = "interrupts",
36266 };
36267
36268 -static struct kobj_attribute *counter_attrs;
36269 +static kobj_attribute_no_const *counter_attrs;
36270
36271 static void delete_gpe_attr_array(void)
36272 {
36273 diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36274 index b986145..82bddb8 100644
36275 --- a/drivers/ata/libahci.c
36276 +++ b/drivers/ata/libahci.c
36277 @@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36278 }
36279 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36280
36281 -static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36282 +static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36283 struct ata_taskfile *tf, int is_cmd, u16 flags,
36284 unsigned long timeout_msec)
36285 {
36286 diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36287 index 18d97d5..be690af 100644
36288 --- a/drivers/ata/libata-core.c
36289 +++ b/drivers/ata/libata-core.c
36290 @@ -98,7 +98,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36291 static void ata_dev_xfermask(struct ata_device *dev);
36292 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36293
36294 -atomic_t ata_print_id = ATOMIC_INIT(0);
36295 +atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36296
36297 struct ata_force_param {
36298 const char *name;
36299 @@ -4858,7 +4858,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36300 struct ata_port *ap;
36301 unsigned int tag;
36302
36303 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36304 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36305 ap = qc->ap;
36306
36307 qc->flags = 0;
36308 @@ -4874,7 +4874,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36309 struct ata_port *ap;
36310 struct ata_link *link;
36311
36312 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36313 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36314 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36315 ap = qc->ap;
36316 link = qc->dev->link;
36317 @@ -5978,6 +5978,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36318 return;
36319
36320 spin_lock(&lock);
36321 + pax_open_kernel();
36322
36323 for (cur = ops->inherits; cur; cur = cur->inherits) {
36324 void **inherit = (void **)cur;
36325 @@ -5991,8 +5992,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36326 if (IS_ERR(*pp))
36327 *pp = NULL;
36328
36329 - ops->inherits = NULL;
36330 + *(struct ata_port_operations **)&ops->inherits = NULL;
36331
36332 + pax_close_kernel();
36333 spin_unlock(&lock);
36334 }
36335
36336 @@ -6185,7 +6187,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36337
36338 /* give ports names and add SCSI hosts */
36339 for (i = 0; i < host->n_ports; i++) {
36340 - host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36341 + host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36342 host->ports[i]->local_port_no = i + 1;
36343 }
36344
36345 diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36346 index ef8567d..8bdbd03 100644
36347 --- a/drivers/ata/libata-scsi.c
36348 +++ b/drivers/ata/libata-scsi.c
36349 @@ -4147,7 +4147,7 @@ int ata_sas_port_init(struct ata_port *ap)
36350
36351 if (rc)
36352 return rc;
36353 - ap->print_id = atomic_inc_return(&ata_print_id);
36354 + ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36355 return 0;
36356 }
36357 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36358 diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36359 index 45b5ab3..98446b8 100644
36360 --- a/drivers/ata/libata.h
36361 +++ b/drivers/ata/libata.h
36362 @@ -53,7 +53,7 @@ enum {
36363 ATA_DNXFER_QUIET = (1 << 31),
36364 };
36365
36366 -extern atomic_t ata_print_id;
36367 +extern atomic_unchecked_t ata_print_id;
36368 extern int atapi_passthru16;
36369 extern int libata_fua;
36370 extern int libata_noacpi;
36371 diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36372 index 4edb1a8..84e1658 100644
36373 --- a/drivers/ata/pata_arasan_cf.c
36374 +++ b/drivers/ata/pata_arasan_cf.c
36375 @@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36376 /* Handle platform specific quirks */
36377 if (quirk) {
36378 if (quirk & CF_BROKEN_PIO) {
36379 - ap->ops->set_piomode = NULL;
36380 + pax_open_kernel();
36381 + *(void **)&ap->ops->set_piomode = NULL;
36382 + pax_close_kernel();
36383 ap->pio_mask = 0;
36384 }
36385 if (quirk & CF_BROKEN_MWDMA)
36386 diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36387 index f9b983a..887b9d8 100644
36388 --- a/drivers/atm/adummy.c
36389 +++ b/drivers/atm/adummy.c
36390 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36391 vcc->pop(vcc, skb);
36392 else
36393 dev_kfree_skb_any(skb);
36394 - atomic_inc(&vcc->stats->tx);
36395 + atomic_inc_unchecked(&vcc->stats->tx);
36396
36397 return 0;
36398 }
36399 diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36400 index f1a9198..f466a4a 100644
36401 --- a/drivers/atm/ambassador.c
36402 +++ b/drivers/atm/ambassador.c
36403 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36404 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36405
36406 // VC layer stats
36407 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36408 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36409
36410 // free the descriptor
36411 kfree (tx_descr);
36412 @@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36413 dump_skb ("<<<", vc, skb);
36414
36415 // VC layer stats
36416 - atomic_inc(&atm_vcc->stats->rx);
36417 + atomic_inc_unchecked(&atm_vcc->stats->rx);
36418 __net_timestamp(skb);
36419 // end of our responsibility
36420 atm_vcc->push (atm_vcc, skb);
36421 @@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36422 } else {
36423 PRINTK (KERN_INFO, "dropped over-size frame");
36424 // should we count this?
36425 - atomic_inc(&atm_vcc->stats->rx_drop);
36426 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36427 }
36428
36429 } else {
36430 @@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36431 }
36432
36433 if (check_area (skb->data, skb->len)) {
36434 - atomic_inc(&atm_vcc->stats->tx_err);
36435 + atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36436 return -ENOMEM; // ?
36437 }
36438
36439 diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36440 index 0e3f8f9..765a7a5 100644
36441 --- a/drivers/atm/atmtcp.c
36442 +++ b/drivers/atm/atmtcp.c
36443 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36444 if (vcc->pop) vcc->pop(vcc,skb);
36445 else dev_kfree_skb(skb);
36446 if (dev_data) return 0;
36447 - atomic_inc(&vcc->stats->tx_err);
36448 + atomic_inc_unchecked(&vcc->stats->tx_err);
36449 return -ENOLINK;
36450 }
36451 size = skb->len+sizeof(struct atmtcp_hdr);
36452 @@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36453 if (!new_skb) {
36454 if (vcc->pop) vcc->pop(vcc,skb);
36455 else dev_kfree_skb(skb);
36456 - atomic_inc(&vcc->stats->tx_err);
36457 + atomic_inc_unchecked(&vcc->stats->tx_err);
36458 return -ENOBUFS;
36459 }
36460 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36461 @@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36462 if (vcc->pop) vcc->pop(vcc,skb);
36463 else dev_kfree_skb(skb);
36464 out_vcc->push(out_vcc,new_skb);
36465 - atomic_inc(&vcc->stats->tx);
36466 - atomic_inc(&out_vcc->stats->rx);
36467 + atomic_inc_unchecked(&vcc->stats->tx);
36468 + atomic_inc_unchecked(&out_vcc->stats->rx);
36469 return 0;
36470 }
36471
36472 @@ -299,7 +299,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36473 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
36474 read_unlock(&vcc_sklist_lock);
36475 if (!out_vcc) {
36476 - atomic_inc(&vcc->stats->tx_err);
36477 + atomic_inc_unchecked(&vcc->stats->tx_err);
36478 goto done;
36479 }
36480 skb_pull(skb,sizeof(struct atmtcp_hdr));
36481 @@ -311,8 +311,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36482 __net_timestamp(new_skb);
36483 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36484 out_vcc->push(out_vcc,new_skb);
36485 - atomic_inc(&vcc->stats->tx);
36486 - atomic_inc(&out_vcc->stats->rx);
36487 + atomic_inc_unchecked(&vcc->stats->tx);
36488 + atomic_inc_unchecked(&out_vcc->stats->rx);
36489 done:
36490 if (vcc->pop) vcc->pop(vcc,skb);
36491 else dev_kfree_skb(skb);
36492 diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36493 index b1955ba..b179940 100644
36494 --- a/drivers/atm/eni.c
36495 +++ b/drivers/atm/eni.c
36496 @@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36497 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36498 vcc->dev->number);
36499 length = 0;
36500 - atomic_inc(&vcc->stats->rx_err);
36501 + atomic_inc_unchecked(&vcc->stats->rx_err);
36502 }
36503 else {
36504 length = ATM_CELL_SIZE-1; /* no HEC */
36505 @@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36506 size);
36507 }
36508 eff = length = 0;
36509 - atomic_inc(&vcc->stats->rx_err);
36510 + atomic_inc_unchecked(&vcc->stats->rx_err);
36511 }
36512 else {
36513 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36514 @@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36515 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36516 vcc->dev->number,vcc->vci,length,size << 2,descr);
36517 length = eff = 0;
36518 - atomic_inc(&vcc->stats->rx_err);
36519 + atomic_inc_unchecked(&vcc->stats->rx_err);
36520 }
36521 }
36522 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36523 @@ -767,7 +767,7 @@ rx_dequeued++;
36524 vcc->push(vcc,skb);
36525 pushed++;
36526 }
36527 - atomic_inc(&vcc->stats->rx);
36528 + atomic_inc_unchecked(&vcc->stats->rx);
36529 }
36530 wake_up(&eni_dev->rx_wait);
36531 }
36532 @@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
36533 PCI_DMA_TODEVICE);
36534 if (vcc->pop) vcc->pop(vcc,skb);
36535 else dev_kfree_skb_irq(skb);
36536 - atomic_inc(&vcc->stats->tx);
36537 + atomic_inc_unchecked(&vcc->stats->tx);
36538 wake_up(&eni_dev->tx_wait);
36539 dma_complete++;
36540 }
36541 diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36542 index 82f2ae0..f205c02 100644
36543 --- a/drivers/atm/firestream.c
36544 +++ b/drivers/atm/firestream.c
36545 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36546 }
36547 }
36548
36549 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36550 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36551
36552 fs_dprintk (FS_DEBUG_TXMEM, "i");
36553 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
36554 @@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36555 #endif
36556 skb_put (skb, qe->p1 & 0xffff);
36557 ATM_SKB(skb)->vcc = atm_vcc;
36558 - atomic_inc(&atm_vcc->stats->rx);
36559 + atomic_inc_unchecked(&atm_vcc->stats->rx);
36560 __net_timestamp(skb);
36561 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
36562 atm_vcc->push (atm_vcc, skb);
36563 @@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36564 kfree (pe);
36565 }
36566 if (atm_vcc)
36567 - atomic_inc(&atm_vcc->stats->rx_drop);
36568 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36569 break;
36570 case 0x1f: /* Reassembly abort: no buffers. */
36571 /* Silently increment error counter. */
36572 if (atm_vcc)
36573 - atomic_inc(&atm_vcc->stats->rx_drop);
36574 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36575 break;
36576 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
36577 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
36578 diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
36579 index 204814e..cede831 100644
36580 --- a/drivers/atm/fore200e.c
36581 +++ b/drivers/atm/fore200e.c
36582 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
36583 #endif
36584 /* check error condition */
36585 if (*entry->status & STATUS_ERROR)
36586 - atomic_inc(&vcc->stats->tx_err);
36587 + atomic_inc_unchecked(&vcc->stats->tx_err);
36588 else
36589 - atomic_inc(&vcc->stats->tx);
36590 + atomic_inc_unchecked(&vcc->stats->tx);
36591 }
36592 }
36593
36594 @@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36595 if (skb == NULL) {
36596 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
36597
36598 - atomic_inc(&vcc->stats->rx_drop);
36599 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36600 return -ENOMEM;
36601 }
36602
36603 @@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36604
36605 dev_kfree_skb_any(skb);
36606
36607 - atomic_inc(&vcc->stats->rx_drop);
36608 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36609 return -ENOMEM;
36610 }
36611
36612 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36613
36614 vcc->push(vcc, skb);
36615 - atomic_inc(&vcc->stats->rx);
36616 + atomic_inc_unchecked(&vcc->stats->rx);
36617
36618 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36619
36620 @@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
36621 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
36622 fore200e->atm_dev->number,
36623 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
36624 - atomic_inc(&vcc->stats->rx_err);
36625 + atomic_inc_unchecked(&vcc->stats->rx_err);
36626 }
36627 }
36628
36629 @@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
36630 goto retry_here;
36631 }
36632
36633 - atomic_inc(&vcc->stats->tx_err);
36634 + atomic_inc_unchecked(&vcc->stats->tx_err);
36635
36636 fore200e->tx_sat++;
36637 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
36638 diff --git a/drivers/atm/he.c b/drivers/atm/he.c
36639 index aa6be26..f70a785 100644
36640 --- a/drivers/atm/he.c
36641 +++ b/drivers/atm/he.c
36642 @@ -1690,7 +1690,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36643
36644 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
36645 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
36646 - atomic_inc(&vcc->stats->rx_drop);
36647 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36648 goto return_host_buffers;
36649 }
36650
36651 @@ -1717,7 +1717,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36652 RBRQ_LEN_ERR(he_dev->rbrq_head)
36653 ? "LEN_ERR" : "",
36654 vcc->vpi, vcc->vci);
36655 - atomic_inc(&vcc->stats->rx_err);
36656 + atomic_inc_unchecked(&vcc->stats->rx_err);
36657 goto return_host_buffers;
36658 }
36659
36660 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36661 vcc->push(vcc, skb);
36662 spin_lock(&he_dev->global_lock);
36663
36664 - atomic_inc(&vcc->stats->rx);
36665 + atomic_inc_unchecked(&vcc->stats->rx);
36666
36667 return_host_buffers:
36668 ++pdus_assembled;
36669 @@ -2095,7 +2095,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
36670 tpd->vcc->pop(tpd->vcc, tpd->skb);
36671 else
36672 dev_kfree_skb_any(tpd->skb);
36673 - atomic_inc(&tpd->vcc->stats->tx_err);
36674 + atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
36675 }
36676 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
36677 return;
36678 @@ -2507,7 +2507,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36679 vcc->pop(vcc, skb);
36680 else
36681 dev_kfree_skb_any(skb);
36682 - atomic_inc(&vcc->stats->tx_err);
36683 + atomic_inc_unchecked(&vcc->stats->tx_err);
36684 return -EINVAL;
36685 }
36686
36687 @@ -2518,7 +2518,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36688 vcc->pop(vcc, skb);
36689 else
36690 dev_kfree_skb_any(skb);
36691 - atomic_inc(&vcc->stats->tx_err);
36692 + atomic_inc_unchecked(&vcc->stats->tx_err);
36693 return -EINVAL;
36694 }
36695 #endif
36696 @@ -2530,7 +2530,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36697 vcc->pop(vcc, skb);
36698 else
36699 dev_kfree_skb_any(skb);
36700 - atomic_inc(&vcc->stats->tx_err);
36701 + atomic_inc_unchecked(&vcc->stats->tx_err);
36702 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36703 return -ENOMEM;
36704 }
36705 @@ -2572,7 +2572,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36706 vcc->pop(vcc, skb);
36707 else
36708 dev_kfree_skb_any(skb);
36709 - atomic_inc(&vcc->stats->tx_err);
36710 + atomic_inc_unchecked(&vcc->stats->tx_err);
36711 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36712 return -ENOMEM;
36713 }
36714 @@ -2603,7 +2603,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36715 __enqueue_tpd(he_dev, tpd, cid);
36716 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36717
36718 - atomic_inc(&vcc->stats->tx);
36719 + atomic_inc_unchecked(&vcc->stats->tx);
36720
36721 return 0;
36722 }
36723 diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
36724 index 1dc0519..1aadaf7 100644
36725 --- a/drivers/atm/horizon.c
36726 +++ b/drivers/atm/horizon.c
36727 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
36728 {
36729 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
36730 // VC layer stats
36731 - atomic_inc(&vcc->stats->rx);
36732 + atomic_inc_unchecked(&vcc->stats->rx);
36733 __net_timestamp(skb);
36734 // end of our responsibility
36735 vcc->push (vcc, skb);
36736 @@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
36737 dev->tx_iovec = NULL;
36738
36739 // VC layer stats
36740 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36741 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36742
36743 // free the skb
36744 hrz_kfree_skb (skb);
36745 diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
36746 index 1bdf104..9dc44b1 100644
36747 --- a/drivers/atm/idt77252.c
36748 +++ b/drivers/atm/idt77252.c
36749 @@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
36750 else
36751 dev_kfree_skb(skb);
36752
36753 - atomic_inc(&vcc->stats->tx);
36754 + atomic_inc_unchecked(&vcc->stats->tx);
36755 }
36756
36757 atomic_dec(&scq->used);
36758 @@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36759 if ((sb = dev_alloc_skb(64)) == NULL) {
36760 printk("%s: Can't allocate buffers for aal0.\n",
36761 card->name);
36762 - atomic_add(i, &vcc->stats->rx_drop);
36763 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
36764 break;
36765 }
36766 if (!atm_charge(vcc, sb->truesize)) {
36767 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
36768 card->name);
36769 - atomic_add(i - 1, &vcc->stats->rx_drop);
36770 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
36771 dev_kfree_skb(sb);
36772 break;
36773 }
36774 @@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36775 ATM_SKB(sb)->vcc = vcc;
36776 __net_timestamp(sb);
36777 vcc->push(vcc, sb);
36778 - atomic_inc(&vcc->stats->rx);
36779 + atomic_inc_unchecked(&vcc->stats->rx);
36780
36781 cell += ATM_CELL_PAYLOAD;
36782 }
36783 @@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36784 "(CDC: %08x)\n",
36785 card->name, len, rpp->len, readl(SAR_REG_CDC));
36786 recycle_rx_pool_skb(card, rpp);
36787 - atomic_inc(&vcc->stats->rx_err);
36788 + atomic_inc_unchecked(&vcc->stats->rx_err);
36789 return;
36790 }
36791 if (stat & SAR_RSQE_CRC) {
36792 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
36793 recycle_rx_pool_skb(card, rpp);
36794 - atomic_inc(&vcc->stats->rx_err);
36795 + atomic_inc_unchecked(&vcc->stats->rx_err);
36796 return;
36797 }
36798 if (skb_queue_len(&rpp->queue) > 1) {
36799 @@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36800 RXPRINTK("%s: Can't alloc RX skb.\n",
36801 card->name);
36802 recycle_rx_pool_skb(card, rpp);
36803 - atomic_inc(&vcc->stats->rx_err);
36804 + atomic_inc_unchecked(&vcc->stats->rx_err);
36805 return;
36806 }
36807 if (!atm_charge(vcc, skb->truesize)) {
36808 @@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36809 __net_timestamp(skb);
36810
36811 vcc->push(vcc, skb);
36812 - atomic_inc(&vcc->stats->rx);
36813 + atomic_inc_unchecked(&vcc->stats->rx);
36814
36815 return;
36816 }
36817 @@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36818 __net_timestamp(skb);
36819
36820 vcc->push(vcc, skb);
36821 - atomic_inc(&vcc->stats->rx);
36822 + atomic_inc_unchecked(&vcc->stats->rx);
36823
36824 if (skb->truesize > SAR_FB_SIZE_3)
36825 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
36826 @@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
36827 if (vcc->qos.aal != ATM_AAL0) {
36828 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
36829 card->name, vpi, vci);
36830 - atomic_inc(&vcc->stats->rx_drop);
36831 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36832 goto drop;
36833 }
36834
36835 if ((sb = dev_alloc_skb(64)) == NULL) {
36836 printk("%s: Can't allocate buffers for AAL0.\n",
36837 card->name);
36838 - atomic_inc(&vcc->stats->rx_err);
36839 + atomic_inc_unchecked(&vcc->stats->rx_err);
36840 goto drop;
36841 }
36842
36843 @@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
36844 ATM_SKB(sb)->vcc = vcc;
36845 __net_timestamp(sb);
36846 vcc->push(vcc, sb);
36847 - atomic_inc(&vcc->stats->rx);
36848 + atomic_inc_unchecked(&vcc->stats->rx);
36849
36850 drop:
36851 skb_pull(queue, 64);
36852 @@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36853
36854 if (vc == NULL) {
36855 printk("%s: NULL connection in send().\n", card->name);
36856 - atomic_inc(&vcc->stats->tx_err);
36857 + atomic_inc_unchecked(&vcc->stats->tx_err);
36858 dev_kfree_skb(skb);
36859 return -EINVAL;
36860 }
36861 if (!test_bit(VCF_TX, &vc->flags)) {
36862 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
36863 - atomic_inc(&vcc->stats->tx_err);
36864 + atomic_inc_unchecked(&vcc->stats->tx_err);
36865 dev_kfree_skb(skb);
36866 return -EINVAL;
36867 }
36868 @@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36869 break;
36870 default:
36871 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
36872 - atomic_inc(&vcc->stats->tx_err);
36873 + atomic_inc_unchecked(&vcc->stats->tx_err);
36874 dev_kfree_skb(skb);
36875 return -EINVAL;
36876 }
36877
36878 if (skb_shinfo(skb)->nr_frags != 0) {
36879 printk("%s: No scatter-gather yet.\n", card->name);
36880 - atomic_inc(&vcc->stats->tx_err);
36881 + atomic_inc_unchecked(&vcc->stats->tx_err);
36882 dev_kfree_skb(skb);
36883 return -EINVAL;
36884 }
36885 @@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36886
36887 err = queue_skb(card, vc, skb, oam);
36888 if (err) {
36889 - atomic_inc(&vcc->stats->tx_err);
36890 + atomic_inc_unchecked(&vcc->stats->tx_err);
36891 dev_kfree_skb(skb);
36892 return err;
36893 }
36894 @@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
36895 skb = dev_alloc_skb(64);
36896 if (!skb) {
36897 printk("%s: Out of memory in send_oam().\n", card->name);
36898 - atomic_inc(&vcc->stats->tx_err);
36899 + atomic_inc_unchecked(&vcc->stats->tx_err);
36900 return -ENOMEM;
36901 }
36902 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
36903 diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
36904 index 4217f29..88f547a 100644
36905 --- a/drivers/atm/iphase.c
36906 +++ b/drivers/atm/iphase.c
36907 @@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
36908 status = (u_short) (buf_desc_ptr->desc_mode);
36909 if (status & (RX_CER | RX_PTE | RX_OFL))
36910 {
36911 - atomic_inc(&vcc->stats->rx_err);
36912 + atomic_inc_unchecked(&vcc->stats->rx_err);
36913 IF_ERR(printk("IA: bad packet, dropping it");)
36914 if (status & RX_CER) {
36915 IF_ERR(printk(" cause: packet CRC error\n");)
36916 @@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
36917 len = dma_addr - buf_addr;
36918 if (len > iadev->rx_buf_sz) {
36919 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
36920 - atomic_inc(&vcc->stats->rx_err);
36921 + atomic_inc_unchecked(&vcc->stats->rx_err);
36922 goto out_free_desc;
36923 }
36924
36925 @@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
36926 ia_vcc = INPH_IA_VCC(vcc);
36927 if (ia_vcc == NULL)
36928 {
36929 - atomic_inc(&vcc->stats->rx_err);
36930 + atomic_inc_unchecked(&vcc->stats->rx_err);
36931 atm_return(vcc, skb->truesize);
36932 dev_kfree_skb_any(skb);
36933 goto INCR_DLE;
36934 @@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
36935 if ((length > iadev->rx_buf_sz) || (length >
36936 (skb->len - sizeof(struct cpcs_trailer))))
36937 {
36938 - atomic_inc(&vcc->stats->rx_err);
36939 + atomic_inc_unchecked(&vcc->stats->rx_err);
36940 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
36941 length, skb->len);)
36942 atm_return(vcc, skb->truesize);
36943 @@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
36944
36945 IF_RX(printk("rx_dle_intr: skb push");)
36946 vcc->push(vcc,skb);
36947 - atomic_inc(&vcc->stats->rx);
36948 + atomic_inc_unchecked(&vcc->stats->rx);
36949 iadev->rx_pkt_cnt++;
36950 }
36951 INCR_DLE:
36952 @@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
36953 {
36954 struct k_sonet_stats *stats;
36955 stats = &PRIV(_ia_dev[board])->sonet_stats;
36956 - printk("section_bip: %d\n", atomic_read(&stats->section_bip));
36957 - printk("line_bip : %d\n", atomic_read(&stats->line_bip));
36958 - printk("path_bip : %d\n", atomic_read(&stats->path_bip));
36959 - printk("line_febe : %d\n", atomic_read(&stats->line_febe));
36960 - printk("path_febe : %d\n", atomic_read(&stats->path_febe));
36961 - printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
36962 - printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
36963 - printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
36964 - printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
36965 + printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
36966 + printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
36967 + printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
36968 + printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
36969 + printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
36970 + printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
36971 + printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
36972 + printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
36973 + printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
36974 }
36975 ia_cmds.status = 0;
36976 break;
36977 @@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
36978 if ((desc == 0) || (desc > iadev->num_tx_desc))
36979 {
36980 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
36981 - atomic_inc(&vcc->stats->tx);
36982 + atomic_inc_unchecked(&vcc->stats->tx);
36983 if (vcc->pop)
36984 vcc->pop(vcc, skb);
36985 else
36986 @@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
36987 ATM_DESC(skb) = vcc->vci;
36988 skb_queue_tail(&iadev->tx_dma_q, skb);
36989
36990 - atomic_inc(&vcc->stats->tx);
36991 + atomic_inc_unchecked(&vcc->stats->tx);
36992 iadev->tx_pkt_cnt++;
36993 /* Increment transaction counter */
36994 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
36995
36996 #if 0
36997 /* add flow control logic */
36998 - if (atomic_read(&vcc->stats->tx) % 20 == 0) {
36999 + if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37000 if (iavcc->vc_desc_cnt > 10) {
37001 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37002 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37003 diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37004 index fa7d701..1e404c7 100644
37005 --- a/drivers/atm/lanai.c
37006 +++ b/drivers/atm/lanai.c
37007 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37008 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37009 lanai_endtx(lanai, lvcc);
37010 lanai_free_skb(lvcc->tx.atmvcc, skb);
37011 - atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37012 + atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37013 }
37014
37015 /* Try to fill the buffer - don't call unless there is backlog */
37016 @@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37017 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37018 __net_timestamp(skb);
37019 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37020 - atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37021 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37022 out:
37023 lvcc->rx.buf.ptr = end;
37024 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37025 @@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37026 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37027 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37028 lanai->stats.service_rxnotaal5++;
37029 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37030 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37031 return 0;
37032 }
37033 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37034 @@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37035 int bytes;
37036 read_unlock(&vcc_sklist_lock);
37037 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37038 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37039 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37040 lvcc->stats.x.aal5.service_trash++;
37041 bytes = (SERVICE_GET_END(s) * 16) -
37042 (((unsigned long) lvcc->rx.buf.ptr) -
37043 @@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37044 }
37045 if (s & SERVICE_STREAM) {
37046 read_unlock(&vcc_sklist_lock);
37047 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37048 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37049 lvcc->stats.x.aal5.service_stream++;
37050 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37051 "PDU on VCI %d!\n", lanai->number, vci);
37052 @@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37053 return 0;
37054 }
37055 DPRINTK("got rx crc error on vci %d\n", vci);
37056 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37057 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37058 lvcc->stats.x.aal5.service_rxcrc++;
37059 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37060 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37061 diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37062 index 9988ac9..7c52585 100644
37063 --- a/drivers/atm/nicstar.c
37064 +++ b/drivers/atm/nicstar.c
37065 @@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37066 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37067 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37068 card->index);
37069 - atomic_inc(&vcc->stats->tx_err);
37070 + atomic_inc_unchecked(&vcc->stats->tx_err);
37071 dev_kfree_skb_any(skb);
37072 return -EINVAL;
37073 }
37074 @@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37075 if (!vc->tx) {
37076 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37077 card->index);
37078 - atomic_inc(&vcc->stats->tx_err);
37079 + atomic_inc_unchecked(&vcc->stats->tx_err);
37080 dev_kfree_skb_any(skb);
37081 return -EINVAL;
37082 }
37083 @@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37084 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37085 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37086 card->index);
37087 - atomic_inc(&vcc->stats->tx_err);
37088 + atomic_inc_unchecked(&vcc->stats->tx_err);
37089 dev_kfree_skb_any(skb);
37090 return -EINVAL;
37091 }
37092
37093 if (skb_shinfo(skb)->nr_frags != 0) {
37094 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37095 - atomic_inc(&vcc->stats->tx_err);
37096 + atomic_inc_unchecked(&vcc->stats->tx_err);
37097 dev_kfree_skb_any(skb);
37098 return -EINVAL;
37099 }
37100 @@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37101 }
37102
37103 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37104 - atomic_inc(&vcc->stats->tx_err);
37105 + atomic_inc_unchecked(&vcc->stats->tx_err);
37106 dev_kfree_skb_any(skb);
37107 return -EIO;
37108 }
37109 - atomic_inc(&vcc->stats->tx);
37110 + atomic_inc_unchecked(&vcc->stats->tx);
37111
37112 return 0;
37113 }
37114 @@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37115 printk
37116 ("nicstar%d: Can't allocate buffers for aal0.\n",
37117 card->index);
37118 - atomic_add(i, &vcc->stats->rx_drop);
37119 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
37120 break;
37121 }
37122 if (!atm_charge(vcc, sb->truesize)) {
37123 RXPRINTK
37124 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37125 card->index);
37126 - atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37127 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37128 dev_kfree_skb_any(sb);
37129 break;
37130 }
37131 @@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37132 ATM_SKB(sb)->vcc = vcc;
37133 __net_timestamp(sb);
37134 vcc->push(vcc, sb);
37135 - atomic_inc(&vcc->stats->rx);
37136 + atomic_inc_unchecked(&vcc->stats->rx);
37137 cell += ATM_CELL_PAYLOAD;
37138 }
37139
37140 @@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37141 if (iovb == NULL) {
37142 printk("nicstar%d: Out of iovec buffers.\n",
37143 card->index);
37144 - atomic_inc(&vcc->stats->rx_drop);
37145 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37146 recycle_rx_buf(card, skb);
37147 return;
37148 }
37149 @@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37150 small or large buffer itself. */
37151 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37152 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37153 - atomic_inc(&vcc->stats->rx_err);
37154 + atomic_inc_unchecked(&vcc->stats->rx_err);
37155 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37156 NS_MAX_IOVECS);
37157 NS_PRV_IOVCNT(iovb) = 0;
37158 @@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37159 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37160 card->index);
37161 which_list(card, skb);
37162 - atomic_inc(&vcc->stats->rx_err);
37163 + atomic_inc_unchecked(&vcc->stats->rx_err);
37164 recycle_rx_buf(card, skb);
37165 vc->rx_iov = NULL;
37166 recycle_iov_buf(card, iovb);
37167 @@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37168 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37169 card->index);
37170 which_list(card, skb);
37171 - atomic_inc(&vcc->stats->rx_err);
37172 + atomic_inc_unchecked(&vcc->stats->rx_err);
37173 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37174 NS_PRV_IOVCNT(iovb));
37175 vc->rx_iov = NULL;
37176 @@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37177 printk(" - PDU size mismatch.\n");
37178 else
37179 printk(".\n");
37180 - atomic_inc(&vcc->stats->rx_err);
37181 + atomic_inc_unchecked(&vcc->stats->rx_err);
37182 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37183 NS_PRV_IOVCNT(iovb));
37184 vc->rx_iov = NULL;
37185 @@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37186 /* skb points to a small buffer */
37187 if (!atm_charge(vcc, skb->truesize)) {
37188 push_rxbufs(card, skb);
37189 - atomic_inc(&vcc->stats->rx_drop);
37190 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37191 } else {
37192 skb_put(skb, len);
37193 dequeue_sm_buf(card, skb);
37194 @@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37195 ATM_SKB(skb)->vcc = vcc;
37196 __net_timestamp(skb);
37197 vcc->push(vcc, skb);
37198 - atomic_inc(&vcc->stats->rx);
37199 + atomic_inc_unchecked(&vcc->stats->rx);
37200 }
37201 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37202 struct sk_buff *sb;
37203 @@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37204 if (len <= NS_SMBUFSIZE) {
37205 if (!atm_charge(vcc, sb->truesize)) {
37206 push_rxbufs(card, sb);
37207 - atomic_inc(&vcc->stats->rx_drop);
37208 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37209 } else {
37210 skb_put(sb, len);
37211 dequeue_sm_buf(card, sb);
37212 @@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37213 ATM_SKB(sb)->vcc = vcc;
37214 __net_timestamp(sb);
37215 vcc->push(vcc, sb);
37216 - atomic_inc(&vcc->stats->rx);
37217 + atomic_inc_unchecked(&vcc->stats->rx);
37218 }
37219
37220 push_rxbufs(card, skb);
37221 @@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37222
37223 if (!atm_charge(vcc, skb->truesize)) {
37224 push_rxbufs(card, skb);
37225 - atomic_inc(&vcc->stats->rx_drop);
37226 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37227 } else {
37228 dequeue_lg_buf(card, skb);
37229 #ifdef NS_USE_DESTRUCTORS
37230 @@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37231 ATM_SKB(skb)->vcc = vcc;
37232 __net_timestamp(skb);
37233 vcc->push(vcc, skb);
37234 - atomic_inc(&vcc->stats->rx);
37235 + atomic_inc_unchecked(&vcc->stats->rx);
37236 }
37237
37238 push_rxbufs(card, sb);
37239 @@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37240 printk
37241 ("nicstar%d: Out of huge buffers.\n",
37242 card->index);
37243 - atomic_inc(&vcc->stats->rx_drop);
37244 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37245 recycle_iovec_rx_bufs(card,
37246 (struct iovec *)
37247 iovb->data,
37248 @@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37249 card->hbpool.count++;
37250 } else
37251 dev_kfree_skb_any(hb);
37252 - atomic_inc(&vcc->stats->rx_drop);
37253 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37254 } else {
37255 /* Copy the small buffer to the huge buffer */
37256 sb = (struct sk_buff *)iov->iov_base;
37257 @@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37258 #endif /* NS_USE_DESTRUCTORS */
37259 __net_timestamp(hb);
37260 vcc->push(vcc, hb);
37261 - atomic_inc(&vcc->stats->rx);
37262 + atomic_inc_unchecked(&vcc->stats->rx);
37263 }
37264 }
37265
37266 diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37267 index 943cf0d..37d15d5 100644
37268 --- a/drivers/atm/solos-pci.c
37269 +++ b/drivers/atm/solos-pci.c
37270 @@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37271 }
37272 atm_charge(vcc, skb->truesize);
37273 vcc->push(vcc, skb);
37274 - atomic_inc(&vcc->stats->rx);
37275 + atomic_inc_unchecked(&vcc->stats->rx);
37276 break;
37277
37278 case PKT_STATUS:
37279 @@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37280 vcc = SKB_CB(oldskb)->vcc;
37281
37282 if (vcc) {
37283 - atomic_inc(&vcc->stats->tx);
37284 + atomic_inc_unchecked(&vcc->stats->tx);
37285 solos_pop(vcc, oldskb);
37286 } else {
37287 dev_kfree_skb_irq(oldskb);
37288 diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37289 index 0215934..ce9f5b1 100644
37290 --- a/drivers/atm/suni.c
37291 +++ b/drivers/atm/suni.c
37292 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37293
37294
37295 #define ADD_LIMITED(s,v) \
37296 - atomic_add((v),&stats->s); \
37297 - if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37298 + atomic_add_unchecked((v),&stats->s); \
37299 + if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37300
37301
37302 static void suni_hz(unsigned long from_timer)
37303 diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37304 index 5120a96..e2572bd 100644
37305 --- a/drivers/atm/uPD98402.c
37306 +++ b/drivers/atm/uPD98402.c
37307 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37308 struct sonet_stats tmp;
37309 int error = 0;
37310
37311 - atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37312 + atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37313 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37314 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37315 if (zero && !error) {
37316 @@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37317
37318
37319 #define ADD_LIMITED(s,v) \
37320 - { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37321 - if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37322 - atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37323 + { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37324 + if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37325 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37326
37327
37328 static void stat_event(struct atm_dev *dev)
37329 @@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37330 if (reason & uPD98402_INT_PFM) stat_event(dev);
37331 if (reason & uPD98402_INT_PCO) {
37332 (void) GET(PCOCR); /* clear interrupt cause */
37333 - atomic_add(GET(HECCT),
37334 + atomic_add_unchecked(GET(HECCT),
37335 &PRIV(dev)->sonet_stats.uncorr_hcs);
37336 }
37337 if ((reason & uPD98402_INT_RFO) &&
37338 @@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37339 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37340 uPD98402_INT_LOS),PIMR); /* enable them */
37341 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37342 - atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37343 - atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37344 - atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37345 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37346 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37347 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37348 return 0;
37349 }
37350
37351 diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37352 index 969c3c2..9b72956 100644
37353 --- a/drivers/atm/zatm.c
37354 +++ b/drivers/atm/zatm.c
37355 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37356 }
37357 if (!size) {
37358 dev_kfree_skb_irq(skb);
37359 - if (vcc) atomic_inc(&vcc->stats->rx_err);
37360 + if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37361 continue;
37362 }
37363 if (!atm_charge(vcc,skb->truesize)) {
37364 @@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37365 skb->len = size;
37366 ATM_SKB(skb)->vcc = vcc;
37367 vcc->push(vcc,skb);
37368 - atomic_inc(&vcc->stats->rx);
37369 + atomic_inc_unchecked(&vcc->stats->rx);
37370 }
37371 zout(pos & 0xffff,MTA(mbx));
37372 #if 0 /* probably a stupid idea */
37373 @@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37374 skb_queue_head(&zatm_vcc->backlog,skb);
37375 break;
37376 }
37377 - atomic_inc(&vcc->stats->tx);
37378 + atomic_inc_unchecked(&vcc->stats->tx);
37379 wake_up(&zatm_vcc->tx_wait);
37380 }
37381
37382 diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37383 index 83e910a..b224a73 100644
37384 --- a/drivers/base/bus.c
37385 +++ b/drivers/base/bus.c
37386 @@ -1124,7 +1124,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37387 return -EINVAL;
37388
37389 mutex_lock(&subsys->p->mutex);
37390 - list_add_tail(&sif->node, &subsys->p->interfaces);
37391 + pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37392 if (sif->add_dev) {
37393 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37394 while ((dev = subsys_dev_iter_next(&iter)))
37395 @@ -1149,7 +1149,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37396 subsys = sif->subsys;
37397
37398 mutex_lock(&subsys->p->mutex);
37399 - list_del_init(&sif->node);
37400 + pax_list_del_init((struct list_head *)&sif->node);
37401 if (sif->remove_dev) {
37402 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37403 while ((dev = subsys_dev_iter_next(&iter)))
37404 diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37405 index 25798db..15f130e 100644
37406 --- a/drivers/base/devtmpfs.c
37407 +++ b/drivers/base/devtmpfs.c
37408 @@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37409 if (!thread)
37410 return 0;
37411
37412 - err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37413 + err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37414 if (err)
37415 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37416 else
37417 @@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37418 *err = sys_unshare(CLONE_NEWNS);
37419 if (*err)
37420 goto out;
37421 - *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37422 + *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37423 if (*err)
37424 goto out;
37425 - sys_chdir("/.."); /* will traverse into overmounted root */
37426 - sys_chroot(".");
37427 + sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37428 + sys_chroot((char __force_user *)".");
37429 complete(&setup_done);
37430 while (1) {
37431 spin_lock(&req_lock);
37432 diff --git a/drivers/base/node.c b/drivers/base/node.c
37433 index 8f7ed99..700dd0c 100644
37434 --- a/drivers/base/node.c
37435 +++ b/drivers/base/node.c
37436 @@ -624,7 +624,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37437 struct node_attr {
37438 struct device_attribute attr;
37439 enum node_states state;
37440 -};
37441 +} __do_const;
37442
37443 static ssize_t show_node_state(struct device *dev,
37444 struct device_attribute *attr, char *buf)
37445 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37446 index ae098a2..0999830 100644
37447 --- a/drivers/base/power/domain.c
37448 +++ b/drivers/base/power/domain.c
37449 @@ -1821,9 +1821,9 @@ int __pm_genpd_remove_callbacks(struct device *dev, bool clear_td)
37450
37451 if (dev->power.subsys_data->domain_data) {
37452 gpd_data = to_gpd_data(dev->power.subsys_data->domain_data);
37453 - gpd_data->ops = (struct gpd_dev_ops){ NULL };
37454 + memset(&gpd_data->ops, 0, sizeof(gpd_data->ops));
37455 if (clear_td)
37456 - gpd_data->td = (struct gpd_timing_data){ 0 };
37457 + memset(&gpd_data->td, 0, sizeof(gpd_data->td));
37458
37459 if (--gpd_data->refcount == 0) {
37460 dev->power.subsys_data->domain_data = NULL;
37461 @@ -1862,7 +1862,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37462 {
37463 struct cpuidle_driver *cpuidle_drv;
37464 struct gpd_cpu_data *cpu_data;
37465 - struct cpuidle_state *idle_state;
37466 + cpuidle_state_no_const *idle_state;
37467 int ret = 0;
37468
37469 if (IS_ERR_OR_NULL(genpd) || state < 0)
37470 @@ -1930,7 +1930,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37471 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37472 {
37473 struct gpd_cpu_data *cpu_data;
37474 - struct cpuidle_state *idle_state;
37475 + cpuidle_state_no_const *idle_state;
37476 int ret = 0;
37477
37478 if (IS_ERR_OR_NULL(genpd))
37479 diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37480 index 95b181d1..c4f0e19 100644
37481 --- a/drivers/base/power/sysfs.c
37482 +++ b/drivers/base/power/sysfs.c
37483 @@ -185,7 +185,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37484 return -EIO;
37485 }
37486 }
37487 - return sprintf(buf, p);
37488 + return sprintf(buf, "%s", p);
37489 }
37490
37491 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37492 diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37493 index 2d56f41..8830f19 100644
37494 --- a/drivers/base/power/wakeup.c
37495 +++ b/drivers/base/power/wakeup.c
37496 @@ -29,14 +29,14 @@ bool events_check_enabled __read_mostly;
37497 * They need to be modified together atomically, so it's better to use one
37498 * atomic variable to hold them both.
37499 */
37500 -static atomic_t combined_event_count = ATOMIC_INIT(0);
37501 +static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37502
37503 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37504 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37505
37506 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37507 {
37508 - unsigned int comb = atomic_read(&combined_event_count);
37509 + unsigned int comb = atomic_read_unchecked(&combined_event_count);
37510
37511 *cnt = (comb >> IN_PROGRESS_BITS);
37512 *inpr = comb & MAX_IN_PROGRESS;
37513 @@ -395,7 +395,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37514 ws->start_prevent_time = ws->last_time;
37515
37516 /* Increment the counter of events in progress. */
37517 - cec = atomic_inc_return(&combined_event_count);
37518 + cec = atomic_inc_return_unchecked(&combined_event_count);
37519
37520 trace_wakeup_source_activate(ws->name, cec);
37521 }
37522 @@ -521,7 +521,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37523 * Increment the counter of registered wakeup events and decrement the
37524 * couter of wakeup events in progress simultaneously.
37525 */
37526 - cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37527 + cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37528 trace_wakeup_source_deactivate(ws->name, cec);
37529
37530 split_counters(&cnt, &inpr);
37531 diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37532 index e8d11b6..7b1b36f 100644
37533 --- a/drivers/base/syscore.c
37534 +++ b/drivers/base/syscore.c
37535 @@ -21,7 +21,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37536 void register_syscore_ops(struct syscore_ops *ops)
37537 {
37538 mutex_lock(&syscore_ops_lock);
37539 - list_add_tail(&ops->node, &syscore_ops_list);
37540 + pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37541 mutex_unlock(&syscore_ops_lock);
37542 }
37543 EXPORT_SYMBOL_GPL(register_syscore_ops);
37544 @@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37545 void unregister_syscore_ops(struct syscore_ops *ops)
37546 {
37547 mutex_lock(&syscore_ops_lock);
37548 - list_del(&ops->node);
37549 + pax_list_del((struct list_head *)&ops->node);
37550 mutex_unlock(&syscore_ops_lock);
37551 }
37552 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37553 diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37554 index 73894ca..69f64ef 100644
37555 --- a/drivers/block/cciss.c
37556 +++ b/drivers/block/cciss.c
37557 @@ -3011,7 +3011,7 @@ static void start_io(ctlr_info_t *h)
37558 while (!list_empty(&h->reqQ)) {
37559 c = list_entry(h->reqQ.next, CommandList_struct, list);
37560 /* can't do anything if fifo is full */
37561 - if ((h->access.fifo_full(h))) {
37562 + if ((h->access->fifo_full(h))) {
37563 dev_warn(&h->pdev->dev, "fifo full\n");
37564 break;
37565 }
37566 @@ -3021,7 +3021,7 @@ static void start_io(ctlr_info_t *h)
37567 h->Qdepth--;
37568
37569 /* Tell the controller execute command */
37570 - h->access.submit_command(h, c);
37571 + h->access->submit_command(h, c);
37572
37573 /* Put job onto the completed Q */
37574 addQ(&h->cmpQ, c);
37575 @@ -3447,17 +3447,17 @@ startio:
37576
37577 static inline unsigned long get_next_completion(ctlr_info_t *h)
37578 {
37579 - return h->access.command_completed(h);
37580 + return h->access->command_completed(h);
37581 }
37582
37583 static inline int interrupt_pending(ctlr_info_t *h)
37584 {
37585 - return h->access.intr_pending(h);
37586 + return h->access->intr_pending(h);
37587 }
37588
37589 static inline long interrupt_not_for_us(ctlr_info_t *h)
37590 {
37591 - return ((h->access.intr_pending(h) == 0) ||
37592 + return ((h->access->intr_pending(h) == 0) ||
37593 (h->interrupts_enabled == 0));
37594 }
37595
37596 @@ -3490,7 +3490,7 @@ static inline u32 next_command(ctlr_info_t *h)
37597 u32 a;
37598
37599 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37600 - return h->access.command_completed(h);
37601 + return h->access->command_completed(h);
37602
37603 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
37604 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
37605 @@ -4047,7 +4047,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
37606 trans_support & CFGTBL_Trans_use_short_tags);
37607
37608 /* Change the access methods to the performant access methods */
37609 - h->access = SA5_performant_access;
37610 + h->access = &SA5_performant_access;
37611 h->transMethod = CFGTBL_Trans_Performant;
37612
37613 return;
37614 @@ -4325,7 +4325,7 @@ static int cciss_pci_init(ctlr_info_t *h)
37615 if (prod_index < 0)
37616 return -ENODEV;
37617 h->product_name = products[prod_index].product_name;
37618 - h->access = *(products[prod_index].access);
37619 + h->access = products[prod_index].access;
37620
37621 if (cciss_board_disabled(h)) {
37622 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
37623 @@ -5057,7 +5057,7 @@ reinit_after_soft_reset:
37624 }
37625
37626 /* make sure the board interrupts are off */
37627 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37628 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37629 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
37630 if (rc)
37631 goto clean2;
37632 @@ -5107,7 +5107,7 @@ reinit_after_soft_reset:
37633 * fake ones to scoop up any residual completions.
37634 */
37635 spin_lock_irqsave(&h->lock, flags);
37636 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37637 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37638 spin_unlock_irqrestore(&h->lock, flags);
37639 free_irq(h->intr[h->intr_mode], h);
37640 rc = cciss_request_irq(h, cciss_msix_discard_completions,
37641 @@ -5127,9 +5127,9 @@ reinit_after_soft_reset:
37642 dev_info(&h->pdev->dev, "Board READY.\n");
37643 dev_info(&h->pdev->dev,
37644 "Waiting for stale completions to drain.\n");
37645 - h->access.set_intr_mask(h, CCISS_INTR_ON);
37646 + h->access->set_intr_mask(h, CCISS_INTR_ON);
37647 msleep(10000);
37648 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37649 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37650
37651 rc = controller_reset_failed(h->cfgtable);
37652 if (rc)
37653 @@ -5152,7 +5152,7 @@ reinit_after_soft_reset:
37654 cciss_scsi_setup(h);
37655
37656 /* Turn the interrupts on so we can service requests */
37657 - h->access.set_intr_mask(h, CCISS_INTR_ON);
37658 + h->access->set_intr_mask(h, CCISS_INTR_ON);
37659
37660 /* Get the firmware version */
37661 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
37662 @@ -5224,7 +5224,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
37663 kfree(flush_buf);
37664 if (return_code != IO_OK)
37665 dev_warn(&h->pdev->dev, "Error flushing cache\n");
37666 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37667 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37668 free_irq(h->intr[h->intr_mode], h);
37669 }
37670
37671 diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
37672 index 7fda30e..2f27946 100644
37673 --- a/drivers/block/cciss.h
37674 +++ b/drivers/block/cciss.h
37675 @@ -101,7 +101,7 @@ struct ctlr_info
37676 /* information about each logical volume */
37677 drive_info_struct *drv[CISS_MAX_LUN];
37678
37679 - struct access_method access;
37680 + struct access_method *access;
37681
37682 /* queue and queue Info */
37683 struct list_head reqQ;
37684 @@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
37685 }
37686
37687 static struct access_method SA5_access = {
37688 - SA5_submit_command,
37689 - SA5_intr_mask,
37690 - SA5_fifo_full,
37691 - SA5_intr_pending,
37692 - SA5_completed,
37693 + .submit_command = SA5_submit_command,
37694 + .set_intr_mask = SA5_intr_mask,
37695 + .fifo_full = SA5_fifo_full,
37696 + .intr_pending = SA5_intr_pending,
37697 + .command_completed = SA5_completed,
37698 };
37699
37700 static struct access_method SA5B_access = {
37701 - SA5_submit_command,
37702 - SA5B_intr_mask,
37703 - SA5_fifo_full,
37704 - SA5B_intr_pending,
37705 - SA5_completed,
37706 + .submit_command = SA5_submit_command,
37707 + .set_intr_mask = SA5B_intr_mask,
37708 + .fifo_full = SA5_fifo_full,
37709 + .intr_pending = SA5B_intr_pending,
37710 + .command_completed = SA5_completed,
37711 };
37712
37713 static struct access_method SA5_performant_access = {
37714 - SA5_submit_command,
37715 - SA5_performant_intr_mask,
37716 - SA5_fifo_full,
37717 - SA5_performant_intr_pending,
37718 - SA5_performant_completed,
37719 + .submit_command = SA5_submit_command,
37720 + .set_intr_mask = SA5_performant_intr_mask,
37721 + .fifo_full = SA5_fifo_full,
37722 + .intr_pending = SA5_performant_intr_pending,
37723 + .command_completed = SA5_performant_completed,
37724 };
37725
37726 struct board_type {
37727 diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
37728 index 2b94403..fd6ad1f 100644
37729 --- a/drivers/block/cpqarray.c
37730 +++ b/drivers/block/cpqarray.c
37731 @@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37732 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
37733 goto Enomem4;
37734 }
37735 - hba[i]->access.set_intr_mask(hba[i], 0);
37736 + hba[i]->access->set_intr_mask(hba[i], 0);
37737 if (request_irq(hba[i]->intr, do_ida_intr,
37738 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
37739 {
37740 @@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37741 add_timer(&hba[i]->timer);
37742
37743 /* Enable IRQ now that spinlock and rate limit timer are set up */
37744 - hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37745 + hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37746
37747 for(j=0; j<NWD; j++) {
37748 struct gendisk *disk = ida_gendisk[i][j];
37749 @@ -694,7 +694,7 @@ DBGINFO(
37750 for(i=0; i<NR_PRODUCTS; i++) {
37751 if (board_id == products[i].board_id) {
37752 c->product_name = products[i].product_name;
37753 - c->access = *(products[i].access);
37754 + c->access = products[i].access;
37755 break;
37756 }
37757 }
37758 @@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
37759 hba[ctlr]->intr = intr;
37760 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
37761 hba[ctlr]->product_name = products[j].product_name;
37762 - hba[ctlr]->access = *(products[j].access);
37763 + hba[ctlr]->access = products[j].access;
37764 hba[ctlr]->ctlr = ctlr;
37765 hba[ctlr]->board_id = board_id;
37766 hba[ctlr]->pci_dev = NULL; /* not PCI */
37767 @@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
37768
37769 while((c = h->reqQ) != NULL) {
37770 /* Can't do anything if we're busy */
37771 - if (h->access.fifo_full(h) == 0)
37772 + if (h->access->fifo_full(h) == 0)
37773 return;
37774
37775 /* Get the first entry from the request Q */
37776 @@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
37777 h->Qdepth--;
37778
37779 /* Tell the controller to do our bidding */
37780 - h->access.submit_command(h, c);
37781 + h->access->submit_command(h, c);
37782
37783 /* Get onto the completion Q */
37784 addQ(&h->cmpQ, c);
37785 @@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37786 unsigned long flags;
37787 __u32 a,a1;
37788
37789 - istat = h->access.intr_pending(h);
37790 + istat = h->access->intr_pending(h);
37791 /* Is this interrupt for us? */
37792 if (istat == 0)
37793 return IRQ_NONE;
37794 @@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37795 */
37796 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
37797 if (istat & FIFO_NOT_EMPTY) {
37798 - while((a = h->access.command_completed(h))) {
37799 + while((a = h->access->command_completed(h))) {
37800 a1 = a; a &= ~3;
37801 if ((c = h->cmpQ) == NULL)
37802 {
37803 @@ -1448,11 +1448,11 @@ static int sendcmd(
37804 /*
37805 * Disable interrupt
37806 */
37807 - info_p->access.set_intr_mask(info_p, 0);
37808 + info_p->access->set_intr_mask(info_p, 0);
37809 /* Make sure there is room in the command FIFO */
37810 /* Actually it should be completely empty at this time. */
37811 for (i = 200000; i > 0; i--) {
37812 - temp = info_p->access.fifo_full(info_p);
37813 + temp = info_p->access->fifo_full(info_p);
37814 if (temp != 0) {
37815 break;
37816 }
37817 @@ -1465,7 +1465,7 @@ DBG(
37818 /*
37819 * Send the cmd
37820 */
37821 - info_p->access.submit_command(info_p, c);
37822 + info_p->access->submit_command(info_p, c);
37823 complete = pollcomplete(ctlr);
37824
37825 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
37826 @@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
37827 * we check the new geometry. Then turn interrupts back on when
37828 * we're done.
37829 */
37830 - host->access.set_intr_mask(host, 0);
37831 + host->access->set_intr_mask(host, 0);
37832 getgeometry(ctlr);
37833 - host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
37834 + host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
37835
37836 for(i=0; i<NWD; i++) {
37837 struct gendisk *disk = ida_gendisk[ctlr][i];
37838 @@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
37839 /* Wait (up to 2 seconds) for a command to complete */
37840
37841 for (i = 200000; i > 0; i--) {
37842 - done = hba[ctlr]->access.command_completed(hba[ctlr]);
37843 + done = hba[ctlr]->access->command_completed(hba[ctlr]);
37844 if (done == 0) {
37845 udelay(10); /* a short fixed delay */
37846 } else
37847 diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
37848 index be73e9d..7fbf140 100644
37849 --- a/drivers/block/cpqarray.h
37850 +++ b/drivers/block/cpqarray.h
37851 @@ -99,7 +99,7 @@ struct ctlr_info {
37852 drv_info_t drv[NWD];
37853 struct proc_dir_entry *proc;
37854
37855 - struct access_method access;
37856 + struct access_method *access;
37857
37858 cmdlist_t *reqQ;
37859 cmdlist_t *cmpQ;
37860 diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
37861 index e7093d4..b364085 100644
37862 --- a/drivers/block/drbd/drbd_int.h
37863 +++ b/drivers/block/drbd/drbd_int.h
37864 @@ -331,7 +331,7 @@ struct drbd_epoch {
37865 struct drbd_connection *connection;
37866 struct list_head list;
37867 unsigned int barrier_nr;
37868 - atomic_t epoch_size; /* increased on every request added. */
37869 + atomic_unchecked_t epoch_size; /* increased on every request added. */
37870 atomic_t active; /* increased on every req. added, and dec on every finished. */
37871 unsigned long flags;
37872 };
37873 @@ -787,7 +787,7 @@ struct drbd_device {
37874 unsigned int al_tr_number;
37875 int al_tr_cycle;
37876 wait_queue_head_t seq_wait;
37877 - atomic_t packet_seq;
37878 + atomic_unchecked_t packet_seq;
37879 unsigned int peer_seq;
37880 spinlock_t peer_seq_lock;
37881 unsigned int minor;
37882 @@ -1361,7 +1361,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
37883 char __user *uoptval;
37884 int err;
37885
37886 - uoptval = (char __user __force *)optval;
37887 + uoptval = (char __force_user *)optval;
37888
37889 set_fs(KERNEL_DS);
37890 if (level == SOL_SOCKET)
37891 diff --git a/drivers/block/drbd/drbd_interval.c b/drivers/block/drbd/drbd_interval.c
37892 index 89c497c..9c736ae 100644
37893 --- a/drivers/block/drbd/drbd_interval.c
37894 +++ b/drivers/block/drbd/drbd_interval.c
37895 @@ -67,9 +67,9 @@ static void augment_rotate(struct rb_node *rb_old, struct rb_node *rb_new)
37896 }
37897
37898 static const struct rb_augment_callbacks augment_callbacks = {
37899 - augment_propagate,
37900 - augment_copy,
37901 - augment_rotate,
37902 + .propagate = augment_propagate,
37903 + .copy = augment_copy,
37904 + .rotate = augment_rotate,
37905 };
37906
37907 /**
37908 diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
37909 index 331e5cc..6d657bce 100644
37910 --- a/drivers/block/drbd/drbd_main.c
37911 +++ b/drivers/block/drbd/drbd_main.c
37912 @@ -1322,7 +1322,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
37913 p->sector = sector;
37914 p->block_id = block_id;
37915 p->blksize = blksize;
37916 - p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
37917 + p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
37918 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
37919 }
37920
37921 @@ -1628,7 +1628,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
37922 return -EIO;
37923 p->sector = cpu_to_be64(req->i.sector);
37924 p->block_id = (unsigned long)req;
37925 - p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
37926 + p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
37927 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
37928 if (device->state.conn >= C_SYNC_SOURCE &&
37929 device->state.conn <= C_PAUSED_SYNC_T)
37930 @@ -2658,8 +2658,8 @@ void drbd_destroy_connection(struct kref *kref)
37931 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
37932 struct drbd_resource *resource = connection->resource;
37933
37934 - if (atomic_read(&connection->current_epoch->epoch_size) != 0)
37935 - drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
37936 + if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
37937 + drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
37938 kfree(connection->current_epoch);
37939
37940 idr_destroy(&connection->peer_devices);
37941 diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
37942 index 526414b..4eb8184 100644
37943 --- a/drivers/block/drbd/drbd_nl.c
37944 +++ b/drivers/block/drbd/drbd_nl.c
37945 @@ -3505,7 +3505,7 @@ out:
37946
37947 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
37948 {
37949 - static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
37950 + static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
37951 struct sk_buff *msg;
37952 struct drbd_genlmsghdr *d_out;
37953 unsigned seq;
37954 @@ -3518,7 +3518,7 @@ void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
37955 return;
37956 }
37957
37958 - seq = atomic_inc_return(&drbd_genl_seq);
37959 + seq = atomic_inc_return_unchecked(&drbd_genl_seq);
37960 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
37961 if (!msg)
37962 goto failed;
37963 diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
37964 index 68e3992..1aca24a 100644
37965 --- a/drivers/block/drbd/drbd_receiver.c
37966 +++ b/drivers/block/drbd/drbd_receiver.c
37967 @@ -826,7 +826,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
37968 struct drbd_device *device = peer_device->device;
37969 int err;
37970
37971 - atomic_set(&device->packet_seq, 0);
37972 + atomic_set_unchecked(&device->packet_seq, 0);
37973 device->peer_seq = 0;
37974
37975 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
37976 @@ -1188,7 +1188,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
37977 do {
37978 next_epoch = NULL;
37979
37980 - epoch_size = atomic_read(&epoch->epoch_size);
37981 + epoch_size = atomic_read_unchecked(&epoch->epoch_size);
37982
37983 switch (ev & ~EV_CLEANUP) {
37984 case EV_PUT:
37985 @@ -1228,7 +1228,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
37986 rv = FE_DESTROYED;
37987 } else {
37988 epoch->flags = 0;
37989 - atomic_set(&epoch->epoch_size, 0);
37990 + atomic_set_unchecked(&epoch->epoch_size, 0);
37991 /* atomic_set(&epoch->active, 0); is already zero */
37992 if (rv == FE_STILL_LIVE)
37993 rv = FE_RECYCLED;
37994 @@ -1456,7 +1456,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
37995 conn_wait_active_ee_empty(connection);
37996 drbd_flush(connection);
37997
37998 - if (atomic_read(&connection->current_epoch->epoch_size)) {
37999 + if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38000 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38001 if (epoch)
38002 break;
38003 @@ -1469,11 +1469,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38004 }
38005
38006 epoch->flags = 0;
38007 - atomic_set(&epoch->epoch_size, 0);
38008 + atomic_set_unchecked(&epoch->epoch_size, 0);
38009 atomic_set(&epoch->active, 0);
38010
38011 spin_lock(&connection->epoch_lock);
38012 - if (atomic_read(&connection->current_epoch->epoch_size)) {
38013 + if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38014 list_add(&epoch->list, &connection->current_epoch->list);
38015 connection->current_epoch = epoch;
38016 connection->epochs++;
38017 @@ -2182,7 +2182,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38018
38019 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38020 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38021 - atomic_inc(&connection->current_epoch->epoch_size);
38022 + atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38023 err2 = drbd_drain_block(peer_device, pi->size);
38024 if (!err)
38025 err = err2;
38026 @@ -2216,7 +2216,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38027
38028 spin_lock(&connection->epoch_lock);
38029 peer_req->epoch = connection->current_epoch;
38030 - atomic_inc(&peer_req->epoch->epoch_size);
38031 + atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38032 atomic_inc(&peer_req->epoch->active);
38033 spin_unlock(&connection->epoch_lock);
38034
38035 @@ -4396,7 +4396,7 @@ struct data_cmd {
38036 int expect_payload;
38037 size_t pkt_size;
38038 int (*fn)(struct drbd_connection *, struct packet_info *);
38039 -};
38040 +} __do_const;
38041
38042 static struct data_cmd drbd_cmd_handler[] = {
38043 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38044 @@ -4506,7 +4506,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38045 if (!list_empty(&connection->current_epoch->list))
38046 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38047 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38048 - atomic_set(&connection->current_epoch->epoch_size, 0);
38049 + atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38050 connection->send.seen_any_write_yet = false;
38051
38052 drbd_info(connection, "Connection closed\n");
38053 @@ -5281,7 +5281,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38054 struct asender_cmd {
38055 size_t pkt_size;
38056 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38057 -};
38058 +} __do_const;
38059
38060 static struct asender_cmd asender_tbl[] = {
38061 [P_PING] = { 0, got_Ping },
38062 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38063 index f70a230..9dc90d5 100644
38064 --- a/drivers/block/loop.c
38065 +++ b/drivers/block/loop.c
38066 @@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
38067
38068 file_start_write(file);
38069 set_fs(get_ds());
38070 - bw = file->f_op->write(file, buf, len, &pos);
38071 + bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38072 set_fs(old_fs);
38073 file_end_write(file);
38074 if (likely(bw == len))
38075 diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
38076 index 091b9ea..f5428f8 100644
38077 --- a/drivers/block/null_blk.c
38078 +++ b/drivers/block/null_blk.c
38079 @@ -382,15 +382,25 @@ static int null_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
38080 return 0;
38081 }
38082
38083 -static struct blk_mq_ops null_mq_ops = {
38084 - .queue_rq = null_queue_rq,
38085 - .map_queue = blk_mq_map_queue,
38086 +static struct blk_mq_ops null_mq_single_ops = {
38087 + .queue_rq = null_queue_rq,
38088 + .map_queue = blk_mq_map_queue,
38089 .init_hctx = null_init_hctx,
38090 .complete = null_softirq_done_fn,
38091 + .alloc_hctx = blk_mq_alloc_single_hw_queue,
38092 + .free_hctx = blk_mq_free_single_hw_queue,
38093 +};
38094 +
38095 +static struct blk_mq_ops null_mq_per_node_ops = {
38096 + .queue_rq = null_queue_rq,
38097 + .map_queue = blk_mq_map_queue,
38098 + .init_hctx = null_init_hctx,
38099 + .alloc_hctx = null_alloc_hctx,
38100 + .free_hctx = null_free_hctx,
38101 };
38102
38103 static struct blk_mq_reg null_mq_reg = {
38104 - .ops = &null_mq_ops,
38105 + .ops = &null_mq_single_ops,
38106 .queue_depth = 64,
38107 .cmd_size = sizeof(struct nullb_cmd),
38108 .flags = BLK_MQ_F_SHOULD_MERGE,
38109 @@ -521,13 +531,8 @@ static int null_add_dev(void)
38110 null_mq_reg.queue_depth = hw_queue_depth;
38111 null_mq_reg.nr_hw_queues = submit_queues;
38112
38113 - if (use_per_node_hctx) {
38114 - null_mq_reg.ops->alloc_hctx = null_alloc_hctx;
38115 - null_mq_reg.ops->free_hctx = null_free_hctx;
38116 - } else {
38117 - null_mq_reg.ops->alloc_hctx = blk_mq_alloc_single_hw_queue;
38118 - null_mq_reg.ops->free_hctx = blk_mq_free_single_hw_queue;
38119 - }
38120 + if (use_per_node_hctx)
38121 + null_mq_reg.ops = &null_mq_per_node_ops;
38122
38123 nullb->q = blk_mq_init_queue(&null_mq_reg, nullb);
38124 } else if (queue_mode == NULL_Q_BIO) {
38125 diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38126 index a2af73d..c0b8f61 100644
38127 --- a/drivers/block/pktcdvd.c
38128 +++ b/drivers/block/pktcdvd.c
38129 @@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38130
38131 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38132 {
38133 - return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38134 + return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38135 }
38136
38137 /*
38138 @@ -1888,7 +1888,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38139 return -EROFS;
38140 }
38141 pd->settings.fp = ti.fp;
38142 - pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38143 + pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38144
38145 if (ti.nwa_v) {
38146 pd->nwa = be32_to_cpu(ti.next_writable);
38147 diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38148 index e5565fb..71be10b4 100644
38149 --- a/drivers/block/smart1,2.h
38150 +++ b/drivers/block/smart1,2.h
38151 @@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38152 }
38153
38154 static struct access_method smart4_access = {
38155 - smart4_submit_command,
38156 - smart4_intr_mask,
38157 - smart4_fifo_full,
38158 - smart4_intr_pending,
38159 - smart4_completed,
38160 + .submit_command = smart4_submit_command,
38161 + .set_intr_mask = smart4_intr_mask,
38162 + .fifo_full = smart4_fifo_full,
38163 + .intr_pending = smart4_intr_pending,
38164 + .command_completed = smart4_completed,
38165 };
38166
38167 /*
38168 @@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38169 }
38170
38171 static struct access_method smart2_access = {
38172 - smart2_submit_command,
38173 - smart2_intr_mask,
38174 - smart2_fifo_full,
38175 - smart2_intr_pending,
38176 - smart2_completed,
38177 + .submit_command = smart2_submit_command,
38178 + .set_intr_mask = smart2_intr_mask,
38179 + .fifo_full = smart2_fifo_full,
38180 + .intr_pending = smart2_intr_pending,
38181 + .command_completed = smart2_completed,
38182 };
38183
38184 /*
38185 @@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38186 }
38187
38188 static struct access_method smart2e_access = {
38189 - smart2e_submit_command,
38190 - smart2e_intr_mask,
38191 - smart2e_fifo_full,
38192 - smart2e_intr_pending,
38193 - smart2e_completed,
38194 + .submit_command = smart2e_submit_command,
38195 + .set_intr_mask = smart2e_intr_mask,
38196 + .fifo_full = smart2e_fifo_full,
38197 + .intr_pending = smart2e_intr_pending,
38198 + .command_completed = smart2e_completed,
38199 };
38200
38201 /*
38202 @@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38203 }
38204
38205 static struct access_method smart1_access = {
38206 - smart1_submit_command,
38207 - smart1_intr_mask,
38208 - smart1_fifo_full,
38209 - smart1_intr_pending,
38210 - smart1_completed,
38211 + .submit_command = smart1_submit_command,
38212 + .set_intr_mask = smart1_intr_mask,
38213 + .fifo_full = smart1_fifo_full,
38214 + .intr_pending = smart1_intr_pending,
38215 + .command_completed = smart1_completed,
38216 };
38217 diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38218 index f038dba..bb74c08 100644
38219 --- a/drivers/bluetooth/btwilink.c
38220 +++ b/drivers/bluetooth/btwilink.c
38221 @@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38222
38223 static int bt_ti_probe(struct platform_device *pdev)
38224 {
38225 - static struct ti_st *hst;
38226 + struct ti_st *hst;
38227 struct hci_dev *hdev;
38228 int err;
38229
38230 diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38231 index 8a3aff7..d7538c2 100644
38232 --- a/drivers/cdrom/cdrom.c
38233 +++ b/drivers/cdrom/cdrom.c
38234 @@ -416,7 +416,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38235 ENSURE(reset, CDC_RESET);
38236 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38237 cdi->mc_flags = 0;
38238 - cdo->n_minors = 0;
38239 cdi->options = CDO_USE_FFLAGS;
38240
38241 if (autoclose==1 && CDROM_CAN(CDC_CLOSE_TRAY))
38242 @@ -436,8 +435,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38243 else
38244 cdi->cdda_method = CDDA_OLD;
38245
38246 - if (!cdo->generic_packet)
38247 - cdo->generic_packet = cdrom_dummy_generic_packet;
38248 + if (!cdo->generic_packet) {
38249 + pax_open_kernel();
38250 + *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38251 + pax_close_kernel();
38252 + }
38253
38254 cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38255 mutex_lock(&cdrom_mutex);
38256 @@ -458,7 +460,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38257 if (cdi->exit)
38258 cdi->exit(cdi);
38259
38260 - cdi->ops->n_minors--;
38261 cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38262 }
38263
38264 @@ -2107,7 +2108,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38265 */
38266 nr = nframes;
38267 do {
38268 - cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38269 + cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38270 if (cgc.buffer)
38271 break;
38272
38273 @@ -3429,7 +3430,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38274 struct cdrom_device_info *cdi;
38275 int ret;
38276
38277 - ret = scnprintf(info + *pos, max_size - *pos, header);
38278 + ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38279 if (!ret)
38280 return 1;
38281
38282 diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38283 index 51e75ad..39c4c76 100644
38284 --- a/drivers/cdrom/gdrom.c
38285 +++ b/drivers/cdrom/gdrom.c
38286 @@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38287 .audio_ioctl = gdrom_audio_ioctl,
38288 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38289 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38290 - .n_minors = 1,
38291 };
38292
38293 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38294 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38295 index 6e9f74a..50c7cea 100644
38296 --- a/drivers/char/Kconfig
38297 +++ b/drivers/char/Kconfig
38298 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
38299
38300 config DEVKMEM
38301 bool "/dev/kmem virtual device support"
38302 - default y
38303 + default n
38304 + depends on !GRKERNSEC_KMEM
38305 help
38306 Say Y here if you want to support the /dev/kmem device. The
38307 /dev/kmem device is rarely used, but can be used for certain
38308 @@ -577,6 +578,7 @@ config DEVPORT
38309 bool
38310 depends on !M68K
38311 depends on ISA || PCI
38312 + depends on !GRKERNSEC_KMEM
38313 default y
38314
38315 source "drivers/s390/char/Kconfig"
38316 diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38317 index a48e05b..6bac831 100644
38318 --- a/drivers/char/agp/compat_ioctl.c
38319 +++ b/drivers/char/agp/compat_ioctl.c
38320 @@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38321 return -ENOMEM;
38322 }
38323
38324 - if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38325 + if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38326 sizeof(*usegment) * ureserve.seg_count)) {
38327 kfree(usegment);
38328 kfree(ksegment);
38329 diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38330 index b297033..fa217ca 100644
38331 --- a/drivers/char/agp/frontend.c
38332 +++ b/drivers/char/agp/frontend.c
38333 @@ -819,7 +819,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38334 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38335 return -EFAULT;
38336
38337 - if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38338 + if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38339 return -EFAULT;
38340
38341 client = agp_find_client_by_pid(reserve.pid);
38342 @@ -849,7 +849,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38343 if (segment == NULL)
38344 return -ENOMEM;
38345
38346 - if (copy_from_user(segment, (void __user *) reserve.seg_list,
38347 + if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38348 sizeof(struct agp_segment) * reserve.seg_count)) {
38349 kfree(segment);
38350 return -EFAULT;
38351 diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38352 index 4f94375..413694e 100644
38353 --- a/drivers/char/genrtc.c
38354 +++ b/drivers/char/genrtc.c
38355 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38356 switch (cmd) {
38357
38358 case RTC_PLL_GET:
38359 + memset(&pll, 0, sizeof(pll));
38360 if (get_rtc_pll(&pll))
38361 return -EINVAL;
38362 else
38363 diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38364 index d5d4cd8..22d561d 100644
38365 --- a/drivers/char/hpet.c
38366 +++ b/drivers/char/hpet.c
38367 @@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38368 }
38369
38370 static int
38371 -hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38372 +hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38373 struct hpet_info *info)
38374 {
38375 struct hpet_timer __iomem *timer;
38376 diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
38377 index 86fe45c..c0ea948 100644
38378 --- a/drivers/char/hw_random/intel-rng.c
38379 +++ b/drivers/char/hw_random/intel-rng.c
38380 @@ -314,7 +314,7 @@ PFX "RNG, try using the 'no_fwh_detect' option.\n";
38381
38382 if (no_fwh_detect)
38383 return -ENODEV;
38384 - printk(warning);
38385 + printk("%s", warning);
38386 return -EBUSY;
38387 }
38388
38389 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38390 index e6db938..835e3a2 100644
38391 --- a/drivers/char/ipmi/ipmi_msghandler.c
38392 +++ b/drivers/char/ipmi/ipmi_msghandler.c
38393 @@ -438,7 +438,7 @@ struct ipmi_smi {
38394 struct proc_dir_entry *proc_dir;
38395 char proc_dir_name[10];
38396
38397 - atomic_t stats[IPMI_NUM_STATS];
38398 + atomic_unchecked_t stats[IPMI_NUM_STATS];
38399
38400 /*
38401 * run_to_completion duplicate of smb_info, smi_info
38402 @@ -470,9 +470,9 @@ static LIST_HEAD(smi_watchers);
38403 static DEFINE_MUTEX(smi_watchers_mutex);
38404
38405 #define ipmi_inc_stat(intf, stat) \
38406 - atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38407 + atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38408 #define ipmi_get_stat(intf, stat) \
38409 - ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38410 + ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38411
38412 static int is_lan_addr(struct ipmi_addr *addr)
38413 {
38414 @@ -2926,7 +2926,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38415 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38416 init_waitqueue_head(&intf->waitq);
38417 for (i = 0; i < IPMI_NUM_STATS; i++)
38418 - atomic_set(&intf->stats[i], 0);
38419 + atomic_set_unchecked(&intf->stats[i], 0);
38420
38421 intf->proc_dir = NULL;
38422
38423 diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38424 index 1c4bb4f..719e873 100644
38425 --- a/drivers/char/ipmi/ipmi_si_intf.c
38426 +++ b/drivers/char/ipmi/ipmi_si_intf.c
38427 @@ -285,7 +285,7 @@ struct smi_info {
38428 unsigned char slave_addr;
38429
38430 /* Counters and things for the proc filesystem. */
38431 - atomic_t stats[SI_NUM_STATS];
38432 + atomic_unchecked_t stats[SI_NUM_STATS];
38433
38434 struct task_struct *thread;
38435
38436 @@ -294,9 +294,9 @@ struct smi_info {
38437 };
38438
38439 #define smi_inc_stat(smi, stat) \
38440 - atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38441 + atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38442 #define smi_get_stat(smi, stat) \
38443 - ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38444 + ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38445
38446 #define SI_MAX_PARMS 4
38447
38448 @@ -3374,7 +3374,7 @@ static int try_smi_init(struct smi_info *new_smi)
38449 atomic_set(&new_smi->req_events, 0);
38450 new_smi->run_to_completion = false;
38451 for (i = 0; i < SI_NUM_STATS; i++)
38452 - atomic_set(&new_smi->stats[i], 0);
38453 + atomic_set_unchecked(&new_smi->stats[i], 0);
38454
38455 new_smi->interrupt_disabled = true;
38456 atomic_set(&new_smi->stop_operation, 0);
38457 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38458 index 917403f..dddd899 100644
38459 --- a/drivers/char/mem.c
38460 +++ b/drivers/char/mem.c
38461 @@ -18,6 +18,7 @@
38462 #include <linux/raw.h>
38463 #include <linux/tty.h>
38464 #include <linux/capability.h>
38465 +#include <linux/security.h>
38466 #include <linux/ptrace.h>
38467 #include <linux/device.h>
38468 #include <linux/highmem.h>
38469 @@ -36,6 +37,10 @@
38470
38471 #define DEVPORT_MINOR 4
38472
38473 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38474 +extern const struct file_operations grsec_fops;
38475 +#endif
38476 +
38477 static inline unsigned long size_inside_page(unsigned long start,
38478 unsigned long size)
38479 {
38480 @@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38481
38482 while (cursor < to) {
38483 if (!devmem_is_allowed(pfn)) {
38484 +#ifdef CONFIG_GRKERNSEC_KMEM
38485 + gr_handle_mem_readwrite(from, to);
38486 +#else
38487 printk(KERN_INFO
38488 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38489 current->comm, from, to);
38490 +#endif
38491 return 0;
38492 }
38493 cursor += PAGE_SIZE;
38494 @@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38495 }
38496 return 1;
38497 }
38498 +#elif defined(CONFIG_GRKERNSEC_KMEM)
38499 +static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38500 +{
38501 + return 0;
38502 +}
38503 #else
38504 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38505 {
38506 @@ -122,6 +136,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38507
38508 while (count > 0) {
38509 unsigned long remaining;
38510 + char *temp;
38511
38512 sz = size_inside_page(p, count);
38513
38514 @@ -137,7 +152,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38515 if (!ptr)
38516 return -EFAULT;
38517
38518 - remaining = copy_to_user(buf, ptr, sz);
38519 +#ifdef CONFIG_PAX_USERCOPY
38520 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38521 + if (!temp) {
38522 + unxlate_dev_mem_ptr(p, ptr);
38523 + return -ENOMEM;
38524 + }
38525 + memcpy(temp, ptr, sz);
38526 +#else
38527 + temp = ptr;
38528 +#endif
38529 +
38530 + remaining = copy_to_user(buf, temp, sz);
38531 +
38532 +#ifdef CONFIG_PAX_USERCOPY
38533 + kfree(temp);
38534 +#endif
38535 +
38536 unxlate_dev_mem_ptr(p, ptr);
38537 if (remaining)
38538 return -EFAULT;
38539 @@ -369,9 +400,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38540 size_t count, loff_t *ppos)
38541 {
38542 unsigned long p = *ppos;
38543 - ssize_t low_count, read, sz;
38544 + ssize_t low_count, read, sz, err = 0;
38545 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
38546 - int err = 0;
38547
38548 read = 0;
38549 if (p < (unsigned long) high_memory) {
38550 @@ -393,6 +423,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38551 }
38552 #endif
38553 while (low_count > 0) {
38554 + char *temp;
38555 +
38556 sz = size_inside_page(p, low_count);
38557
38558 /*
38559 @@ -402,7 +434,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38560 */
38561 kbuf = xlate_dev_kmem_ptr((char *)p);
38562
38563 - if (copy_to_user(buf, kbuf, sz))
38564 +#ifdef CONFIG_PAX_USERCOPY
38565 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38566 + if (!temp)
38567 + return -ENOMEM;
38568 + memcpy(temp, kbuf, sz);
38569 +#else
38570 + temp = kbuf;
38571 +#endif
38572 +
38573 + err = copy_to_user(buf, temp, sz);
38574 +
38575 +#ifdef CONFIG_PAX_USERCOPY
38576 + kfree(temp);
38577 +#endif
38578 +
38579 + if (err)
38580 return -EFAULT;
38581 buf += sz;
38582 p += sz;
38583 @@ -827,6 +874,9 @@ static const struct memdev {
38584 #ifdef CONFIG_PRINTK
38585 [11] = { "kmsg", 0644, &kmsg_fops, NULL },
38586 #endif
38587 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38588 + [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
38589 +#endif
38590 };
38591
38592 static int memory_open(struct inode *inode, struct file *filp)
38593 @@ -898,7 +948,7 @@ static int __init chr_dev_init(void)
38594 continue;
38595
38596 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
38597 - NULL, devlist[minor].name);
38598 + NULL, "%s", devlist[minor].name);
38599 }
38600
38601 return tty_init();
38602 diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
38603 index 9df78e2..01ba9ae 100644
38604 --- a/drivers/char/nvram.c
38605 +++ b/drivers/char/nvram.c
38606 @@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
38607
38608 spin_unlock_irq(&rtc_lock);
38609
38610 - if (copy_to_user(buf, contents, tmp - contents))
38611 + if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
38612 return -EFAULT;
38613
38614 *ppos = i;
38615 diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
38616 index 8320abd..ec48108 100644
38617 --- a/drivers/char/pcmcia/synclink_cs.c
38618 +++ b/drivers/char/pcmcia/synclink_cs.c
38619 @@ -2345,9 +2345,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38620
38621 if (debug_level >= DEBUG_LEVEL_INFO)
38622 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
38623 - __FILE__, __LINE__, info->device_name, port->count);
38624 + __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
38625
38626 - WARN_ON(!port->count);
38627 + WARN_ON(!atomic_read(&port->count));
38628
38629 if (tty_port_close_start(port, tty, filp) == 0)
38630 goto cleanup;
38631 @@ -2365,7 +2365,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38632 cleanup:
38633 if (debug_level >= DEBUG_LEVEL_INFO)
38634 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
38635 - tty->driver->name, port->count);
38636 + tty->driver->name, atomic_read(&port->count));
38637 }
38638
38639 /* Wait until the transmitter is empty.
38640 @@ -2507,7 +2507,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38641
38642 if (debug_level >= DEBUG_LEVEL_INFO)
38643 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
38644 - __FILE__, __LINE__, tty->driver->name, port->count);
38645 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
38646
38647 /* If port is closing, signal caller to try again */
38648 if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING){
38649 @@ -2527,11 +2527,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38650 goto cleanup;
38651 }
38652 spin_lock(&port->lock);
38653 - port->count++;
38654 + atomic_inc(&port->count);
38655 spin_unlock(&port->lock);
38656 spin_unlock_irqrestore(&info->netlock, flags);
38657
38658 - if (port->count == 1) {
38659 + if (atomic_read(&port->count) == 1) {
38660 /* 1st open on this device, init hardware */
38661 retval = startup(info, tty);
38662 if (retval < 0)
38663 @@ -3920,7 +3920,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38664 unsigned short new_crctype;
38665
38666 /* return error if TTY interface open */
38667 - if (info->port.count)
38668 + if (atomic_read(&info->port.count))
38669 return -EBUSY;
38670
38671 switch (encoding)
38672 @@ -4024,7 +4024,7 @@ static int hdlcdev_open(struct net_device *dev)
38673
38674 /* arbitrate between network and tty opens */
38675 spin_lock_irqsave(&info->netlock, flags);
38676 - if (info->port.count != 0 || info->netcount != 0) {
38677 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38678 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
38679 spin_unlock_irqrestore(&info->netlock, flags);
38680 return -EBUSY;
38681 @@ -4114,7 +4114,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38682 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
38683
38684 /* return error if TTY interface open */
38685 - if (info->port.count)
38686 + if (atomic_read(&info->port.count))
38687 return -EBUSY;
38688
38689 if (cmd != SIOCWANDEV)
38690 diff --git a/drivers/char/random.c b/drivers/char/random.c
38691 index 2b6e4cd..43d7ae1 100644
38692 --- a/drivers/char/random.c
38693 +++ b/drivers/char/random.c
38694 @@ -270,10 +270,17 @@
38695 /*
38696 * Configuration information
38697 */
38698 +#ifdef CONFIG_GRKERNSEC_RANDNET
38699 +#define INPUT_POOL_SHIFT 14
38700 +#define INPUT_POOL_WORDS (1 << (INPUT_POOL_SHIFT-5))
38701 +#define OUTPUT_POOL_SHIFT 12
38702 +#define OUTPUT_POOL_WORDS (1 << (OUTPUT_POOL_SHIFT-5))
38703 +#else
38704 #define INPUT_POOL_SHIFT 12
38705 #define INPUT_POOL_WORDS (1 << (INPUT_POOL_SHIFT-5))
38706 #define OUTPUT_POOL_SHIFT 10
38707 #define OUTPUT_POOL_WORDS (1 << (OUTPUT_POOL_SHIFT-5))
38708 +#endif
38709 #define SEC_XFER_SIZE 512
38710 #define EXTRACT_SIZE 10
38711
38712 @@ -284,9 +291,6 @@
38713 /*
38714 * To allow fractional bits to be tracked, the entropy_count field is
38715 * denominated in units of 1/8th bits.
38716 - *
38717 - * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
38718 - * credit_entropy_bits() needs to be 64 bits wide.
38719 */
38720 #define ENTROPY_SHIFT 3
38721 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
38722 @@ -361,12 +365,19 @@ static struct poolinfo {
38723 #define S(x) ilog2(x)+5, (x), (x)*4, (x)*32, (x) << (ENTROPY_SHIFT+5)
38724 int tap1, tap2, tap3, tap4, tap5;
38725 } poolinfo_table[] = {
38726 +#ifdef CONFIG_GRKERNSEC_RANDNET
38727 + /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
38728 + { S(512), 411, 308, 208, 104, 1 },
38729 + /* x^128 + x^104 + x^76 + x^51 + x^25 + x + 1 -- 105 */
38730 + { S(128), 104, 76, 51, 25, 1 },
38731 +#else
38732 /* was: x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 */
38733 /* x^128 + x^104 + x^76 + x^51 +x^25 + x + 1 */
38734 { S(128), 104, 76, 51, 25, 1 },
38735 /* was: x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 */
38736 /* x^32 + x^26 + x^19 + x^14 + x^7 + x + 1 */
38737 { S(32), 26, 19, 14, 7, 1 },
38738 +#endif
38739 #if 0
38740 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
38741 { S(2048), 1638, 1231, 819, 411, 1 },
38742 @@ -433,9 +444,9 @@ struct entropy_store {
38743 };
38744
38745 static void push_to_pool(struct work_struct *work);
38746 -static __u32 input_pool_data[INPUT_POOL_WORDS];
38747 -static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
38748 -static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
38749 +static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
38750 +static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38751 +static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38752
38753 static struct entropy_store input_pool = {
38754 .poolinfo = &poolinfo_table[0],
38755 @@ -524,8 +535,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
38756 input_rotate = (input_rotate + (i ? 7 : 14)) & 31;
38757 }
38758
38759 - ACCESS_ONCE(r->input_rotate) = input_rotate;
38760 - ACCESS_ONCE(r->add_ptr) = i;
38761 + ACCESS_ONCE_RW(r->input_rotate) = input_rotate;
38762 + ACCESS_ONCE_RW(r->add_ptr) = i;
38763 smp_wmb();
38764
38765 if (out)
38766 @@ -632,7 +643,7 @@ retry:
38767 /* The +2 corresponds to the /4 in the denominator */
38768
38769 do {
38770 - unsigned int anfrac = min(pnfrac, pool_size/2);
38771 + u64 anfrac = min(pnfrac, pool_size/2);
38772 unsigned int add =
38773 ((pool_size - entropy_count)*anfrac*3) >> s;
38774
38775 @@ -1166,7 +1177,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
38776
38777 extract_buf(r, tmp);
38778 i = min_t(int, nbytes, EXTRACT_SIZE);
38779 - if (copy_to_user(buf, tmp, i)) {
38780 + if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
38781 ret = -EFAULT;
38782 break;
38783 }
38784 @@ -1555,7 +1566,7 @@ static char sysctl_bootid[16];
38785 static int proc_do_uuid(struct ctl_table *table, int write,
38786 void __user *buffer, size_t *lenp, loff_t *ppos)
38787 {
38788 - struct ctl_table fake_table;
38789 + ctl_table_no_const fake_table;
38790 unsigned char buf[64], tmp_uuid[16], *uuid;
38791
38792 uuid = table->data;
38793 @@ -1585,7 +1596,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
38794 static int proc_do_entropy(ctl_table *table, int write,
38795 void __user *buffer, size_t *lenp, loff_t *ppos)
38796 {
38797 - ctl_table fake_table;
38798 + ctl_table_no_const fake_table;
38799 int entropy_count;
38800
38801 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
38802 diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
38803 index 7cc1fe22..b602d6b 100644
38804 --- a/drivers/char/sonypi.c
38805 +++ b/drivers/char/sonypi.c
38806 @@ -54,6 +54,7 @@
38807
38808 #include <asm/uaccess.h>
38809 #include <asm/io.h>
38810 +#include <asm/local.h>
38811
38812 #include <linux/sonypi.h>
38813
38814 @@ -490,7 +491,7 @@ static struct sonypi_device {
38815 spinlock_t fifo_lock;
38816 wait_queue_head_t fifo_proc_list;
38817 struct fasync_struct *fifo_async;
38818 - int open_count;
38819 + local_t open_count;
38820 int model;
38821 struct input_dev *input_jog_dev;
38822 struct input_dev *input_key_dev;
38823 @@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
38824 static int sonypi_misc_release(struct inode *inode, struct file *file)
38825 {
38826 mutex_lock(&sonypi_device.lock);
38827 - sonypi_device.open_count--;
38828 + local_dec(&sonypi_device.open_count);
38829 mutex_unlock(&sonypi_device.lock);
38830 return 0;
38831 }
38832 @@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
38833 {
38834 mutex_lock(&sonypi_device.lock);
38835 /* Flush input queue on first open */
38836 - if (!sonypi_device.open_count)
38837 + if (!local_read(&sonypi_device.open_count))
38838 kfifo_reset(&sonypi_device.fifo);
38839 - sonypi_device.open_count++;
38840 + local_inc(&sonypi_device.open_count);
38841 mutex_unlock(&sonypi_device.lock);
38842
38843 return 0;
38844 diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
38845 index b9a57fa..5bb9e38 100644
38846 --- a/drivers/char/tpm/tpm_acpi.c
38847 +++ b/drivers/char/tpm/tpm_acpi.c
38848 @@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
38849 virt = acpi_os_map_memory(start, len);
38850 if (!virt) {
38851 kfree(log->bios_event_log);
38852 + log->bios_event_log = NULL;
38853 printk("%s: ERROR - Unable to map memory\n", __func__);
38854 return -EIO;
38855 }
38856
38857 - memcpy_fromio(log->bios_event_log, virt, len);
38858 + memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
38859
38860 acpi_os_unmap_memory(virt, len);
38861 return 0;
38862 diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
38863 index 59f7cb2..bac8b6d 100644
38864 --- a/drivers/char/tpm/tpm_eventlog.c
38865 +++ b/drivers/char/tpm/tpm_eventlog.c
38866 @@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
38867 event = addr;
38868
38869 if ((event->event_type == 0 && event->event_size == 0) ||
38870 - ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
38871 + (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
38872 return NULL;
38873
38874 return addr;
38875 @@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
38876 return NULL;
38877
38878 if ((event->event_type == 0 && event->event_size == 0) ||
38879 - ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
38880 + (event->event_size >= limit - v - sizeof(struct tcpa_event)))
38881 return NULL;
38882
38883 (*pos)++;
38884 @@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
38885 int i;
38886
38887 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
38888 - seq_putc(m, data[i]);
38889 + if (!seq_putc(m, data[i]))
38890 + return -EFAULT;
38891
38892 return 0;
38893 }
38894 diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
38895 index 60aafb8..10c08e0 100644
38896 --- a/drivers/char/virtio_console.c
38897 +++ b/drivers/char/virtio_console.c
38898 @@ -684,7 +684,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
38899 if (to_user) {
38900 ssize_t ret;
38901
38902 - ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
38903 + ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
38904 if (ret)
38905 return -EFAULT;
38906 } else {
38907 @@ -787,7 +787,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
38908 if (!port_has_data(port) && !port->host_connected)
38909 return 0;
38910
38911 - return fill_readbuf(port, ubuf, count, true);
38912 + return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
38913 }
38914
38915 static int wait_port_writable(struct port *port, bool nonblock)
38916 diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
38917 index 57a078e..c17cde8 100644
38918 --- a/drivers/clk/clk-composite.c
38919 +++ b/drivers/clk/clk-composite.c
38920 @@ -146,7 +146,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
38921 struct clk *clk;
38922 struct clk_init_data init;
38923 struct clk_composite *composite;
38924 - struct clk_ops *clk_composite_ops;
38925 + clk_ops_no_const *clk_composite_ops;
38926
38927 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
38928 if (!composite) {
38929 diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
38930 index 501d513..fb0ecf9 100644
38931 --- a/drivers/clk/socfpga/clk-gate.c
38932 +++ b/drivers/clk/socfpga/clk-gate.c
38933 @@ -22,6 +22,7 @@
38934 #include <linux/mfd/syscon.h>
38935 #include <linux/of.h>
38936 #include <linux/regmap.h>
38937 +#include <asm/pgtable.h>
38938
38939 #include "clk.h"
38940
38941 @@ -175,7 +176,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
38942 return 0;
38943 }
38944
38945 -static struct clk_ops gateclk_ops = {
38946 +static clk_ops_no_const gateclk_ops __read_only = {
38947 .prepare = socfpga_clk_prepare,
38948 .recalc_rate = socfpga_clk_recalc_rate,
38949 .get_parent = socfpga_clk_get_parent,
38950 @@ -209,8 +210,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
38951 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
38952 socfpga_clk->hw.bit_idx = clk_gate[1];
38953
38954 - gateclk_ops.enable = clk_gate_ops.enable;
38955 - gateclk_ops.disable = clk_gate_ops.disable;
38956 + pax_open_kernel();
38957 + *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
38958 + *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
38959 + pax_close_kernel();
38960 }
38961
38962 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
38963 diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
38964 index de6da95..a2e72c0 100644
38965 --- a/drivers/clk/socfpga/clk-pll.c
38966 +++ b/drivers/clk/socfpga/clk-pll.c
38967 @@ -21,6 +21,7 @@
38968 #include <linux/io.h>
38969 #include <linux/of.h>
38970 #include <linux/of_address.h>
38971 +#include <asm/pgtable.h>
38972
38973 #include "clk.h"
38974
38975 @@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
38976 CLK_MGR_PLL_CLK_SRC_MASK;
38977 }
38978
38979 -static struct clk_ops clk_pll_ops = {
38980 +static struct clk_ops_no_const clk_pll_ops __read_only = {
38981 .recalc_rate = clk_pll_recalc_rate,
38982 .get_parent = clk_pll_get_parent,
38983 };
38984 @@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
38985 pll_clk->hw.hw.init = &init;
38986
38987 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
38988 - clk_pll_ops.enable = clk_gate_ops.enable;
38989 - clk_pll_ops.disable = clk_gate_ops.disable;
38990 + pax_open_kernel();
38991 + *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
38992 + *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
38993 + pax_close_kernel();
38994
38995 clk = clk_register(NULL, &pll_clk->hw.hw);
38996 if (WARN_ON(IS_ERR(clk))) {
38997 diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
38998 index 000e4e0..4770351 100644
38999 --- a/drivers/cpufreq/acpi-cpufreq.c
39000 +++ b/drivers/cpufreq/acpi-cpufreq.c
39001 @@ -676,8 +676,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39002 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39003 per_cpu(acfreq_data, cpu) = data;
39004
39005 - if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39006 - acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39007 + if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39008 + pax_open_kernel();
39009 + *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39010 + pax_close_kernel();
39011 + }
39012
39013 result = acpi_processor_register_performance(data->acpi_data, cpu);
39014 if (result)
39015 @@ -810,7 +813,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39016 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39017 break;
39018 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39019 - acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39020 + pax_open_kernel();
39021 + *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39022 + pax_close_kernel();
39023 break;
39024 default:
39025 break;
39026 @@ -904,8 +909,10 @@ static void __init acpi_cpufreq_boost_init(void)
39027 if (!msrs)
39028 return;
39029
39030 - acpi_cpufreq_driver.boost_supported = true;
39031 - acpi_cpufreq_driver.boost_enabled = boost_state(0);
39032 + pax_open_kernel();
39033 + *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39034 + *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39035 + pax_close_kernel();
39036
39037 cpu_notifier_register_begin();
39038
39039 diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39040 index 558224c..55e3b57 100644
39041 --- a/drivers/cpufreq/cpufreq.c
39042 +++ b/drivers/cpufreq/cpufreq.c
39043 @@ -2022,7 +2022,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39044 }
39045
39046 mutex_lock(&cpufreq_governor_mutex);
39047 - list_del(&governor->governor_list);
39048 + pax_list_del(&governor->governor_list);
39049 mutex_unlock(&cpufreq_governor_mutex);
39050 return;
39051 }
39052 @@ -2238,7 +2238,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39053 return NOTIFY_OK;
39054 }
39055
39056 -static struct notifier_block __refdata cpufreq_cpu_notifier = {
39057 +static struct notifier_block cpufreq_cpu_notifier = {
39058 .notifier_call = cpufreq_cpu_callback,
39059 };
39060
39061 @@ -2278,13 +2278,17 @@ int cpufreq_boost_trigger_state(int state)
39062 return 0;
39063
39064 write_lock_irqsave(&cpufreq_driver_lock, flags);
39065 - cpufreq_driver->boost_enabled = state;
39066 + pax_open_kernel();
39067 + *(bool *)&cpufreq_driver->boost_enabled = state;
39068 + pax_close_kernel();
39069 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39070
39071 ret = cpufreq_driver->set_boost(state);
39072 if (ret) {
39073 write_lock_irqsave(&cpufreq_driver_lock, flags);
39074 - cpufreq_driver->boost_enabled = !state;
39075 + pax_open_kernel();
39076 + *(bool *)&cpufreq_driver->boost_enabled = !state;
39077 + pax_close_kernel();
39078 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39079
39080 pr_err("%s: Cannot %s BOOST\n",
39081 @@ -2340,8 +2344,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39082
39083 pr_debug("trying to register driver %s\n", driver_data->name);
39084
39085 - if (driver_data->setpolicy)
39086 - driver_data->flags |= CPUFREQ_CONST_LOOPS;
39087 + if (driver_data->setpolicy) {
39088 + pax_open_kernel();
39089 + *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39090 + pax_close_kernel();
39091 + }
39092
39093 write_lock_irqsave(&cpufreq_driver_lock, flags);
39094 if (cpufreq_driver) {
39095 @@ -2356,8 +2363,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39096 * Check if driver provides function to enable boost -
39097 * if not, use cpufreq_boost_set_sw as default
39098 */
39099 - if (!cpufreq_driver->set_boost)
39100 - cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39101 + if (!cpufreq_driver->set_boost) {
39102 + pax_open_kernel();
39103 + *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39104 + pax_close_kernel();
39105 + }
39106
39107 ret = cpufreq_sysfs_create_file(&boost.attr);
39108 if (ret) {
39109 diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39110 index e1c6433..31203ae 100644
39111 --- a/drivers/cpufreq/cpufreq_governor.c
39112 +++ b/drivers/cpufreq/cpufreq_governor.c
39113 @@ -191,7 +191,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39114 struct dbs_data *dbs_data;
39115 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39116 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39117 - struct od_ops *od_ops = NULL;
39118 + const struct od_ops *od_ops = NULL;
39119 struct od_dbs_tuners *od_tuners = NULL;
39120 struct cs_dbs_tuners *cs_tuners = NULL;
39121 struct cpu_dbs_common_info *cpu_cdbs;
39122 @@ -257,7 +257,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39123
39124 if ((cdata->governor == GOV_CONSERVATIVE) &&
39125 (!policy->governor->initialized)) {
39126 - struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39127 + const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39128
39129 cpufreq_register_notifier(cs_ops->notifier_block,
39130 CPUFREQ_TRANSITION_NOTIFIER);
39131 @@ -277,7 +277,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39132
39133 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39134 (policy->governor->initialized == 1)) {
39135 - struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39136 + const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39137
39138 cpufreq_unregister_notifier(cs_ops->notifier_block,
39139 CPUFREQ_TRANSITION_NOTIFIER);
39140 diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39141 index bfb9ae1..e1d3a7e 100644
39142 --- a/drivers/cpufreq/cpufreq_governor.h
39143 +++ b/drivers/cpufreq/cpufreq_governor.h
39144 @@ -205,7 +205,7 @@ struct common_dbs_data {
39145 void (*exit)(struct dbs_data *dbs_data);
39146
39147 /* Governor specific ops, see below */
39148 - void *gov_ops;
39149 + const void *gov_ops;
39150 };
39151
39152 /* Governor Per policy data */
39153 @@ -225,7 +225,7 @@ struct od_ops {
39154 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39155 unsigned int freq_next, unsigned int relation);
39156 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39157 -};
39158 +} __no_const;
39159
39160 struct cs_ops {
39161 struct notifier_block *notifier_block;
39162 diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39163 index 18d4091..434be15 100644
39164 --- a/drivers/cpufreq/cpufreq_ondemand.c
39165 +++ b/drivers/cpufreq/cpufreq_ondemand.c
39166 @@ -521,7 +521,7 @@ static void od_exit(struct dbs_data *dbs_data)
39167
39168 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39169
39170 -static struct od_ops od_ops = {
39171 +static struct od_ops od_ops __read_only = {
39172 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39173 .powersave_bias_target = generic_powersave_bias_target,
39174 .freq_increase = dbs_freq_increase,
39175 @@ -576,14 +576,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39176 (struct cpufreq_policy *, unsigned int, unsigned int),
39177 unsigned int powersave_bias)
39178 {
39179 - od_ops.powersave_bias_target = f;
39180 + pax_open_kernel();
39181 + *(void **)&od_ops.powersave_bias_target = f;
39182 + pax_close_kernel();
39183 od_set_powersave_bias(powersave_bias);
39184 }
39185 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39186
39187 void od_unregister_powersave_bias_handler(void)
39188 {
39189 - od_ops.powersave_bias_target = generic_powersave_bias_target;
39190 + pax_open_kernel();
39191 + *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39192 + pax_close_kernel();
39193 od_set_powersave_bias(0);
39194 }
39195 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39196 diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39197 index fcd0c92..7b736c2 100644
39198 --- a/drivers/cpufreq/intel_pstate.c
39199 +++ b/drivers/cpufreq/intel_pstate.c
39200 @@ -125,10 +125,10 @@ struct pstate_funcs {
39201 struct cpu_defaults {
39202 struct pstate_adjust_policy pid_policy;
39203 struct pstate_funcs funcs;
39204 -};
39205 +} __do_const;
39206
39207 static struct pstate_adjust_policy pid_params;
39208 -static struct pstate_funcs pstate_funcs;
39209 +static struct pstate_funcs *pstate_funcs;
39210
39211 struct perf_limits {
39212 int no_turbo;
39213 @@ -526,7 +526,7 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39214
39215 cpu->pstate.current_pstate = pstate;
39216
39217 - pstate_funcs.set(cpu, pstate);
39218 + pstate_funcs->set(cpu, pstate);
39219 }
39220
39221 static inline void intel_pstate_pstate_increase(struct cpudata *cpu, int steps)
39222 @@ -548,12 +548,12 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39223 {
39224 sprintf(cpu->name, "Intel 2nd generation core");
39225
39226 - cpu->pstate.min_pstate = pstate_funcs.get_min();
39227 - cpu->pstate.max_pstate = pstate_funcs.get_max();
39228 - cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39229 + cpu->pstate.min_pstate = pstate_funcs->get_min();
39230 + cpu->pstate.max_pstate = pstate_funcs->get_max();
39231 + cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39232
39233 - if (pstate_funcs.get_vid)
39234 - pstate_funcs.get_vid(cpu);
39235 + if (pstate_funcs->get_vid)
39236 + pstate_funcs->get_vid(cpu);
39237 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39238 }
39239
39240 @@ -838,9 +838,9 @@ static int intel_pstate_msrs_not_valid(void)
39241 rdmsrl(MSR_IA32_APERF, aperf);
39242 rdmsrl(MSR_IA32_MPERF, mperf);
39243
39244 - if (!pstate_funcs.get_max() ||
39245 - !pstate_funcs.get_min() ||
39246 - !pstate_funcs.get_turbo())
39247 + if (!pstate_funcs->get_max() ||
39248 + !pstate_funcs->get_min() ||
39249 + !pstate_funcs->get_turbo())
39250 return -ENODEV;
39251
39252 rdmsrl(MSR_IA32_APERF, tmp);
39253 @@ -854,7 +854,7 @@ static int intel_pstate_msrs_not_valid(void)
39254 return 0;
39255 }
39256
39257 -static void copy_pid_params(struct pstate_adjust_policy *policy)
39258 +static void copy_pid_params(const struct pstate_adjust_policy *policy)
39259 {
39260 pid_params.sample_rate_ms = policy->sample_rate_ms;
39261 pid_params.p_gain_pct = policy->p_gain_pct;
39262 @@ -866,11 +866,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39263
39264 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39265 {
39266 - pstate_funcs.get_max = funcs->get_max;
39267 - pstate_funcs.get_min = funcs->get_min;
39268 - pstate_funcs.get_turbo = funcs->get_turbo;
39269 - pstate_funcs.set = funcs->set;
39270 - pstate_funcs.get_vid = funcs->get_vid;
39271 + pstate_funcs = funcs;
39272 }
39273
39274 #if IS_ENABLED(CONFIG_ACPI)
39275 diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39276 index 529cfd9..0e28fff 100644
39277 --- a/drivers/cpufreq/p4-clockmod.c
39278 +++ b/drivers/cpufreq/p4-clockmod.c
39279 @@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39280 case 0x0F: /* Core Duo */
39281 case 0x16: /* Celeron Core */
39282 case 0x1C: /* Atom */
39283 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39284 + pax_open_kernel();
39285 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39286 + pax_close_kernel();
39287 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39288 case 0x0D: /* Pentium M (Dothan) */
39289 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39290 + pax_open_kernel();
39291 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39292 + pax_close_kernel();
39293 /* fall through */
39294 case 0x09: /* Pentium M (Banias) */
39295 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39296 @@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39297
39298 /* on P-4s, the TSC runs with constant frequency independent whether
39299 * throttling is active or not. */
39300 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39301 + pax_open_kernel();
39302 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39303 + pax_close_kernel();
39304
39305 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39306 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39307 diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39308 index 9bb42ba..b01b4a2 100644
39309 --- a/drivers/cpufreq/sparc-us3-cpufreq.c
39310 +++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39311 @@ -18,14 +18,12 @@
39312 #include <asm/head.h>
39313 #include <asm/timer.h>
39314
39315 -static struct cpufreq_driver *cpufreq_us3_driver;
39316 -
39317 struct us3_freq_percpu_info {
39318 struct cpufreq_frequency_table table[4];
39319 };
39320
39321 /* Indexed by cpu number. */
39322 -static struct us3_freq_percpu_info *us3_freq_table;
39323 +static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39324
39325 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39326 * in the Safari config register.
39327 @@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39328
39329 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39330 {
39331 - if (cpufreq_us3_driver)
39332 - us3_freq_target(policy, 0);
39333 + us3_freq_target(policy, 0);
39334
39335 return 0;
39336 }
39337
39338 +static int __init us3_freq_init(void);
39339 +static void __exit us3_freq_exit(void);
39340 +
39341 +static struct cpufreq_driver cpufreq_us3_driver = {
39342 + .init = us3_freq_cpu_init,
39343 + .verify = cpufreq_generic_frequency_table_verify,
39344 + .target_index = us3_freq_target,
39345 + .get = us3_freq_get,
39346 + .exit = us3_freq_cpu_exit,
39347 + .name = "UltraSPARC-III",
39348 +
39349 +};
39350 +
39351 static int __init us3_freq_init(void)
39352 {
39353 unsigned long manuf, impl, ver;
39354 - int ret;
39355
39356 if (tlb_type != cheetah && tlb_type != cheetah_plus)
39357 return -ENODEV;
39358 @@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
39359 (impl == CHEETAH_IMPL ||
39360 impl == CHEETAH_PLUS_IMPL ||
39361 impl == JAGUAR_IMPL ||
39362 - impl == PANTHER_IMPL)) {
39363 - struct cpufreq_driver *driver;
39364 -
39365 - ret = -ENOMEM;
39366 - driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39367 - if (!driver)
39368 - goto err_out;
39369 -
39370 - us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39371 - GFP_KERNEL);
39372 - if (!us3_freq_table)
39373 - goto err_out;
39374 -
39375 - driver->init = us3_freq_cpu_init;
39376 - driver->verify = cpufreq_generic_frequency_table_verify;
39377 - driver->target_index = us3_freq_target;
39378 - driver->get = us3_freq_get;
39379 - driver->exit = us3_freq_cpu_exit;
39380 - strcpy(driver->name, "UltraSPARC-III");
39381 -
39382 - cpufreq_us3_driver = driver;
39383 - ret = cpufreq_register_driver(driver);
39384 - if (ret)
39385 - goto err_out;
39386 -
39387 - return 0;
39388 -
39389 -err_out:
39390 - if (driver) {
39391 - kfree(driver);
39392 - cpufreq_us3_driver = NULL;
39393 - }
39394 - kfree(us3_freq_table);
39395 - us3_freq_table = NULL;
39396 - return ret;
39397 - }
39398 + impl == PANTHER_IMPL))
39399 + return cpufreq_register_driver(&cpufreq_us3_driver);
39400
39401 return -ENODEV;
39402 }
39403
39404 static void __exit us3_freq_exit(void)
39405 {
39406 - if (cpufreq_us3_driver) {
39407 - cpufreq_unregister_driver(cpufreq_us3_driver);
39408 - kfree(cpufreq_us3_driver);
39409 - cpufreq_us3_driver = NULL;
39410 - kfree(us3_freq_table);
39411 - us3_freq_table = NULL;
39412 - }
39413 + cpufreq_unregister_driver(&cpufreq_us3_driver);
39414 }
39415
39416 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39417 diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39418 index 6723f03..3465190 100644
39419 --- a/drivers/cpufreq/speedstep-centrino.c
39420 +++ b/drivers/cpufreq/speedstep-centrino.c
39421 @@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39422 !cpu_has(cpu, X86_FEATURE_EST))
39423 return -ENODEV;
39424
39425 - if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39426 - centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39427 + if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39428 + pax_open_kernel();
39429 + *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39430 + pax_close_kernel();
39431 + }
39432
39433 if (policy->cpu != 0)
39434 return -ENODEV;
39435 diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39436 index 136d6a2..06e373d 100644
39437 --- a/drivers/cpuidle/driver.c
39438 +++ b/drivers/cpuidle/driver.c
39439 @@ -202,7 +202,7 @@ static int poll_idle(struct cpuidle_device *dev,
39440
39441 static void poll_idle_init(struct cpuidle_driver *drv)
39442 {
39443 - struct cpuidle_state *state = &drv->states[0];
39444 + cpuidle_state_no_const *state = &drv->states[0];
39445
39446 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39447 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39448 diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39449 index ca89412..a7b9c49 100644
39450 --- a/drivers/cpuidle/governor.c
39451 +++ b/drivers/cpuidle/governor.c
39452 @@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39453 mutex_lock(&cpuidle_lock);
39454 if (__cpuidle_find_governor(gov->name) == NULL) {
39455 ret = 0;
39456 - list_add_tail(&gov->governor_list, &cpuidle_governors);
39457 + pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39458 if (!cpuidle_curr_governor ||
39459 cpuidle_curr_governor->rating < gov->rating)
39460 cpuidle_switch_governor(gov);
39461 diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39462 index efe2f17..b8124f9 100644
39463 --- a/drivers/cpuidle/sysfs.c
39464 +++ b/drivers/cpuidle/sysfs.c
39465 @@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39466 NULL
39467 };
39468
39469 -static struct attribute_group cpuidle_attr_group = {
39470 +static attribute_group_no_const cpuidle_attr_group = {
39471 .attrs = cpuidle_default_attrs,
39472 .name = "cpuidle",
39473 };
39474 diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39475 index 12fea3e..1e28f47 100644
39476 --- a/drivers/crypto/hifn_795x.c
39477 +++ b/drivers/crypto/hifn_795x.c
39478 @@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39479 MODULE_PARM_DESC(hifn_pll_ref,
39480 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39481
39482 -static atomic_t hifn_dev_number;
39483 +static atomic_unchecked_t hifn_dev_number;
39484
39485 #define ACRYPTO_OP_DECRYPT 0
39486 #define ACRYPTO_OP_ENCRYPT 1
39487 @@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
39488 goto err_out_disable_pci_device;
39489
39490 snprintf(name, sizeof(name), "hifn%d",
39491 - atomic_inc_return(&hifn_dev_number)-1);
39492 + atomic_inc_return_unchecked(&hifn_dev_number)-1);
39493
39494 err = pci_request_regions(pdev, name);
39495 if (err)
39496 diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
39497 index 2042ec3..a9ce67f 100644
39498 --- a/drivers/devfreq/devfreq.c
39499 +++ b/drivers/devfreq/devfreq.c
39500 @@ -616,7 +616,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
39501 goto err_out;
39502 }
39503
39504 - list_add(&governor->node, &devfreq_governor_list);
39505 + pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
39506
39507 list_for_each_entry(devfreq, &devfreq_list, node) {
39508 int ret = 0;
39509 @@ -704,7 +704,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
39510 }
39511 }
39512
39513 - list_del(&governor->node);
39514 + pax_list_del((struct list_head *)&governor->node);
39515 err_out:
39516 mutex_unlock(&devfreq_list_lock);
39517
39518 diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
39519 index 5239677..1cb71a8 100644
39520 --- a/drivers/dma/sh/shdma-base.c
39521 +++ b/drivers/dma/sh/shdma-base.c
39522 @@ -267,8 +267,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
39523 schan->slave_id = -EINVAL;
39524 }
39525
39526 - schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
39527 - sdev->desc_size, GFP_KERNEL);
39528 + schan->desc = kcalloc(sdev->desc_size,
39529 + NR_DESCS_PER_CHANNEL, GFP_KERNEL);
39530 if (!schan->desc) {
39531 ret = -ENOMEM;
39532 goto edescalloc;
39533 diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
39534 index dda7e75..0a4c867 100644
39535 --- a/drivers/dma/sh/shdmac.c
39536 +++ b/drivers/dma/sh/shdmac.c
39537 @@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
39538 return ret;
39539 }
39540
39541 -static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
39542 +static struct notifier_block sh_dmae_nmi_notifier = {
39543 .notifier_call = sh_dmae_nmi_handler,
39544
39545 /* Run before NMI debug handler and KGDB */
39546 diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
39547 index 592af5f..bb1d583 100644
39548 --- a/drivers/edac/edac_device.c
39549 +++ b/drivers/edac/edac_device.c
39550 @@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
39551 */
39552 int edac_device_alloc_index(void)
39553 {
39554 - static atomic_t device_indexes = ATOMIC_INIT(0);
39555 + static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
39556
39557 - return atomic_inc_return(&device_indexes) - 1;
39558 + return atomic_inc_return_unchecked(&device_indexes) - 1;
39559 }
39560 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
39561
39562 diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
39563 index 01fae82..1dd8289 100644
39564 --- a/drivers/edac/edac_mc_sysfs.c
39565 +++ b/drivers/edac/edac_mc_sysfs.c
39566 @@ -152,7 +152,7 @@ static const char * const edac_caps[] = {
39567 struct dev_ch_attribute {
39568 struct device_attribute attr;
39569 int channel;
39570 -};
39571 +} __do_const;
39572
39573 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
39574 struct dev_ch_attribute dev_attr_legacy_##_name = \
39575 @@ -1009,14 +1009,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
39576 }
39577
39578 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
39579 + pax_open_kernel();
39580 if (mci->get_sdram_scrub_rate) {
39581 - dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39582 - dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39583 + *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39584 + *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39585 }
39586 if (mci->set_sdram_scrub_rate) {
39587 - dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39588 - dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39589 + *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39590 + *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39591 }
39592 + pax_close_kernel();
39593 err = device_create_file(&mci->dev,
39594 &dev_attr_sdram_scrub_rate);
39595 if (err) {
39596 diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
39597 index 2cf44b4d..6dd2dc7 100644
39598 --- a/drivers/edac/edac_pci.c
39599 +++ b/drivers/edac/edac_pci.c
39600 @@ -29,7 +29,7 @@
39601
39602 static DEFINE_MUTEX(edac_pci_ctls_mutex);
39603 static LIST_HEAD(edac_pci_list);
39604 -static atomic_t pci_indexes = ATOMIC_INIT(0);
39605 +static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
39606
39607 /*
39608 * edac_pci_alloc_ctl_info
39609 @@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
39610 */
39611 int edac_pci_alloc_index(void)
39612 {
39613 - return atomic_inc_return(&pci_indexes) - 1;
39614 + return atomic_inc_return_unchecked(&pci_indexes) - 1;
39615 }
39616 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
39617
39618 diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
39619 index e8658e4..22746d6 100644
39620 --- a/drivers/edac/edac_pci_sysfs.c
39621 +++ b/drivers/edac/edac_pci_sysfs.c
39622 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
39623 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
39624 static int edac_pci_poll_msec = 1000; /* one second workq period */
39625
39626 -static atomic_t pci_parity_count = ATOMIC_INIT(0);
39627 -static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
39628 +static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
39629 +static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
39630
39631 static struct kobject *edac_pci_top_main_kobj;
39632 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
39633 @@ -235,7 +235,7 @@ struct edac_pci_dev_attribute {
39634 void *value;
39635 ssize_t(*show) (void *, char *);
39636 ssize_t(*store) (void *, const char *, size_t);
39637 -};
39638 +} __do_const;
39639
39640 /* Set of show/store abstract level functions for PCI Parity object */
39641 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
39642 @@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39643 edac_printk(KERN_CRIT, EDAC_PCI,
39644 "Signaled System Error on %s\n",
39645 pci_name(dev));
39646 - atomic_inc(&pci_nonparity_count);
39647 + atomic_inc_unchecked(&pci_nonparity_count);
39648 }
39649
39650 if (status & (PCI_STATUS_PARITY)) {
39651 @@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39652 "Master Data Parity Error on %s\n",
39653 pci_name(dev));
39654
39655 - atomic_inc(&pci_parity_count);
39656 + atomic_inc_unchecked(&pci_parity_count);
39657 }
39658
39659 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39660 @@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39661 "Detected Parity Error on %s\n",
39662 pci_name(dev));
39663
39664 - atomic_inc(&pci_parity_count);
39665 + atomic_inc_unchecked(&pci_parity_count);
39666 }
39667 }
39668
39669 @@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39670 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
39671 "Signaled System Error on %s\n",
39672 pci_name(dev));
39673 - atomic_inc(&pci_nonparity_count);
39674 + atomic_inc_unchecked(&pci_nonparity_count);
39675 }
39676
39677 if (status & (PCI_STATUS_PARITY)) {
39678 @@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39679 "Master Data Parity Error on "
39680 "%s\n", pci_name(dev));
39681
39682 - atomic_inc(&pci_parity_count);
39683 + atomic_inc_unchecked(&pci_parity_count);
39684 }
39685
39686 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39687 @@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39688 "Detected Parity Error on %s\n",
39689 pci_name(dev));
39690
39691 - atomic_inc(&pci_parity_count);
39692 + atomic_inc_unchecked(&pci_parity_count);
39693 }
39694 }
39695 }
39696 @@ -672,7 +672,7 @@ void edac_pci_do_parity_check(void)
39697 if (!check_pci_errors)
39698 return;
39699
39700 - before_count = atomic_read(&pci_parity_count);
39701 + before_count = atomic_read_unchecked(&pci_parity_count);
39702
39703 /* scan all PCI devices looking for a Parity Error on devices and
39704 * bridges.
39705 @@ -684,7 +684,7 @@ void edac_pci_do_parity_check(void)
39706 /* Only if operator has selected panic on PCI Error */
39707 if (edac_pci_get_panic_on_pe()) {
39708 /* If the count is different 'after' from 'before' */
39709 - if (before_count != atomic_read(&pci_parity_count))
39710 + if (before_count != atomic_read_unchecked(&pci_parity_count))
39711 panic("EDAC: PCI Parity Error");
39712 }
39713 }
39714 diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
39715 index 51b7e3a..aa8a3e8 100644
39716 --- a/drivers/edac/mce_amd.h
39717 +++ b/drivers/edac/mce_amd.h
39718 @@ -77,7 +77,7 @@ struct amd_decoder_ops {
39719 bool (*mc0_mce)(u16, u8);
39720 bool (*mc1_mce)(u16, u8);
39721 bool (*mc2_mce)(u16, u8);
39722 -};
39723 +} __no_const;
39724
39725 void amd_report_gart_errors(bool);
39726 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
39727 diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
39728 index 57ea7f4..af06b76 100644
39729 --- a/drivers/firewire/core-card.c
39730 +++ b/drivers/firewire/core-card.c
39731 @@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
39732 const struct fw_card_driver *driver,
39733 struct device *device)
39734 {
39735 - static atomic_t index = ATOMIC_INIT(-1);
39736 + static atomic_unchecked_t index = ATOMIC_INIT(-1);
39737
39738 - card->index = atomic_inc_return(&index);
39739 + card->index = atomic_inc_return_unchecked(&index);
39740 card->driver = driver;
39741 card->device = device;
39742 card->current_tlabel = 0;
39743 @@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
39744
39745 void fw_core_remove_card(struct fw_card *card)
39746 {
39747 - struct fw_card_driver dummy_driver = dummy_driver_template;
39748 + fw_card_driver_no_const dummy_driver = dummy_driver_template;
39749
39750 card->driver->update_phy_reg(card, 4,
39751 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
39752 diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
39753 index 2c6d5e1..a2cca6b 100644
39754 --- a/drivers/firewire/core-device.c
39755 +++ b/drivers/firewire/core-device.c
39756 @@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
39757 struct config_rom_attribute {
39758 struct device_attribute attr;
39759 u32 key;
39760 -};
39761 +} __do_const;
39762
39763 static ssize_t show_immediate(struct device *dev,
39764 struct device_attribute *dattr, char *buf)
39765 diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
39766 index eb6935c..3cc2bfa 100644
39767 --- a/drivers/firewire/core-transaction.c
39768 +++ b/drivers/firewire/core-transaction.c
39769 @@ -38,6 +38,7 @@
39770 #include <linux/timer.h>
39771 #include <linux/types.h>
39772 #include <linux/workqueue.h>
39773 +#include <linux/sched.h>
39774
39775 #include <asm/byteorder.h>
39776
39777 diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
39778 index f477308..2795f24 100644
39779 --- a/drivers/firewire/core.h
39780 +++ b/drivers/firewire/core.h
39781 @@ -111,6 +111,7 @@ struct fw_card_driver {
39782
39783 int (*stop_iso)(struct fw_iso_context *ctx);
39784 };
39785 +typedef struct fw_card_driver __no_const fw_card_driver_no_const;
39786
39787 void fw_card_initialize(struct fw_card *card,
39788 const struct fw_card_driver *driver, struct device *device);
39789 diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
39790 index 586f2f7..3545ad2 100644
39791 --- a/drivers/firewire/ohci.c
39792 +++ b/drivers/firewire/ohci.c
39793 @@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
39794 be32_to_cpu(ohci->next_header));
39795 }
39796
39797 +#ifndef CONFIG_GRKERNSEC
39798 if (param_remote_dma) {
39799 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
39800 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
39801 }
39802 +#endif
39803
39804 spin_unlock_irq(&ohci->lock);
39805
39806 @@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
39807 unsigned long flags;
39808 int n, ret = 0;
39809
39810 +#ifndef CONFIG_GRKERNSEC
39811 if (param_remote_dma)
39812 return 0;
39813 +#endif
39814
39815 /*
39816 * FIXME: Make sure this bitmask is cleared when we clear the busReset
39817 diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
39818 index 94a58a0..f5eba42 100644
39819 --- a/drivers/firmware/dmi-id.c
39820 +++ b/drivers/firmware/dmi-id.c
39821 @@ -16,7 +16,7 @@
39822 struct dmi_device_attribute{
39823 struct device_attribute dev_attr;
39824 int field;
39825 -};
39826 +} __do_const;
39827 #define to_dmi_dev_attr(_dev_attr) \
39828 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
39829
39830 diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
39831 index 17afc51..0ef90cd 100644
39832 --- a/drivers/firmware/dmi_scan.c
39833 +++ b/drivers/firmware/dmi_scan.c
39834 @@ -835,7 +835,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
39835 if (buf == NULL)
39836 return -1;
39837
39838 - dmi_table(buf, dmi_len, dmi_num, decode, private_data);
39839 + dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
39840
39841 dmi_unmap(buf);
39842 return 0;
39843 diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
39844 index 1491dd4..aa910db 100644
39845 --- a/drivers/firmware/efi/cper.c
39846 +++ b/drivers/firmware/efi/cper.c
39847 @@ -41,12 +41,12 @@
39848 */
39849 u64 cper_next_record_id(void)
39850 {
39851 - static atomic64_t seq;
39852 + static atomic64_unchecked_t seq;
39853
39854 - if (!atomic64_read(&seq))
39855 - atomic64_set(&seq, ((u64)get_seconds()) << 32);
39856 + if (!atomic64_read_unchecked(&seq))
39857 + atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
39858
39859 - return atomic64_inc_return(&seq);
39860 + return atomic64_inc_return_unchecked(&seq);
39861 }
39862 EXPORT_SYMBOL_GPL(cper_next_record_id);
39863
39864 diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
39865 index af20f17..4e4e545 100644
39866 --- a/drivers/firmware/efi/efi.c
39867 +++ b/drivers/firmware/efi/efi.c
39868 @@ -120,14 +120,16 @@ static struct attribute_group efi_subsys_attr_group = {
39869 };
39870
39871 static struct efivars generic_efivars;
39872 -static struct efivar_operations generic_ops;
39873 +static efivar_operations_no_const generic_ops __read_only;
39874
39875 static int generic_ops_register(void)
39876 {
39877 - generic_ops.get_variable = efi.get_variable;
39878 - generic_ops.set_variable = efi.set_variable;
39879 - generic_ops.get_next_variable = efi.get_next_variable;
39880 - generic_ops.query_variable_store = efi_query_variable_store;
39881 + pax_open_kernel();
39882 + *(void **)&generic_ops.get_variable = efi.get_variable;
39883 + *(void **)&generic_ops.set_variable = efi.set_variable;
39884 + *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
39885 + *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
39886 + pax_close_kernel();
39887
39888 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
39889 }
39890 diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
39891 index 50ea412..caccd6e9 100644
39892 --- a/drivers/firmware/efi/efivars.c
39893 +++ b/drivers/firmware/efi/efivars.c
39894 @@ -456,7 +456,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
39895 static int
39896 create_efivars_bin_attributes(void)
39897 {
39898 - struct bin_attribute *attr;
39899 + bin_attribute_no_const *attr;
39900 int error;
39901
39902 /* new_var */
39903 diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
39904 index 2f569aa..c95f4fb 100644
39905 --- a/drivers/firmware/google/memconsole.c
39906 +++ b/drivers/firmware/google/memconsole.c
39907 @@ -155,7 +155,10 @@ static int __init memconsole_init(void)
39908 if (!found_memconsole())
39909 return -ENODEV;
39910
39911 - memconsole_bin_attr.size = memconsole_length;
39912 + pax_open_kernel();
39913 + *(size_t *)&memconsole_bin_attr.size = memconsole_length;
39914 + pax_close_kernel();
39915 +
39916 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
39917 }
39918
39919 diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
39920 index 8765bd6..2e5b147 100644
39921 --- a/drivers/gpio/gpio-em.c
39922 +++ b/drivers/gpio/gpio-em.c
39923 @@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
39924 struct em_gio_priv *p;
39925 struct resource *io[2], *irq[2];
39926 struct gpio_chip *gpio_chip;
39927 - struct irq_chip *irq_chip;
39928 + irq_chip_no_const *irq_chip;
39929 const char *name = dev_name(&pdev->dev);
39930 int ret;
39931
39932 diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
39933 index 7030422..42a3fe9 100644
39934 --- a/drivers/gpio/gpio-ich.c
39935 +++ b/drivers/gpio/gpio-ich.c
39936 @@ -94,7 +94,7 @@ struct ichx_desc {
39937 * this option allows driver caching written output values
39938 */
39939 bool use_outlvl_cache;
39940 -};
39941 +} __do_const;
39942
39943 static struct {
39944 spinlock_t lock;
39945 diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
39946 index 03c9148..c66e753 100644
39947 --- a/drivers/gpio/gpio-rcar.c
39948 +++ b/drivers/gpio/gpio-rcar.c
39949 @@ -355,7 +355,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
39950 struct gpio_rcar_priv *p;
39951 struct resource *io, *irq;
39952 struct gpio_chip *gpio_chip;
39953 - struct irq_chip *irq_chip;
39954 + irq_chip_no_const *irq_chip;
39955 struct device *dev = &pdev->dev;
39956 const char *name = dev_name(dev);
39957 int ret;
39958 diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
39959 index 66cbcc1..0c5e622 100644
39960 --- a/drivers/gpio/gpio-vr41xx.c
39961 +++ b/drivers/gpio/gpio-vr41xx.c
39962 @@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
39963 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
39964 maskl, pendl, maskh, pendh);
39965
39966 - atomic_inc(&irq_err_count);
39967 + atomic_inc_unchecked(&irq_err_count);
39968
39969 return -EINVAL;
39970 }
39971 diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
39972 index d8b7099..8a314a5 100644
39973 --- a/drivers/gpu/drm/drm_crtc.c
39974 +++ b/drivers/gpu/drm/drm_crtc.c
39975 @@ -3500,7 +3500,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
39976 goto done;
39977 }
39978
39979 - if (copy_to_user(&enum_ptr[copied].name,
39980 + if (copy_to_user(enum_ptr[copied].name,
39981 &prop_enum->name, DRM_PROP_NAME_LEN)) {
39982 ret = -EFAULT;
39983 goto done;
39984 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
39985 old mode 100644
39986 new mode 100755
39987 index 8218078..9960928a
39988 --- a/drivers/gpu/drm/drm_drv.c
39989 +++ b/drivers/gpu/drm/drm_drv.c
39990 @@ -233,7 +233,7 @@ module_exit(drm_core_exit);
39991 /**
39992 * Copy and IOCTL return string to user space
39993 */
39994 -static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
39995 +static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
39996 {
39997 int len;
39998
39999 @@ -342,7 +342,7 @@ long drm_ioctl(struct file *filp,
40000 struct drm_file *file_priv = filp->private_data;
40001 struct drm_device *dev;
40002 const struct drm_ioctl_desc *ioctl = NULL;
40003 - drm_ioctl_t *func;
40004 + drm_ioctl_no_const_t func;
40005 unsigned int nr = DRM_IOCTL_NR(cmd);
40006 int retcode = -EINVAL;
40007 char stack_kdata[128];
40008 diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40009 index e1eba0b..98f69f9 100644
40010 --- a/drivers/gpu/drm/drm_fops.c
40011 +++ b/drivers/gpu/drm/drm_fops.c
40012 @@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40013 return PTR_ERR(minor);
40014
40015 dev = minor->dev;
40016 - if (!dev->open_count++)
40017 + if (local_inc_return(&dev->open_count) == 1)
40018 need_setup = 1;
40019
40020 /* share address_space across all char-devs of a single device */
40021 @@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40022 return 0;
40023
40024 err_undo:
40025 - dev->open_count--;
40026 + local_dec(&dev->open_count);
40027 drm_minor_release(minor);
40028 return retcode;
40029 }
40030 @@ -430,7 +430,7 @@ int drm_release(struct inode *inode, struct file *filp)
40031
40032 mutex_lock(&drm_global_mutex);
40033
40034 - DRM_DEBUG("open_count = %d\n", dev->open_count);
40035 + DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40036
40037 if (dev->driver->preclose)
40038 dev->driver->preclose(dev, file_priv);
40039 @@ -439,10 +439,10 @@ int drm_release(struct inode *inode, struct file *filp)
40040 * Begin inline drm_release
40041 */
40042
40043 - DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40044 + DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40045 task_pid_nr(current),
40046 (long)old_encode_dev(file_priv->minor->kdev->devt),
40047 - dev->open_count);
40048 + local_read(&dev->open_count));
40049
40050 /* Release any auth tokens that might point to this file_priv,
40051 (do that under the drm_global_mutex) */
40052 @@ -543,7 +543,7 @@ int drm_release(struct inode *inode, struct file *filp)
40053 * End inline drm_release
40054 */
40055
40056 - if (!--dev->open_count) {
40057 + if (local_dec_and_test(&dev->open_count)) {
40058 retcode = drm_lastclose(dev);
40059 if (drm_device_is_unplugged(dev))
40060 drm_put_dev(dev);
40061 diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40062 index 3d2e91c..d31c4c9 100644
40063 --- a/drivers/gpu/drm/drm_global.c
40064 +++ b/drivers/gpu/drm/drm_global.c
40065 @@ -36,7 +36,7 @@
40066 struct drm_global_item {
40067 struct mutex mutex;
40068 void *object;
40069 - int refcount;
40070 + atomic_t refcount;
40071 };
40072
40073 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40074 @@ -49,7 +49,7 @@ void drm_global_init(void)
40075 struct drm_global_item *item = &glob[i];
40076 mutex_init(&item->mutex);
40077 item->object = NULL;
40078 - item->refcount = 0;
40079 + atomic_set(&item->refcount, 0);
40080 }
40081 }
40082
40083 @@ -59,7 +59,7 @@ void drm_global_release(void)
40084 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
40085 struct drm_global_item *item = &glob[i];
40086 BUG_ON(item->object != NULL);
40087 - BUG_ON(item->refcount != 0);
40088 + BUG_ON(atomic_read(&item->refcount) != 0);
40089 }
40090 }
40091
40092 @@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40093 struct drm_global_item *item = &glob[ref->global_type];
40094
40095 mutex_lock(&item->mutex);
40096 - if (item->refcount == 0) {
40097 + if (atomic_read(&item->refcount) == 0) {
40098 item->object = kzalloc(ref->size, GFP_KERNEL);
40099 if (unlikely(item->object == NULL)) {
40100 ret = -ENOMEM;
40101 @@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40102 goto out_err;
40103
40104 }
40105 - ++item->refcount;
40106 + atomic_inc(&item->refcount);
40107 ref->object = item->object;
40108 mutex_unlock(&item->mutex);
40109 return 0;
40110 @@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
40111 struct drm_global_item *item = &glob[ref->global_type];
40112
40113 mutex_lock(&item->mutex);
40114 - BUG_ON(item->refcount == 0);
40115 + BUG_ON(atomic_read(&item->refcount) == 0);
40116 BUG_ON(ref->object != item->object);
40117 - if (--item->refcount == 0) {
40118 + if (atomic_dec_and_test(&item->refcount)) {
40119 ref->release(ref);
40120 item->object = NULL;
40121 }
40122 diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
40123 index 7473035..a48b9c5 100644
40124 --- a/drivers/gpu/drm/drm_info.c
40125 +++ b/drivers/gpu/drm/drm_info.c
40126 @@ -75,10 +75,13 @@ int drm_vm_info(struct seq_file *m, void *data)
40127 struct drm_local_map *map;
40128 struct drm_map_list *r_list;
40129
40130 - /* Hardcoded from _DRM_FRAME_BUFFER,
40131 - _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
40132 - _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
40133 - const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
40134 + static const char * const types[] = {
40135 + [_DRM_FRAME_BUFFER] = "FB",
40136 + [_DRM_REGISTERS] = "REG",
40137 + [_DRM_SHM] = "SHM",
40138 + [_DRM_AGP] = "AGP",
40139 + [_DRM_SCATTER_GATHER] = "SG",
40140 + [_DRM_CONSISTENT] = "PCI"};
40141 const char *type;
40142 int i;
40143
40144 @@ -89,7 +92,7 @@ int drm_vm_info(struct seq_file *m, void *data)
40145 map = r_list->map;
40146 if (!map)
40147 continue;
40148 - if (map->type < 0 || map->type > 5)
40149 + if (map->type >= ARRAY_SIZE(types))
40150 type = "??";
40151 else
40152 type = types[map->type];
40153 @@ -261,7 +264,11 @@ int drm_vma_info(struct seq_file *m, void *data)
40154 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
40155 vma->vm_flags & VM_LOCKED ? 'l' : '-',
40156 vma->vm_flags & VM_IO ? 'i' : '-',
40157 +#ifdef CONFIG_GRKERNSEC_HIDESYM
40158 + 0);
40159 +#else
40160 vma->vm_pgoff);
40161 +#endif
40162
40163 #if defined(__i386__)
40164 pgprot = pgprot_val(vma->vm_page_prot);
40165 diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
40166 index 2f4c4343..dd12cd2 100644
40167 --- a/drivers/gpu/drm/drm_ioc32.c
40168 +++ b/drivers/gpu/drm/drm_ioc32.c
40169 @@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
40170 request = compat_alloc_user_space(nbytes);
40171 if (!access_ok(VERIFY_WRITE, request, nbytes))
40172 return -EFAULT;
40173 - list = (struct drm_buf_desc *) (request + 1);
40174 + list = (struct drm_buf_desc __user *) (request + 1);
40175
40176 if (__put_user(count, &request->count)
40177 || __put_user(list, &request->list))
40178 @@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
40179 request = compat_alloc_user_space(nbytes);
40180 if (!access_ok(VERIFY_WRITE, request, nbytes))
40181 return -EFAULT;
40182 - list = (struct drm_buf_pub *) (request + 1);
40183 + list = (struct drm_buf_pub __user *) (request + 1);
40184
40185 if (__put_user(count, &request->count)
40186 || __put_user(list, &request->list))
40187 @@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
40188 return 0;
40189 }
40190
40191 -drm_ioctl_compat_t *drm_compat_ioctls[] = {
40192 +drm_ioctl_compat_t drm_compat_ioctls[] = {
40193 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
40194 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
40195 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
40196 @@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
40197 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40198 {
40199 unsigned int nr = DRM_IOCTL_NR(cmd);
40200 - drm_ioctl_compat_t *fn;
40201 int ret;
40202
40203 /* Assume that ioctls without an explicit compat routine will just
40204 @@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40205 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
40206 return drm_ioctl(filp, cmd, arg);
40207
40208 - fn = drm_compat_ioctls[nr];
40209 -
40210 - if (fn != NULL)
40211 - ret = (*fn) (filp, cmd, arg);
40212 + if (drm_compat_ioctls[nr] != NULL)
40213 + ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
40214 else
40215 ret = drm_ioctl(filp, cmd, arg);
40216
40217 diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
40218 index 4c24c3a..c903cab 100644
40219 --- a/drivers/gpu/drm/drm_stub.c
40220 +++ b/drivers/gpu/drm/drm_stub.c
40221 @@ -455,7 +455,7 @@ void drm_unplug_dev(struct drm_device *dev)
40222
40223 drm_device_set_unplugged(dev);
40224
40225 - if (dev->open_count == 0) {
40226 + if (local_read(&dev->open_count) == 0) {
40227 drm_put_dev(dev);
40228 }
40229 mutex_unlock(&drm_global_mutex);
40230 diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
40231 index c22c309..ae758c3 100644
40232 --- a/drivers/gpu/drm/drm_sysfs.c
40233 +++ b/drivers/gpu/drm/drm_sysfs.c
40234 @@ -505,7 +505,7 @@ static void drm_sysfs_release(struct device *dev)
40235 */
40236 int drm_sysfs_device_add(struct drm_minor *minor)
40237 {
40238 - char *minor_str;
40239 + const char *minor_str;
40240 int r;
40241
40242 if (minor->type == DRM_MINOR_CONTROL)
40243 diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40244 index d4d16ed..8fb0b51 100644
40245 --- a/drivers/gpu/drm/i810/i810_drv.h
40246 +++ b/drivers/gpu/drm/i810/i810_drv.h
40247 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
40248 int page_flipping;
40249
40250 wait_queue_head_t irq_queue;
40251 - atomic_t irq_received;
40252 - atomic_t irq_emitted;
40253 + atomic_unchecked_t irq_received;
40254 + atomic_unchecked_t irq_emitted;
40255
40256 int front_offset;
40257 } drm_i810_private_t;
40258 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40259 index eedb023..25076a4 100644
40260 --- a/drivers/gpu/drm/i915/i915_dma.c
40261 +++ b/drivers/gpu/drm/i915/i915_dma.c
40262 @@ -1280,7 +1280,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40263 bool can_switch;
40264
40265 spin_lock(&dev->count_lock);
40266 - can_switch = (dev->open_count == 0);
40267 + can_switch = (local_read(&dev->open_count) == 0);
40268 spin_unlock(&dev->count_lock);
40269 return can_switch;
40270 }
40271 diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40272 index 20fef6c..76c78fb 100644
40273 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40274 +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40275 @@ -886,9 +886,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
40276
40277 static int
40278 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
40279 - int count)
40280 + unsigned int count)
40281 {
40282 - int i;
40283 + unsigned int i;
40284 unsigned relocs_total = 0;
40285 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
40286
40287 diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
40288 index 3c59584..500f2e9 100644
40289 --- a/drivers/gpu/drm/i915/i915_ioc32.c
40290 +++ b/drivers/gpu/drm/i915/i915_ioc32.c
40291 @@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
40292 (unsigned long)request);
40293 }
40294
40295 -static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40296 +static drm_ioctl_compat_t i915_compat_ioctls[] = {
40297 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
40298 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
40299 [DRM_I915_GETPARAM] = compat_i915_getparam,
40300 @@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40301 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40302 {
40303 unsigned int nr = DRM_IOCTL_NR(cmd);
40304 - drm_ioctl_compat_t *fn = NULL;
40305 int ret;
40306
40307 if (nr < DRM_COMMAND_BASE)
40308 return drm_compat_ioctl(filp, cmd, arg);
40309
40310 - if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls))
40311 - fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40312 -
40313 - if (fn != NULL)
40314 + if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls)) {
40315 + drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40316 ret = (*fn) (filp, cmd, arg);
40317 - else
40318 + } else
40319 ret = drm_ioctl(filp, cmd, arg);
40320
40321 return ret;
40322 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
40323 index 5b60e25..eac1625 100644
40324 --- a/drivers/gpu/drm/i915/intel_display.c
40325 +++ b/drivers/gpu/drm/i915/intel_display.c
40326 @@ -11171,13 +11171,13 @@ struct intel_quirk {
40327 int subsystem_vendor;
40328 int subsystem_device;
40329 void (*hook)(struct drm_device *dev);
40330 -};
40331 +} __do_const;
40332
40333 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
40334 struct intel_dmi_quirk {
40335 void (*hook)(struct drm_device *dev);
40336 const struct dmi_system_id (*dmi_id_list)[];
40337 -};
40338 +} __do_const;
40339
40340 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40341 {
40342 @@ -11185,18 +11185,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40343 return 1;
40344 }
40345
40346 -static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40347 +static const struct dmi_system_id intel_dmi_quirks_table[] = {
40348 {
40349 - .dmi_id_list = &(const struct dmi_system_id[]) {
40350 - {
40351 - .callback = intel_dmi_reverse_brightness,
40352 - .ident = "NCR Corporation",
40353 - .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40354 - DMI_MATCH(DMI_PRODUCT_NAME, ""),
40355 - },
40356 - },
40357 - { } /* terminating entry */
40358 + .callback = intel_dmi_reverse_brightness,
40359 + .ident = "NCR Corporation",
40360 + .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40361 + DMI_MATCH(DMI_PRODUCT_NAME, ""),
40362 },
40363 + },
40364 + { } /* terminating entry */
40365 +};
40366 +
40367 +static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40368 + {
40369 + .dmi_id_list = &intel_dmi_quirks_table,
40370 .hook = quirk_invert_brightness,
40371 },
40372 };
40373 diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
40374 index fe45321..836fdca 100644
40375 --- a/drivers/gpu/drm/mga/mga_drv.h
40376 +++ b/drivers/gpu/drm/mga/mga_drv.h
40377 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
40378 u32 clear_cmd;
40379 u32 maccess;
40380
40381 - atomic_t vbl_received; /**< Number of vblanks received. */
40382 + atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
40383 wait_queue_head_t fence_queue;
40384 - atomic_t last_fence_retired;
40385 + atomic_unchecked_t last_fence_retired;
40386 u32 next_fence_to_post;
40387
40388 unsigned int fb_cpp;
40389 diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
40390 index 86b4bb8..ae237ad 100644
40391 --- a/drivers/gpu/drm/mga/mga_ioc32.c
40392 +++ b/drivers/gpu/drm/mga/mga_ioc32.c
40393 @@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
40394 return 0;
40395 }
40396
40397 -drm_ioctl_compat_t *mga_compat_ioctls[] = {
40398 +drm_ioctl_compat_t mga_compat_ioctls[] = {
40399 [DRM_MGA_INIT] = compat_mga_init,
40400 [DRM_MGA_GETPARAM] = compat_mga_getparam,
40401 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
40402 @@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
40403 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40404 {
40405 unsigned int nr = DRM_IOCTL_NR(cmd);
40406 - drm_ioctl_compat_t *fn = NULL;
40407 int ret;
40408
40409 if (nr < DRM_COMMAND_BASE)
40410 return drm_compat_ioctl(filp, cmd, arg);
40411
40412 - if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls))
40413 - fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40414 -
40415 - if (fn != NULL)
40416 + if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls)) {
40417 + drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40418 ret = (*fn) (filp, cmd, arg);
40419 - else
40420 + } else
40421 ret = drm_ioctl(filp, cmd, arg);
40422
40423 return ret;
40424 diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
40425 index 1b071b8..de8601a 100644
40426 --- a/drivers/gpu/drm/mga/mga_irq.c
40427 +++ b/drivers/gpu/drm/mga/mga_irq.c
40428 @@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
40429 if (crtc != 0)
40430 return 0;
40431
40432 - return atomic_read(&dev_priv->vbl_received);
40433 + return atomic_read_unchecked(&dev_priv->vbl_received);
40434 }
40435
40436
40437 @@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40438 /* VBLANK interrupt */
40439 if (status & MGA_VLINEPEN) {
40440 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
40441 - atomic_inc(&dev_priv->vbl_received);
40442 + atomic_inc_unchecked(&dev_priv->vbl_received);
40443 drm_handle_vblank(dev, 0);
40444 handled = 1;
40445 }
40446 @@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40447 if ((prim_start & ~0x03) != (prim_end & ~0x03))
40448 MGA_WRITE(MGA_PRIMEND, prim_end);
40449
40450 - atomic_inc(&dev_priv->last_fence_retired);
40451 + atomic_inc_unchecked(&dev_priv->last_fence_retired);
40452 wake_up(&dev_priv->fence_queue);
40453 handled = 1;
40454 }
40455 @@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
40456 * using fences.
40457 */
40458 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
40459 - (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
40460 + (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
40461 - *sequence) <= (1 << 23)));
40462
40463 *sequence = cur_fence;
40464 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
40465 index 8268a4c..5105708 100644
40466 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c
40467 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
40468 @@ -965,7 +965,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
40469 struct bit_table {
40470 const char id;
40471 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
40472 -};
40473 +} __no_const;
40474
40475 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
40476
40477 diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
40478 index 7efbafa..19f8087 100644
40479 --- a/drivers/gpu/drm/nouveau/nouveau_drm.h
40480 +++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
40481 @@ -97,7 +97,6 @@ struct nouveau_drm {
40482 struct drm_global_reference mem_global_ref;
40483 struct ttm_bo_global_ref bo_global_ref;
40484 struct ttm_bo_device bdev;
40485 - atomic_t validate_sequence;
40486 int (*move)(struct nouveau_channel *,
40487 struct ttm_buffer_object *,
40488 struct ttm_mem_reg *, struct ttm_mem_reg *);
40489 diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40490 index c1a7e5a..38b8539 100644
40491 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40492 +++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40493 @@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
40494 unsigned long arg)
40495 {
40496 unsigned int nr = DRM_IOCTL_NR(cmd);
40497 - drm_ioctl_compat_t *fn = NULL;
40498 + drm_ioctl_compat_t fn = NULL;
40499 int ret;
40500
40501 if (nr < DRM_COMMAND_BASE)
40502 diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40503 index ab0228f..20b756b 100644
40504 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
40505 +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40506 @@ -130,11 +130,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40507 }
40508
40509 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
40510 - nouveau_vram_manager_init,
40511 - nouveau_vram_manager_fini,
40512 - nouveau_vram_manager_new,
40513 - nouveau_vram_manager_del,
40514 - nouveau_vram_manager_debug
40515 + .init = nouveau_vram_manager_init,
40516 + .takedown = nouveau_vram_manager_fini,
40517 + .get_node = nouveau_vram_manager_new,
40518 + .put_node = nouveau_vram_manager_del,
40519 + .debug = nouveau_vram_manager_debug
40520 };
40521
40522 static int
40523 @@ -199,11 +199,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40524 }
40525
40526 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
40527 - nouveau_gart_manager_init,
40528 - nouveau_gart_manager_fini,
40529 - nouveau_gart_manager_new,
40530 - nouveau_gart_manager_del,
40531 - nouveau_gart_manager_debug
40532 + .init = nouveau_gart_manager_init,
40533 + .takedown = nouveau_gart_manager_fini,
40534 + .get_node = nouveau_gart_manager_new,
40535 + .put_node = nouveau_gart_manager_del,
40536 + .debug = nouveau_gart_manager_debug
40537 };
40538
40539 #include <core/subdev/vm/nv04.h>
40540 @@ -271,11 +271,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40541 }
40542
40543 const struct ttm_mem_type_manager_func nv04_gart_manager = {
40544 - nv04_gart_manager_init,
40545 - nv04_gart_manager_fini,
40546 - nv04_gart_manager_new,
40547 - nv04_gart_manager_del,
40548 - nv04_gart_manager_debug
40549 + .init = nv04_gart_manager_init,
40550 + .takedown = nv04_gart_manager_fini,
40551 + .get_node = nv04_gart_manager_new,
40552 + .put_node = nv04_gart_manager_del,
40553 + .debug = nv04_gart_manager_debug
40554 };
40555
40556 int
40557 diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
40558 index fb84da3..d7ee463 100644
40559 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c
40560 +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
40561 @@ -67,7 +67,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
40562 bool can_switch;
40563
40564 spin_lock(&dev->count_lock);
40565 - can_switch = (dev->open_count == 0);
40566 + can_switch = (local_read(&dev->open_count) == 0);
40567 spin_unlock(&dev->count_lock);
40568 return can_switch;
40569 }
40570 diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
40571 index eb89653..613cf71 100644
40572 --- a/drivers/gpu/drm/qxl/qxl_cmd.c
40573 +++ b/drivers/gpu/drm/qxl/qxl_cmd.c
40574 @@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
40575 int ret;
40576
40577 mutex_lock(&qdev->async_io_mutex);
40578 - irq_num = atomic_read(&qdev->irq_received_io_cmd);
40579 + irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40580 if (qdev->last_sent_io_cmd > irq_num) {
40581 if (intr)
40582 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40583 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40584 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40585 else
40586 ret = wait_event_timeout(qdev->io_cmd_event,
40587 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40588 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40589 /* 0 is timeout, just bail the "hw" has gone away */
40590 if (ret <= 0)
40591 goto out;
40592 - irq_num = atomic_read(&qdev->irq_received_io_cmd);
40593 + irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40594 }
40595 outb(val, addr);
40596 qdev->last_sent_io_cmd = irq_num + 1;
40597 if (intr)
40598 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40599 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40600 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40601 else
40602 ret = wait_event_timeout(qdev->io_cmd_event,
40603 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40604 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40605 out:
40606 if (ret > 0)
40607 ret = 0;
40608 diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
40609 index c3c2bbd..bc3c0fb 100644
40610 --- a/drivers/gpu/drm/qxl/qxl_debugfs.c
40611 +++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
40612 @@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
40613 struct drm_info_node *node = (struct drm_info_node *) m->private;
40614 struct qxl_device *qdev = node->minor->dev->dev_private;
40615
40616 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
40617 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
40618 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
40619 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
40620 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
40621 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
40622 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
40623 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
40624 seq_printf(m, "%d\n", qdev->irq_received_error);
40625 return 0;
40626 }
40627 diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
40628 index 36ed40b..0397633 100644
40629 --- a/drivers/gpu/drm/qxl/qxl_drv.h
40630 +++ b/drivers/gpu/drm/qxl/qxl_drv.h
40631 @@ -290,10 +290,10 @@ struct qxl_device {
40632 unsigned int last_sent_io_cmd;
40633
40634 /* interrupt handling */
40635 - atomic_t irq_received;
40636 - atomic_t irq_received_display;
40637 - atomic_t irq_received_cursor;
40638 - atomic_t irq_received_io_cmd;
40639 + atomic_unchecked_t irq_received;
40640 + atomic_unchecked_t irq_received_display;
40641 + atomic_unchecked_t irq_received_cursor;
40642 + atomic_unchecked_t irq_received_io_cmd;
40643 unsigned irq_received_error;
40644 wait_queue_head_t display_event;
40645 wait_queue_head_t cursor_event;
40646 diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
40647 index 0bb86e6..d41416d 100644
40648 --- a/drivers/gpu/drm/qxl/qxl_ioctl.c
40649 +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
40650 @@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40651
40652 /* TODO copy slow path code from i915 */
40653 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
40654 - unwritten = __copy_from_user_inatomic_nocache(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE), (void *)(unsigned long)cmd->command, cmd->command_size);
40655 + unwritten = __copy_from_user_inatomic_nocache(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE), (void __force_user *)(unsigned long)cmd->command, cmd->command_size);
40656
40657 {
40658 struct qxl_drawable *draw = fb_cmd;
40659 @@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40660 struct drm_qxl_reloc reloc;
40661
40662 if (copy_from_user(&reloc,
40663 - &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
40664 + &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
40665 sizeof(reloc))) {
40666 ret = -EFAULT;
40667 goto out_free_bos;
40668 @@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
40669
40670 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
40671
40672 - struct drm_qxl_command *commands =
40673 - (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
40674 + struct drm_qxl_command __user *commands =
40675 + (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
40676
40677 - if (copy_from_user(&user_cmd, &commands[cmd_num],
40678 + if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
40679 sizeof(user_cmd)))
40680 return -EFAULT;
40681
40682 diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
40683 index 28f84b4..fb3e224 100644
40684 --- a/drivers/gpu/drm/qxl/qxl_irq.c
40685 +++ b/drivers/gpu/drm/qxl/qxl_irq.c
40686 @@ -33,19 +33,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
40687
40688 pending = xchg(&qdev->ram_header->int_pending, 0);
40689
40690 - atomic_inc(&qdev->irq_received);
40691 + atomic_inc_unchecked(&qdev->irq_received);
40692
40693 if (pending & QXL_INTERRUPT_DISPLAY) {
40694 - atomic_inc(&qdev->irq_received_display);
40695 + atomic_inc_unchecked(&qdev->irq_received_display);
40696 wake_up_all(&qdev->display_event);
40697 qxl_queue_garbage_collect(qdev, false);
40698 }
40699 if (pending & QXL_INTERRUPT_CURSOR) {
40700 - atomic_inc(&qdev->irq_received_cursor);
40701 + atomic_inc_unchecked(&qdev->irq_received_cursor);
40702 wake_up_all(&qdev->cursor_event);
40703 }
40704 if (pending & QXL_INTERRUPT_IO_CMD) {
40705 - atomic_inc(&qdev->irq_received_io_cmd);
40706 + atomic_inc_unchecked(&qdev->irq_received_io_cmd);
40707 wake_up_all(&qdev->io_cmd_event);
40708 }
40709 if (pending & QXL_INTERRUPT_ERROR) {
40710 @@ -82,10 +82,10 @@ int qxl_irq_init(struct qxl_device *qdev)
40711 init_waitqueue_head(&qdev->io_cmd_event);
40712 INIT_WORK(&qdev->client_monitors_config_work,
40713 qxl_client_monitors_config_work_func);
40714 - atomic_set(&qdev->irq_received, 0);
40715 - atomic_set(&qdev->irq_received_display, 0);
40716 - atomic_set(&qdev->irq_received_cursor, 0);
40717 - atomic_set(&qdev->irq_received_io_cmd, 0);
40718 + atomic_set_unchecked(&qdev->irq_received, 0);
40719 + atomic_set_unchecked(&qdev->irq_received_display, 0);
40720 + atomic_set_unchecked(&qdev->irq_received_cursor, 0);
40721 + atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
40722 qdev->irq_received_error = 0;
40723 ret = drm_irq_install(qdev->ddev);
40724 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
40725 diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
40726 index d52c275..4e6b43d 100644
40727 --- a/drivers/gpu/drm/qxl/qxl_ttm.c
40728 +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
40729 @@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
40730 }
40731 }
40732
40733 -static struct vm_operations_struct qxl_ttm_vm_ops;
40734 +static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
40735 static const struct vm_operations_struct *ttm_vm_ops;
40736
40737 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
40738 @@ -147,8 +147,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
40739 return r;
40740 if (unlikely(ttm_vm_ops == NULL)) {
40741 ttm_vm_ops = vma->vm_ops;
40742 + pax_open_kernel();
40743 qxl_ttm_vm_ops = *ttm_vm_ops;
40744 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
40745 + pax_close_kernel();
40746 }
40747 vma->vm_ops = &qxl_ttm_vm_ops;
40748 return 0;
40749 @@ -561,25 +563,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
40750 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
40751 {
40752 #if defined(CONFIG_DEBUG_FS)
40753 - static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
40754 - static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
40755 - unsigned i;
40756 + static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
40757 + {
40758 + .name = "qxl_mem_mm",
40759 + .show = &qxl_mm_dump_table,
40760 + },
40761 + {
40762 + .name = "qxl_surf_mm",
40763 + .show = &qxl_mm_dump_table,
40764 + }
40765 + };
40766
40767 - for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
40768 - if (i == 0)
40769 - sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
40770 - else
40771 - sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
40772 - qxl_mem_types_list[i].name = qxl_mem_types_names[i];
40773 - qxl_mem_types_list[i].show = &qxl_mm_dump_table;
40774 - qxl_mem_types_list[i].driver_features = 0;
40775 - if (i == 0)
40776 - qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40777 - else
40778 - qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40779 + pax_open_kernel();
40780 + *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40781 + *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40782 + pax_close_kernel();
40783
40784 - }
40785 - return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
40786 + return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
40787 #else
40788 return 0;
40789 #endif
40790 diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
40791 index 59459fe..be26b31 100644
40792 --- a/drivers/gpu/drm/r128/r128_cce.c
40793 +++ b/drivers/gpu/drm/r128/r128_cce.c
40794 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
40795
40796 /* GH: Simple idle check.
40797 */
40798 - atomic_set(&dev_priv->idle_count, 0);
40799 + atomic_set_unchecked(&dev_priv->idle_count, 0);
40800
40801 /* We don't support anything other than bus-mastering ring mode,
40802 * but the ring can be in either AGP or PCI space for the ring
40803 diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
40804 index 5bf3f5f..7000661 100644
40805 --- a/drivers/gpu/drm/r128/r128_drv.h
40806 +++ b/drivers/gpu/drm/r128/r128_drv.h
40807 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
40808 int is_pci;
40809 unsigned long cce_buffers_offset;
40810
40811 - atomic_t idle_count;
40812 + atomic_unchecked_t idle_count;
40813
40814 int page_flipping;
40815 int current_page;
40816 u32 crtc_offset;
40817 u32 crtc_offset_cntl;
40818
40819 - atomic_t vbl_received;
40820 + atomic_unchecked_t vbl_received;
40821
40822 u32 color_fmt;
40823 unsigned int front_offset;
40824 diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
40825 index b0d0fd3..a6fbbe4 100644
40826 --- a/drivers/gpu/drm/r128/r128_ioc32.c
40827 +++ b/drivers/gpu/drm/r128/r128_ioc32.c
40828 @@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
40829 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
40830 }
40831
40832 -drm_ioctl_compat_t *r128_compat_ioctls[] = {
40833 +drm_ioctl_compat_t r128_compat_ioctls[] = {
40834 [DRM_R128_INIT] = compat_r128_init,
40835 [DRM_R128_DEPTH] = compat_r128_depth,
40836 [DRM_R128_STIPPLE] = compat_r128_stipple,
40837 @@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
40838 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40839 {
40840 unsigned int nr = DRM_IOCTL_NR(cmd);
40841 - drm_ioctl_compat_t *fn = NULL;
40842 int ret;
40843
40844 if (nr < DRM_COMMAND_BASE)
40845 return drm_compat_ioctl(filp, cmd, arg);
40846
40847 - if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls))
40848 - fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
40849 -
40850 - if (fn != NULL)
40851 + if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls)) {
40852 + drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
40853 ret = (*fn) (filp, cmd, arg);
40854 - else
40855 + } else
40856 ret = drm_ioctl(filp, cmd, arg);
40857
40858 return ret;
40859 diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
40860 index c2ae496..30b5993 100644
40861 --- a/drivers/gpu/drm/r128/r128_irq.c
40862 +++ b/drivers/gpu/drm/r128/r128_irq.c
40863 @@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
40864 if (crtc != 0)
40865 return 0;
40866
40867 - return atomic_read(&dev_priv->vbl_received);
40868 + return atomic_read_unchecked(&dev_priv->vbl_received);
40869 }
40870
40871 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
40872 @@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
40873 /* VBLANK interrupt */
40874 if (status & R128_CRTC_VBLANK_INT) {
40875 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
40876 - atomic_inc(&dev_priv->vbl_received);
40877 + atomic_inc_unchecked(&dev_priv->vbl_received);
40878 drm_handle_vblank(dev, 0);
40879 return IRQ_HANDLED;
40880 }
40881 diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
40882 index e806dac..f81d32f 100644
40883 --- a/drivers/gpu/drm/r128/r128_state.c
40884 +++ b/drivers/gpu/drm/r128/r128_state.c
40885 @@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
40886
40887 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
40888 {
40889 - if (atomic_read(&dev_priv->idle_count) == 0)
40890 + if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
40891 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
40892 else
40893 - atomic_set(&dev_priv->idle_count, 0);
40894 + atomic_set_unchecked(&dev_priv->idle_count, 0);
40895 }
40896
40897 #endif
40898 diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
40899 index 4a85bb6..aaea819 100644
40900 --- a/drivers/gpu/drm/radeon/mkregtable.c
40901 +++ b/drivers/gpu/drm/radeon/mkregtable.c
40902 @@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
40903 regex_t mask_rex;
40904 regmatch_t match[4];
40905 char buf[1024];
40906 - size_t end;
40907 + long end;
40908 int len;
40909 int done = 0;
40910 int r;
40911 unsigned o;
40912 struct offset *offset;
40913 char last_reg_s[10];
40914 - int last_reg;
40915 + unsigned long last_reg;
40916
40917 if (regcomp
40918 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
40919 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
40920 index 2cd144c..a01c95a 100644
40921 --- a/drivers/gpu/drm/radeon/radeon_device.c
40922 +++ b/drivers/gpu/drm/radeon/radeon_device.c
40923 @@ -1129,7 +1129,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
40924 bool can_switch;
40925
40926 spin_lock(&dev->count_lock);
40927 - can_switch = (dev->open_count == 0);
40928 + can_switch = (local_read(&dev->open_count) == 0);
40929 spin_unlock(&dev->count_lock);
40930 return can_switch;
40931 }
40932 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
40933 index dafd812..1bf20c7 100644
40934 --- a/drivers/gpu/drm/radeon/radeon_drv.h
40935 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
40936 @@ -262,7 +262,7 @@ typedef struct drm_radeon_private {
40937
40938 /* SW interrupt */
40939 wait_queue_head_t swi_queue;
40940 - atomic_t swi_emitted;
40941 + atomic_unchecked_t swi_emitted;
40942 int vblank_crtc;
40943 uint32_t irq_enable_reg;
40944 uint32_t r500_disp_irq_reg;
40945 diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
40946 index bdb0f93..5ff558f 100644
40947 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c
40948 +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
40949 @@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
40950 request = compat_alloc_user_space(sizeof(*request));
40951 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
40952 || __put_user(req32.param, &request->param)
40953 - || __put_user((void __user *)(unsigned long)req32.value,
40954 + || __put_user((unsigned long)req32.value,
40955 &request->value))
40956 return -EFAULT;
40957
40958 @@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
40959 #define compat_radeon_cp_setparam NULL
40960 #endif /* X86_64 || IA64 */
40961
40962 -static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
40963 +static drm_ioctl_compat_t radeon_compat_ioctls[] = {
40964 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
40965 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
40966 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
40967 @@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
40968 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40969 {
40970 unsigned int nr = DRM_IOCTL_NR(cmd);
40971 - drm_ioctl_compat_t *fn = NULL;
40972 int ret;
40973
40974 if (nr < DRM_COMMAND_BASE)
40975 return drm_compat_ioctl(filp, cmd, arg);
40976
40977 - if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls))
40978 - fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
40979 -
40980 - if (fn != NULL)
40981 + if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls)) {
40982 + drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
40983 ret = (*fn) (filp, cmd, arg);
40984 - else
40985 + } else
40986 ret = drm_ioctl(filp, cmd, arg);
40987
40988 return ret;
40989 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
40990 index 244b19b..c19226d 100644
40991 --- a/drivers/gpu/drm/radeon/radeon_irq.c
40992 +++ b/drivers/gpu/drm/radeon/radeon_irq.c
40993 @@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
40994 unsigned int ret;
40995 RING_LOCALS;
40996
40997 - atomic_inc(&dev_priv->swi_emitted);
40998 - ret = atomic_read(&dev_priv->swi_emitted);
40999 + atomic_inc_unchecked(&dev_priv->swi_emitted);
41000 + ret = atomic_read_unchecked(&dev_priv->swi_emitted);
41001
41002 BEGIN_RING(4);
41003 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
41004 @@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
41005 drm_radeon_private_t *dev_priv =
41006 (drm_radeon_private_t *) dev->dev_private;
41007
41008 - atomic_set(&dev_priv->swi_emitted, 0);
41009 + atomic_set_unchecked(&dev_priv->swi_emitted, 0);
41010 init_waitqueue_head(&dev_priv->swi_queue);
41011
41012 dev->max_vblank_count = 0x001fffff;
41013 diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
41014 index 956ab7f..fbd36d8 100644
41015 --- a/drivers/gpu/drm/radeon/radeon_state.c
41016 +++ b/drivers/gpu/drm/radeon/radeon_state.c
41017 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
41018 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
41019 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
41020
41021 - if (copy_from_user(&depth_boxes, clear->depth_boxes,
41022 + if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
41023 sarea_priv->nbox * sizeof(depth_boxes[0])))
41024 return -EFAULT;
41025
41026 @@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
41027 {
41028 drm_radeon_private_t *dev_priv = dev->dev_private;
41029 drm_radeon_getparam_t *param = data;
41030 - int value;
41031 + int value = 0;
41032
41033 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
41034
41035 diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
41036 index c8a8a51..219dacc 100644
41037 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
41038 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
41039 @@ -797,7 +797,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
41040 man->size = size >> PAGE_SHIFT;
41041 }
41042
41043 -static struct vm_operations_struct radeon_ttm_vm_ops;
41044 +static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
41045 static const struct vm_operations_struct *ttm_vm_ops = NULL;
41046
41047 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41048 @@ -838,8 +838,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
41049 }
41050 if (unlikely(ttm_vm_ops == NULL)) {
41051 ttm_vm_ops = vma->vm_ops;
41052 + pax_open_kernel();
41053 radeon_ttm_vm_ops = *ttm_vm_ops;
41054 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
41055 + pax_close_kernel();
41056 }
41057 vma->vm_ops = &radeon_ttm_vm_ops;
41058 return 0;
41059 diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
41060 index c11b71d..c8c48aa 100644
41061 --- a/drivers/gpu/drm/radeon/radeon_vm.c
41062 +++ b/drivers/gpu/drm/radeon/radeon_vm.c
41063 @@ -493,7 +493,7 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
41064 mutex_unlock(&vm->mutex);
41065
41066 r = radeon_bo_create(rdev, RADEON_VM_PTE_COUNT * 8,
41067 - RADEON_GPU_PAGE_SIZE, false,
41068 + RADEON_GPU_PAGE_SIZE, true,
41069 RADEON_GEM_DOMAIN_VRAM, NULL, &pt);
41070 if (r)
41071 return r;
41072 @@ -913,7 +913,7 @@ int radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm)
41073 return -ENOMEM;
41074 }
41075
41076 - r = radeon_bo_create(rdev, pd_size, RADEON_VM_PTB_ALIGN_SIZE, false,
41077 + r = radeon_bo_create(rdev, pd_size, RADEON_VM_PTB_ALIGN_SIZE, true,
41078 RADEON_GEM_DOMAIN_VRAM, NULL,
41079 &vm->page_directory);
41080 if (r)
41081 diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
41082 index edb871d..a275c6ed 100644
41083 --- a/drivers/gpu/drm/tegra/dc.c
41084 +++ b/drivers/gpu/drm/tegra/dc.c
41085 @@ -1057,7 +1057,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
41086 }
41087
41088 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41089 - dc->debugfs_files[i].data = dc;
41090 + *(void **)&dc->debugfs_files[i].data = dc;
41091
41092 err = drm_debugfs_create_files(dc->debugfs_files,
41093 ARRAY_SIZE(debugfs_files),
41094 diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
41095 index 0e599f0..c9ea7c7 100644
41096 --- a/drivers/gpu/drm/tegra/dsi.c
41097 +++ b/drivers/gpu/drm/tegra/dsi.c
41098 @@ -39,7 +39,7 @@ struct tegra_dsi {
41099 struct clk *clk_lp;
41100 struct clk *clk;
41101
41102 - struct drm_info_list *debugfs_files;
41103 + drm_info_list_no_const *debugfs_files;
41104 struct drm_minor *minor;
41105 struct dentry *debugfs;
41106
41107 diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41108 index 6928015..c9853e7 100644
41109 --- a/drivers/gpu/drm/tegra/hdmi.c
41110 +++ b/drivers/gpu/drm/tegra/hdmi.c
41111 @@ -59,7 +59,7 @@ struct tegra_hdmi {
41112 bool stereo;
41113 bool dvi;
41114
41115 - struct drm_info_list *debugfs_files;
41116 + drm_info_list_no_const *debugfs_files;
41117 struct drm_minor *minor;
41118 struct dentry *debugfs;
41119 };
41120 diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41121 index bd850c9..d9f3573 100644
41122 --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41123 +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41124 @@ -146,10 +146,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41125 }
41126
41127 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41128 - ttm_bo_man_init,
41129 - ttm_bo_man_takedown,
41130 - ttm_bo_man_get_node,
41131 - ttm_bo_man_put_node,
41132 - ttm_bo_man_debug
41133 + .init = ttm_bo_man_init,
41134 + .takedown = ttm_bo_man_takedown,
41135 + .get_node = ttm_bo_man_get_node,
41136 + .put_node = ttm_bo_man_put_node,
41137 + .debug = ttm_bo_man_debug
41138 };
41139 EXPORT_SYMBOL(ttm_bo_manager_func);
41140 diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41141 index dbc2def..0a9f710 100644
41142 --- a/drivers/gpu/drm/ttm/ttm_memory.c
41143 +++ b/drivers/gpu/drm/ttm/ttm_memory.c
41144 @@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41145 zone->glob = glob;
41146 glob->zone_kernel = zone;
41147 ret = kobject_init_and_add(
41148 - &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41149 + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41150 if (unlikely(ret != 0)) {
41151 kobject_put(&zone->kobj);
41152 return ret;
41153 @@ -347,7 +347,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41154 zone->glob = glob;
41155 glob->zone_dma32 = zone;
41156 ret = kobject_init_and_add(
41157 - &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41158 + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41159 if (unlikely(ret != 0)) {
41160 kobject_put(&zone->kobj);
41161 return ret;
41162 diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41163 index 863bef9..cba15cf 100644
41164 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41165 +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41166 @@ -391,9 +391,9 @@ out:
41167 static unsigned long
41168 ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41169 {
41170 - static atomic_t start_pool = ATOMIC_INIT(0);
41171 + static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
41172 unsigned i;
41173 - unsigned pool_offset = atomic_add_return(1, &start_pool);
41174 + unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
41175 struct ttm_page_pool *pool;
41176 int shrink_pages = sc->nr_to_scan;
41177 unsigned long freed = 0;
41178 diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
41179 index 3771763..883f206 100644
41180 --- a/drivers/gpu/drm/udl/udl_fb.c
41181 +++ b/drivers/gpu/drm/udl/udl_fb.c
41182 @@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
41183 fb_deferred_io_cleanup(info);
41184 kfree(info->fbdefio);
41185 info->fbdefio = NULL;
41186 - info->fbops->fb_mmap = udl_fb_mmap;
41187 }
41188
41189 pr_warn("released /dev/fb%d user=%d count=%d\n",
41190 diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
41191 index ad02732..144f5ed 100644
41192 --- a/drivers/gpu/drm/via/via_drv.h
41193 +++ b/drivers/gpu/drm/via/via_drv.h
41194 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
41195 typedef uint32_t maskarray_t[5];
41196
41197 typedef struct drm_via_irq {
41198 - atomic_t irq_received;
41199 + atomic_unchecked_t irq_received;
41200 uint32_t pending_mask;
41201 uint32_t enable_mask;
41202 wait_queue_head_t irq_queue;
41203 @@ -75,7 +75,7 @@ typedef struct drm_via_private {
41204 struct timeval last_vblank;
41205 int last_vblank_valid;
41206 unsigned usec_per_vblank;
41207 - atomic_t vbl_received;
41208 + atomic_unchecked_t vbl_received;
41209 drm_via_state_t hc_state;
41210 char pci_buf[VIA_PCI_BUF_SIZE];
41211 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
41212 diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
41213 index 1319433..a993b0c 100644
41214 --- a/drivers/gpu/drm/via/via_irq.c
41215 +++ b/drivers/gpu/drm/via/via_irq.c
41216 @@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
41217 if (crtc != 0)
41218 return 0;
41219
41220 - return atomic_read(&dev_priv->vbl_received);
41221 + return atomic_read_unchecked(&dev_priv->vbl_received);
41222 }
41223
41224 irqreturn_t via_driver_irq_handler(int irq, void *arg)
41225 @@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41226
41227 status = VIA_READ(VIA_REG_INTERRUPT);
41228 if (status & VIA_IRQ_VBLANK_PENDING) {
41229 - atomic_inc(&dev_priv->vbl_received);
41230 - if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
41231 + atomic_inc_unchecked(&dev_priv->vbl_received);
41232 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
41233 do_gettimeofday(&cur_vblank);
41234 if (dev_priv->last_vblank_valid) {
41235 dev_priv->usec_per_vblank =
41236 @@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41237 dev_priv->last_vblank = cur_vblank;
41238 dev_priv->last_vblank_valid = 1;
41239 }
41240 - if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
41241 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
41242 DRM_DEBUG("US per vblank is: %u\n",
41243 dev_priv->usec_per_vblank);
41244 }
41245 @@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41246
41247 for (i = 0; i < dev_priv->num_irqs; ++i) {
41248 if (status & cur_irq->pending_mask) {
41249 - atomic_inc(&cur_irq->irq_received);
41250 + atomic_inc_unchecked(&cur_irq->irq_received);
41251 wake_up(&cur_irq->irq_queue);
41252 handled = 1;
41253 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
41254 @@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
41255 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41256 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
41257 masks[irq][4]));
41258 - cur_irq_sequence = atomic_read(&cur_irq->irq_received);
41259 + cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
41260 } else {
41261 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41262 (((cur_irq_sequence =
41263 - atomic_read(&cur_irq->irq_received)) -
41264 + atomic_read_unchecked(&cur_irq->irq_received)) -
41265 *sequence) <= (1 << 23)));
41266 }
41267 *sequence = cur_irq_sequence;
41268 @@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
41269 }
41270
41271 for (i = 0; i < dev_priv->num_irqs; ++i) {
41272 - atomic_set(&cur_irq->irq_received, 0);
41273 + atomic_set_unchecked(&cur_irq->irq_received, 0);
41274 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
41275 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
41276 init_waitqueue_head(&cur_irq->irq_queue);
41277 @@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
41278 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
41279 case VIA_IRQ_RELATIVE:
41280 irqwait->request.sequence +=
41281 - atomic_read(&cur_irq->irq_received);
41282 + atomic_read_unchecked(&cur_irq->irq_received);
41283 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
41284 case VIA_IRQ_ABSOLUTE:
41285 break;
41286 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41287 index 6b252a8..5975dfe 100644
41288 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41289 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41290 @@ -437,7 +437,7 @@ struct vmw_private {
41291 * Fencing and IRQs.
41292 */
41293
41294 - atomic_t marker_seq;
41295 + atomic_unchecked_t marker_seq;
41296 wait_queue_head_t fence_queue;
41297 wait_queue_head_t fifo_queue;
41298 int fence_queue_waiters; /* Protected by hw_mutex */
41299 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41300 index 6ccd993..618d592 100644
41301 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41302 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41303 @@ -154,7 +154,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
41304 (unsigned int) min,
41305 (unsigned int) fifo->capabilities);
41306
41307 - atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41308 + atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41309 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
41310 vmw_marker_queue_init(&fifo->marker_queue);
41311 return vmw_fifo_send_fence(dev_priv, &dummy);
41312 @@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
41313 if (reserveable)
41314 iowrite32(bytes, fifo_mem +
41315 SVGA_FIFO_RESERVED);
41316 - return fifo_mem + (next_cmd >> 2);
41317 + return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
41318 } else {
41319 need_bounce = true;
41320 }
41321 @@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41322
41323 fm = vmw_fifo_reserve(dev_priv, bytes);
41324 if (unlikely(fm == NULL)) {
41325 - *seqno = atomic_read(&dev_priv->marker_seq);
41326 + *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41327 ret = -ENOMEM;
41328 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
41329 false, 3*HZ);
41330 @@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41331 }
41332
41333 do {
41334 - *seqno = atomic_add_return(1, &dev_priv->marker_seq);
41335 + *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
41336 } while (*seqno == 0);
41337
41338 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
41339 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41340 index b1273e8..9c274fd 100644
41341 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41342 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41343 @@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
41344 }
41345
41346 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
41347 - vmw_gmrid_man_init,
41348 - vmw_gmrid_man_takedown,
41349 - vmw_gmrid_man_get_node,
41350 - vmw_gmrid_man_put_node,
41351 - vmw_gmrid_man_debug
41352 + .init = vmw_gmrid_man_init,
41353 + .takedown = vmw_gmrid_man_takedown,
41354 + .get_node = vmw_gmrid_man_get_node,
41355 + .put_node = vmw_gmrid_man_put_node,
41356 + .debug = vmw_gmrid_man_debug
41357 };
41358 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41359 index 37881ec..319065d 100644
41360 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41361 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41362 @@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
41363 int ret;
41364
41365 num_clips = arg->num_clips;
41366 - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41367 + clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41368
41369 if (unlikely(num_clips == 0))
41370 return 0;
41371 @@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
41372 int ret;
41373
41374 num_clips = arg->num_clips;
41375 - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41376 + clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41377
41378 if (unlikely(num_clips == 0))
41379 return 0;
41380 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41381 index 0c42376..6febe77 100644
41382 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41383 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41384 @@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
41385 * emitted. Then the fence is stale and signaled.
41386 */
41387
41388 - ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
41389 + ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
41390 > VMW_FENCE_WRAP);
41391
41392 return ret;
41393 @@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
41394
41395 if (fifo_idle)
41396 down_read(&fifo_state->rwsem);
41397 - signal_seq = atomic_read(&dev_priv->marker_seq);
41398 + signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
41399 ret = 0;
41400
41401 for (;;) {
41402 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41403 index 8a8725c2..afed796 100644
41404 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41405 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41406 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
41407 while (!vmw_lag_lt(queue, us)) {
41408 spin_lock(&queue->lock);
41409 if (list_empty(&queue->head))
41410 - seqno = atomic_read(&dev_priv->marker_seq);
41411 + seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41412 else {
41413 marker = list_first_entry(&queue->head,
41414 struct vmw_marker, head);
41415 diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
41416 index 6866448..2ad2b34 100644
41417 --- a/drivers/gpu/vga/vga_switcheroo.c
41418 +++ b/drivers/gpu/vga/vga_switcheroo.c
41419 @@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
41420
41421 /* this version is for the case where the power switch is separate
41422 to the device being powered down. */
41423 -int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
41424 +int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
41425 {
41426 /* copy over all the bus versions */
41427 if (dev->bus && dev->bus->pm) {
41428 @@ -689,7 +689,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
41429 return ret;
41430 }
41431
41432 -int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
41433 +int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
41434 {
41435 /* copy over all the bus versions */
41436 if (dev->bus && dev->bus->pm) {
41437 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
41438 index a5c7927..025a2b4 100644
41439 --- a/drivers/hid/hid-core.c
41440 +++ b/drivers/hid/hid-core.c
41441 @@ -2476,7 +2476,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
41442
41443 int hid_add_device(struct hid_device *hdev)
41444 {
41445 - static atomic_t id = ATOMIC_INIT(0);
41446 + static atomic_unchecked_t id = ATOMIC_INIT(0);
41447 int ret;
41448
41449 if (WARN_ON(hdev->status & HID_STAT_ADDED))
41450 @@ -2518,7 +2518,7 @@ int hid_add_device(struct hid_device *hdev)
41451 /* XXX hack, any other cleaner solution after the driver core
41452 * is converted to allow more than 20 bytes as the device name? */
41453 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
41454 - hdev->vendor, hdev->product, atomic_inc_return(&id));
41455 + hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
41456
41457 hid_debug_register(hdev, dev_name(&hdev->dev));
41458 ret = device_add(&hdev->dev);
41459 diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
41460 index c13fb5b..55a3802 100644
41461 --- a/drivers/hid/hid-wiimote-debug.c
41462 +++ b/drivers/hid/hid-wiimote-debug.c
41463 @@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
41464 else if (size == 0)
41465 return -EIO;
41466
41467 - if (copy_to_user(u, buf, size))
41468 + if (size > sizeof(buf) || copy_to_user(u, buf, size))
41469 return -EFAULT;
41470
41471 *off += size;
41472 diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
41473 index 0d078c3..cd0962c 100644
41474 --- a/drivers/hid/uhid.c
41475 +++ b/drivers/hid/uhid.c
41476 @@ -47,7 +47,7 @@ struct uhid_device {
41477 struct mutex report_lock;
41478 wait_queue_head_t report_wait;
41479 atomic_t report_done;
41480 - atomic_t report_id;
41481 + atomic_unchecked_t report_id;
41482 struct uhid_event report_buf;
41483 };
41484
41485 @@ -163,7 +163,7 @@ static int uhid_hid_get_raw(struct hid_device *hid, unsigned char rnum,
41486
41487 spin_lock_irqsave(&uhid->qlock, flags);
41488 ev->type = UHID_FEATURE;
41489 - ev->u.feature.id = atomic_inc_return(&uhid->report_id);
41490 + ev->u.feature.id = atomic_inc_return_unchecked(&uhid->report_id);
41491 ev->u.feature.rnum = rnum;
41492 ev->u.feature.rtype = report_type;
41493
41494 @@ -539,7 +539,7 @@ static int uhid_dev_feature_answer(struct uhid_device *uhid,
41495 spin_lock_irqsave(&uhid->qlock, flags);
41496
41497 /* id for old report; drop it silently */
41498 - if (atomic_read(&uhid->report_id) != ev->u.feature_answer.id)
41499 + if (atomic_read_unchecked(&uhid->report_id) != ev->u.feature_answer.id)
41500 goto unlock;
41501 if (atomic_read(&uhid->report_done))
41502 goto unlock;
41503 diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
41504 index 602ca86..10a6573 100644
41505 --- a/drivers/hv/channel.c
41506 +++ b/drivers/hv/channel.c
41507 @@ -365,8 +365,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
41508 int ret = 0;
41509 int t;
41510
41511 - next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
41512 - atomic_inc(&vmbus_connection.next_gpadl_handle);
41513 + next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
41514 + atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
41515
41516 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
41517 if (ret)
41518 diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
41519 index bcb4950..61dba6c 100644
41520 --- a/drivers/hv/hv.c
41521 +++ b/drivers/hv/hv.c
41522 @@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
41523 u64 output_address = (output) ? virt_to_phys(output) : 0;
41524 u32 output_address_hi = output_address >> 32;
41525 u32 output_address_lo = output_address & 0xFFFFFFFF;
41526 - void *hypercall_page = hv_context.hypercall_page;
41527 + void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
41528
41529 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
41530 "=a"(hv_status_lo) : "d" (control_hi),
41531 @@ -154,7 +154,7 @@ int hv_init(void)
41532 /* See if the hypercall page is already set */
41533 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
41534
41535 - virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
41536 + virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
41537
41538 if (!virtaddr)
41539 goto cleanup;
41540 diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
41541 index 5e90c5d..d8fcefb 100644
41542 --- a/drivers/hv/hv_balloon.c
41543 +++ b/drivers/hv/hv_balloon.c
41544 @@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
41545
41546 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
41547 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
41548 -static atomic_t trans_id = ATOMIC_INIT(0);
41549 +static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
41550
41551 static int dm_ring_size = (5 * PAGE_SIZE);
41552
41553 @@ -893,7 +893,7 @@ static void hot_add_req(struct work_struct *dummy)
41554 pr_info("Memory hot add failed\n");
41555
41556 dm->state = DM_INITIALIZED;
41557 - resp.hdr.trans_id = atomic_inc_return(&trans_id);
41558 + resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41559 vmbus_sendpacket(dm->dev->channel, &resp,
41560 sizeof(struct dm_hot_add_response),
41561 (unsigned long)NULL,
41562 @@ -973,7 +973,7 @@ static void post_status(struct hv_dynmem_device *dm)
41563 memset(&status, 0, sizeof(struct dm_status));
41564 status.hdr.type = DM_STATUS_REPORT;
41565 status.hdr.size = sizeof(struct dm_status);
41566 - status.hdr.trans_id = atomic_inc_return(&trans_id);
41567 + status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41568
41569 /*
41570 * The host expects the guest to report free memory.
41571 @@ -993,7 +993,7 @@ static void post_status(struct hv_dynmem_device *dm)
41572 * send the status. This can happen if we were interrupted
41573 * after we picked our transaction ID.
41574 */
41575 - if (status.hdr.trans_id != atomic_read(&trans_id))
41576 + if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
41577 return;
41578
41579 /*
41580 @@ -1129,7 +1129,7 @@ static void balloon_up(struct work_struct *dummy)
41581 */
41582
41583 do {
41584 - bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
41585 + bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41586 ret = vmbus_sendpacket(dm_device.dev->channel,
41587 bl_resp,
41588 bl_resp->hdr.size,
41589 @@ -1175,7 +1175,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
41590
41591 memset(&resp, 0, sizeof(struct dm_unballoon_response));
41592 resp.hdr.type = DM_UNBALLOON_RESPONSE;
41593 - resp.hdr.trans_id = atomic_inc_return(&trans_id);
41594 + resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41595 resp.hdr.size = sizeof(struct dm_unballoon_response);
41596
41597 vmbus_sendpacket(dm_device.dev->channel, &resp,
41598 @@ -1239,7 +1239,7 @@ static void version_resp(struct hv_dynmem_device *dm,
41599 memset(&version_req, 0, sizeof(struct dm_version_request));
41600 version_req.hdr.type = DM_VERSION_REQUEST;
41601 version_req.hdr.size = sizeof(struct dm_version_request);
41602 - version_req.hdr.trans_id = atomic_inc_return(&trans_id);
41603 + version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41604 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
41605 version_req.is_last_attempt = 1;
41606
41607 @@ -1409,7 +1409,7 @@ static int balloon_probe(struct hv_device *dev,
41608 memset(&version_req, 0, sizeof(struct dm_version_request));
41609 version_req.hdr.type = DM_VERSION_REQUEST;
41610 version_req.hdr.size = sizeof(struct dm_version_request);
41611 - version_req.hdr.trans_id = atomic_inc_return(&trans_id);
41612 + version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41613 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
41614 version_req.is_last_attempt = 0;
41615
41616 @@ -1440,7 +1440,7 @@ static int balloon_probe(struct hv_device *dev,
41617 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
41618 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
41619 cap_msg.hdr.size = sizeof(struct dm_capabilities);
41620 - cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
41621 + cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41622
41623 cap_msg.caps.cap_bits.balloon = 1;
41624 cap_msg.caps.cap_bits.hot_add = 1;
41625 diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
41626 index 860134d..ea3a79a 100644
41627 --- a/drivers/hv/hyperv_vmbus.h
41628 +++ b/drivers/hv/hyperv_vmbus.h
41629 @@ -602,7 +602,7 @@ enum vmbus_connect_state {
41630 struct vmbus_connection {
41631 enum vmbus_connect_state conn_state;
41632
41633 - atomic_t next_gpadl_handle;
41634 + atomic_unchecked_t next_gpadl_handle;
41635
41636 /*
41637 * Represents channel interrupts. Each bit position represents a
41638 diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
41639 index 8e53a3c..7a64e44 100644
41640 --- a/drivers/hv/vmbus_drv.c
41641 +++ b/drivers/hv/vmbus_drv.c
41642 @@ -807,10 +807,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
41643 {
41644 int ret = 0;
41645
41646 - static atomic_t device_num = ATOMIC_INIT(0);
41647 + static atomic_unchecked_t device_num = ATOMIC_INIT(0);
41648
41649 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
41650 - atomic_inc_return(&device_num));
41651 + atomic_inc_return_unchecked(&device_num));
41652
41653 child_device_obj->device.bus = &hv_bus;
41654 child_device_obj->device.parent = &hv_acpi_dev->dev;
41655 diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
41656 index 579bdf9..75118b5 100644
41657 --- a/drivers/hwmon/acpi_power_meter.c
41658 +++ b/drivers/hwmon/acpi_power_meter.c
41659 @@ -116,7 +116,7 @@ struct sensor_template {
41660 struct device_attribute *devattr,
41661 const char *buf, size_t count);
41662 int index;
41663 -};
41664 +} __do_const;
41665
41666 /* Averaging interval */
41667 static int update_avg_interval(struct acpi_power_meter_resource *resource)
41668 @@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
41669 struct sensor_template *attrs)
41670 {
41671 struct device *dev = &resource->acpi_dev->dev;
41672 - struct sensor_device_attribute *sensors =
41673 + sensor_device_attribute_no_const *sensors =
41674 &resource->sensors[resource->num_sensors];
41675 int res = 0;
41676
41677 diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
41678 index 3288f13..71cfb4e 100644
41679 --- a/drivers/hwmon/applesmc.c
41680 +++ b/drivers/hwmon/applesmc.c
41681 @@ -1106,7 +1106,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
41682 {
41683 struct applesmc_node_group *grp;
41684 struct applesmc_dev_attr *node;
41685 - struct attribute *attr;
41686 + attribute_no_const *attr;
41687 int ret, i;
41688
41689 for (grp = groups; grp->format; grp++) {
41690 diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
41691 index ae208f6..48b6c5b 100644
41692 --- a/drivers/hwmon/asus_atk0110.c
41693 +++ b/drivers/hwmon/asus_atk0110.c
41694 @@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
41695 struct atk_sensor_data {
41696 struct list_head list;
41697 struct atk_data *data;
41698 - struct device_attribute label_attr;
41699 - struct device_attribute input_attr;
41700 - struct device_attribute limit1_attr;
41701 - struct device_attribute limit2_attr;
41702 + device_attribute_no_const label_attr;
41703 + device_attribute_no_const input_attr;
41704 + device_attribute_no_const limit1_attr;
41705 + device_attribute_no_const limit2_attr;
41706 char label_attr_name[ATTR_NAME_SIZE];
41707 char input_attr_name[ATTR_NAME_SIZE];
41708 char limit1_attr_name[ATTR_NAME_SIZE];
41709 @@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
41710 static struct device_attribute atk_name_attr =
41711 __ATTR(name, 0444, atk_name_show, NULL);
41712
41713 -static void atk_init_attribute(struct device_attribute *attr, char *name,
41714 +static void atk_init_attribute(device_attribute_no_const *attr, char *name,
41715 sysfs_show_func show)
41716 {
41717 sysfs_attr_init(&attr->attr);
41718 diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
41719 index d76f0b7..55ae976 100644
41720 --- a/drivers/hwmon/coretemp.c
41721 +++ b/drivers/hwmon/coretemp.c
41722 @@ -784,7 +784,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
41723 return NOTIFY_OK;
41724 }
41725
41726 -static struct notifier_block coretemp_cpu_notifier __refdata = {
41727 +static struct notifier_block coretemp_cpu_notifier = {
41728 .notifier_call = coretemp_cpu_callback,
41729 };
41730
41731 diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
41732 index 632f1dc..57e6a58 100644
41733 --- a/drivers/hwmon/ibmaem.c
41734 +++ b/drivers/hwmon/ibmaem.c
41735 @@ -926,7 +926,7 @@ static int aem_register_sensors(struct aem_data *data,
41736 struct aem_rw_sensor_template *rw)
41737 {
41738 struct device *dev = &data->pdev->dev;
41739 - struct sensor_device_attribute *sensors = data->sensors;
41740 + sensor_device_attribute_no_const *sensors = data->sensors;
41741 int err;
41742
41743 /* Set up read-only sensors */
41744 diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
41745 index 9fbb1b1..efbaa3e 100644
41746 --- a/drivers/hwmon/iio_hwmon.c
41747 +++ b/drivers/hwmon/iio_hwmon.c
41748 @@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
41749 {
41750 struct device *dev = &pdev->dev;
41751 struct iio_hwmon_state *st;
41752 - struct sensor_device_attribute *a;
41753 + sensor_device_attribute_no_const *a;
41754 int ret, i;
41755 int in_i = 1, temp_i = 1, curr_i = 1;
41756 enum iio_chan_type type;
41757 diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
41758 index 38d5a63..cf2c2ea 100644
41759 --- a/drivers/hwmon/nct6775.c
41760 +++ b/drivers/hwmon/nct6775.c
41761 @@ -944,10 +944,10 @@ static struct attribute_group *
41762 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
41763 int repeat)
41764 {
41765 - struct attribute_group *group;
41766 + attribute_group_no_const *group;
41767 struct sensor_device_attr_u *su;
41768 - struct sensor_device_attribute *a;
41769 - struct sensor_device_attribute_2 *a2;
41770 + sensor_device_attribute_no_const *a;
41771 + sensor_device_attribute_2_no_const *a2;
41772 struct attribute **attrs;
41773 struct sensor_device_template **t;
41774 int i, count;
41775 diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
41776 index 291d11f..3f0dbbd 100644
41777 --- a/drivers/hwmon/pmbus/pmbus_core.c
41778 +++ b/drivers/hwmon/pmbus/pmbus_core.c
41779 @@ -783,7 +783,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
41780 return 0;
41781 }
41782
41783 -static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
41784 +static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
41785 const char *name,
41786 umode_t mode,
41787 ssize_t (*show)(struct device *dev,
41788 @@ -800,7 +800,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
41789 dev_attr->store = store;
41790 }
41791
41792 -static void pmbus_attr_init(struct sensor_device_attribute *a,
41793 +static void pmbus_attr_init(sensor_device_attribute_no_const *a,
41794 const char *name,
41795 umode_t mode,
41796 ssize_t (*show)(struct device *dev,
41797 @@ -822,7 +822,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
41798 u16 reg, u8 mask)
41799 {
41800 struct pmbus_boolean *boolean;
41801 - struct sensor_device_attribute *a;
41802 + sensor_device_attribute_no_const *a;
41803
41804 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
41805 if (!boolean)
41806 @@ -847,7 +847,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
41807 bool update, bool readonly)
41808 {
41809 struct pmbus_sensor *sensor;
41810 - struct device_attribute *a;
41811 + device_attribute_no_const *a;
41812
41813 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
41814 if (!sensor)
41815 @@ -878,7 +878,7 @@ static int pmbus_add_label(struct pmbus_data *data,
41816 const char *lstring, int index)
41817 {
41818 struct pmbus_label *label;
41819 - struct device_attribute *a;
41820 + device_attribute_no_const *a;
41821
41822 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
41823 if (!label)
41824 diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
41825 index 97cd45a..ac54d8b 100644
41826 --- a/drivers/hwmon/sht15.c
41827 +++ b/drivers/hwmon/sht15.c
41828 @@ -169,7 +169,7 @@ struct sht15_data {
41829 int supply_uv;
41830 bool supply_uv_valid;
41831 struct work_struct update_supply_work;
41832 - atomic_t interrupt_handled;
41833 + atomic_unchecked_t interrupt_handled;
41834 };
41835
41836 /**
41837 @@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
41838 ret = gpio_direction_input(data->pdata->gpio_data);
41839 if (ret)
41840 return ret;
41841 - atomic_set(&data->interrupt_handled, 0);
41842 + atomic_set_unchecked(&data->interrupt_handled, 0);
41843
41844 enable_irq(gpio_to_irq(data->pdata->gpio_data));
41845 if (gpio_get_value(data->pdata->gpio_data) == 0) {
41846 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
41847 /* Only relevant if the interrupt hasn't occurred. */
41848 - if (!atomic_read(&data->interrupt_handled))
41849 + if (!atomic_read_unchecked(&data->interrupt_handled))
41850 schedule_work(&data->read_work);
41851 }
41852 ret = wait_event_timeout(data->wait_queue,
41853 @@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
41854
41855 /* First disable the interrupt */
41856 disable_irq_nosync(irq);
41857 - atomic_inc(&data->interrupt_handled);
41858 + atomic_inc_unchecked(&data->interrupt_handled);
41859 /* Then schedule a reading work struct */
41860 if (data->state != SHT15_READING_NOTHING)
41861 schedule_work(&data->read_work);
41862 @@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
41863 * If not, then start the interrupt again - care here as could
41864 * have gone low in meantime so verify it hasn't!
41865 */
41866 - atomic_set(&data->interrupt_handled, 0);
41867 + atomic_set_unchecked(&data->interrupt_handled, 0);
41868 enable_irq(gpio_to_irq(data->pdata->gpio_data));
41869 /* If still not occurred or another handler was scheduled */
41870 if (gpio_get_value(data->pdata->gpio_data)
41871 - || atomic_read(&data->interrupt_handled))
41872 + || atomic_read_unchecked(&data->interrupt_handled))
41873 return;
41874 }
41875
41876 diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
41877 index 8df43c5..b07b91d 100644
41878 --- a/drivers/hwmon/via-cputemp.c
41879 +++ b/drivers/hwmon/via-cputemp.c
41880 @@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
41881 return NOTIFY_OK;
41882 }
41883
41884 -static struct notifier_block via_cputemp_cpu_notifier __refdata = {
41885 +static struct notifier_block via_cputemp_cpu_notifier = {
41886 .notifier_call = via_cputemp_cpu_callback,
41887 };
41888
41889 diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
41890 index 41fc683..a39cfea 100644
41891 --- a/drivers/i2c/busses/i2c-amd756-s4882.c
41892 +++ b/drivers/i2c/busses/i2c-amd756-s4882.c
41893 @@ -43,7 +43,7 @@
41894 extern struct i2c_adapter amd756_smbus;
41895
41896 static struct i2c_adapter *s4882_adapter;
41897 -static struct i2c_algorithm *s4882_algo;
41898 +static i2c_algorithm_no_const *s4882_algo;
41899
41900 /* Wrapper access functions for multiplexed SMBus */
41901 static DEFINE_MUTEX(amd756_lock);
41902 diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
41903 index 721f7eb..0fd2a09 100644
41904 --- a/drivers/i2c/busses/i2c-diolan-u2c.c
41905 +++ b/drivers/i2c/busses/i2c-diolan-u2c.c
41906 @@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
41907 /* usb layer */
41908
41909 /* Send command to device, and get response. */
41910 -static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
41911 +static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
41912 {
41913 int ret = 0;
41914 int actual;
41915 diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
41916 index b170bdf..3c76427 100644
41917 --- a/drivers/i2c/busses/i2c-nforce2-s4985.c
41918 +++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
41919 @@ -41,7 +41,7 @@
41920 extern struct i2c_adapter *nforce2_smbus;
41921
41922 static struct i2c_adapter *s4985_adapter;
41923 -static struct i2c_algorithm *s4985_algo;
41924 +static i2c_algorithm_no_const *s4985_algo;
41925
41926 /* Wrapper access functions for multiplexed SMBus */
41927 static DEFINE_MUTEX(nforce2_lock);
41928 diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
41929 index 80b47e8..1a6040d9 100644
41930 --- a/drivers/i2c/i2c-dev.c
41931 +++ b/drivers/i2c/i2c-dev.c
41932 @@ -277,7 +277,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
41933 break;
41934 }
41935
41936 - data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
41937 + data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
41938 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
41939 if (IS_ERR(rdwr_pa[i].buf)) {
41940 res = PTR_ERR(rdwr_pa[i].buf);
41941 diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
41942 index 0b510ba..4fbb5085 100644
41943 --- a/drivers/ide/ide-cd.c
41944 +++ b/drivers/ide/ide-cd.c
41945 @@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
41946 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
41947 if ((unsigned long)buf & alignment
41948 || blk_rq_bytes(rq) & q->dma_pad_mask
41949 - || object_is_on_stack(buf))
41950 + || object_starts_on_stack(buf))
41951 drive->dma = 0;
41952 }
41953 }
41954 diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
41955 index ede16aec..e423e8a 100644
41956 --- a/drivers/iio/industrialio-core.c
41957 +++ b/drivers/iio/industrialio-core.c
41958 @@ -527,7 +527,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
41959 }
41960
41961 static
41962 -int __iio_device_attr_init(struct device_attribute *dev_attr,
41963 +int __iio_device_attr_init(device_attribute_no_const *dev_attr,
41964 const char *postfix,
41965 struct iio_chan_spec const *chan,
41966 ssize_t (*readfunc)(struct device *dev,
41967 diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
41968 index c323917..6ddea8b 100644
41969 --- a/drivers/infiniband/core/cm.c
41970 +++ b/drivers/infiniband/core/cm.c
41971 @@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
41972
41973 struct cm_counter_group {
41974 struct kobject obj;
41975 - atomic_long_t counter[CM_ATTR_COUNT];
41976 + atomic_long_unchecked_t counter[CM_ATTR_COUNT];
41977 };
41978
41979 struct cm_counter_attribute {
41980 @@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
41981 struct ib_mad_send_buf *msg = NULL;
41982 int ret;
41983
41984 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
41985 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
41986 counter[CM_REQ_COUNTER]);
41987
41988 /* Quick state check to discard duplicate REQs. */
41989 @@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
41990 if (!cm_id_priv)
41991 return;
41992
41993 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
41994 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
41995 counter[CM_REP_COUNTER]);
41996 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
41997 if (ret)
41998 @@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
41999 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42000 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42001 spin_unlock_irq(&cm_id_priv->lock);
42002 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42003 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42004 counter[CM_RTU_COUNTER]);
42005 goto out;
42006 }
42007 @@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
42008 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42009 dreq_msg->local_comm_id);
42010 if (!cm_id_priv) {
42011 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42012 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42013 counter[CM_DREQ_COUNTER]);
42014 cm_issue_drep(work->port, work->mad_recv_wc);
42015 return -EINVAL;
42016 @@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
42017 case IB_CM_MRA_REP_RCVD:
42018 break;
42019 case IB_CM_TIMEWAIT:
42020 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42021 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42022 counter[CM_DREQ_COUNTER]);
42023 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42024 goto unlock;
42025 @@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
42026 cm_free_msg(msg);
42027 goto deref;
42028 case IB_CM_DREQ_RCVD:
42029 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42030 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42031 counter[CM_DREQ_COUNTER]);
42032 goto unlock;
42033 default:
42034 @@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
42035 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42036 cm_id_priv->msg, timeout)) {
42037 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42038 - atomic_long_inc(&work->port->
42039 + atomic_long_inc_unchecked(&work->port->
42040 counter_group[CM_RECV_DUPLICATES].
42041 counter[CM_MRA_COUNTER]);
42042 goto out;
42043 @@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
42044 break;
42045 case IB_CM_MRA_REQ_RCVD:
42046 case IB_CM_MRA_REP_RCVD:
42047 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42048 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42049 counter[CM_MRA_COUNTER]);
42050 /* fall through */
42051 default:
42052 @@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
42053 case IB_CM_LAP_IDLE:
42054 break;
42055 case IB_CM_MRA_LAP_SENT:
42056 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42057 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42058 counter[CM_LAP_COUNTER]);
42059 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42060 goto unlock;
42061 @@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
42062 cm_free_msg(msg);
42063 goto deref;
42064 case IB_CM_LAP_RCVD:
42065 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42066 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42067 counter[CM_LAP_COUNTER]);
42068 goto unlock;
42069 default:
42070 @@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
42071 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
42072 if (cur_cm_id_priv) {
42073 spin_unlock_irq(&cm.lock);
42074 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42075 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42076 counter[CM_SIDR_REQ_COUNTER]);
42077 goto out; /* Duplicate message. */
42078 }
42079 @@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
42080 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
42081 msg->retries = 1;
42082
42083 - atomic_long_add(1 + msg->retries,
42084 + atomic_long_add_unchecked(1 + msg->retries,
42085 &port->counter_group[CM_XMIT].counter[attr_index]);
42086 if (msg->retries)
42087 - atomic_long_add(msg->retries,
42088 + atomic_long_add_unchecked(msg->retries,
42089 &port->counter_group[CM_XMIT_RETRIES].
42090 counter[attr_index]);
42091
42092 @@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
42093 }
42094
42095 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
42096 - atomic_long_inc(&port->counter_group[CM_RECV].
42097 + atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
42098 counter[attr_id - CM_ATTR_ID_OFFSET]);
42099
42100 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
42101 @@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
42102 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42103
42104 return sprintf(buf, "%ld\n",
42105 - atomic_long_read(&group->counter[cm_attr->index]));
42106 + atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42107 }
42108
42109 static const struct sysfs_ops cm_counter_ops = {
42110 diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
42111 index 9f5ad7c..588cd84 100644
42112 --- a/drivers/infiniband/core/fmr_pool.c
42113 +++ b/drivers/infiniband/core/fmr_pool.c
42114 @@ -98,8 +98,8 @@ struct ib_fmr_pool {
42115
42116 struct task_struct *thread;
42117
42118 - atomic_t req_ser;
42119 - atomic_t flush_ser;
42120 + atomic_unchecked_t req_ser;
42121 + atomic_unchecked_t flush_ser;
42122
42123 wait_queue_head_t force_wait;
42124 };
42125 @@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42126 struct ib_fmr_pool *pool = pool_ptr;
42127
42128 do {
42129 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
42130 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
42131 ib_fmr_batch_release(pool);
42132
42133 - atomic_inc(&pool->flush_ser);
42134 + atomic_inc_unchecked(&pool->flush_ser);
42135 wake_up_interruptible(&pool->force_wait);
42136
42137 if (pool->flush_function)
42138 @@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42139 }
42140
42141 set_current_state(TASK_INTERRUPTIBLE);
42142 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
42143 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
42144 !kthread_should_stop())
42145 schedule();
42146 __set_current_state(TASK_RUNNING);
42147 @@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
42148 pool->dirty_watermark = params->dirty_watermark;
42149 pool->dirty_len = 0;
42150 spin_lock_init(&pool->pool_lock);
42151 - atomic_set(&pool->req_ser, 0);
42152 - atomic_set(&pool->flush_ser, 0);
42153 + atomic_set_unchecked(&pool->req_ser, 0);
42154 + atomic_set_unchecked(&pool->flush_ser, 0);
42155 init_waitqueue_head(&pool->force_wait);
42156
42157 pool->thread = kthread_run(ib_fmr_cleanup_thread,
42158 @@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
42159 }
42160 spin_unlock_irq(&pool->pool_lock);
42161
42162 - serial = atomic_inc_return(&pool->req_ser);
42163 + serial = atomic_inc_return_unchecked(&pool->req_ser);
42164 wake_up_process(pool->thread);
42165
42166 if (wait_event_interruptible(pool->force_wait,
42167 - atomic_read(&pool->flush_ser) - serial >= 0))
42168 + atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
42169 return -EINTR;
42170
42171 return 0;
42172 @@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
42173 } else {
42174 list_add_tail(&fmr->list, &pool->dirty_list);
42175 if (++pool->dirty_len >= pool->dirty_watermark) {
42176 - atomic_inc(&pool->req_ser);
42177 + atomic_inc_unchecked(&pool->req_ser);
42178 wake_up_process(pool->thread);
42179 }
42180 }
42181 diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
42182 index ec7a298..8742e59 100644
42183 --- a/drivers/infiniband/hw/cxgb4/mem.c
42184 +++ b/drivers/infiniband/hw/cxgb4/mem.c
42185 @@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42186 int err;
42187 struct fw_ri_tpte tpt;
42188 u32 stag_idx;
42189 - static atomic_t key;
42190 + static atomic_unchecked_t key;
42191
42192 if (c4iw_fatal_error(rdev))
42193 return -EIO;
42194 @@ -270,7 +270,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42195 if (rdev->stats.stag.cur > rdev->stats.stag.max)
42196 rdev->stats.stag.max = rdev->stats.stag.cur;
42197 mutex_unlock(&rdev->stats.lock);
42198 - *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
42199 + *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
42200 }
42201 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
42202 __func__, stag_state, type, pdid, stag_idx);
42203 diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
42204 index 79b3dbc..96e5fcc 100644
42205 --- a/drivers/infiniband/hw/ipath/ipath_rc.c
42206 +++ b/drivers/infiniband/hw/ipath/ipath_rc.c
42207 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42208 struct ib_atomic_eth *ateth;
42209 struct ipath_ack_entry *e;
42210 u64 vaddr;
42211 - atomic64_t *maddr;
42212 + atomic64_unchecked_t *maddr;
42213 u64 sdata;
42214 u32 rkey;
42215 u8 next;
42216 @@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42217 IB_ACCESS_REMOTE_ATOMIC)))
42218 goto nack_acc_unlck;
42219 /* Perform atomic OP and save result. */
42220 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42221 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42222 sdata = be64_to_cpu(ateth->swap_data);
42223 e = &qp->s_ack_queue[qp->r_head_ack_queue];
42224 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
42225 - (u64) atomic64_add_return(sdata, maddr) - sdata :
42226 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42227 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42228 be64_to_cpu(ateth->compare_data),
42229 sdata);
42230 diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
42231 index 1f95bba..9530f87 100644
42232 --- a/drivers/infiniband/hw/ipath/ipath_ruc.c
42233 +++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
42234 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
42235 unsigned long flags;
42236 struct ib_wc wc;
42237 u64 sdata;
42238 - atomic64_t *maddr;
42239 + atomic64_unchecked_t *maddr;
42240 enum ib_wc_status send_status;
42241
42242 /*
42243 @@ -382,11 +382,11 @@ again:
42244 IB_ACCESS_REMOTE_ATOMIC)))
42245 goto acc_err;
42246 /* Perform atomic OP and save result. */
42247 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42248 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42249 sdata = wqe->wr.wr.atomic.compare_add;
42250 *(u64 *) sqp->s_sge.sge.vaddr =
42251 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
42252 - (u64) atomic64_add_return(sdata, maddr) - sdata :
42253 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42254 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42255 sdata, wqe->wr.wr.atomic.swap);
42256 goto send_comp;
42257 diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
42258 index fd36ec6..a6a082f 100644
42259 --- a/drivers/infiniband/hw/mlx4/mad.c
42260 +++ b/drivers/infiniband/hw/mlx4/mad.c
42261 @@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
42262
42263 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
42264 {
42265 - return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
42266 + return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
42267 cpu_to_be64(0xff00000000000000LL);
42268 }
42269
42270 diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
42271 index ed327e6..ca1739e0 100644
42272 --- a/drivers/infiniband/hw/mlx4/mcg.c
42273 +++ b/drivers/infiniband/hw/mlx4/mcg.c
42274 @@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
42275 {
42276 char name[20];
42277
42278 - atomic_set(&ctx->tid, 0);
42279 + atomic_set_unchecked(&ctx->tid, 0);
42280 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
42281 ctx->mcg_wq = create_singlethread_workqueue(name);
42282 if (!ctx->mcg_wq)
42283 diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42284 index 66b0b7d..f14836a 100644
42285 --- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
42286 +++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42287 @@ -425,7 +425,7 @@ struct mlx4_ib_demux_ctx {
42288 struct list_head mcg_mgid0_list;
42289 struct workqueue_struct *mcg_wq;
42290 struct mlx4_ib_demux_pv_ctx **tun;
42291 - atomic_t tid;
42292 + atomic_unchecked_t tid;
42293 int flushing; /* flushing the work queue */
42294 };
42295
42296 diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
42297 index 9d3e5c1..6f166df 100644
42298 --- a/drivers/infiniband/hw/mthca/mthca_cmd.c
42299 +++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
42300 @@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
42301 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
42302 }
42303
42304 -int mthca_QUERY_FW(struct mthca_dev *dev)
42305 +int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
42306 {
42307 struct mthca_mailbox *mailbox;
42308 u32 *outbox;
42309 @@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42310 CMD_TIME_CLASS_B);
42311 }
42312
42313 -int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42314 +int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42315 int num_mtt)
42316 {
42317 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
42318 @@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
42319 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
42320 }
42321
42322 -int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42323 +int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42324 int eq_num)
42325 {
42326 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
42327 @@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
42328 CMD_TIME_CLASS_B);
42329 }
42330
42331 -int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42332 +int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42333 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
42334 void *in_mad, void *response_mad)
42335 {
42336 diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
42337 index ded76c1..0cf0a08 100644
42338 --- a/drivers/infiniband/hw/mthca/mthca_main.c
42339 +++ b/drivers/infiniband/hw/mthca/mthca_main.c
42340 @@ -692,7 +692,7 @@ err_close:
42341 return err;
42342 }
42343
42344 -static int mthca_setup_hca(struct mthca_dev *dev)
42345 +static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
42346 {
42347 int err;
42348
42349 diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
42350 index ed9a989..6aa5dc2 100644
42351 --- a/drivers/infiniband/hw/mthca/mthca_mr.c
42352 +++ b/drivers/infiniband/hw/mthca/mthca_mr.c
42353 @@ -81,7 +81,7 @@ struct mthca_mpt_entry {
42354 * through the bitmaps)
42355 */
42356
42357 -static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42358 +static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42359 {
42360 int o;
42361 int m;
42362 @@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
42363 return key;
42364 }
42365
42366 -int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42367 +int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42368 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
42369 {
42370 struct mthca_mailbox *mailbox;
42371 @@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
42372 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
42373 }
42374
42375 -int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
42376 +int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
42377 u64 *buffer_list, int buffer_size_shift,
42378 int list_len, u64 iova, u64 total_size,
42379 u32 access, struct mthca_mr *mr)
42380 diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
42381 index 415f8e1..e34214e 100644
42382 --- a/drivers/infiniband/hw/mthca/mthca_provider.c
42383 +++ b/drivers/infiniband/hw/mthca/mthca_provider.c
42384 @@ -764,7 +764,7 @@ unlock:
42385 return 0;
42386 }
42387
42388 -static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
42389 +static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
42390 {
42391 struct mthca_dev *dev = to_mdev(ibcq->device);
42392 struct mthca_cq *cq = to_mcq(ibcq);
42393 diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
42394 index 353c7b0..c6ce921 100644
42395 --- a/drivers/infiniband/hw/nes/nes.c
42396 +++ b/drivers/infiniband/hw/nes/nes.c
42397 @@ -98,7 +98,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
42398 LIST_HEAD(nes_adapter_list);
42399 static LIST_HEAD(nes_dev_list);
42400
42401 -atomic_t qps_destroyed;
42402 +atomic_unchecked_t qps_destroyed;
42403
42404 static unsigned int ee_flsh_adapter;
42405 static unsigned int sysfs_nonidx_addr;
42406 @@ -269,7 +269,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
42407 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
42408 struct nes_adapter *nesadapter = nesdev->nesadapter;
42409
42410 - atomic_inc(&qps_destroyed);
42411 + atomic_inc_unchecked(&qps_destroyed);
42412
42413 /* Free the control structures */
42414
42415 diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
42416 index 33cc589..3bd6538 100644
42417 --- a/drivers/infiniband/hw/nes/nes.h
42418 +++ b/drivers/infiniband/hw/nes/nes.h
42419 @@ -177,17 +177,17 @@ extern unsigned int nes_debug_level;
42420 extern unsigned int wqm_quanta;
42421 extern struct list_head nes_adapter_list;
42422
42423 -extern atomic_t cm_connects;
42424 -extern atomic_t cm_accepts;
42425 -extern atomic_t cm_disconnects;
42426 -extern atomic_t cm_closes;
42427 -extern atomic_t cm_connecteds;
42428 -extern atomic_t cm_connect_reqs;
42429 -extern atomic_t cm_rejects;
42430 -extern atomic_t mod_qp_timouts;
42431 -extern atomic_t qps_created;
42432 -extern atomic_t qps_destroyed;
42433 -extern atomic_t sw_qps_destroyed;
42434 +extern atomic_unchecked_t cm_connects;
42435 +extern atomic_unchecked_t cm_accepts;
42436 +extern atomic_unchecked_t cm_disconnects;
42437 +extern atomic_unchecked_t cm_closes;
42438 +extern atomic_unchecked_t cm_connecteds;
42439 +extern atomic_unchecked_t cm_connect_reqs;
42440 +extern atomic_unchecked_t cm_rejects;
42441 +extern atomic_unchecked_t mod_qp_timouts;
42442 +extern atomic_unchecked_t qps_created;
42443 +extern atomic_unchecked_t qps_destroyed;
42444 +extern atomic_unchecked_t sw_qps_destroyed;
42445 extern u32 mh_detected;
42446 extern u32 mh_pauses_sent;
42447 extern u32 cm_packets_sent;
42448 @@ -196,16 +196,16 @@ extern u32 cm_packets_created;
42449 extern u32 cm_packets_received;
42450 extern u32 cm_packets_dropped;
42451 extern u32 cm_packets_retrans;
42452 -extern atomic_t cm_listens_created;
42453 -extern atomic_t cm_listens_destroyed;
42454 +extern atomic_unchecked_t cm_listens_created;
42455 +extern atomic_unchecked_t cm_listens_destroyed;
42456 extern u32 cm_backlog_drops;
42457 -extern atomic_t cm_loopbacks;
42458 -extern atomic_t cm_nodes_created;
42459 -extern atomic_t cm_nodes_destroyed;
42460 -extern atomic_t cm_accel_dropped_pkts;
42461 -extern atomic_t cm_resets_recvd;
42462 -extern atomic_t pau_qps_created;
42463 -extern atomic_t pau_qps_destroyed;
42464 +extern atomic_unchecked_t cm_loopbacks;
42465 +extern atomic_unchecked_t cm_nodes_created;
42466 +extern atomic_unchecked_t cm_nodes_destroyed;
42467 +extern atomic_unchecked_t cm_accel_dropped_pkts;
42468 +extern atomic_unchecked_t cm_resets_recvd;
42469 +extern atomic_unchecked_t pau_qps_created;
42470 +extern atomic_unchecked_t pau_qps_destroyed;
42471
42472 extern u32 int_mod_timer_init;
42473 extern u32 int_mod_cq_depth_256;
42474 diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
42475 index dfa9df4..6bf7221 100644
42476 --- a/drivers/infiniband/hw/nes/nes_cm.c
42477 +++ b/drivers/infiniband/hw/nes/nes_cm.c
42478 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
42479 u32 cm_packets_retrans;
42480 u32 cm_packets_created;
42481 u32 cm_packets_received;
42482 -atomic_t cm_listens_created;
42483 -atomic_t cm_listens_destroyed;
42484 +atomic_unchecked_t cm_listens_created;
42485 +atomic_unchecked_t cm_listens_destroyed;
42486 u32 cm_backlog_drops;
42487 -atomic_t cm_loopbacks;
42488 -atomic_t cm_nodes_created;
42489 -atomic_t cm_nodes_destroyed;
42490 -atomic_t cm_accel_dropped_pkts;
42491 -atomic_t cm_resets_recvd;
42492 +atomic_unchecked_t cm_loopbacks;
42493 +atomic_unchecked_t cm_nodes_created;
42494 +atomic_unchecked_t cm_nodes_destroyed;
42495 +atomic_unchecked_t cm_accel_dropped_pkts;
42496 +atomic_unchecked_t cm_resets_recvd;
42497
42498 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
42499 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
42500 @@ -134,28 +134,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
42501 /* instance of function pointers for client API */
42502 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
42503 static struct nes_cm_ops nes_cm_api = {
42504 - mini_cm_accelerated,
42505 - mini_cm_listen,
42506 - mini_cm_del_listen,
42507 - mini_cm_connect,
42508 - mini_cm_close,
42509 - mini_cm_accept,
42510 - mini_cm_reject,
42511 - mini_cm_recv_pkt,
42512 - mini_cm_dealloc_core,
42513 - mini_cm_get,
42514 - mini_cm_set
42515 + .accelerated = mini_cm_accelerated,
42516 + .listen = mini_cm_listen,
42517 + .stop_listener = mini_cm_del_listen,
42518 + .connect = mini_cm_connect,
42519 + .close = mini_cm_close,
42520 + .accept = mini_cm_accept,
42521 + .reject = mini_cm_reject,
42522 + .recv_pkt = mini_cm_recv_pkt,
42523 + .destroy_cm_core = mini_cm_dealloc_core,
42524 + .get = mini_cm_get,
42525 + .set = mini_cm_set
42526 };
42527
42528 static struct nes_cm_core *g_cm_core;
42529
42530 -atomic_t cm_connects;
42531 -atomic_t cm_accepts;
42532 -atomic_t cm_disconnects;
42533 -atomic_t cm_closes;
42534 -atomic_t cm_connecteds;
42535 -atomic_t cm_connect_reqs;
42536 -atomic_t cm_rejects;
42537 +atomic_unchecked_t cm_connects;
42538 +atomic_unchecked_t cm_accepts;
42539 +atomic_unchecked_t cm_disconnects;
42540 +atomic_unchecked_t cm_closes;
42541 +atomic_unchecked_t cm_connecteds;
42542 +atomic_unchecked_t cm_connect_reqs;
42543 +atomic_unchecked_t cm_rejects;
42544
42545 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
42546 {
42547 @@ -1319,7 +1319,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
42548 kfree(listener);
42549 listener = NULL;
42550 ret = 0;
42551 - atomic_inc(&cm_listens_destroyed);
42552 + atomic_inc_unchecked(&cm_listens_destroyed);
42553 } else {
42554 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
42555 }
42556 @@ -1513,7 +1513,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
42557 cm_node->rem_mac);
42558
42559 add_hte_node(cm_core, cm_node);
42560 - atomic_inc(&cm_nodes_created);
42561 + atomic_inc_unchecked(&cm_nodes_created);
42562
42563 return cm_node;
42564 }
42565 @@ -1571,7 +1571,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
42566 }
42567
42568 atomic_dec(&cm_core->node_cnt);
42569 - atomic_inc(&cm_nodes_destroyed);
42570 + atomic_inc_unchecked(&cm_nodes_destroyed);
42571 nesqp = cm_node->nesqp;
42572 if (nesqp) {
42573 nesqp->cm_node = NULL;
42574 @@ -1635,7 +1635,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
42575
42576 static void drop_packet(struct sk_buff *skb)
42577 {
42578 - atomic_inc(&cm_accel_dropped_pkts);
42579 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
42580 dev_kfree_skb_any(skb);
42581 }
42582
42583 @@ -1698,7 +1698,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
42584 {
42585
42586 int reset = 0; /* whether to send reset in case of err.. */
42587 - atomic_inc(&cm_resets_recvd);
42588 + atomic_inc_unchecked(&cm_resets_recvd);
42589 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
42590 " refcnt=%d\n", cm_node, cm_node->state,
42591 atomic_read(&cm_node->ref_count));
42592 @@ -2339,7 +2339,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
42593 rem_ref_cm_node(cm_node->cm_core, cm_node);
42594 return NULL;
42595 }
42596 - atomic_inc(&cm_loopbacks);
42597 + atomic_inc_unchecked(&cm_loopbacks);
42598 loopbackremotenode->loopbackpartner = cm_node;
42599 loopbackremotenode->tcp_cntxt.rcv_wscale =
42600 NES_CM_DEFAULT_RCV_WND_SCALE;
42601 @@ -2614,7 +2614,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
42602 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
42603 else {
42604 rem_ref_cm_node(cm_core, cm_node);
42605 - atomic_inc(&cm_accel_dropped_pkts);
42606 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
42607 dev_kfree_skb_any(skb);
42608 }
42609 break;
42610 @@ -2922,7 +2922,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
42611
42612 if ((cm_id) && (cm_id->event_handler)) {
42613 if (issue_disconn) {
42614 - atomic_inc(&cm_disconnects);
42615 + atomic_inc_unchecked(&cm_disconnects);
42616 cm_event.event = IW_CM_EVENT_DISCONNECT;
42617 cm_event.status = disconn_status;
42618 cm_event.local_addr = cm_id->local_addr;
42619 @@ -2944,7 +2944,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
42620 }
42621
42622 if (issue_close) {
42623 - atomic_inc(&cm_closes);
42624 + atomic_inc_unchecked(&cm_closes);
42625 nes_disconnect(nesqp, 1);
42626
42627 cm_id->provider_data = nesqp;
42628 @@ -3082,7 +3082,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
42629
42630 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
42631 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
42632 - atomic_inc(&cm_accepts);
42633 + atomic_inc_unchecked(&cm_accepts);
42634
42635 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
42636 netdev_refcnt_read(nesvnic->netdev));
42637 @@ -3278,7 +3278,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
42638 struct nes_cm_core *cm_core;
42639 u8 *start_buff;
42640
42641 - atomic_inc(&cm_rejects);
42642 + atomic_inc_unchecked(&cm_rejects);
42643 cm_node = (struct nes_cm_node *)cm_id->provider_data;
42644 loopback = cm_node->loopbackpartner;
42645 cm_core = cm_node->cm_core;
42646 @@ -3340,7 +3340,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
42647 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
42648 ntohs(laddr->sin_port));
42649
42650 - atomic_inc(&cm_connects);
42651 + atomic_inc_unchecked(&cm_connects);
42652 nesqp->active_conn = 1;
42653
42654 /* cache the cm_id in the qp */
42655 @@ -3451,7 +3451,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
42656 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
42657 return err;
42658 }
42659 - atomic_inc(&cm_listens_created);
42660 + atomic_inc_unchecked(&cm_listens_created);
42661 }
42662
42663 cm_id->add_ref(cm_id);
42664 @@ -3558,7 +3558,7 @@ static void cm_event_connected(struct nes_cm_event *event)
42665
42666 if (nesqp->destroyed)
42667 return;
42668 - atomic_inc(&cm_connecteds);
42669 + atomic_inc_unchecked(&cm_connecteds);
42670 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
42671 " local port 0x%04X. jiffies = %lu.\n",
42672 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
42673 @@ -3741,7 +3741,7 @@ static void cm_event_reset(struct nes_cm_event *event)
42674
42675 cm_id->add_ref(cm_id);
42676 ret = cm_id->event_handler(cm_id, &cm_event);
42677 - atomic_inc(&cm_closes);
42678 + atomic_inc_unchecked(&cm_closes);
42679 cm_event.event = IW_CM_EVENT_CLOSE;
42680 cm_event.status = 0;
42681 cm_event.provider_data = cm_id->provider_data;
42682 @@ -3781,7 +3781,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
42683 return;
42684 cm_id = cm_node->cm_id;
42685
42686 - atomic_inc(&cm_connect_reqs);
42687 + atomic_inc_unchecked(&cm_connect_reqs);
42688 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
42689 cm_node, cm_id, jiffies);
42690
42691 @@ -3830,7 +3830,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
42692 return;
42693 cm_id = cm_node->cm_id;
42694
42695 - atomic_inc(&cm_connect_reqs);
42696 + atomic_inc_unchecked(&cm_connect_reqs);
42697 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
42698 cm_node, cm_id, jiffies);
42699
42700 diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
42701 index 4166452..fc952c3 100644
42702 --- a/drivers/infiniband/hw/nes/nes_mgt.c
42703 +++ b/drivers/infiniband/hw/nes/nes_mgt.c
42704 @@ -40,8 +40,8 @@
42705 #include "nes.h"
42706 #include "nes_mgt.h"
42707
42708 -atomic_t pau_qps_created;
42709 -atomic_t pau_qps_destroyed;
42710 +atomic_unchecked_t pau_qps_created;
42711 +atomic_unchecked_t pau_qps_destroyed;
42712
42713 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
42714 {
42715 @@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
42716 {
42717 struct sk_buff *skb;
42718 unsigned long flags;
42719 - atomic_inc(&pau_qps_destroyed);
42720 + atomic_inc_unchecked(&pau_qps_destroyed);
42721
42722 /* Free packets that have not yet been forwarded */
42723 /* Lock is acquired by skb_dequeue when removing the skb */
42724 @@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
42725 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
42726 skb_queue_head_init(&nesqp->pau_list);
42727 spin_lock_init(&nesqp->pau_lock);
42728 - atomic_inc(&pau_qps_created);
42729 + atomic_inc_unchecked(&pau_qps_created);
42730 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
42731 }
42732
42733 diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
42734 index 49eb511..a774366 100644
42735 --- a/drivers/infiniband/hw/nes/nes_nic.c
42736 +++ b/drivers/infiniband/hw/nes/nes_nic.c
42737 @@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
42738 target_stat_values[++index] = mh_detected;
42739 target_stat_values[++index] = mh_pauses_sent;
42740 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
42741 - target_stat_values[++index] = atomic_read(&cm_connects);
42742 - target_stat_values[++index] = atomic_read(&cm_accepts);
42743 - target_stat_values[++index] = atomic_read(&cm_disconnects);
42744 - target_stat_values[++index] = atomic_read(&cm_connecteds);
42745 - target_stat_values[++index] = atomic_read(&cm_connect_reqs);
42746 - target_stat_values[++index] = atomic_read(&cm_rejects);
42747 - target_stat_values[++index] = atomic_read(&mod_qp_timouts);
42748 - target_stat_values[++index] = atomic_read(&qps_created);
42749 - target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
42750 - target_stat_values[++index] = atomic_read(&qps_destroyed);
42751 - target_stat_values[++index] = atomic_read(&cm_closes);
42752 + target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
42753 + target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
42754 + target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
42755 + target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
42756 + target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
42757 + target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
42758 + target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
42759 + target_stat_values[++index] = atomic_read_unchecked(&qps_created);
42760 + target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
42761 + target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
42762 + target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
42763 target_stat_values[++index] = cm_packets_sent;
42764 target_stat_values[++index] = cm_packets_bounced;
42765 target_stat_values[++index] = cm_packets_created;
42766 target_stat_values[++index] = cm_packets_received;
42767 target_stat_values[++index] = cm_packets_dropped;
42768 target_stat_values[++index] = cm_packets_retrans;
42769 - target_stat_values[++index] = atomic_read(&cm_listens_created);
42770 - target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
42771 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
42772 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
42773 target_stat_values[++index] = cm_backlog_drops;
42774 - target_stat_values[++index] = atomic_read(&cm_loopbacks);
42775 - target_stat_values[++index] = atomic_read(&cm_nodes_created);
42776 - target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
42777 - target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
42778 - target_stat_values[++index] = atomic_read(&cm_resets_recvd);
42779 + target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
42780 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
42781 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
42782 + target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
42783 + target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
42784 target_stat_values[++index] = nesadapter->free_4kpbl;
42785 target_stat_values[++index] = nesadapter->free_256pbl;
42786 target_stat_values[++index] = int_mod_timer_init;
42787 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
42788 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
42789 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
42790 - target_stat_values[++index] = atomic_read(&pau_qps_created);
42791 - target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
42792 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
42793 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
42794 }
42795
42796 /**
42797 diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
42798 index 218dd35..97ce31d 100644
42799 --- a/drivers/infiniband/hw/nes/nes_verbs.c
42800 +++ b/drivers/infiniband/hw/nes/nes_verbs.c
42801 @@ -46,9 +46,9 @@
42802
42803 #include <rdma/ib_umem.h>
42804
42805 -atomic_t mod_qp_timouts;
42806 -atomic_t qps_created;
42807 -atomic_t sw_qps_destroyed;
42808 +atomic_unchecked_t mod_qp_timouts;
42809 +atomic_unchecked_t qps_created;
42810 +atomic_unchecked_t sw_qps_destroyed;
42811
42812 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
42813
42814 @@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
42815 if (init_attr->create_flags)
42816 return ERR_PTR(-EINVAL);
42817
42818 - atomic_inc(&qps_created);
42819 + atomic_inc_unchecked(&qps_created);
42820 switch (init_attr->qp_type) {
42821 case IB_QPT_RC:
42822 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
42823 @@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
42824 struct iw_cm_event cm_event;
42825 int ret = 0;
42826
42827 - atomic_inc(&sw_qps_destroyed);
42828 + atomic_inc_unchecked(&sw_qps_destroyed);
42829 nesqp->destroyed = 1;
42830
42831 /* Blow away the connection if it exists. */
42832 diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
42833 index c00ae09..04e91be 100644
42834 --- a/drivers/infiniband/hw/qib/qib.h
42835 +++ b/drivers/infiniband/hw/qib/qib.h
42836 @@ -52,6 +52,7 @@
42837 #include <linux/kref.h>
42838 #include <linux/sched.h>
42839 #include <linux/kthread.h>
42840 +#include <linux/slab.h>
42841
42842 #include "qib_common.h"
42843 #include "qib_verbs.h"
42844 diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
42845 index 24c41ba..102d71f 100644
42846 --- a/drivers/input/gameport/gameport.c
42847 +++ b/drivers/input/gameport/gameport.c
42848 @@ -490,14 +490,14 @@ EXPORT_SYMBOL(gameport_set_phys);
42849 */
42850 static void gameport_init_port(struct gameport *gameport)
42851 {
42852 - static atomic_t gameport_no = ATOMIC_INIT(0);
42853 + static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
42854
42855 __module_get(THIS_MODULE);
42856
42857 mutex_init(&gameport->drv_mutex);
42858 device_initialize(&gameport->dev);
42859 dev_set_name(&gameport->dev, "gameport%lu",
42860 - (unsigned long)atomic_inc_return(&gameport_no) - 1);
42861 + (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
42862 gameport->dev.bus = &gameport_bus;
42863 gameport->dev.release = gameport_release_port;
42864 if (gameport->parent)
42865 diff --git a/drivers/input/input.c b/drivers/input/input.c
42866 index 1c4c0db..6f7abe3 100644
42867 --- a/drivers/input/input.c
42868 +++ b/drivers/input/input.c
42869 @@ -1772,7 +1772,7 @@ EXPORT_SYMBOL_GPL(input_class);
42870 */
42871 struct input_dev *input_allocate_device(void)
42872 {
42873 - static atomic_t input_no = ATOMIC_INIT(0);
42874 + static atomic_unchecked_t input_no = ATOMIC_INIT(0);
42875 struct input_dev *dev;
42876
42877 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
42878 @@ -1787,7 +1787,7 @@ struct input_dev *input_allocate_device(void)
42879 INIT_LIST_HEAD(&dev->node);
42880
42881 dev_set_name(&dev->dev, "input%ld",
42882 - (unsigned long) atomic_inc_return(&input_no) - 1);
42883 + (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
42884
42885 __module_get(THIS_MODULE);
42886 }
42887 diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
42888 index 4a95b22..874c182 100644
42889 --- a/drivers/input/joystick/sidewinder.c
42890 +++ b/drivers/input/joystick/sidewinder.c
42891 @@ -30,6 +30,7 @@
42892 #include <linux/kernel.h>
42893 #include <linux/module.h>
42894 #include <linux/slab.h>
42895 +#include <linux/sched.h>
42896 #include <linux/input.h>
42897 #include <linux/gameport.h>
42898 #include <linux/jiffies.h>
42899 diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
42900 index 603fe0d..f63decc 100644
42901 --- a/drivers/input/joystick/xpad.c
42902 +++ b/drivers/input/joystick/xpad.c
42903 @@ -737,7 +737,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
42904
42905 static int xpad_led_probe(struct usb_xpad *xpad)
42906 {
42907 - static atomic_t led_seq = ATOMIC_INIT(0);
42908 + static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
42909 long led_no;
42910 struct xpad_led *led;
42911 struct led_classdev *led_cdev;
42912 @@ -750,7 +750,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
42913 if (!led)
42914 return -ENOMEM;
42915
42916 - led_no = (long)atomic_inc_return(&led_seq) - 1;
42917 + led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
42918
42919 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
42920 led->xpad = xpad;
42921 diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
42922 index 5a73639..d586683 100644
42923 --- a/drivers/input/misc/ims-pcu.c
42924 +++ b/drivers/input/misc/ims-pcu.c
42925 @@ -1850,7 +1850,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
42926
42927 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
42928 {
42929 - static atomic_t device_no = ATOMIC_INIT(0);
42930 + static atomic_unchecked_t device_no = ATOMIC_INIT(0);
42931
42932 const struct ims_pcu_device_info *info;
42933 int error;
42934 @@ -1881,7 +1881,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
42935 }
42936
42937 /* Device appears to be operable, complete initialization */
42938 - pcu->device_no = atomic_inc_return(&device_no) - 1;
42939 + pcu->device_no = atomic_inc_return_unchecked(&device_no) - 1;
42940
42941 /*
42942 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
42943 diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
42944 index 2f0b39d..7370f13 100644
42945 --- a/drivers/input/mouse/psmouse.h
42946 +++ b/drivers/input/mouse/psmouse.h
42947 @@ -116,7 +116,7 @@ struct psmouse_attribute {
42948 ssize_t (*set)(struct psmouse *psmouse, void *data,
42949 const char *buf, size_t count);
42950 bool protect;
42951 -};
42952 +} __do_const;
42953 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
42954
42955 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
42956 diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
42957 index b604564..3f14ae4 100644
42958 --- a/drivers/input/mousedev.c
42959 +++ b/drivers/input/mousedev.c
42960 @@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
42961
42962 spin_unlock_irq(&client->packet_lock);
42963
42964 - if (copy_to_user(buffer, data, count))
42965 + if (count > sizeof(data) || copy_to_user(buffer, data, count))
42966 return -EFAULT;
42967
42968 return count;
42969 diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
42970 index b29134d..394deb0 100644
42971 --- a/drivers/input/serio/serio.c
42972 +++ b/drivers/input/serio/serio.c
42973 @@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
42974 */
42975 static void serio_init_port(struct serio *serio)
42976 {
42977 - static atomic_t serio_no = ATOMIC_INIT(0);
42978 + static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
42979
42980 __module_get(THIS_MODULE);
42981
42982 @@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
42983 mutex_init(&serio->drv_mutex);
42984 device_initialize(&serio->dev);
42985 dev_set_name(&serio->dev, "serio%ld",
42986 - (long)atomic_inc_return(&serio_no) - 1);
42987 + (long)atomic_inc_return_unchecked(&serio_no) - 1);
42988 serio->dev.bus = &serio_bus;
42989 serio->dev.release = serio_release_port;
42990 serio->dev.groups = serio_device_attr_groups;
42991 diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
42992 index c9a02fe..0debc75 100644
42993 --- a/drivers/input/serio/serio_raw.c
42994 +++ b/drivers/input/serio/serio_raw.c
42995 @@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
42996
42997 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
42998 {
42999 - static atomic_t serio_raw_no = ATOMIC_INIT(0);
43000 + static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(0);
43001 struct serio_raw *serio_raw;
43002 int err;
43003
43004 @@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43005 }
43006
43007 snprintf(serio_raw->name, sizeof(serio_raw->name),
43008 - "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no) - 1);
43009 + "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no) - 1);
43010 kref_init(&serio_raw->kref);
43011 INIT_LIST_HEAD(&serio_raw->client_list);
43012 init_waitqueue_head(&serio_raw->wait);
43013 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
43014 index e5555fc..937986d 100644
43015 --- a/drivers/iommu/iommu.c
43016 +++ b/drivers/iommu/iommu.c
43017 @@ -588,7 +588,7 @@ static struct notifier_block iommu_bus_nb = {
43018 static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
43019 {
43020 bus_register_notifier(bus, &iommu_bus_nb);
43021 - bus_for_each_dev(bus, NULL, ops, add_iommu_group);
43022 + bus_for_each_dev(bus, NULL, (void *)ops, add_iommu_group);
43023 }
43024
43025 /**
43026 diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
43027 index 228632c9..edfe331 100644
43028 --- a/drivers/iommu/irq_remapping.c
43029 +++ b/drivers/iommu/irq_remapping.c
43030 @@ -356,7 +356,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
43031 void panic_if_irq_remap(const char *msg)
43032 {
43033 if (irq_remapping_enabled)
43034 - panic(msg);
43035 + panic("%s", msg);
43036 }
43037
43038 static void ir_ack_apic_edge(struct irq_data *data)
43039 @@ -377,10 +377,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
43040
43041 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
43042 {
43043 - chip->irq_print_chip = ir_print_prefix;
43044 - chip->irq_ack = ir_ack_apic_edge;
43045 - chip->irq_eoi = ir_ack_apic_level;
43046 - chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43047 + pax_open_kernel();
43048 + *(void **)&chip->irq_print_chip = ir_print_prefix;
43049 + *(void **)&chip->irq_ack = ir_ack_apic_edge;
43050 + *(void **)&chip->irq_eoi = ir_ack_apic_level;
43051 + *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43052 + pax_close_kernel();
43053 }
43054
43055 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
43056 diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
43057 index 57d165e..611997e 100644
43058 --- a/drivers/irqchip/irq-gic.c
43059 +++ b/drivers/irqchip/irq-gic.c
43060 @@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
43061 * Supported arch specific GIC irq extension.
43062 * Default make them NULL.
43063 */
43064 -struct irq_chip gic_arch_extn = {
43065 +irq_chip_no_const gic_arch_extn = {
43066 .irq_eoi = NULL,
43067 .irq_mask = NULL,
43068 .irq_unmask = NULL,
43069 @@ -336,7 +336,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
43070 chained_irq_exit(chip, desc);
43071 }
43072
43073 -static struct irq_chip gic_chip = {
43074 +static irq_chip_no_const gic_chip __read_only = {
43075 .name = "GIC",
43076 .irq_mask = gic_mask_irq,
43077 .irq_unmask = gic_unmask_irq,
43078 diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
43079 index 8777065..a4a9967 100644
43080 --- a/drivers/irqchip/irq-renesas-irqc.c
43081 +++ b/drivers/irqchip/irq-renesas-irqc.c
43082 @@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
43083 struct irqc_priv *p;
43084 struct resource *io;
43085 struct resource *irq;
43086 - struct irq_chip *irq_chip;
43087 + irq_chip_no_const *irq_chip;
43088 const char *name = dev_name(&pdev->dev);
43089 int ret;
43090 int k;
43091 diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
43092 index ac6f72b..81150f2 100644
43093 --- a/drivers/isdn/capi/capi.c
43094 +++ b/drivers/isdn/capi/capi.c
43095 @@ -81,8 +81,8 @@ struct capiminor {
43096
43097 struct capi20_appl *ap;
43098 u32 ncci;
43099 - atomic_t datahandle;
43100 - atomic_t msgid;
43101 + atomic_unchecked_t datahandle;
43102 + atomic_unchecked_t msgid;
43103
43104 struct tty_port port;
43105 int ttyinstop;
43106 @@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
43107 capimsg_setu16(s, 2, mp->ap->applid);
43108 capimsg_setu8 (s, 4, CAPI_DATA_B3);
43109 capimsg_setu8 (s, 5, CAPI_RESP);
43110 - capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
43111 + capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
43112 capimsg_setu32(s, 8, mp->ncci);
43113 capimsg_setu16(s, 12, datahandle);
43114 }
43115 @@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
43116 mp->outbytes -= len;
43117 spin_unlock_bh(&mp->outlock);
43118
43119 - datahandle = atomic_inc_return(&mp->datahandle);
43120 + datahandle = atomic_inc_return_unchecked(&mp->datahandle);
43121 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
43122 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43123 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43124 capimsg_setu16(skb->data, 2, mp->ap->applid);
43125 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
43126 capimsg_setu8 (skb->data, 5, CAPI_REQ);
43127 - capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
43128 + capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
43129 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
43130 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
43131 capimsg_setu16(skb->data, 16, len); /* Data length */
43132 diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
43133 index c44950d..10ac276 100644
43134 --- a/drivers/isdn/gigaset/bas-gigaset.c
43135 +++ b/drivers/isdn/gigaset/bas-gigaset.c
43136 @@ -2564,22 +2564,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
43137
43138
43139 static const struct gigaset_ops gigops = {
43140 - gigaset_write_cmd,
43141 - gigaset_write_room,
43142 - gigaset_chars_in_buffer,
43143 - gigaset_brkchars,
43144 - gigaset_init_bchannel,
43145 - gigaset_close_bchannel,
43146 - gigaset_initbcshw,
43147 - gigaset_freebcshw,
43148 - gigaset_reinitbcshw,
43149 - gigaset_initcshw,
43150 - gigaset_freecshw,
43151 - gigaset_set_modem_ctrl,
43152 - gigaset_baud_rate,
43153 - gigaset_set_line_ctrl,
43154 - gigaset_isoc_send_skb,
43155 - gigaset_isoc_input,
43156 + .write_cmd = gigaset_write_cmd,
43157 + .write_room = gigaset_write_room,
43158 + .chars_in_buffer = gigaset_chars_in_buffer,
43159 + .brkchars = gigaset_brkchars,
43160 + .init_bchannel = gigaset_init_bchannel,
43161 + .close_bchannel = gigaset_close_bchannel,
43162 + .initbcshw = gigaset_initbcshw,
43163 + .freebcshw = gigaset_freebcshw,
43164 + .reinitbcshw = gigaset_reinitbcshw,
43165 + .initcshw = gigaset_initcshw,
43166 + .freecshw = gigaset_freecshw,
43167 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43168 + .baud_rate = gigaset_baud_rate,
43169 + .set_line_ctrl = gigaset_set_line_ctrl,
43170 + .send_skb = gigaset_isoc_send_skb,
43171 + .handle_input = gigaset_isoc_input,
43172 };
43173
43174 /* bas_gigaset_init
43175 diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
43176 index 600c79b..3752bab 100644
43177 --- a/drivers/isdn/gigaset/interface.c
43178 +++ b/drivers/isdn/gigaset/interface.c
43179 @@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
43180 }
43181 tty->driver_data = cs;
43182
43183 - ++cs->port.count;
43184 + atomic_inc(&cs->port.count);
43185
43186 - if (cs->port.count == 1) {
43187 + if (atomic_read(&cs->port.count) == 1) {
43188 tty_port_tty_set(&cs->port, tty);
43189 cs->port.low_latency = 1;
43190 }
43191 @@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
43192
43193 if (!cs->connected)
43194 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
43195 - else if (!cs->port.count)
43196 + else if (!atomic_read(&cs->port.count))
43197 dev_warn(cs->dev, "%s: device not opened\n", __func__);
43198 - else if (!--cs->port.count)
43199 + else if (!atomic_dec_return(&cs->port.count))
43200 tty_port_tty_set(&cs->port, NULL);
43201
43202 mutex_unlock(&cs->mutex);
43203 diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
43204 index 8c91fd5..14f13ce 100644
43205 --- a/drivers/isdn/gigaset/ser-gigaset.c
43206 +++ b/drivers/isdn/gigaset/ser-gigaset.c
43207 @@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
43208 }
43209
43210 static const struct gigaset_ops ops = {
43211 - gigaset_write_cmd,
43212 - gigaset_write_room,
43213 - gigaset_chars_in_buffer,
43214 - gigaset_brkchars,
43215 - gigaset_init_bchannel,
43216 - gigaset_close_bchannel,
43217 - gigaset_initbcshw,
43218 - gigaset_freebcshw,
43219 - gigaset_reinitbcshw,
43220 - gigaset_initcshw,
43221 - gigaset_freecshw,
43222 - gigaset_set_modem_ctrl,
43223 - gigaset_baud_rate,
43224 - gigaset_set_line_ctrl,
43225 - gigaset_m10x_send_skb, /* asyncdata.c */
43226 - gigaset_m10x_input, /* asyncdata.c */
43227 + .write_cmd = gigaset_write_cmd,
43228 + .write_room = gigaset_write_room,
43229 + .chars_in_buffer = gigaset_chars_in_buffer,
43230 + .brkchars = gigaset_brkchars,
43231 + .init_bchannel = gigaset_init_bchannel,
43232 + .close_bchannel = gigaset_close_bchannel,
43233 + .initbcshw = gigaset_initbcshw,
43234 + .freebcshw = gigaset_freebcshw,
43235 + .reinitbcshw = gigaset_reinitbcshw,
43236 + .initcshw = gigaset_initcshw,
43237 + .freecshw = gigaset_freecshw,
43238 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43239 + .baud_rate = gigaset_baud_rate,
43240 + .set_line_ctrl = gigaset_set_line_ctrl,
43241 + .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
43242 + .handle_input = gigaset_m10x_input, /* asyncdata.c */
43243 };
43244
43245
43246 diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
43247 index d0a41cb..b953e50 100644
43248 --- a/drivers/isdn/gigaset/usb-gigaset.c
43249 +++ b/drivers/isdn/gigaset/usb-gigaset.c
43250 @@ -547,7 +547,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
43251 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
43252 memcpy(cs->hw.usb->bchars, buf, 6);
43253 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
43254 - 0, 0, &buf, 6, 2000);
43255 + 0, 0, buf, 6, 2000);
43256 }
43257
43258 static void gigaset_freebcshw(struct bc_state *bcs)
43259 @@ -869,22 +869,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
43260 }
43261
43262 static const struct gigaset_ops ops = {
43263 - gigaset_write_cmd,
43264 - gigaset_write_room,
43265 - gigaset_chars_in_buffer,
43266 - gigaset_brkchars,
43267 - gigaset_init_bchannel,
43268 - gigaset_close_bchannel,
43269 - gigaset_initbcshw,
43270 - gigaset_freebcshw,
43271 - gigaset_reinitbcshw,
43272 - gigaset_initcshw,
43273 - gigaset_freecshw,
43274 - gigaset_set_modem_ctrl,
43275 - gigaset_baud_rate,
43276 - gigaset_set_line_ctrl,
43277 - gigaset_m10x_send_skb,
43278 - gigaset_m10x_input,
43279 + .write_cmd = gigaset_write_cmd,
43280 + .write_room = gigaset_write_room,
43281 + .chars_in_buffer = gigaset_chars_in_buffer,
43282 + .brkchars = gigaset_brkchars,
43283 + .init_bchannel = gigaset_init_bchannel,
43284 + .close_bchannel = gigaset_close_bchannel,
43285 + .initbcshw = gigaset_initbcshw,
43286 + .freebcshw = gigaset_freebcshw,
43287 + .reinitbcshw = gigaset_reinitbcshw,
43288 + .initcshw = gigaset_initcshw,
43289 + .freecshw = gigaset_freecshw,
43290 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43291 + .baud_rate = gigaset_baud_rate,
43292 + .set_line_ctrl = gigaset_set_line_ctrl,
43293 + .send_skb = gigaset_m10x_send_skb,
43294 + .handle_input = gigaset_m10x_input,
43295 };
43296
43297 /*
43298 diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
43299 index 4d9b195..455075c 100644
43300 --- a/drivers/isdn/hardware/avm/b1.c
43301 +++ b/drivers/isdn/hardware/avm/b1.c
43302 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
43303 }
43304 if (left) {
43305 if (t4file->user) {
43306 - if (copy_from_user(buf, dp, left))
43307 + if (left > sizeof buf || copy_from_user(buf, dp, left))
43308 return -EFAULT;
43309 } else {
43310 memcpy(buf, dp, left);
43311 @@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
43312 }
43313 if (left) {
43314 if (config->user) {
43315 - if (copy_from_user(buf, dp, left))
43316 + if (left > sizeof buf || copy_from_user(buf, dp, left))
43317 return -EFAULT;
43318 } else {
43319 memcpy(buf, dp, left);
43320 diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
43321 index 9b856e1..fa03c92 100644
43322 --- a/drivers/isdn/i4l/isdn_common.c
43323 +++ b/drivers/isdn/i4l/isdn_common.c
43324 @@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
43325 } else
43326 return -EINVAL;
43327 case IIOCDBGVAR:
43328 + if (!capable(CAP_SYS_RAWIO))
43329 + return -EPERM;
43330 if (arg) {
43331 if (copy_to_user(argp, &dev, sizeof(ulong)))
43332 return -EFAULT;
43333 diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
43334 index 91d5730..336523e 100644
43335 --- a/drivers/isdn/i4l/isdn_concap.c
43336 +++ b/drivers/isdn/i4l/isdn_concap.c
43337 @@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
43338 }
43339
43340 struct concap_device_ops isdn_concap_reliable_dl_dops = {
43341 - &isdn_concap_dl_data_req,
43342 - &isdn_concap_dl_connect_req,
43343 - &isdn_concap_dl_disconn_req
43344 + .data_req = &isdn_concap_dl_data_req,
43345 + .connect_req = &isdn_concap_dl_connect_req,
43346 + .disconn_req = &isdn_concap_dl_disconn_req
43347 };
43348
43349 /* The following should better go into a dedicated source file such that
43350 diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
43351 index 3c5f249..5fac4d0 100644
43352 --- a/drivers/isdn/i4l/isdn_tty.c
43353 +++ b/drivers/isdn/i4l/isdn_tty.c
43354 @@ -1508,9 +1508,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
43355
43356 #ifdef ISDN_DEBUG_MODEM_OPEN
43357 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
43358 - port->count);
43359 + atomic_read(&port->count));
43360 #endif
43361 - port->count++;
43362 + atomic_inc(&port->count);
43363 port->tty = tty;
43364 /*
43365 * Start up serial port
43366 @@ -1554,7 +1554,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
43367 #endif
43368 return;
43369 }
43370 - if ((tty->count == 1) && (port->count != 1)) {
43371 + if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
43372 /*
43373 * Uh, oh. tty->count is 1, which means that the tty
43374 * structure will be freed. Info->count should always
43375 @@ -1563,15 +1563,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
43376 * serial port won't be shutdown.
43377 */
43378 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
43379 - "info->count is %d\n", port->count);
43380 - port->count = 1;
43381 + "info->count is %d\n", atomic_read(&port->count));
43382 + atomic_set(&port->count, 1);
43383 }
43384 - if (--port->count < 0) {
43385 + if (atomic_dec_return(&port->count) < 0) {
43386 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
43387 - info->line, port->count);
43388 - port->count = 0;
43389 + info->line, atomic_read(&port->count));
43390 + atomic_set(&port->count, 0);
43391 }
43392 - if (port->count) {
43393 + if (atomic_read(&port->count)) {
43394 #ifdef ISDN_DEBUG_MODEM_OPEN
43395 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
43396 #endif
43397 @@ -1625,7 +1625,7 @@ isdn_tty_hangup(struct tty_struct *tty)
43398 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
43399 return;
43400 isdn_tty_shutdown(info);
43401 - port->count = 0;
43402 + atomic_set(&port->count, 0);
43403 port->flags &= ~ASYNC_NORMAL_ACTIVE;
43404 port->tty = NULL;
43405 wake_up_interruptible(&port->open_wait);
43406 @@ -1970,7 +1970,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
43407 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
43408 modem_info *info = &dev->mdm.info[i];
43409
43410 - if (info->port.count == 0)
43411 + if (atomic_read(&info->port.count) == 0)
43412 continue;
43413 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
43414 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
43415 diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
43416 index e2d4e58..40cd045 100644
43417 --- a/drivers/isdn/i4l/isdn_x25iface.c
43418 +++ b/drivers/isdn/i4l/isdn_x25iface.c
43419 @@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
43420
43421
43422 static struct concap_proto_ops ix25_pops = {
43423 - &isdn_x25iface_proto_new,
43424 - &isdn_x25iface_proto_del,
43425 - &isdn_x25iface_proto_restart,
43426 - &isdn_x25iface_proto_close,
43427 - &isdn_x25iface_xmit,
43428 - &isdn_x25iface_receive,
43429 - &isdn_x25iface_connect_ind,
43430 - &isdn_x25iface_disconn_ind
43431 + .proto_new = &isdn_x25iface_proto_new,
43432 + .proto_del = &isdn_x25iface_proto_del,
43433 + .restart = &isdn_x25iface_proto_restart,
43434 + .close = &isdn_x25iface_proto_close,
43435 + .encap_and_xmit = &isdn_x25iface_xmit,
43436 + .data_ind = &isdn_x25iface_receive,
43437 + .connect_ind = &isdn_x25iface_connect_ind,
43438 + .disconn_ind = &isdn_x25iface_disconn_ind
43439 };
43440
43441 /* error message helper function */
43442 diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
43443 index 6a7447c..cae33fe 100644
43444 --- a/drivers/isdn/icn/icn.c
43445 +++ b/drivers/isdn/icn/icn.c
43446 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
43447 if (count > len)
43448 count = len;
43449 if (user) {
43450 - if (copy_from_user(msg, buf, count))
43451 + if (count > sizeof msg || copy_from_user(msg, buf, count))
43452 return -EFAULT;
43453 } else
43454 memcpy(msg, buf, count);
43455 diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
43456 index a4f05c5..1433bc5 100644
43457 --- a/drivers/isdn/mISDN/dsp_cmx.c
43458 +++ b/drivers/isdn/mISDN/dsp_cmx.c
43459 @@ -1628,7 +1628,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
43460 static u16 dsp_count; /* last sample count */
43461 static int dsp_count_valid; /* if we have last sample count */
43462
43463 -void
43464 +void __intentional_overflow(-1)
43465 dsp_cmx_send(void *arg)
43466 {
43467 struct dsp_conf *conf;
43468 diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
43469 index f58a354..fbae176 100644
43470 --- a/drivers/leds/leds-clevo-mail.c
43471 +++ b/drivers/leds/leds-clevo-mail.c
43472 @@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
43473 * detected as working, but in reality it is not) as low as
43474 * possible.
43475 */
43476 -static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
43477 +static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
43478 {
43479 .callback = clevo_mail_led_dmi_callback,
43480 .ident = "Clevo D410J",
43481 diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
43482 index 2eb3ef6..295891f 100644
43483 --- a/drivers/leds/leds-ss4200.c
43484 +++ b/drivers/leds/leds-ss4200.c
43485 @@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
43486 * detected as working, but in reality it is not) as low as
43487 * possible.
43488 */
43489 -static struct dmi_system_id nas_led_whitelist[] __initdata = {
43490 +static struct dmi_system_id nas_led_whitelist[] __initconst = {
43491 {
43492 .callback = ss4200_led_dmi_callback,
43493 .ident = "Intel SS4200-E",
43494 diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
43495 index 0bf1e4e..b4bf44e 100644
43496 --- a/drivers/lguest/core.c
43497 +++ b/drivers/lguest/core.c
43498 @@ -97,9 +97,17 @@ static __init int map_switcher(void)
43499 * The end address needs +1 because __get_vm_area allocates an
43500 * extra guard page, so we need space for that.
43501 */
43502 +
43503 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
43504 + switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
43505 + VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
43506 + + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
43507 +#else
43508 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
43509 VM_ALLOC, switcher_addr, switcher_addr
43510 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
43511 +#endif
43512 +
43513 if (!switcher_vma) {
43514 err = -ENOMEM;
43515 printk("lguest: could not map switcher pages high\n");
43516 @@ -124,7 +132,7 @@ static __init int map_switcher(void)
43517 * Now the Switcher is mapped at the right address, we can't fail!
43518 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
43519 */
43520 - memcpy(switcher_vma->addr, start_switcher_text,
43521 + memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
43522 end_switcher_text - start_switcher_text);
43523
43524 printk(KERN_INFO "lguest: mapped switcher at %p\n",
43525 diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
43526 index e8b55c3..3514c37 100644
43527 --- a/drivers/lguest/page_tables.c
43528 +++ b/drivers/lguest/page_tables.c
43529 @@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
43530 /*:*/
43531
43532 #ifdef CONFIG_X86_PAE
43533 -static void release_pmd(pmd_t *spmd)
43534 +static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
43535 {
43536 /* If the entry's not present, there's nothing to release. */
43537 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
43538 diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
43539 index 922a1ac..9dd0c2a 100644
43540 --- a/drivers/lguest/x86/core.c
43541 +++ b/drivers/lguest/x86/core.c
43542 @@ -59,7 +59,7 @@ static struct {
43543 /* Offset from where switcher.S was compiled to where we've copied it */
43544 static unsigned long switcher_offset(void)
43545 {
43546 - return switcher_addr - (unsigned long)start_switcher_text;
43547 + return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
43548 }
43549
43550 /* This cpu's struct lguest_pages (after the Switcher text page) */
43551 @@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
43552 * These copies are pretty cheap, so we do them unconditionally: */
43553 /* Save the current Host top-level page directory.
43554 */
43555 +
43556 +#ifdef CONFIG_PAX_PER_CPU_PGD
43557 + pages->state.host_cr3 = read_cr3();
43558 +#else
43559 pages->state.host_cr3 = __pa(current->mm->pgd);
43560 +#endif
43561 +
43562 /*
43563 * Set up the Guest's page tables to see this CPU's pages (and no
43564 * other CPU's pages).
43565 @@ -477,7 +483,7 @@ void __init lguest_arch_host_init(void)
43566 * compiled-in switcher code and the high-mapped copy we just made.
43567 */
43568 for (i = 0; i < IDT_ENTRIES; i++)
43569 - default_idt_entries[i] += switcher_offset();
43570 + default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
43571
43572 /*
43573 * Set up the Switcher's per-cpu areas.
43574 @@ -560,7 +566,7 @@ void __init lguest_arch_host_init(void)
43575 * it will be undisturbed when we switch. To change %cs and jump we
43576 * need this structure to feed to Intel's "lcall" instruction.
43577 */
43578 - lguest_entry.offset = (long)switch_to_guest + switcher_offset();
43579 + lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
43580 lguest_entry.segment = LGUEST_CS;
43581
43582 /*
43583 diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
43584 index 40634b0..4f5855e 100644
43585 --- a/drivers/lguest/x86/switcher_32.S
43586 +++ b/drivers/lguest/x86/switcher_32.S
43587 @@ -87,6 +87,7 @@
43588 #include <asm/page.h>
43589 #include <asm/segment.h>
43590 #include <asm/lguest.h>
43591 +#include <asm/processor-flags.h>
43592
43593 // We mark the start of the code to copy
43594 // It's placed in .text tho it's never run here
43595 @@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
43596 // Changes type when we load it: damn Intel!
43597 // For after we switch over our page tables
43598 // That entry will be read-only: we'd crash.
43599 +
43600 +#ifdef CONFIG_PAX_KERNEXEC
43601 + mov %cr0, %edx
43602 + xor $X86_CR0_WP, %edx
43603 + mov %edx, %cr0
43604 +#endif
43605 +
43606 movl $(GDT_ENTRY_TSS*8), %edx
43607 ltr %dx
43608
43609 @@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
43610 // Let's clear it again for our return.
43611 // The GDT descriptor of the Host
43612 // Points to the table after two "size" bytes
43613 - movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
43614 + movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
43615 // Clear "used" from type field (byte 5, bit 2)
43616 - andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
43617 + andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
43618 +
43619 +#ifdef CONFIG_PAX_KERNEXEC
43620 + mov %cr0, %eax
43621 + xor $X86_CR0_WP, %eax
43622 + mov %eax, %cr0
43623 +#endif
43624
43625 // Once our page table's switched, the Guest is live!
43626 // The Host fades as we run this final step.
43627 @@ -295,13 +309,12 @@ deliver_to_host:
43628 // I consulted gcc, and it gave
43629 // These instructions, which I gladly credit:
43630 leal (%edx,%ebx,8), %eax
43631 - movzwl (%eax),%edx
43632 - movl 4(%eax), %eax
43633 - xorw %ax, %ax
43634 - orl %eax, %edx
43635 + movl 4(%eax), %edx
43636 + movw (%eax), %dx
43637 // Now the address of the handler's in %edx
43638 // We call it now: its "iret" drops us home.
43639 - jmp *%edx
43640 + ljmp $__KERNEL_CS, $1f
43641 +1: jmp *%edx
43642
43643 // Every interrupt can come to us here
43644 // But we must truly tell each apart.
43645 diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
43646 index 7ef7461..5a09dac 100644
43647 --- a/drivers/md/bcache/closure.h
43648 +++ b/drivers/md/bcache/closure.h
43649 @@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
43650 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
43651 struct workqueue_struct *wq)
43652 {
43653 - BUG_ON(object_is_on_stack(cl));
43654 + BUG_ON(object_starts_on_stack(cl));
43655 closure_set_ip(cl);
43656 cl->fn = fn;
43657 cl->wq = wq;
43658 diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
43659 index 9a8e66a..10cc762 100644
43660 --- a/drivers/md/bitmap.c
43661 +++ b/drivers/md/bitmap.c
43662 @@ -1779,7 +1779,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
43663 chunk_kb ? "KB" : "B");
43664 if (bitmap->storage.file) {
43665 seq_printf(seq, ", file: ");
43666 - seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
43667 + seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
43668 }
43669
43670 seq_printf(seq, "\n");
43671 diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
43672 index 5152142..623d141 100644
43673 --- a/drivers/md/dm-ioctl.c
43674 +++ b/drivers/md/dm-ioctl.c
43675 @@ -1769,7 +1769,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
43676 cmd == DM_LIST_VERSIONS_CMD)
43677 return 0;
43678
43679 - if ((cmd == DM_DEV_CREATE_CMD)) {
43680 + if (cmd == DM_DEV_CREATE_CMD) {
43681 if (!*param->name) {
43682 DMWARN("name not supplied when creating device");
43683 return -EINVAL;
43684 diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
43685 index 7dfdb5c..4caada6 100644
43686 --- a/drivers/md/dm-raid1.c
43687 +++ b/drivers/md/dm-raid1.c
43688 @@ -40,7 +40,7 @@ enum dm_raid1_error {
43689
43690 struct mirror {
43691 struct mirror_set *ms;
43692 - atomic_t error_count;
43693 + atomic_unchecked_t error_count;
43694 unsigned long error_type;
43695 struct dm_dev *dev;
43696 sector_t offset;
43697 @@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
43698 struct mirror *m;
43699
43700 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
43701 - if (!atomic_read(&m->error_count))
43702 + if (!atomic_read_unchecked(&m->error_count))
43703 return m;
43704
43705 return NULL;
43706 @@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
43707 * simple way to tell if a device has encountered
43708 * errors.
43709 */
43710 - atomic_inc(&m->error_count);
43711 + atomic_inc_unchecked(&m->error_count);
43712
43713 if (test_and_set_bit(error_type, &m->error_type))
43714 return;
43715 @@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
43716 struct mirror *m = get_default_mirror(ms);
43717
43718 do {
43719 - if (likely(!atomic_read(&m->error_count)))
43720 + if (likely(!atomic_read_unchecked(&m->error_count)))
43721 return m;
43722
43723 if (m-- == ms->mirror)
43724 @@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
43725 {
43726 struct mirror *default_mirror = get_default_mirror(m->ms);
43727
43728 - return !atomic_read(&default_mirror->error_count);
43729 + return !atomic_read_unchecked(&default_mirror->error_count);
43730 }
43731
43732 static int mirror_available(struct mirror_set *ms, struct bio *bio)
43733 @@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
43734 */
43735 if (likely(region_in_sync(ms, region, 1)))
43736 m = choose_mirror(ms, bio->bi_iter.bi_sector);
43737 - else if (m && atomic_read(&m->error_count))
43738 + else if (m && atomic_read_unchecked(&m->error_count))
43739 m = NULL;
43740
43741 if (likely(m))
43742 @@ -927,7 +927,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
43743 }
43744
43745 ms->mirror[mirror].ms = ms;
43746 - atomic_set(&(ms->mirror[mirror].error_count), 0);
43747 + atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
43748 ms->mirror[mirror].error_type = 0;
43749 ms->mirror[mirror].offset = offset;
43750
43751 @@ -1342,7 +1342,7 @@ static void mirror_resume(struct dm_target *ti)
43752 */
43753 static char device_status_char(struct mirror *m)
43754 {
43755 - if (!atomic_read(&(m->error_count)))
43756 + if (!atomic_read_unchecked(&(m->error_count)))
43757 return 'A';
43758
43759 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
43760 diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
43761 index 28a9012..9c0f6a5 100644
43762 --- a/drivers/md/dm-stats.c
43763 +++ b/drivers/md/dm-stats.c
43764 @@ -382,7 +382,7 @@ do_sync_free:
43765 synchronize_rcu_expedited();
43766 dm_stat_free(&s->rcu_head);
43767 } else {
43768 - ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
43769 + ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
43770 call_rcu(&s->rcu_head, dm_stat_free);
43771 }
43772 return 0;
43773 @@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
43774 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
43775 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
43776 ));
43777 - ACCESS_ONCE(last->last_sector) = end_sector;
43778 - ACCESS_ONCE(last->last_rw) = bi_rw;
43779 + ACCESS_ONCE_RW(last->last_sector) = end_sector;
43780 + ACCESS_ONCE_RW(last->last_rw) = bi_rw;
43781 }
43782
43783 rcu_read_lock();
43784 diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
43785 index d1600d2..4c3af3a 100644
43786 --- a/drivers/md/dm-stripe.c
43787 +++ b/drivers/md/dm-stripe.c
43788 @@ -21,7 +21,7 @@ struct stripe {
43789 struct dm_dev *dev;
43790 sector_t physical_start;
43791
43792 - atomic_t error_count;
43793 + atomic_unchecked_t error_count;
43794 };
43795
43796 struct stripe_c {
43797 @@ -186,7 +186,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
43798 kfree(sc);
43799 return r;
43800 }
43801 - atomic_set(&(sc->stripe[i].error_count), 0);
43802 + atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
43803 }
43804
43805 ti->private = sc;
43806 @@ -330,7 +330,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
43807 DMEMIT("%d ", sc->stripes);
43808 for (i = 0; i < sc->stripes; i++) {
43809 DMEMIT("%s ", sc->stripe[i].dev->name);
43810 - buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
43811 + buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
43812 'D' : 'A';
43813 }
43814 buffer[i] = '\0';
43815 @@ -375,8 +375,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
43816 */
43817 for (i = 0; i < sc->stripes; i++)
43818 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
43819 - atomic_inc(&(sc->stripe[i].error_count));
43820 - if (atomic_read(&(sc->stripe[i].error_count)) <
43821 + atomic_inc_unchecked(&(sc->stripe[i].error_count));
43822 + if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
43823 DM_IO_ERROR_THRESHOLD)
43824 schedule_work(&sc->trigger_event);
43825 }
43826 diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
43827 index 50601ec..6d3b9dc 100644
43828 --- a/drivers/md/dm-table.c
43829 +++ b/drivers/md/dm-table.c
43830 @@ -274,7 +274,7 @@ static struct dm_dev_internal *find_device(struct list_head *l, dev_t dev)
43831 static int open_dev(struct dm_dev_internal *d, dev_t dev,
43832 struct mapped_device *md)
43833 {
43834 - static char *_claim_ptr = "I belong to device-mapper";
43835 + static char _claim_ptr[] = "I belong to device-mapper";
43836 struct block_device *bdev;
43837
43838 int r;
43839 @@ -342,7 +342,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
43840 if (!dev_size)
43841 return 0;
43842
43843 - if ((start >= dev_size) || (start + len > dev_size)) {
43844 + if ((start >= dev_size) || (len > dev_size - start)) {
43845 DMWARN("%s: %s too small for target: "
43846 "start=%llu, len=%llu, dev_size=%llu",
43847 dm_device_name(ti->table->md), bdevname(bdev, b),
43848 diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
43849 index b086a94..74cb67e 100644
43850 --- a/drivers/md/dm-thin-metadata.c
43851 +++ b/drivers/md/dm-thin-metadata.c
43852 @@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
43853 {
43854 pmd->info.tm = pmd->tm;
43855 pmd->info.levels = 2;
43856 - pmd->info.value_type.context = pmd->data_sm;
43857 + pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
43858 pmd->info.value_type.size = sizeof(__le64);
43859 pmd->info.value_type.inc = data_block_inc;
43860 pmd->info.value_type.dec = data_block_dec;
43861 @@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
43862
43863 pmd->bl_info.tm = pmd->tm;
43864 pmd->bl_info.levels = 1;
43865 - pmd->bl_info.value_type.context = pmd->data_sm;
43866 + pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
43867 pmd->bl_info.value_type.size = sizeof(__le64);
43868 pmd->bl_info.value_type.inc = data_block_inc;
43869 pmd->bl_info.value_type.dec = data_block_dec;
43870 diff --git a/drivers/md/dm.c b/drivers/md/dm.c
43871 index 455e649..1f214be 100644
43872 --- a/drivers/md/dm.c
43873 +++ b/drivers/md/dm.c
43874 @@ -178,9 +178,9 @@ struct mapped_device {
43875 /*
43876 * Event handling.
43877 */
43878 - atomic_t event_nr;
43879 + atomic_unchecked_t event_nr;
43880 wait_queue_head_t eventq;
43881 - atomic_t uevent_seq;
43882 + atomic_unchecked_t uevent_seq;
43883 struct list_head uevent_list;
43884 spinlock_t uevent_lock; /* Protect access to uevent_list */
43885
43886 @@ -1884,8 +1884,8 @@ static struct mapped_device *alloc_dev(int minor)
43887 spin_lock_init(&md->deferred_lock);
43888 atomic_set(&md->holders, 1);
43889 atomic_set(&md->open_count, 0);
43890 - atomic_set(&md->event_nr, 0);
43891 - atomic_set(&md->uevent_seq, 0);
43892 + atomic_set_unchecked(&md->event_nr, 0);
43893 + atomic_set_unchecked(&md->uevent_seq, 0);
43894 INIT_LIST_HEAD(&md->uevent_list);
43895 spin_lock_init(&md->uevent_lock);
43896
43897 @@ -2039,7 +2039,7 @@ static void event_callback(void *context)
43898
43899 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
43900
43901 - atomic_inc(&md->event_nr);
43902 + atomic_inc_unchecked(&md->event_nr);
43903 wake_up(&md->eventq);
43904 }
43905
43906 @@ -2732,18 +2732,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
43907
43908 uint32_t dm_next_uevent_seq(struct mapped_device *md)
43909 {
43910 - return atomic_add_return(1, &md->uevent_seq);
43911 + return atomic_add_return_unchecked(1, &md->uevent_seq);
43912 }
43913
43914 uint32_t dm_get_event_nr(struct mapped_device *md)
43915 {
43916 - return atomic_read(&md->event_nr);
43917 + return atomic_read_unchecked(&md->event_nr);
43918 }
43919
43920 int dm_wait_event(struct mapped_device *md, int event_nr)
43921 {
43922 return wait_event_interruptible(md->eventq,
43923 - (event_nr != atomic_read(&md->event_nr)));
43924 + (event_nr != atomic_read_unchecked(&md->event_nr)));
43925 }
43926
43927 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
43928 diff --git a/drivers/md/md.c b/drivers/md/md.c
43929 index 9a18209..ec4d3ec 100644
43930 --- a/drivers/md/md.c
43931 +++ b/drivers/md/md.c
43932 @@ -194,10 +194,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
43933 * start build, activate spare
43934 */
43935 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
43936 -static atomic_t md_event_count;
43937 +static atomic_unchecked_t md_event_count;
43938 void md_new_event(struct mddev *mddev)
43939 {
43940 - atomic_inc(&md_event_count);
43941 + atomic_inc_unchecked(&md_event_count);
43942 wake_up(&md_event_waiters);
43943 }
43944 EXPORT_SYMBOL_GPL(md_new_event);
43945 @@ -207,7 +207,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
43946 */
43947 static void md_new_event_inintr(struct mddev *mddev)
43948 {
43949 - atomic_inc(&md_event_count);
43950 + atomic_inc_unchecked(&md_event_count);
43951 wake_up(&md_event_waiters);
43952 }
43953
43954 @@ -1462,7 +1462,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
43955 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
43956 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
43957 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
43958 - atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
43959 + atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
43960
43961 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
43962 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
43963 @@ -1713,7 +1713,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
43964 else
43965 sb->resync_offset = cpu_to_le64(0);
43966
43967 - sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
43968 + sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
43969
43970 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
43971 sb->size = cpu_to_le64(mddev->dev_sectors);
43972 @@ -2725,7 +2725,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
43973 static ssize_t
43974 errors_show(struct md_rdev *rdev, char *page)
43975 {
43976 - return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
43977 + return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
43978 }
43979
43980 static ssize_t
43981 @@ -2734,7 +2734,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
43982 char *e;
43983 unsigned long n = simple_strtoul(buf, &e, 10);
43984 if (*buf && (*e == 0 || *e == '\n')) {
43985 - atomic_set(&rdev->corrected_errors, n);
43986 + atomic_set_unchecked(&rdev->corrected_errors, n);
43987 return len;
43988 }
43989 return -EINVAL;
43990 @@ -3183,8 +3183,8 @@ int md_rdev_init(struct md_rdev *rdev)
43991 rdev->sb_loaded = 0;
43992 rdev->bb_page = NULL;
43993 atomic_set(&rdev->nr_pending, 0);
43994 - atomic_set(&rdev->read_errors, 0);
43995 - atomic_set(&rdev->corrected_errors, 0);
43996 + atomic_set_unchecked(&rdev->read_errors, 0);
43997 + atomic_set_unchecked(&rdev->corrected_errors, 0);
43998
43999 INIT_LIST_HEAD(&rdev->same_set);
44000 init_waitqueue_head(&rdev->blocked_wait);
44001 @@ -7058,7 +7058,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
44002
44003 spin_unlock(&pers_lock);
44004 seq_printf(seq, "\n");
44005 - seq->poll_event = atomic_read(&md_event_count);
44006 + seq->poll_event = atomic_read_unchecked(&md_event_count);
44007 return 0;
44008 }
44009 if (v == (void*)2) {
44010 @@ -7161,7 +7161,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
44011 return error;
44012
44013 seq = file->private_data;
44014 - seq->poll_event = atomic_read(&md_event_count);
44015 + seq->poll_event = atomic_read_unchecked(&md_event_count);
44016 return error;
44017 }
44018
44019 @@ -7178,7 +7178,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
44020 /* always allow read */
44021 mask = POLLIN | POLLRDNORM;
44022
44023 - if (seq->poll_event != atomic_read(&md_event_count))
44024 + if (seq->poll_event != atomic_read_unchecked(&md_event_count))
44025 mask |= POLLERR | POLLPRI;
44026 return mask;
44027 }
44028 @@ -7222,7 +7222,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
44029 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
44030 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
44031 (int)part_stat_read(&disk->part0, sectors[1]) -
44032 - atomic_read(&disk->sync_io);
44033 + atomic_read_unchecked(&disk->sync_io);
44034 /* sync IO will cause sync_io to increase before the disk_stats
44035 * as sync_io is counted when a request starts, and
44036 * disk_stats is counted when it completes.
44037 diff --git a/drivers/md/md.h b/drivers/md/md.h
44038 index a49d991..3582bb7 100644
44039 --- a/drivers/md/md.h
44040 +++ b/drivers/md/md.h
44041 @@ -94,13 +94,13 @@ struct md_rdev {
44042 * only maintained for arrays that
44043 * support hot removal
44044 */
44045 - atomic_t read_errors; /* number of consecutive read errors that
44046 + atomic_unchecked_t read_errors; /* number of consecutive read errors that
44047 * we have tried to ignore.
44048 */
44049 struct timespec last_read_error; /* monotonic time since our
44050 * last read error
44051 */
44052 - atomic_t corrected_errors; /* number of corrected read errors,
44053 + atomic_unchecked_t corrected_errors; /* number of corrected read errors,
44054 * for reporting to userspace and storing
44055 * in superblock.
44056 */
44057 @@ -449,7 +449,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
44058
44059 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
44060 {
44061 - atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44062 + atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44063 }
44064
44065 struct md_personality
44066 diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
44067 index 786b689..ea8c956 100644
44068 --- a/drivers/md/persistent-data/dm-space-map-metadata.c
44069 +++ b/drivers/md/persistent-data/dm-space-map-metadata.c
44070 @@ -679,7 +679,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
44071 * Flick into a mode where all blocks get allocated in the new area.
44072 */
44073 smm->begin = old_len;
44074 - memcpy(sm, &bootstrap_ops, sizeof(*sm));
44075 + memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
44076
44077 /*
44078 * Extend.
44079 @@ -710,7 +710,7 @@ out:
44080 /*
44081 * Switch back to normal behaviour.
44082 */
44083 - memcpy(sm, &ops, sizeof(*sm));
44084 + memcpy((void *)sm, &ops, sizeof(*sm));
44085 return r;
44086 }
44087
44088 diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
44089 index 3e6d115..ffecdeb 100644
44090 --- a/drivers/md/persistent-data/dm-space-map.h
44091 +++ b/drivers/md/persistent-data/dm-space-map.h
44092 @@ -71,6 +71,7 @@ struct dm_space_map {
44093 dm_sm_threshold_fn fn,
44094 void *context);
44095 };
44096 +typedef struct dm_space_map __no_const dm_space_map_no_const;
44097
44098 /*----------------------------------------------------------------*/
44099
44100 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
44101 index 56e24c0..e1c8e1f 100644
44102 --- a/drivers/md/raid1.c
44103 +++ b/drivers/md/raid1.c
44104 @@ -1931,7 +1931,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
44105 if (r1_sync_page_io(rdev, sect, s,
44106 bio->bi_io_vec[idx].bv_page,
44107 READ) != 0)
44108 - atomic_add(s, &rdev->corrected_errors);
44109 + atomic_add_unchecked(s, &rdev->corrected_errors);
44110 }
44111 sectors -= s;
44112 sect += s;
44113 @@ -2165,7 +2165,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
44114 test_bit(In_sync, &rdev->flags)) {
44115 if (r1_sync_page_io(rdev, sect, s,
44116 conf->tmppage, READ)) {
44117 - atomic_add(s, &rdev->corrected_errors);
44118 + atomic_add_unchecked(s, &rdev->corrected_errors);
44119 printk(KERN_INFO
44120 "md/raid1:%s: read error corrected "
44121 "(%d sectors at %llu on %s)\n",
44122 diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
44123 index cb882aa..9bd076e 100644
44124 --- a/drivers/md/raid10.c
44125 +++ b/drivers/md/raid10.c
44126 @@ -1949,7 +1949,7 @@ static void end_sync_read(struct bio *bio, int error)
44127 /* The write handler will notice the lack of
44128 * R10BIO_Uptodate and record any errors etc
44129 */
44130 - atomic_add(r10_bio->sectors,
44131 + atomic_add_unchecked(r10_bio->sectors,
44132 &conf->mirrors[d].rdev->corrected_errors);
44133
44134 /* for reconstruct, we always reschedule after a read.
44135 @@ -2307,7 +2307,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44136 {
44137 struct timespec cur_time_mon;
44138 unsigned long hours_since_last;
44139 - unsigned int read_errors = atomic_read(&rdev->read_errors);
44140 + unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
44141
44142 ktime_get_ts(&cur_time_mon);
44143
44144 @@ -2329,9 +2329,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44145 * overflowing the shift of read_errors by hours_since_last.
44146 */
44147 if (hours_since_last >= 8 * sizeof(read_errors))
44148 - atomic_set(&rdev->read_errors, 0);
44149 + atomic_set_unchecked(&rdev->read_errors, 0);
44150 else
44151 - atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
44152 + atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
44153 }
44154
44155 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
44156 @@ -2385,8 +2385,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44157 return;
44158
44159 check_decay_read_errors(mddev, rdev);
44160 - atomic_inc(&rdev->read_errors);
44161 - if (atomic_read(&rdev->read_errors) > max_read_errors) {
44162 + atomic_inc_unchecked(&rdev->read_errors);
44163 + if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
44164 char b[BDEVNAME_SIZE];
44165 bdevname(rdev->bdev, b);
44166
44167 @@ -2394,7 +2394,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44168 "md/raid10:%s: %s: Raid device exceeded "
44169 "read_error threshold [cur %d:max %d]\n",
44170 mdname(mddev), b,
44171 - atomic_read(&rdev->read_errors), max_read_errors);
44172 + atomic_read_unchecked(&rdev->read_errors), max_read_errors);
44173 printk(KERN_NOTICE
44174 "md/raid10:%s: %s: Failing raid device\n",
44175 mdname(mddev), b);
44176 @@ -2549,7 +2549,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44177 sect +
44178 choose_data_offset(r10_bio, rdev)),
44179 bdevname(rdev->bdev, b));
44180 - atomic_add(s, &rdev->corrected_errors);
44181 + atomic_add_unchecked(s, &rdev->corrected_errors);
44182 }
44183
44184 rdev_dec_pending(rdev, mddev);
44185 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
44186 index ad1b9be..b417412 100644
44187 --- a/drivers/md/raid5.c
44188 +++ b/drivers/md/raid5.c
44189 @@ -1702,6 +1702,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
44190 return 1;
44191 }
44192
44193 +#ifdef CONFIG_GRKERNSEC_HIDESYM
44194 +static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
44195 +#endif
44196 +
44197 static int grow_stripes(struct r5conf *conf, int num)
44198 {
44199 struct kmem_cache *sc;
44200 @@ -1713,7 +1717,11 @@ static int grow_stripes(struct r5conf *conf, int num)
44201 "raid%d-%s", conf->level, mdname(conf->mddev));
44202 else
44203 sprintf(conf->cache_name[0],
44204 +#ifdef CONFIG_GRKERNSEC_HIDESYM
44205 + "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
44206 +#else
44207 "raid%d-%p", conf->level, conf->mddev);
44208 +#endif
44209 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
44210
44211 conf->active_name = 0;
44212 @@ -1986,21 +1994,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
44213 mdname(conf->mddev), STRIPE_SECTORS,
44214 (unsigned long long)s,
44215 bdevname(rdev->bdev, b));
44216 - atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
44217 + atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
44218 clear_bit(R5_ReadError, &sh->dev[i].flags);
44219 clear_bit(R5_ReWrite, &sh->dev[i].flags);
44220 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
44221 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
44222
44223 - if (atomic_read(&rdev->read_errors))
44224 - atomic_set(&rdev->read_errors, 0);
44225 + if (atomic_read_unchecked(&rdev->read_errors))
44226 + atomic_set_unchecked(&rdev->read_errors, 0);
44227 } else {
44228 const char *bdn = bdevname(rdev->bdev, b);
44229 int retry = 0;
44230 int set_bad = 0;
44231
44232 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
44233 - atomic_inc(&rdev->read_errors);
44234 + atomic_inc_unchecked(&rdev->read_errors);
44235 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
44236 printk_ratelimited(
44237 KERN_WARNING
44238 @@ -2028,7 +2036,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
44239 mdname(conf->mddev),
44240 (unsigned long long)s,
44241 bdn);
44242 - } else if (atomic_read(&rdev->read_errors)
44243 + } else if (atomic_read_unchecked(&rdev->read_errors)
44244 > conf->max_nr_stripes)
44245 printk(KERN_WARNING
44246 "md/raid:%s: Too many read errors, failing device %s.\n",
44247 diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
44248 index 983db75..ef9248c 100644
44249 --- a/drivers/media/dvb-core/dvbdev.c
44250 +++ b/drivers/media/dvb-core/dvbdev.c
44251 @@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
44252 const struct dvb_device *template, void *priv, int type)
44253 {
44254 struct dvb_device *dvbdev;
44255 - struct file_operations *dvbdevfops;
44256 + file_operations_no_const *dvbdevfops;
44257 struct device *clsdev;
44258 int minor;
44259 int id;
44260 diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
44261 index 539f4db..cdd403b 100644
44262 --- a/drivers/media/dvb-frontends/af9033.h
44263 +++ b/drivers/media/dvb-frontends/af9033.h
44264 @@ -82,7 +82,7 @@ struct af9033_ops {
44265 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
44266 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
44267 int onoff);
44268 -};
44269 +} __no_const;
44270
44271
44272 #if IS_ENABLED(CONFIG_DVB_AF9033)
44273 diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
44274 index 9b6c3bb..baeb5c7 100644
44275 --- a/drivers/media/dvb-frontends/dib3000.h
44276 +++ b/drivers/media/dvb-frontends/dib3000.h
44277 @@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
44278 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
44279 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
44280 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
44281 -};
44282 +} __no_const;
44283
44284 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
44285 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
44286 diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
44287 index ed8cb90..5ef7f79 100644
44288 --- a/drivers/media/pci/cx88/cx88-video.c
44289 +++ b/drivers/media/pci/cx88/cx88-video.c
44290 @@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
44291
44292 /* ------------------------------------------------------------------ */
44293
44294 -static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44295 -static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44296 -static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44297 +static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44298 +static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44299 +static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44300
44301 module_param_array(video_nr, int, NULL, 0444);
44302 module_param_array(vbi_nr, int, NULL, 0444);
44303 diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
44304 index 802642d..5534900 100644
44305 --- a/drivers/media/pci/ivtv/ivtv-driver.c
44306 +++ b/drivers/media/pci/ivtv/ivtv-driver.c
44307 @@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
44308 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
44309
44310 /* ivtv instance counter */
44311 -static atomic_t ivtv_instance = ATOMIC_INIT(0);
44312 +static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
44313
44314 /* Parameter declarations */
44315 static int cardtype[IVTV_MAX_CARDS];
44316 diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
44317 index 9a726ea..f5e9b52 100644
44318 --- a/drivers/media/platform/omap/omap_vout.c
44319 +++ b/drivers/media/platform/omap/omap_vout.c
44320 @@ -63,7 +63,6 @@ enum omap_vout_channels {
44321 OMAP_VIDEO2,
44322 };
44323
44324 -static struct videobuf_queue_ops video_vbq_ops;
44325 /* Variables configurable through module params*/
44326 static u32 video1_numbuffers = 3;
44327 static u32 video2_numbuffers = 3;
44328 @@ -1015,6 +1014,12 @@ static int omap_vout_open(struct file *file)
44329 {
44330 struct videobuf_queue *q;
44331 struct omap_vout_device *vout = NULL;
44332 + static struct videobuf_queue_ops video_vbq_ops = {
44333 + .buf_setup = omap_vout_buffer_setup,
44334 + .buf_prepare = omap_vout_buffer_prepare,
44335 + .buf_release = omap_vout_buffer_release,
44336 + .buf_queue = omap_vout_buffer_queue,
44337 + };
44338
44339 vout = video_drvdata(file);
44340 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
44341 @@ -1032,10 +1037,6 @@ static int omap_vout_open(struct file *file)
44342 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
44343
44344 q = &vout->vbq;
44345 - video_vbq_ops.buf_setup = omap_vout_buffer_setup;
44346 - video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
44347 - video_vbq_ops.buf_release = omap_vout_buffer_release;
44348 - video_vbq_ops.buf_queue = omap_vout_buffer_queue;
44349 spin_lock_init(&vout->vbq_lock);
44350
44351 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
44352 diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
44353 index fb2acc5..a2fcbdc4 100644
44354 --- a/drivers/media/platform/s5p-tv/mixer.h
44355 +++ b/drivers/media/platform/s5p-tv/mixer.h
44356 @@ -156,7 +156,7 @@ struct mxr_layer {
44357 /** layer index (unique identifier) */
44358 int idx;
44359 /** callbacks for layer methods */
44360 - struct mxr_layer_ops ops;
44361 + struct mxr_layer_ops *ops;
44362 /** format array */
44363 const struct mxr_format **fmt_array;
44364 /** size of format array */
44365 diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
44366 index 74344c7..a39e70e 100644
44367 --- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
44368 +++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
44369 @@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
44370 {
44371 struct mxr_layer *layer;
44372 int ret;
44373 - struct mxr_layer_ops ops = {
44374 + static struct mxr_layer_ops ops = {
44375 .release = mxr_graph_layer_release,
44376 .buffer_set = mxr_graph_buffer_set,
44377 .stream_set = mxr_graph_stream_set,
44378 diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
44379 index b713403..53cb5ad 100644
44380 --- a/drivers/media/platform/s5p-tv/mixer_reg.c
44381 +++ b/drivers/media/platform/s5p-tv/mixer_reg.c
44382 @@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
44383 layer->update_buf = next;
44384 }
44385
44386 - layer->ops.buffer_set(layer, layer->update_buf);
44387 + layer->ops->buffer_set(layer, layer->update_buf);
44388
44389 if (done && done != layer->shadow_buf)
44390 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
44391 diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
44392 index a1ce55f..4a3c4d9 100644
44393 --- a/drivers/media/platform/s5p-tv/mixer_video.c
44394 +++ b/drivers/media/platform/s5p-tv/mixer_video.c
44395 @@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
44396 layer->geo.src.height = layer->geo.src.full_height;
44397
44398 mxr_geometry_dump(mdev, &layer->geo);
44399 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
44400 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
44401 mxr_geometry_dump(mdev, &layer->geo);
44402 }
44403
44404 @@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
44405 layer->geo.dst.full_width = mbus_fmt.width;
44406 layer->geo.dst.full_height = mbus_fmt.height;
44407 layer->geo.dst.field = mbus_fmt.field;
44408 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
44409 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
44410
44411 mxr_geometry_dump(mdev, &layer->geo);
44412 }
44413 @@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
44414 /* set source size to highest accepted value */
44415 geo->src.full_width = max(geo->dst.full_width, pix->width);
44416 geo->src.full_height = max(geo->dst.full_height, pix->height);
44417 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
44418 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
44419 mxr_geometry_dump(mdev, &layer->geo);
44420 /* set cropping to total visible screen */
44421 geo->src.width = pix->width;
44422 @@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
44423 geo->src.x_offset = 0;
44424 geo->src.y_offset = 0;
44425 /* assure consistency of geometry */
44426 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
44427 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
44428 mxr_geometry_dump(mdev, &layer->geo);
44429 /* set full size to lowest possible value */
44430 geo->src.full_width = 0;
44431 geo->src.full_height = 0;
44432 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
44433 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
44434 mxr_geometry_dump(mdev, &layer->geo);
44435
44436 /* returning results */
44437 @@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
44438 target->width = s->r.width;
44439 target->height = s->r.height;
44440
44441 - layer->ops.fix_geometry(layer, stage, s->flags);
44442 + layer->ops->fix_geometry(layer, stage, s->flags);
44443
44444 /* retrieve update selection rectangle */
44445 res.left = target->x_offset;
44446 @@ -950,13 +950,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
44447 mxr_output_get(mdev);
44448
44449 mxr_layer_update_output(layer);
44450 - layer->ops.format_set(layer);
44451 + layer->ops->format_set(layer);
44452 /* enabling layer in hardware */
44453 spin_lock_irqsave(&layer->enq_slock, flags);
44454 layer->state = MXR_LAYER_STREAMING;
44455 spin_unlock_irqrestore(&layer->enq_slock, flags);
44456
44457 - layer->ops.stream_set(layer, MXR_ENABLE);
44458 + layer->ops->stream_set(layer, MXR_ENABLE);
44459 mxr_streamer_get(mdev);
44460
44461 return 0;
44462 @@ -1026,7 +1026,7 @@ static int stop_streaming(struct vb2_queue *vq)
44463 spin_unlock_irqrestore(&layer->enq_slock, flags);
44464
44465 /* disabling layer in hardware */
44466 - layer->ops.stream_set(layer, MXR_DISABLE);
44467 + layer->ops->stream_set(layer, MXR_DISABLE);
44468 /* remove one streamer */
44469 mxr_streamer_put(mdev);
44470 /* allow changes in output configuration */
44471 @@ -1065,8 +1065,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
44472
44473 void mxr_layer_release(struct mxr_layer *layer)
44474 {
44475 - if (layer->ops.release)
44476 - layer->ops.release(layer);
44477 + if (layer->ops->release)
44478 + layer->ops->release(layer);
44479 }
44480
44481 void mxr_base_layer_release(struct mxr_layer *layer)
44482 @@ -1092,7 +1092,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
44483
44484 layer->mdev = mdev;
44485 layer->idx = idx;
44486 - layer->ops = *ops;
44487 + layer->ops = ops;
44488
44489 spin_lock_init(&layer->enq_slock);
44490 INIT_LIST_HEAD(&layer->enq_list);
44491 diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
44492 index c9388c4..ce71ece 100644
44493 --- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
44494 +++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
44495 @@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
44496 {
44497 struct mxr_layer *layer;
44498 int ret;
44499 - struct mxr_layer_ops ops = {
44500 + static struct mxr_layer_ops ops = {
44501 .release = mxr_vp_layer_release,
44502 .buffer_set = mxr_vp_buffer_set,
44503 .stream_set = mxr_vp_stream_set,
44504 diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
44505 index 3890f4f..b5c7511 100644
44506 --- a/drivers/media/platform/vivi.c
44507 +++ b/drivers/media/platform/vivi.c
44508 @@ -58,8 +58,8 @@ MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol");
44509 MODULE_LICENSE("Dual BSD/GPL");
44510 MODULE_VERSION(VIVI_VERSION);
44511
44512 -static unsigned video_nr = -1;
44513 -module_param(video_nr, uint, 0644);
44514 +static int video_nr = -1;
44515 +module_param(video_nr, int, 0644);
44516 MODULE_PARM_DESC(video_nr, "videoX start number, -1 is autodetect");
44517
44518 static unsigned n_devs = 1;
44519 diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
44520 index d719e59..63f3470 100644
44521 --- a/drivers/media/radio/radio-cadet.c
44522 +++ b/drivers/media/radio/radio-cadet.c
44523 @@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
44524 unsigned char readbuf[RDS_BUFFER];
44525 int i = 0;
44526
44527 + if (count > RDS_BUFFER)
44528 + return -EFAULT;
44529 mutex_lock(&dev->lock);
44530 if (dev->rdsstat == 0)
44531 cadet_start_rds(dev);
44532 @@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
44533 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
44534 mutex_unlock(&dev->lock);
44535
44536 - if (i && copy_to_user(data, readbuf, i))
44537 - return -EFAULT;
44538 + if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
44539 + i = -EFAULT;
44540 +
44541 return i;
44542 }
44543
44544 diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
44545 index 5236035..c622c74 100644
44546 --- a/drivers/media/radio/radio-maxiradio.c
44547 +++ b/drivers/media/radio/radio-maxiradio.c
44548 @@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
44549 /* TEA5757 pin mappings */
44550 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
44551
44552 -static atomic_t maxiradio_instance = ATOMIC_INIT(0);
44553 +static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
44554
44555 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
44556 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
44557 diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
44558 index 050b3bb..79f62b9 100644
44559 --- a/drivers/media/radio/radio-shark.c
44560 +++ b/drivers/media/radio/radio-shark.c
44561 @@ -79,7 +79,7 @@ struct shark_device {
44562 u32 last_val;
44563 };
44564
44565 -static atomic_t shark_instance = ATOMIC_INIT(0);
44566 +static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
44567
44568 static void shark_write_val(struct snd_tea575x *tea, u32 val)
44569 {
44570 diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
44571 index 8654e0d..0608a64 100644
44572 --- a/drivers/media/radio/radio-shark2.c
44573 +++ b/drivers/media/radio/radio-shark2.c
44574 @@ -74,7 +74,7 @@ struct shark_device {
44575 u8 *transfer_buffer;
44576 };
44577
44578 -static atomic_t shark_instance = ATOMIC_INIT(0);
44579 +static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
44580
44581 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
44582 {
44583 diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
44584 index 2fd9009..278cc1e 100644
44585 --- a/drivers/media/radio/radio-si476x.c
44586 +++ b/drivers/media/radio/radio-si476x.c
44587 @@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
44588 struct si476x_radio *radio;
44589 struct v4l2_ctrl *ctrl;
44590
44591 - static atomic_t instance = ATOMIC_INIT(0);
44592 + static atomic_unchecked_t instance = ATOMIC_INIT(0);
44593
44594 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
44595 if (!radio)
44596 diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
44597 index a1c641e..3007da9 100644
44598 --- a/drivers/media/usb/dvb-usb/cxusb.c
44599 +++ b/drivers/media/usb/dvb-usb/cxusb.c
44600 @@ -1112,7 +1112,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
44601
44602 struct dib0700_adapter_state {
44603 int (*set_param_save) (struct dvb_frontend *);
44604 -};
44605 +} __no_const;
44606
44607 static int dib7070_set_param_override(struct dvb_frontend *fe)
44608 {
44609 diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
44610 index ae0f56a..ec71784 100644
44611 --- a/drivers/media/usb/dvb-usb/dw2102.c
44612 +++ b/drivers/media/usb/dvb-usb/dw2102.c
44613 @@ -118,7 +118,7 @@ struct su3000_state {
44614
44615 struct s6x0_state {
44616 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
44617 -};
44618 +} __no_const;
44619
44620 /* debug */
44621 static int dvb_usb_dw2102_debug;
44622 diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
44623 index 98d24ae..33a8050 100644
44624 --- a/drivers/media/usb/dvb-usb/technisat-usb2.c
44625 +++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
44626 @@ -224,14 +224,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
44627 {
44628 int ret;
44629
44630 - u8 led[8] = {
44631 - red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
44632 - 0
44633 - };
44634 + u8 *led = kzalloc(8, GFP_KERNEL);
44635 +
44636 + if (led == NULL)
44637 + return -ENOMEM;
44638
44639 if (disable_led_control && state != LED_OFF)
44640 return 0;
44641
44642 + led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
44643 +
44644 switch (state) {
44645 case LED_ON:
44646 led[1] = 0x82;
44647 @@ -263,16 +265,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
44648 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
44649 USB_TYPE_VENDOR | USB_DIR_OUT,
44650 0, 0,
44651 - led, sizeof(led), 500);
44652 + led, 8, 500);
44653
44654 mutex_unlock(&d->i2c_mutex);
44655 +
44656 + kfree(led);
44657 +
44658 return ret;
44659 }
44660
44661 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
44662 {
44663 int ret;
44664 - u8 b = 0;
44665 + u8 *b = kzalloc(1, GFP_KERNEL);
44666 +
44667 + if (b == NULL)
44668 + return -ENOMEM;
44669
44670 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
44671 return -EAGAIN;
44672 @@ -281,10 +289,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
44673 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
44674 USB_TYPE_VENDOR | USB_DIR_OUT,
44675 (red << 8) | green, 0,
44676 - &b, 1, 500);
44677 + b, 1, 500);
44678
44679 mutex_unlock(&d->i2c_mutex);
44680
44681 + kfree(b);
44682 +
44683 return ret;
44684 }
44685
44686 @@ -328,7 +338,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
44687 struct dvb_usb_device_description **desc, int *cold)
44688 {
44689 int ret;
44690 - u8 version[3];
44691 + u8 *version = kmalloc(3, GFP_KERNEL);
44692
44693 /* first select the interface */
44694 if (usb_set_interface(udev, 0, 1) != 0)
44695 @@ -338,11 +348,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
44696
44697 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
44698
44699 + if (version == NULL)
44700 + return 0;
44701 +
44702 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
44703 GET_VERSION_INFO_VENDOR_REQUEST,
44704 USB_TYPE_VENDOR | USB_DIR_IN,
44705 0, 0,
44706 - version, sizeof(version), 500);
44707 + version, 3, 500);
44708
44709 if (ret < 0)
44710 *cold = 1;
44711 @@ -351,6 +364,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
44712 *cold = 0;
44713 }
44714
44715 + kfree(version);
44716 +
44717 return 0;
44718 }
44719
44720 @@ -591,10 +606,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
44721
44722 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
44723 {
44724 - u8 buf[62], *b;
44725 + u8 *buf, *b;
44726 int ret;
44727 struct ir_raw_event ev;
44728
44729 + buf = kmalloc(62, GFP_KERNEL);
44730 +
44731 + if (buf == NULL)
44732 + return -ENOMEM;
44733 +
44734 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
44735 buf[1] = 0x08;
44736 buf[2] = 0x8f;
44737 @@ -617,16 +637,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
44738 GET_IR_DATA_VENDOR_REQUEST,
44739 USB_TYPE_VENDOR | USB_DIR_IN,
44740 0x8080, 0,
44741 - buf, sizeof(buf), 500);
44742 + buf, 62, 500);
44743
44744 unlock:
44745 mutex_unlock(&d->i2c_mutex);
44746
44747 - if (ret < 0)
44748 + if (ret < 0) {
44749 + kfree(buf);
44750 return ret;
44751 + }
44752
44753 - if (ret == 1)
44754 + if (ret == 1) {
44755 + kfree(buf);
44756 return 0; /* no key pressed */
44757 + }
44758
44759 /* decoding */
44760 b = buf+1;
44761 @@ -653,6 +677,8 @@ unlock:
44762
44763 ir_raw_event_handle(d->rc_dev);
44764
44765 + kfree(buf);
44766 +
44767 return 1;
44768 }
44769
44770 diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
44771 index 7e2411c..cef73ca 100644
44772 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
44773 +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
44774 @@ -328,7 +328,7 @@ struct v4l2_buffer32 {
44775 __u32 reserved;
44776 };
44777
44778 -static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
44779 +static int get_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
44780 enum v4l2_memory memory)
44781 {
44782 void __user *up_pln;
44783 @@ -357,7 +357,7 @@ static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
44784 return 0;
44785 }
44786
44787 -static int put_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
44788 +static int put_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
44789 enum v4l2_memory memory)
44790 {
44791 if (copy_in_user(up32, up, 2 * sizeof(__u32)) ||
44792 @@ -427,7 +427,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
44793 * by passing a very big num_planes value */
44794 uplane = compat_alloc_user_space(num_planes *
44795 sizeof(struct v4l2_plane));
44796 - kp->m.planes = uplane;
44797 + kp->m.planes = (struct v4l2_plane __force_kernel *)uplane;
44798
44799 while (--num_planes >= 0) {
44800 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
44801 @@ -498,7 +498,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
44802 if (num_planes == 0)
44803 return 0;
44804
44805 - uplane = kp->m.planes;
44806 + uplane = (struct v4l2_plane __force_user *)kp->m.planes;
44807 if (get_user(p, &up->m.planes))
44808 return -EFAULT;
44809 uplane32 = compat_ptr(p);
44810 @@ -552,7 +552,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
44811 get_user(kp->capability, &up->capability) ||
44812 get_user(kp->flags, &up->flags))
44813 return -EFAULT;
44814 - kp->base = compat_ptr(tmp);
44815 + kp->base = (void __force_kernel *)compat_ptr(tmp);
44816 get_v4l2_pix_format(&kp->fmt, &up->fmt);
44817 return 0;
44818 }
44819 @@ -658,7 +658,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
44820 n * sizeof(struct v4l2_ext_control32)))
44821 return -EFAULT;
44822 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
44823 - kp->controls = kcontrols;
44824 + kp->controls = (struct v4l2_ext_control __force_kernel *)kcontrols;
44825 while (--n >= 0) {
44826 if (copy_in_user(kcontrols, ucontrols, sizeof(*ucontrols)))
44827 return -EFAULT;
44828 @@ -680,7 +680,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
44829 static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext_controls32 __user *up)
44830 {
44831 struct v4l2_ext_control32 __user *ucontrols;
44832 - struct v4l2_ext_control __user *kcontrols = kp->controls;
44833 + struct v4l2_ext_control __user *kcontrols = (struct v4l2_ext_control __force_user *)kp->controls;
44834 int n = kp->count;
44835 compat_caddr_t p;
44836
44837 @@ -774,7 +774,7 @@ static int put_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
44838 put_user(kp->start_block, &up->start_block) ||
44839 put_user(kp->blocks, &up->blocks) ||
44840 put_user(tmp, &up->edid) ||
44841 - copy_to_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
44842 + copy_to_user(up->reserved, kp->reserved, sizeof(kp->reserved)))
44843 return -EFAULT;
44844 return 0;
44845 }
44846 diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
44847 index 55c6832..a91c7a6 100644
44848 --- a/drivers/media/v4l2-core/v4l2-ctrls.c
44849 +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
44850 @@ -1431,8 +1431,8 @@ static int validate_new(const struct v4l2_ctrl *ctrl,
44851 return 0;
44852
44853 case V4L2_CTRL_TYPE_STRING:
44854 - len = strlen(c->string);
44855 - if (len < ctrl->minimum)
44856 + len = strlen_user(c->string);
44857 + if (!len || len < ctrl->minimum)
44858 return -ERANGE;
44859 if ((len - ctrl->minimum) % ctrl->step)
44860 return -ERANGE;
44861 diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
44862 index 02d1b63..5fd6b16 100644
44863 --- a/drivers/media/v4l2-core/v4l2-device.c
44864 +++ b/drivers/media/v4l2-core/v4l2-device.c
44865 @@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
44866 EXPORT_SYMBOL_GPL(v4l2_device_put);
44867
44868 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
44869 - atomic_t *instance)
44870 + atomic_unchecked_t *instance)
44871 {
44872 - int num = atomic_inc_return(instance) - 1;
44873 + int num = atomic_inc_return_unchecked(instance) - 1;
44874 int len = strlen(basename);
44875
44876 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
44877 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
44878 index d9113cc..7de6ccc 100644
44879 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
44880 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
44881 @@ -2003,7 +2003,8 @@ struct v4l2_ioctl_info {
44882 struct file *file, void *fh, void *p);
44883 } u;
44884 void (*debug)(const void *arg, bool write_only);
44885 -};
44886 +} __do_const;
44887 +typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
44888
44889 /* This control needs a priority check */
44890 #define INFO_FL_PRIO (1 << 0)
44891 @@ -2186,7 +2187,7 @@ static long __video_do_ioctl(struct file *file,
44892 struct video_device *vfd = video_devdata(file);
44893 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
44894 bool write_only = false;
44895 - struct v4l2_ioctl_info default_info;
44896 + v4l2_ioctl_info_no_const default_info;
44897 const struct v4l2_ioctl_info *info;
44898 void *fh = file->private_data;
44899 struct v4l2_fh *vfh = NULL;
44900 @@ -2260,7 +2261,7 @@ done:
44901 }
44902
44903 static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
44904 - void * __user *user_ptr, void ***kernel_ptr)
44905 + void __user **user_ptr, void ***kernel_ptr)
44906 {
44907 int ret = 0;
44908
44909 @@ -2276,7 +2277,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
44910 ret = -EINVAL;
44911 break;
44912 }
44913 - *user_ptr = (void __user *)buf->m.planes;
44914 + *user_ptr = (void __force_user *)buf->m.planes;
44915 *kernel_ptr = (void *)&buf->m.planes;
44916 *array_size = sizeof(struct v4l2_plane) * buf->length;
44917 ret = 1;
44918 @@ -2311,7 +2312,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
44919 ret = -EINVAL;
44920 break;
44921 }
44922 - *user_ptr = (void __user *)ctrls->controls;
44923 + *user_ptr = (void __force_user *)ctrls->controls;
44924 *kernel_ptr = (void *)&ctrls->controls;
44925 *array_size = sizeof(struct v4l2_ext_control)
44926 * ctrls->count;
44927 @@ -2412,7 +2413,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
44928 }
44929
44930 if (has_array_args) {
44931 - *kernel_ptr = user_ptr;
44932 + *kernel_ptr = (void __force_kernel *)user_ptr;
44933 if (copy_to_user(user_ptr, mbuf, array_size))
44934 err = -EFAULT;
44935 goto out_array_args;
44936 diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
44937 index 570b18a..f880314 100644
44938 --- a/drivers/message/fusion/mptbase.c
44939 +++ b/drivers/message/fusion/mptbase.c
44940 @@ -6755,8 +6755,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
44941 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
44942 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
44943
44944 +#ifdef CONFIG_GRKERNSEC_HIDESYM
44945 + seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
44946 +#else
44947 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
44948 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
44949 +#endif
44950 +
44951 /*
44952 * Rounding UP to nearest 4-kB boundary here...
44953 */
44954 @@ -6769,7 +6774,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
44955 ioc->facts.GlobalCredits);
44956
44957 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
44958 +#ifdef CONFIG_GRKERNSEC_HIDESYM
44959 + NULL, NULL);
44960 +#else
44961 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
44962 +#endif
44963 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
44964 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
44965 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
44966 diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
44967 index 00d339c..2ea899d 100644
44968 --- a/drivers/message/fusion/mptsas.c
44969 +++ b/drivers/message/fusion/mptsas.c
44970 @@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
44971 return 0;
44972 }
44973
44974 +static inline void
44975 +mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
44976 +{
44977 + if (phy_info->port_details) {
44978 + phy_info->port_details->rphy = rphy;
44979 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
44980 + ioc->name, rphy));
44981 + }
44982 +
44983 + if (rphy) {
44984 + dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
44985 + &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
44986 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
44987 + ioc->name, rphy, rphy->dev.release));
44988 + }
44989 +}
44990 +
44991 /* no mutex */
44992 static void
44993 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
44994 @@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
44995 return NULL;
44996 }
44997
44998 -static inline void
44999 -mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
45000 -{
45001 - if (phy_info->port_details) {
45002 - phy_info->port_details->rphy = rphy;
45003 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
45004 - ioc->name, rphy));
45005 - }
45006 -
45007 - if (rphy) {
45008 - dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
45009 - &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
45010 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
45011 - ioc->name, rphy, rphy->dev.release));
45012 - }
45013 -}
45014 -
45015 static inline struct sas_port *
45016 mptsas_get_port(struct mptsas_phyinfo *phy_info)
45017 {
45018 diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
45019 index 727819c..ad74694 100644
45020 --- a/drivers/message/fusion/mptscsih.c
45021 +++ b/drivers/message/fusion/mptscsih.c
45022 @@ -1271,15 +1271,16 @@ mptscsih_info(struct Scsi_Host *SChost)
45023
45024 h = shost_priv(SChost);
45025
45026 - if (h) {
45027 - if (h->info_kbuf == NULL)
45028 - if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
45029 - return h->info_kbuf;
45030 - h->info_kbuf[0] = '\0';
45031 + if (!h)
45032 + return NULL;
45033
45034 - mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
45035 - h->info_kbuf[size-1] = '\0';
45036 - }
45037 + if (h->info_kbuf == NULL)
45038 + if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
45039 + return h->info_kbuf;
45040 + h->info_kbuf[0] = '\0';
45041 +
45042 + mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
45043 + h->info_kbuf[size-1] = '\0';
45044
45045 return h->info_kbuf;
45046 }
45047 diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
45048 index b7d87cd..3fb36da 100644
45049 --- a/drivers/message/i2o/i2o_proc.c
45050 +++ b/drivers/message/i2o/i2o_proc.c
45051 @@ -255,12 +255,6 @@ static char *scsi_devices[] = {
45052 "Array Controller Device"
45053 };
45054
45055 -static char *chtostr(char *tmp, u8 *chars, int n)
45056 -{
45057 - tmp[0] = 0;
45058 - return strncat(tmp, (char *)chars, n);
45059 -}
45060 -
45061 static int i2o_report_query_status(struct seq_file *seq, int block_status,
45062 char *group)
45063 {
45064 @@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
45065 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
45066 {
45067 struct i2o_controller *c = (struct i2o_controller *)seq->private;
45068 - static u32 work32[5];
45069 - static u8 *work8 = (u8 *) work32;
45070 - static u16 *work16 = (u16 *) work32;
45071 + u32 work32[5];
45072 + u8 *work8 = (u8 *) work32;
45073 + u16 *work16 = (u16 *) work32;
45074 int token;
45075 u32 hwcap;
45076
45077 @@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
45078 } *result;
45079
45080 i2o_exec_execute_ddm_table ddm_table;
45081 - char tmp[28 + 1];
45082
45083 result = kmalloc(sizeof(*result), GFP_KERNEL);
45084 if (!result)
45085 @@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
45086
45087 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
45088 seq_printf(seq, "%-#8x", ddm_table.module_id);
45089 - seq_printf(seq, "%-29s",
45090 - chtostr(tmp, ddm_table.module_name_version, 28));
45091 + seq_printf(seq, "%-.28s", ddm_table.module_name_version);
45092 seq_printf(seq, "%9d ", ddm_table.data_size);
45093 seq_printf(seq, "%8d", ddm_table.code_size);
45094
45095 @@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
45096
45097 i2o_driver_result_table *result;
45098 i2o_driver_store_table *dst;
45099 - char tmp[28 + 1];
45100
45101 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
45102 if (result == NULL)
45103 @@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
45104
45105 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
45106 seq_printf(seq, "%-#8x", dst->module_id);
45107 - seq_printf(seq, "%-29s",
45108 - chtostr(tmp, dst->module_name_version, 28));
45109 - seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
45110 + seq_printf(seq, "%-.28s", dst->module_name_version);
45111 + seq_printf(seq, "%-.8s", dst->date);
45112 seq_printf(seq, "%8d ", dst->module_size);
45113 seq_printf(seq, "%8d ", dst->mpb_size);
45114 seq_printf(seq, "0x%04x", dst->module_flags);
45115 @@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
45116 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
45117 {
45118 struct i2o_device *d = (struct i2o_device *)seq->private;
45119 - static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
45120 + u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
45121 // == (allow) 512d bytes (max)
45122 - static u16 *work16 = (u16 *) work32;
45123 + u16 *work16 = (u16 *) work32;
45124 int token;
45125 - char tmp[16 + 1];
45126
45127 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
45128
45129 @@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
45130 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
45131 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
45132 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
45133 - seq_printf(seq, "Vendor info : %s\n",
45134 - chtostr(tmp, (u8 *) (work32 + 2), 16));
45135 - seq_printf(seq, "Product info : %s\n",
45136 - chtostr(tmp, (u8 *) (work32 + 6), 16));
45137 - seq_printf(seq, "Description : %s\n",
45138 - chtostr(tmp, (u8 *) (work32 + 10), 16));
45139 - seq_printf(seq, "Product rev. : %s\n",
45140 - chtostr(tmp, (u8 *) (work32 + 14), 8));
45141 + seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
45142 + seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
45143 + seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
45144 + seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
45145
45146 seq_printf(seq, "Serial number : ");
45147 print_serial_number(seq, (u8 *) (work32 + 16),
45148 @@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
45149 u8 pad[256]; // allow up to 256 byte (max) serial number
45150 } result;
45151
45152 - char tmp[24 + 1];
45153 -
45154 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
45155
45156 if (token < 0) {
45157 @@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
45158 }
45159
45160 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
45161 - seq_printf(seq, "Module name : %s\n",
45162 - chtostr(tmp, result.module_name, 24));
45163 - seq_printf(seq, "Module revision : %s\n",
45164 - chtostr(tmp, result.module_rev, 8));
45165 + seq_printf(seq, "Module name : %.24s\n", result.module_name);
45166 + seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
45167
45168 seq_printf(seq, "Serial number : ");
45169 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
45170 @@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
45171 u8 instance_number[4];
45172 } result;
45173
45174 - char tmp[64 + 1];
45175 -
45176 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
45177
45178 if (token < 0) {
45179 @@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
45180 return 0;
45181 }
45182
45183 - seq_printf(seq, "Device name : %s\n",
45184 - chtostr(tmp, result.device_name, 64));
45185 - seq_printf(seq, "Service name : %s\n",
45186 - chtostr(tmp, result.service_name, 64));
45187 - seq_printf(seq, "Physical name : %s\n",
45188 - chtostr(tmp, result.physical_location, 64));
45189 - seq_printf(seq, "Instance number : %s\n",
45190 - chtostr(tmp, result.instance_number, 4));
45191 + seq_printf(seq, "Device name : %.64s\n", result.device_name);
45192 + seq_printf(seq, "Service name : %.64s\n", result.service_name);
45193 + seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
45194 + seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
45195
45196 return 0;
45197 }
45198 @@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
45199 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
45200 {
45201 struct i2o_device *d = (struct i2o_device *)seq->private;
45202 - static u32 work32[12];
45203 - static u16 *work16 = (u16 *) work32;
45204 - static u8 *work8 = (u8 *) work32;
45205 + u32 work32[12];
45206 + u16 *work16 = (u16 *) work32;
45207 + u8 *work8 = (u8 *) work32;
45208 int token;
45209
45210 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
45211 diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
45212 index 92752fb..a7494f6 100644
45213 --- a/drivers/message/i2o/iop.c
45214 +++ b/drivers/message/i2o/iop.c
45215 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
45216
45217 spin_lock_irqsave(&c->context_list_lock, flags);
45218
45219 - if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
45220 - atomic_inc(&c->context_list_counter);
45221 + if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
45222 + atomic_inc_unchecked(&c->context_list_counter);
45223
45224 - entry->context = atomic_read(&c->context_list_counter);
45225 + entry->context = atomic_read_unchecked(&c->context_list_counter);
45226
45227 list_add(&entry->list, &c->context_list);
45228
45229 @@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
45230
45231 #if BITS_PER_LONG == 64
45232 spin_lock_init(&c->context_list_lock);
45233 - atomic_set(&c->context_list_counter, 0);
45234 + atomic_set_unchecked(&c->context_list_counter, 0);
45235 INIT_LIST_HEAD(&c->context_list);
45236 #endif
45237
45238 diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
45239 index d1a22aa..d0f7bf7 100644
45240 --- a/drivers/mfd/ab8500-debugfs.c
45241 +++ b/drivers/mfd/ab8500-debugfs.c
45242 @@ -100,7 +100,7 @@ static int irq_last;
45243 static u32 *irq_count;
45244 static int num_irqs;
45245
45246 -static struct device_attribute **dev_attr;
45247 +static device_attribute_no_const **dev_attr;
45248 static char **event_name;
45249
45250 static u8 avg_sample = SAMPLE_16;
45251 diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
45252 index a83eed5..62a58a9 100644
45253 --- a/drivers/mfd/max8925-i2c.c
45254 +++ b/drivers/mfd/max8925-i2c.c
45255 @@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
45256 const struct i2c_device_id *id)
45257 {
45258 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
45259 - static struct max8925_chip *chip;
45260 + struct max8925_chip *chip;
45261 struct device_node *node = client->dev.of_node;
45262
45263 if (node && !pdata) {
45264 diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
45265 index 460a014..21d3061 100644
45266 --- a/drivers/mfd/tps65910.c
45267 +++ b/drivers/mfd/tps65910.c
45268 @@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
45269 struct tps65910_platform_data *pdata)
45270 {
45271 int ret = 0;
45272 - static struct regmap_irq_chip *tps6591x_irqs_chip;
45273 + struct regmap_irq_chip *tps6591x_irqs_chip;
45274
45275 if (!irq) {
45276 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
45277 diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
45278 index 596b1f6..5b6ab74 100644
45279 --- a/drivers/mfd/twl4030-irq.c
45280 +++ b/drivers/mfd/twl4030-irq.c
45281 @@ -34,6 +34,7 @@
45282 #include <linux/of.h>
45283 #include <linux/irqdomain.h>
45284 #include <linux/i2c/twl.h>
45285 +#include <asm/pgtable.h>
45286
45287 #include "twl-core.h"
45288
45289 @@ -725,10 +726,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
45290 * Install an irq handler for each of the SIH modules;
45291 * clone dummy irq_chip since PIH can't *do* anything
45292 */
45293 - twl4030_irq_chip = dummy_irq_chip;
45294 - twl4030_irq_chip.name = "twl4030";
45295 + pax_open_kernel();
45296 + memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
45297 + *(const char **)&twl4030_irq_chip.name = "twl4030";
45298
45299 - twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
45300 + *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
45301 + pax_close_kernel();
45302
45303 for (i = irq_base; i < irq_end; i++) {
45304 irq_set_chip_and_handler(i, &twl4030_irq_chip,
45305 diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
45306 index 464419b..64bae8d 100644
45307 --- a/drivers/misc/c2port/core.c
45308 +++ b/drivers/misc/c2port/core.c
45309 @@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
45310 goto error_idr_alloc;
45311 c2dev->id = ret;
45312
45313 - bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
45314 + pax_open_kernel();
45315 + *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
45316 + pax_close_kernel();
45317
45318 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
45319 "c2port%d", c2dev->id);
45320 diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
45321 index 3f2b625..945e179 100644
45322 --- a/drivers/misc/eeprom/sunxi_sid.c
45323 +++ b/drivers/misc/eeprom/sunxi_sid.c
45324 @@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
45325
45326 platform_set_drvdata(pdev, sid_data);
45327
45328 - sid_bin_attr.size = sid_data->keysize;
45329 + pax_open_kernel();
45330 + *(size_t *)&sid_bin_attr.size = sid_data->keysize;
45331 + pax_close_kernel();
45332 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
45333 return -ENODEV;
45334
45335 diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
45336 index 36f5d52..32311c3 100644
45337 --- a/drivers/misc/kgdbts.c
45338 +++ b/drivers/misc/kgdbts.c
45339 @@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
45340 char before[BREAK_INSTR_SIZE];
45341 char after[BREAK_INSTR_SIZE];
45342
45343 - probe_kernel_read(before, (char *)kgdbts_break_test,
45344 + probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
45345 BREAK_INSTR_SIZE);
45346 init_simple_test();
45347 ts.tst = plant_and_detach_test;
45348 @@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
45349 /* Activate test with initial breakpoint */
45350 if (!is_early)
45351 kgdb_breakpoint();
45352 - probe_kernel_read(after, (char *)kgdbts_break_test,
45353 + probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
45354 BREAK_INSTR_SIZE);
45355 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
45356 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
45357 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
45358 index 3ef4627..8d00486 100644
45359 --- a/drivers/misc/lis3lv02d/lis3lv02d.c
45360 +++ b/drivers/misc/lis3lv02d/lis3lv02d.c
45361 @@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
45362 * the lid is closed. This leads to interrupts as soon as a little move
45363 * is done.
45364 */
45365 - atomic_inc(&lis3->count);
45366 + atomic_inc_unchecked(&lis3->count);
45367
45368 wake_up_interruptible(&lis3->misc_wait);
45369 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
45370 @@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
45371 if (lis3->pm_dev)
45372 pm_runtime_get_sync(lis3->pm_dev);
45373
45374 - atomic_set(&lis3->count, 0);
45375 + atomic_set_unchecked(&lis3->count, 0);
45376 return 0;
45377 }
45378
45379 @@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
45380 add_wait_queue(&lis3->misc_wait, &wait);
45381 while (true) {
45382 set_current_state(TASK_INTERRUPTIBLE);
45383 - data = atomic_xchg(&lis3->count, 0);
45384 + data = atomic_xchg_unchecked(&lis3->count, 0);
45385 if (data)
45386 break;
45387
45388 @@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
45389 struct lis3lv02d, miscdev);
45390
45391 poll_wait(file, &lis3->misc_wait, wait);
45392 - if (atomic_read(&lis3->count))
45393 + if (atomic_read_unchecked(&lis3->count))
45394 return POLLIN | POLLRDNORM;
45395 return 0;
45396 }
45397 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
45398 index c439c82..1f20f57 100644
45399 --- a/drivers/misc/lis3lv02d/lis3lv02d.h
45400 +++ b/drivers/misc/lis3lv02d/lis3lv02d.h
45401 @@ -297,7 +297,7 @@ struct lis3lv02d {
45402 struct input_polled_dev *idev; /* input device */
45403 struct platform_device *pdev; /* platform device */
45404 struct regulator_bulk_data regulators[2];
45405 - atomic_t count; /* interrupt count after last read */
45406 + atomic_unchecked_t count; /* interrupt count after last read */
45407 union axis_conversion ac; /* hw -> logical axis */
45408 int mapped_btns[3];
45409
45410 diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
45411 index 2f30bad..c4c13d0 100644
45412 --- a/drivers/misc/sgi-gru/gruhandles.c
45413 +++ b/drivers/misc/sgi-gru/gruhandles.c
45414 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
45415 unsigned long nsec;
45416
45417 nsec = CLKS2NSEC(clks);
45418 - atomic_long_inc(&mcs_op_statistics[op].count);
45419 - atomic_long_add(nsec, &mcs_op_statistics[op].total);
45420 + atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
45421 + atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
45422 if (mcs_op_statistics[op].max < nsec)
45423 mcs_op_statistics[op].max = nsec;
45424 }
45425 diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
45426 index 4f76359..cdfcb2e 100644
45427 --- a/drivers/misc/sgi-gru/gruprocfs.c
45428 +++ b/drivers/misc/sgi-gru/gruprocfs.c
45429 @@ -32,9 +32,9 @@
45430
45431 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
45432
45433 -static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
45434 +static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
45435 {
45436 - unsigned long val = atomic_long_read(v);
45437 + unsigned long val = atomic_long_read_unchecked(v);
45438
45439 seq_printf(s, "%16lu %s\n", val, id);
45440 }
45441 @@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
45442
45443 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
45444 for (op = 0; op < mcsop_last; op++) {
45445 - count = atomic_long_read(&mcs_op_statistics[op].count);
45446 - total = atomic_long_read(&mcs_op_statistics[op].total);
45447 + count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
45448 + total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
45449 max = mcs_op_statistics[op].max;
45450 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
45451 count ? total / count : 0, max);
45452 diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
45453 index 5c3ce24..4915ccb 100644
45454 --- a/drivers/misc/sgi-gru/grutables.h
45455 +++ b/drivers/misc/sgi-gru/grutables.h
45456 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
45457 * GRU statistics.
45458 */
45459 struct gru_stats_s {
45460 - atomic_long_t vdata_alloc;
45461 - atomic_long_t vdata_free;
45462 - atomic_long_t gts_alloc;
45463 - atomic_long_t gts_free;
45464 - atomic_long_t gms_alloc;
45465 - atomic_long_t gms_free;
45466 - atomic_long_t gts_double_allocate;
45467 - atomic_long_t assign_context;
45468 - atomic_long_t assign_context_failed;
45469 - atomic_long_t free_context;
45470 - atomic_long_t load_user_context;
45471 - atomic_long_t load_kernel_context;
45472 - atomic_long_t lock_kernel_context;
45473 - atomic_long_t unlock_kernel_context;
45474 - atomic_long_t steal_user_context;
45475 - atomic_long_t steal_kernel_context;
45476 - atomic_long_t steal_context_failed;
45477 - atomic_long_t nopfn;
45478 - atomic_long_t asid_new;
45479 - atomic_long_t asid_next;
45480 - atomic_long_t asid_wrap;
45481 - atomic_long_t asid_reuse;
45482 - atomic_long_t intr;
45483 - atomic_long_t intr_cbr;
45484 - atomic_long_t intr_tfh;
45485 - atomic_long_t intr_spurious;
45486 - atomic_long_t intr_mm_lock_failed;
45487 - atomic_long_t call_os;
45488 - atomic_long_t call_os_wait_queue;
45489 - atomic_long_t user_flush_tlb;
45490 - atomic_long_t user_unload_context;
45491 - atomic_long_t user_exception;
45492 - atomic_long_t set_context_option;
45493 - atomic_long_t check_context_retarget_intr;
45494 - atomic_long_t check_context_unload;
45495 - atomic_long_t tlb_dropin;
45496 - atomic_long_t tlb_preload_page;
45497 - atomic_long_t tlb_dropin_fail_no_asid;
45498 - atomic_long_t tlb_dropin_fail_upm;
45499 - atomic_long_t tlb_dropin_fail_invalid;
45500 - atomic_long_t tlb_dropin_fail_range_active;
45501 - atomic_long_t tlb_dropin_fail_idle;
45502 - atomic_long_t tlb_dropin_fail_fmm;
45503 - atomic_long_t tlb_dropin_fail_no_exception;
45504 - atomic_long_t tfh_stale_on_fault;
45505 - atomic_long_t mmu_invalidate_range;
45506 - atomic_long_t mmu_invalidate_page;
45507 - atomic_long_t flush_tlb;
45508 - atomic_long_t flush_tlb_gru;
45509 - atomic_long_t flush_tlb_gru_tgh;
45510 - atomic_long_t flush_tlb_gru_zero_asid;
45511 + atomic_long_unchecked_t vdata_alloc;
45512 + atomic_long_unchecked_t vdata_free;
45513 + atomic_long_unchecked_t gts_alloc;
45514 + atomic_long_unchecked_t gts_free;
45515 + atomic_long_unchecked_t gms_alloc;
45516 + atomic_long_unchecked_t gms_free;
45517 + atomic_long_unchecked_t gts_double_allocate;
45518 + atomic_long_unchecked_t assign_context;
45519 + atomic_long_unchecked_t assign_context_failed;
45520 + atomic_long_unchecked_t free_context;
45521 + atomic_long_unchecked_t load_user_context;
45522 + atomic_long_unchecked_t load_kernel_context;
45523 + atomic_long_unchecked_t lock_kernel_context;
45524 + atomic_long_unchecked_t unlock_kernel_context;
45525 + atomic_long_unchecked_t steal_user_context;
45526 + atomic_long_unchecked_t steal_kernel_context;
45527 + atomic_long_unchecked_t steal_context_failed;
45528 + atomic_long_unchecked_t nopfn;
45529 + atomic_long_unchecked_t asid_new;
45530 + atomic_long_unchecked_t asid_next;
45531 + atomic_long_unchecked_t asid_wrap;
45532 + atomic_long_unchecked_t asid_reuse;
45533 + atomic_long_unchecked_t intr;
45534 + atomic_long_unchecked_t intr_cbr;
45535 + atomic_long_unchecked_t intr_tfh;
45536 + atomic_long_unchecked_t intr_spurious;
45537 + atomic_long_unchecked_t intr_mm_lock_failed;
45538 + atomic_long_unchecked_t call_os;
45539 + atomic_long_unchecked_t call_os_wait_queue;
45540 + atomic_long_unchecked_t user_flush_tlb;
45541 + atomic_long_unchecked_t user_unload_context;
45542 + atomic_long_unchecked_t user_exception;
45543 + atomic_long_unchecked_t set_context_option;
45544 + atomic_long_unchecked_t check_context_retarget_intr;
45545 + atomic_long_unchecked_t check_context_unload;
45546 + atomic_long_unchecked_t tlb_dropin;
45547 + atomic_long_unchecked_t tlb_preload_page;
45548 + atomic_long_unchecked_t tlb_dropin_fail_no_asid;
45549 + atomic_long_unchecked_t tlb_dropin_fail_upm;
45550 + atomic_long_unchecked_t tlb_dropin_fail_invalid;
45551 + atomic_long_unchecked_t tlb_dropin_fail_range_active;
45552 + atomic_long_unchecked_t tlb_dropin_fail_idle;
45553 + atomic_long_unchecked_t tlb_dropin_fail_fmm;
45554 + atomic_long_unchecked_t tlb_dropin_fail_no_exception;
45555 + atomic_long_unchecked_t tfh_stale_on_fault;
45556 + atomic_long_unchecked_t mmu_invalidate_range;
45557 + atomic_long_unchecked_t mmu_invalidate_page;
45558 + atomic_long_unchecked_t flush_tlb;
45559 + atomic_long_unchecked_t flush_tlb_gru;
45560 + atomic_long_unchecked_t flush_tlb_gru_tgh;
45561 + atomic_long_unchecked_t flush_tlb_gru_zero_asid;
45562
45563 - atomic_long_t copy_gpa;
45564 - atomic_long_t read_gpa;
45565 + atomic_long_unchecked_t copy_gpa;
45566 + atomic_long_unchecked_t read_gpa;
45567
45568 - atomic_long_t mesq_receive;
45569 - atomic_long_t mesq_receive_none;
45570 - atomic_long_t mesq_send;
45571 - atomic_long_t mesq_send_failed;
45572 - atomic_long_t mesq_noop;
45573 - atomic_long_t mesq_send_unexpected_error;
45574 - atomic_long_t mesq_send_lb_overflow;
45575 - atomic_long_t mesq_send_qlimit_reached;
45576 - atomic_long_t mesq_send_amo_nacked;
45577 - atomic_long_t mesq_send_put_nacked;
45578 - atomic_long_t mesq_page_overflow;
45579 - atomic_long_t mesq_qf_locked;
45580 - atomic_long_t mesq_qf_noop_not_full;
45581 - atomic_long_t mesq_qf_switch_head_failed;
45582 - atomic_long_t mesq_qf_unexpected_error;
45583 - atomic_long_t mesq_noop_unexpected_error;
45584 - atomic_long_t mesq_noop_lb_overflow;
45585 - atomic_long_t mesq_noop_qlimit_reached;
45586 - atomic_long_t mesq_noop_amo_nacked;
45587 - atomic_long_t mesq_noop_put_nacked;
45588 - atomic_long_t mesq_noop_page_overflow;
45589 + atomic_long_unchecked_t mesq_receive;
45590 + atomic_long_unchecked_t mesq_receive_none;
45591 + atomic_long_unchecked_t mesq_send;
45592 + atomic_long_unchecked_t mesq_send_failed;
45593 + atomic_long_unchecked_t mesq_noop;
45594 + atomic_long_unchecked_t mesq_send_unexpected_error;
45595 + atomic_long_unchecked_t mesq_send_lb_overflow;
45596 + atomic_long_unchecked_t mesq_send_qlimit_reached;
45597 + atomic_long_unchecked_t mesq_send_amo_nacked;
45598 + atomic_long_unchecked_t mesq_send_put_nacked;
45599 + atomic_long_unchecked_t mesq_page_overflow;
45600 + atomic_long_unchecked_t mesq_qf_locked;
45601 + atomic_long_unchecked_t mesq_qf_noop_not_full;
45602 + atomic_long_unchecked_t mesq_qf_switch_head_failed;
45603 + atomic_long_unchecked_t mesq_qf_unexpected_error;
45604 + atomic_long_unchecked_t mesq_noop_unexpected_error;
45605 + atomic_long_unchecked_t mesq_noop_lb_overflow;
45606 + atomic_long_unchecked_t mesq_noop_qlimit_reached;
45607 + atomic_long_unchecked_t mesq_noop_amo_nacked;
45608 + atomic_long_unchecked_t mesq_noop_put_nacked;
45609 + atomic_long_unchecked_t mesq_noop_page_overflow;
45610
45611 };
45612
45613 @@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
45614 tghop_invalidate, mcsop_last};
45615
45616 struct mcs_op_statistic {
45617 - atomic_long_t count;
45618 - atomic_long_t total;
45619 + atomic_long_unchecked_t count;
45620 + atomic_long_unchecked_t total;
45621 unsigned long max;
45622 };
45623
45624 @@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
45625
45626 #define STAT(id) do { \
45627 if (gru_options & OPT_STATS) \
45628 - atomic_long_inc(&gru_stats.id); \
45629 + atomic_long_inc_unchecked(&gru_stats.id); \
45630 } while (0)
45631
45632 #ifdef CONFIG_SGI_GRU_DEBUG
45633 diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
45634 index c862cd4..0d176fe 100644
45635 --- a/drivers/misc/sgi-xp/xp.h
45636 +++ b/drivers/misc/sgi-xp/xp.h
45637 @@ -288,7 +288,7 @@ struct xpc_interface {
45638 xpc_notify_func, void *);
45639 void (*received) (short, int, void *);
45640 enum xp_retval (*partid_to_nasids) (short, void *);
45641 -};
45642 +} __no_const;
45643
45644 extern struct xpc_interface xpc_interface;
45645
45646 diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
45647 index 01be66d..e3a0c7e 100644
45648 --- a/drivers/misc/sgi-xp/xp_main.c
45649 +++ b/drivers/misc/sgi-xp/xp_main.c
45650 @@ -78,13 +78,13 @@ xpc_notloaded(void)
45651 }
45652
45653 struct xpc_interface xpc_interface = {
45654 - (void (*)(int))xpc_notloaded,
45655 - (void (*)(int))xpc_notloaded,
45656 - (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
45657 - (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
45658 + .connect = (void (*)(int))xpc_notloaded,
45659 + .disconnect = (void (*)(int))xpc_notloaded,
45660 + .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
45661 + .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
45662 void *))xpc_notloaded,
45663 - (void (*)(short, int, void *))xpc_notloaded,
45664 - (enum xp_retval(*)(short, void *))xpc_notloaded
45665 + .received = (void (*)(short, int, void *))xpc_notloaded,
45666 + .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
45667 };
45668 EXPORT_SYMBOL_GPL(xpc_interface);
45669
45670 diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
45671 index b94d5f7..7f494c5 100644
45672 --- a/drivers/misc/sgi-xp/xpc.h
45673 +++ b/drivers/misc/sgi-xp/xpc.h
45674 @@ -835,6 +835,7 @@ struct xpc_arch_operations {
45675 void (*received_payload) (struct xpc_channel *, void *);
45676 void (*notify_senders_of_disconnect) (struct xpc_channel *);
45677 };
45678 +typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
45679
45680 /* struct xpc_partition act_state values (for XPC HB) */
45681
45682 @@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
45683 /* found in xpc_main.c */
45684 extern struct device *xpc_part;
45685 extern struct device *xpc_chan;
45686 -extern struct xpc_arch_operations xpc_arch_ops;
45687 +extern xpc_arch_operations_no_const xpc_arch_ops;
45688 extern int xpc_disengage_timelimit;
45689 extern int xpc_disengage_timedout;
45690 extern int xpc_activate_IRQ_rcvd;
45691 diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
45692 index 82dc574..8539ab2 100644
45693 --- a/drivers/misc/sgi-xp/xpc_main.c
45694 +++ b/drivers/misc/sgi-xp/xpc_main.c
45695 @@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
45696 .notifier_call = xpc_system_die,
45697 };
45698
45699 -struct xpc_arch_operations xpc_arch_ops;
45700 +xpc_arch_operations_no_const xpc_arch_ops;
45701
45702 /*
45703 * Timer function to enforce the timelimit on the partition disengage.
45704 @@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
45705
45706 if (((die_args->trapnr == X86_TRAP_MF) ||
45707 (die_args->trapnr == X86_TRAP_XF)) &&
45708 - !user_mode_vm(die_args->regs))
45709 + !user_mode(die_args->regs))
45710 xpc_die_deactivate();
45711
45712 break;
45713 diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
45714 index 452782b..0c10e40 100644
45715 --- a/drivers/mmc/card/block.c
45716 +++ b/drivers/mmc/card/block.c
45717 @@ -574,7 +574,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
45718 if (idata->ic.postsleep_min_us)
45719 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
45720
45721 - if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
45722 + if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
45723 err = -EFAULT;
45724 goto cmd_rel_host;
45725 }
45726 diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
45727 index f51b5ba..86614a7 100644
45728 --- a/drivers/mmc/core/mmc_ops.c
45729 +++ b/drivers/mmc/core/mmc_ops.c
45730 @@ -247,7 +247,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
45731 void *data_buf;
45732 int is_on_stack;
45733
45734 - is_on_stack = object_is_on_stack(buf);
45735 + is_on_stack = object_starts_on_stack(buf);
45736 if (is_on_stack) {
45737 /*
45738 * dma onto stack is unsafe/nonportable, but callers to this
45739 diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
45740 index 6834977..824ee1b 100644
45741 --- a/drivers/mmc/host/dw_mmc.h
45742 +++ b/drivers/mmc/host/dw_mmc.h
45743 @@ -259,5 +259,5 @@ struct dw_mci_drv_data {
45744 int (*parse_dt)(struct dw_mci *host);
45745 int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
45746 struct dw_mci_tuning_data *tuning_data);
45747 -};
45748 +} __do_const;
45749 #endif /* _DW_MMC_H_ */
45750 diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
45751 index 771c60a..12cb615 100644
45752 --- a/drivers/mmc/host/mmci.c
45753 +++ b/drivers/mmc/host/mmci.c
45754 @@ -1570,7 +1570,9 @@ static int mmci_probe(struct amba_device *dev,
45755 mmc->caps2 = plat->capabilities2;
45756
45757 if (variant->busy_detect) {
45758 - mmci_ops.card_busy = mmci_card_busy;
45759 + pax_open_kernel();
45760 + *(void **)&mmci_ops.card_busy = mmci_card_busy;
45761 + pax_close_kernel();
45762 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
45763 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
45764 mmc->max_busy_timeout = 0;
45765 diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
45766 index b841bb7..d82712f5 100644
45767 --- a/drivers/mmc/host/sdhci-esdhc-imx.c
45768 +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
45769 @@ -1031,9 +1031,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
45770 host->mmc->caps |= MMC_CAP_1_8V_DDR;
45771 }
45772
45773 - if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
45774 - sdhci_esdhc_ops.platform_execute_tuning =
45775 + if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
45776 + pax_open_kernel();
45777 + *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
45778 esdhc_executing_tuning;
45779 + pax_close_kernel();
45780 + }
45781
45782 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
45783 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
45784 diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
45785 index d61eb5a..88c0f5d 100644
45786 --- a/drivers/mmc/host/sdhci-s3c.c
45787 +++ b/drivers/mmc/host/sdhci-s3c.c
45788 @@ -657,9 +657,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
45789 * we can use overriding functions instead of default.
45790 */
45791 if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
45792 - sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
45793 - sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
45794 - sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
45795 + pax_open_kernel();
45796 + *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
45797 + *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
45798 + *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
45799 + pax_close_kernel();
45800 }
45801
45802 /* It supports additional host capabilities if needed */
45803 diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
45804 index 6293855..3415551 100644
45805 --- a/drivers/mtd/chips/cfi_cmdset_0020.c
45806 +++ b/drivers/mtd/chips/cfi_cmdset_0020.c
45807 @@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
45808 size_t totlen = 0, thislen;
45809 int ret = 0;
45810 size_t buflen = 0;
45811 - static char *buffer;
45812 + char *buffer;
45813
45814 if (!ECCBUF_SIZE) {
45815 /* We should fall back to a general writev implementation.
45816 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
45817 index c07cd57..61c4fbd 100644
45818 --- a/drivers/mtd/nand/denali.c
45819 +++ b/drivers/mtd/nand/denali.c
45820 @@ -24,6 +24,7 @@
45821 #include <linux/slab.h>
45822 #include <linux/mtd/mtd.h>
45823 #include <linux/module.h>
45824 +#include <linux/slab.h>
45825
45826 #include "denali.h"
45827
45828 diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
45829 index bb77f75..47539b1 100644
45830 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
45831 +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
45832 @@ -370,7 +370,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
45833
45834 /* first try to map the upper buffer directly */
45835 if (virt_addr_valid(this->upper_buf) &&
45836 - !object_is_on_stack(this->upper_buf)) {
45837 + !object_starts_on_stack(this->upper_buf)) {
45838 sg_init_one(sgl, this->upper_buf, this->upper_len);
45839 ret = dma_map_sg(this->dev, sgl, 1, dr);
45840 if (ret == 0)
45841 diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
45842 index 51b9d6a..52af9a7 100644
45843 --- a/drivers/mtd/nftlmount.c
45844 +++ b/drivers/mtd/nftlmount.c
45845 @@ -24,6 +24,7 @@
45846 #include <asm/errno.h>
45847 #include <linux/delay.h>
45848 #include <linux/slab.h>
45849 +#include <linux/sched.h>
45850 #include <linux/mtd/mtd.h>
45851 #include <linux/mtd/nand.h>
45852 #include <linux/mtd/nftl.h>
45853 diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
45854 index cf49c22..971b133 100644
45855 --- a/drivers/mtd/sm_ftl.c
45856 +++ b/drivers/mtd/sm_ftl.c
45857 @@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
45858 #define SM_CIS_VENDOR_OFFSET 0x59
45859 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
45860 {
45861 - struct attribute_group *attr_group;
45862 + attribute_group_no_const *attr_group;
45863 struct attribute **attributes;
45864 struct sm_sysfs_attribute *vendor_attribute;
45865 char *vendor;
45866 diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
45867 index f847e16..fc8dbe9 100644
45868 --- a/drivers/net/bonding/bond_netlink.c
45869 +++ b/drivers/net/bonding/bond_netlink.c
45870 @@ -542,7 +542,7 @@ nla_put_failure:
45871 return -EMSGSIZE;
45872 }
45873
45874 -struct rtnl_link_ops bond_link_ops __read_mostly = {
45875 +struct rtnl_link_ops bond_link_ops = {
45876 .kind = "bond",
45877 .priv_size = sizeof(struct bonding),
45878 .setup = bond_setup,
45879 diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
45880 index 9e7d95d..d447b88 100644
45881 --- a/drivers/net/can/Kconfig
45882 +++ b/drivers/net/can/Kconfig
45883 @@ -104,7 +104,7 @@ config CAN_JANZ_ICAN3
45884
45885 config CAN_FLEXCAN
45886 tristate "Support for Freescale FLEXCAN based chips"
45887 - depends on ARM || PPC
45888 + depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
45889 ---help---
45890 Say Y here if you want to support for Freescale FlexCAN.
45891
45892 diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
45893 index 455d4c3..3353ee7 100644
45894 --- a/drivers/net/ethernet/8390/ax88796.c
45895 +++ b/drivers/net/ethernet/8390/ax88796.c
45896 @@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
45897 if (ax->plat->reg_offsets)
45898 ei_local->reg_offset = ax->plat->reg_offsets;
45899 else {
45900 + resource_size_t _mem_size = mem_size;
45901 + do_div(_mem_size, 0x18);
45902 ei_local->reg_offset = ax->reg_offsets;
45903 for (ret = 0; ret < 0x18; ret++)
45904 - ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
45905 + ax->reg_offsets[ret] = _mem_size * ret;
45906 }
45907
45908 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
45909 diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
45910 index 7330681..7e9e463 100644
45911 --- a/drivers/net/ethernet/altera/altera_tse_main.c
45912 +++ b/drivers/net/ethernet/altera/altera_tse_main.c
45913 @@ -1182,7 +1182,7 @@ static int tse_shutdown(struct net_device *dev)
45914 return 0;
45915 }
45916
45917 -static struct net_device_ops altera_tse_netdev_ops = {
45918 +static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
45919 .ndo_open = tse_open,
45920 .ndo_stop = tse_shutdown,
45921 .ndo_start_xmit = tse_start_xmit,
45922 @@ -1439,11 +1439,13 @@ static int altera_tse_probe(struct platform_device *pdev)
45923 ndev->netdev_ops = &altera_tse_netdev_ops;
45924 altera_tse_set_ethtool_ops(ndev);
45925
45926 + pax_open_kernel();
45927 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
45928
45929 if (priv->hash_filter)
45930 altera_tse_netdev_ops.ndo_set_rx_mode =
45931 tse_set_rx_mode_hashfilter;
45932 + pax_close_kernel();
45933
45934 /* Scatter/gather IO is not supported,
45935 * so it is turned off
45936 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
45937 index 3448cc0..67b2dc4 100644
45938 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
45939 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
45940 @@ -1058,7 +1058,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
45941 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
45942 {
45943 /* RX_MODE controlling object */
45944 - bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
45945 + bnx2x_init_rx_mode_obj(bp);
45946
45947 /* multicast configuration controlling object */
45948 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
45949 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
45950 index 31297266..944cf6e 100644
45951 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
45952 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
45953 @@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
45954 return rc;
45955 }
45956
45957 -void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
45958 - struct bnx2x_rx_mode_obj *o)
45959 +void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
45960 {
45961 if (CHIP_IS_E1x(bp)) {
45962 - o->wait_comp = bnx2x_empty_rx_mode_wait;
45963 - o->config_rx_mode = bnx2x_set_rx_mode_e1x;
45964 + bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
45965 + bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
45966 } else {
45967 - o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
45968 - o->config_rx_mode = bnx2x_set_rx_mode_e2;
45969 + bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
45970 + bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
45971 }
45972 }
45973
45974 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
45975 index 80f6c79..fb7d12d 100644
45976 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
45977 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
45978 @@ -1340,8 +1340,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
45979
45980 /********************* RX MODE ****************/
45981
45982 -void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
45983 - struct bnx2x_rx_mode_obj *o);
45984 +void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
45985
45986 /**
45987 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
45988 diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
45989 index 04321e5..b51cdc4 100644
45990 --- a/drivers/net/ethernet/broadcom/tg3.h
45991 +++ b/drivers/net/ethernet/broadcom/tg3.h
45992 @@ -150,6 +150,7 @@
45993 #define CHIPREV_ID_5750_A0 0x4000
45994 #define CHIPREV_ID_5750_A1 0x4001
45995 #define CHIPREV_ID_5750_A3 0x4003
45996 +#define CHIPREV_ID_5750_C1 0x4201
45997 #define CHIPREV_ID_5750_C2 0x4202
45998 #define CHIPREV_ID_5752_A0_HW 0x5000
45999 #define CHIPREV_ID_5752_A0 0x6000
46000 diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
46001 index 13f9636..228040f 100644
46002 --- a/drivers/net/ethernet/brocade/bna/bna_enet.c
46003 +++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
46004 @@ -1690,10 +1690,10 @@ bna_cb_ioceth_reset(void *arg)
46005 }
46006
46007 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
46008 - bna_cb_ioceth_enable,
46009 - bna_cb_ioceth_disable,
46010 - bna_cb_ioceth_hbfail,
46011 - bna_cb_ioceth_reset
46012 + .enable_cbfn = bna_cb_ioceth_enable,
46013 + .disable_cbfn = bna_cb_ioceth_disable,
46014 + .hbfail_cbfn = bna_cb_ioceth_hbfail,
46015 + .reset_cbfn = bna_cb_ioceth_reset
46016 };
46017
46018 static void bna_attr_init(struct bna_ioceth *ioceth)
46019 diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
46020 index 8cffcdf..aadf043 100644
46021 --- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
46022 +++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
46023 @@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
46024 */
46025 struct l2t_skb_cb {
46026 arp_failure_handler_func arp_failure_handler;
46027 -};
46028 +} __no_const;
46029
46030 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
46031
46032 diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
46033 index 24e16e3..bfe6ef2 100644
46034 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
46035 +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
46036 @@ -2139,7 +2139,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
46037
46038 int i;
46039 struct adapter *ap = netdev2adap(dev);
46040 - static const unsigned int *reg_ranges;
46041 + const unsigned int *reg_ranges;
46042 int arr_size = 0, buf_size = 0;
46043
46044 if (is_t4(ap->params.chip)) {
46045 diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
46046 index c05b66d..ed69872 100644
46047 --- a/drivers/net/ethernet/dec/tulip/de4x5.c
46048 +++ b/drivers/net/ethernet/dec/tulip/de4x5.c
46049 @@ -5388,7 +5388,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
46050 for (i=0; i<ETH_ALEN; i++) {
46051 tmp.addr[i] = dev->dev_addr[i];
46052 }
46053 - if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
46054 + if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
46055 break;
46056
46057 case DE4X5_SET_HWADDR: /* Set the hardware address */
46058 @@ -5428,7 +5428,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
46059 spin_lock_irqsave(&lp->lock, flags);
46060 memcpy(&statbuf, &lp->pktStats, ioc->len);
46061 spin_unlock_irqrestore(&lp->lock, flags);
46062 - if (copy_to_user(ioc->data, &statbuf, ioc->len))
46063 + if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
46064 return -EFAULT;
46065 break;
46066 }
46067 diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
46068 index dc19bc5..f2d4548 100644
46069 --- a/drivers/net/ethernet/emulex/benet/be_main.c
46070 +++ b/drivers/net/ethernet/emulex/benet/be_main.c
46071 @@ -535,7 +535,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
46072
46073 if (wrapped)
46074 newacc += 65536;
46075 - ACCESS_ONCE(*acc) = newacc;
46076 + ACCESS_ONCE_RW(*acc) = newacc;
46077 }
46078
46079 static void populate_erx_stats(struct be_adapter *adapter,
46080 diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
46081 index 68069ea..c4484f6 100644
46082 --- a/drivers/net/ethernet/faraday/ftgmac100.c
46083 +++ b/drivers/net/ethernet/faraday/ftgmac100.c
46084 @@ -30,6 +30,8 @@
46085 #include <linux/netdevice.h>
46086 #include <linux/phy.h>
46087 #include <linux/platform_device.h>
46088 +#include <linux/interrupt.h>
46089 +#include <linux/irqreturn.h>
46090 #include <net/ip.h>
46091
46092 #include "ftgmac100.h"
46093 diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
46094 index 8be5b40..081bc1b 100644
46095 --- a/drivers/net/ethernet/faraday/ftmac100.c
46096 +++ b/drivers/net/ethernet/faraday/ftmac100.c
46097 @@ -31,6 +31,8 @@
46098 #include <linux/module.h>
46099 #include <linux/netdevice.h>
46100 #include <linux/platform_device.h>
46101 +#include <linux/interrupt.h>
46102 +#include <linux/irqreturn.h>
46103
46104 #include "ftmac100.h"
46105
46106 diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
46107 index e61e637..9117795 100644
46108 --- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
46109 +++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
46110 @@ -436,7 +436,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
46111 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
46112
46113 /* Update the base adjustement value. */
46114 - ACCESS_ONCE(pf->ptp_base_adj) = incval;
46115 + ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
46116 smp_mb(); /* Force the above update. */
46117 }
46118
46119 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
46120 index 8902ae6..e7bcdce 100644
46121 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
46122 +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
46123 @@ -771,7 +771,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
46124 }
46125
46126 /* update the base incval used to calculate frequency adjustment */
46127 - ACCESS_ONCE(adapter->base_incval) = incval;
46128 + ACCESS_ONCE_RW(adapter->base_incval) = incval;
46129 smp_mb();
46130
46131 /* need lock to prevent incorrect read while modifying cyclecounter */
46132 diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
46133 index 089b713..28d87ae 100644
46134 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
46135 +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
46136 @@ -3461,7 +3461,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
46137 struct __vxge_hw_fifo *fifo;
46138 struct vxge_hw_fifo_config *config;
46139 u32 txdl_size, txdl_per_memblock;
46140 - struct vxge_hw_mempool_cbs fifo_mp_callback;
46141 + static struct vxge_hw_mempool_cbs fifo_mp_callback = {
46142 + .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
46143 + };
46144 +
46145 struct __vxge_hw_virtualpath *vpath;
46146
46147 if ((vp == NULL) || (attr == NULL)) {
46148 @@ -3544,8 +3547,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
46149 goto exit;
46150 }
46151
46152 - fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
46153 -
46154 fifo->mempool =
46155 __vxge_hw_mempool_create(vpath->hldev,
46156 fifo->config->memblock_size,
46157 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
46158 index ba20c72..f30c0fe 100644
46159 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
46160 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
46161 @@ -2176,7 +2176,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
46162 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
46163 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
46164 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
46165 - adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
46166 + pax_open_kernel();
46167 + *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
46168 + pax_close_kernel();
46169 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
46170 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
46171 max_tx_rings = QLCNIC_MAX_TX_RINGS;
46172 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
46173 index be7d7a6..a8983f8 100644
46174 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
46175 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
46176 @@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
46177 case QLCNIC_NON_PRIV_FUNC:
46178 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
46179 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
46180 - nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
46181 + pax_open_kernel();
46182 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
46183 + pax_close_kernel();
46184 break;
46185 case QLCNIC_PRIV_FUNC:
46186 ahw->op_mode = QLCNIC_PRIV_FUNC;
46187 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
46188 - nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
46189 + pax_open_kernel();
46190 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
46191 + pax_close_kernel();
46192 break;
46193 case QLCNIC_MGMT_FUNC:
46194 ahw->op_mode = QLCNIC_MGMT_FUNC;
46195 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
46196 - nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
46197 + pax_open_kernel();
46198 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
46199 + pax_close_kernel();
46200 break;
46201 default:
46202 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
46203 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
46204 index 37b979b..50f5b95 100644
46205 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
46206 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
46207 @@ -1217,7 +1217,7 @@ flash_temp:
46208 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
46209 {
46210 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
46211 - static const struct qlcnic_dump_operations *fw_dump_ops;
46212 + const struct qlcnic_dump_operations *fw_dump_ops;
46213 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
46214 u32 entry_offset, dump, no_entries, buf_offset = 0;
46215 int i, k, ops_cnt, ops_index, dump_size = 0;
46216 diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
46217 index aa1c079..2b1a3e8 100644
46218 --- a/drivers/net/ethernet/realtek/r8169.c
46219 +++ b/drivers/net/ethernet/realtek/r8169.c
46220 @@ -758,22 +758,22 @@ struct rtl8169_private {
46221 struct mdio_ops {
46222 void (*write)(struct rtl8169_private *, int, int);
46223 int (*read)(struct rtl8169_private *, int);
46224 - } mdio_ops;
46225 + } __no_const mdio_ops;
46226
46227 struct pll_power_ops {
46228 void (*down)(struct rtl8169_private *);
46229 void (*up)(struct rtl8169_private *);
46230 - } pll_power_ops;
46231 + } __no_const pll_power_ops;
46232
46233 struct jumbo_ops {
46234 void (*enable)(struct rtl8169_private *);
46235 void (*disable)(struct rtl8169_private *);
46236 - } jumbo_ops;
46237 + } __no_const jumbo_ops;
46238
46239 struct csi_ops {
46240 void (*write)(struct rtl8169_private *, int, int);
46241 u32 (*read)(struct rtl8169_private *, int);
46242 - } csi_ops;
46243 + } __no_const csi_ops;
46244
46245 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
46246 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
46247 diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
46248 index 6b861e3..204ac86 100644
46249 --- a/drivers/net/ethernet/sfc/ptp.c
46250 +++ b/drivers/net/ethernet/sfc/ptp.c
46251 @@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
46252 ptp->start.dma_addr);
46253
46254 /* Clear flag that signals MC ready */
46255 - ACCESS_ONCE(*start) = 0;
46256 + ACCESS_ONCE_RW(*start) = 0;
46257 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
46258 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
46259 EFX_BUG_ON_PARANOID(rc);
46260 diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
46261 index 50617c5..b13724c 100644
46262 --- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
46263 +++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
46264 @@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
46265
46266 writel(value, ioaddr + MMC_CNTRL);
46267
46268 - pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
46269 - MMC_CNTRL, value);
46270 +// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
46271 +// MMC_CNTRL, value);
46272 }
46273
46274 /* To mask all all interrupts.*/
46275 diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
46276 index d18f711d..5755800 100644
46277 --- a/drivers/net/hyperv/hyperv_net.h
46278 +++ b/drivers/net/hyperv/hyperv_net.h
46279 @@ -101,7 +101,7 @@ struct rndis_device {
46280
46281 enum rndis_device_state state;
46282 bool link_state;
46283 - atomic_t new_req_id;
46284 + atomic_unchecked_t new_req_id;
46285
46286 spinlock_t request_lock;
46287 struct list_head req_list;
46288 diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
46289 index 143a98c..d54fbaa 100644
46290 --- a/drivers/net/hyperv/rndis_filter.c
46291 +++ b/drivers/net/hyperv/rndis_filter.c
46292 @@ -100,7 +100,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
46293 * template
46294 */
46295 set = &rndis_msg->msg.set_req;
46296 - set->req_id = atomic_inc_return(&dev->new_req_id);
46297 + set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
46298
46299 /* Add to the request list */
46300 spin_lock_irqsave(&dev->request_lock, flags);
46301 @@ -834,7 +834,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
46302
46303 /* Setup the rndis set */
46304 halt = &request->request_msg.msg.halt_req;
46305 - halt->req_id = atomic_inc_return(&dev->new_req_id);
46306 + halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
46307
46308 /* Ignore return since this msg is optional. */
46309 rndis_filter_send_request(dev, request);
46310 diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
46311 index 78f18be..1d19c62 100644
46312 --- a/drivers/net/ieee802154/fakehard.c
46313 +++ b/drivers/net/ieee802154/fakehard.c
46314 @@ -364,7 +364,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
46315 phy->transmit_power = 0xbf;
46316
46317 dev->netdev_ops = &fake_ops;
46318 - dev->ml_priv = &fake_mlme;
46319 + dev->ml_priv = (void *)&fake_mlme;
46320
46321 priv = netdev_priv(dev);
46322 priv->phy = phy;
46323 diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
46324 index 7eec598..90b8428 100644
46325 --- a/drivers/net/macvlan.c
46326 +++ b/drivers/net/macvlan.c
46327 @@ -984,13 +984,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
46328 int macvlan_link_register(struct rtnl_link_ops *ops)
46329 {
46330 /* common fields */
46331 - ops->priv_size = sizeof(struct macvlan_dev);
46332 - ops->validate = macvlan_validate;
46333 - ops->maxtype = IFLA_MACVLAN_MAX;
46334 - ops->policy = macvlan_policy;
46335 - ops->changelink = macvlan_changelink;
46336 - ops->get_size = macvlan_get_size;
46337 - ops->fill_info = macvlan_fill_info;
46338 + pax_open_kernel();
46339 + *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
46340 + *(void **)&ops->validate = macvlan_validate;
46341 + *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
46342 + *(const void **)&ops->policy = macvlan_policy;
46343 + *(void **)&ops->changelink = macvlan_changelink;
46344 + *(void **)&ops->get_size = macvlan_get_size;
46345 + *(void **)&ops->fill_info = macvlan_fill_info;
46346 + pax_close_kernel();
46347
46348 return rtnl_link_register(ops);
46349 };
46350 @@ -1044,7 +1046,7 @@ static int macvlan_device_event(struct notifier_block *unused,
46351 return NOTIFY_DONE;
46352 }
46353
46354 -static struct notifier_block macvlan_notifier_block __read_mostly = {
46355 +static struct notifier_block macvlan_notifier_block = {
46356 .notifier_call = macvlan_device_event,
46357 };
46358
46359 diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
46360 index 3381c4f..dea5fd5 100644
46361 --- a/drivers/net/macvtap.c
46362 +++ b/drivers/net/macvtap.c
46363 @@ -1020,7 +1020,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
46364 }
46365
46366 ret = 0;
46367 - if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
46368 + if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
46369 put_user(q->flags, &ifr->ifr_flags))
46370 ret = -EFAULT;
46371 macvtap_put_vlan(vlan);
46372 @@ -1190,7 +1190,7 @@ static int macvtap_device_event(struct notifier_block *unused,
46373 return NOTIFY_DONE;
46374 }
46375
46376 -static struct notifier_block macvtap_notifier_block __read_mostly = {
46377 +static struct notifier_block macvtap_notifier_block = {
46378 .notifier_call = macvtap_device_event,
46379 };
46380
46381 diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
46382 index e3923eb..2a0373b 100644
46383 --- a/drivers/net/ppp/ppp_generic.c
46384 +++ b/drivers/net/ppp/ppp_generic.c
46385 @@ -1012,7 +1012,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
46386 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
46387 struct ppp_stats stats;
46388 struct ppp_comp_stats cstats;
46389 - char *vers;
46390
46391 switch (cmd) {
46392 case SIOCGPPPSTATS:
46393 @@ -1034,8 +1033,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
46394 break;
46395
46396 case SIOCGPPPVER:
46397 - vers = PPP_VERSION;
46398 - if (copy_to_user(addr, vers, strlen(vers) + 1))
46399 + if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
46400 break;
46401 err = 0;
46402 break;
46403 diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
46404 index 1252d9c..80e660b 100644
46405 --- a/drivers/net/slip/slhc.c
46406 +++ b/drivers/net/slip/slhc.c
46407 @@ -488,7 +488,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
46408 register struct tcphdr *thp;
46409 register struct iphdr *ip;
46410 register struct cstate *cs;
46411 - int len, hdrlen;
46412 + long len, hdrlen;
46413 unsigned char *cp = icp;
46414
46415 /* We've got a compressed packet; read the change byte */
46416 diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
46417 index ce4989b..b40b328 100644
46418 --- a/drivers/net/team/team.c
46419 +++ b/drivers/net/team/team.c
46420 @@ -2868,7 +2868,7 @@ static int team_device_event(struct notifier_block *unused,
46421 return NOTIFY_DONE;
46422 }
46423
46424 -static struct notifier_block team_notifier_block __read_mostly = {
46425 +static struct notifier_block team_notifier_block = {
46426 .notifier_call = team_device_event,
46427 };
46428
46429 diff --git a/drivers/net/tun.c b/drivers/net/tun.c
46430 index ee328ba..c4a0041 100644
46431 --- a/drivers/net/tun.c
46432 +++ b/drivers/net/tun.c
46433 @@ -1876,7 +1876,7 @@ unlock:
46434 }
46435
46436 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
46437 - unsigned long arg, int ifreq_len)
46438 + unsigned long arg, size_t ifreq_len)
46439 {
46440 struct tun_file *tfile = file->private_data;
46441 struct tun_struct *tun;
46442 @@ -1889,6 +1889,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
46443 unsigned int ifindex;
46444 int ret;
46445
46446 + if (ifreq_len > sizeof ifr)
46447 + return -EFAULT;
46448 +
46449 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
46450 if (copy_from_user(&ifr, argp, ifreq_len))
46451 return -EFAULT;
46452 diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
46453 index 660bd5e..ac59452 100644
46454 --- a/drivers/net/usb/hso.c
46455 +++ b/drivers/net/usb/hso.c
46456 @@ -71,7 +71,7 @@
46457 #include <asm/byteorder.h>
46458 #include <linux/serial_core.h>
46459 #include <linux/serial.h>
46460 -
46461 +#include <asm/local.h>
46462
46463 #define MOD_AUTHOR "Option Wireless"
46464 #define MOD_DESCRIPTION "USB High Speed Option driver"
46465 @@ -1179,7 +1179,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
46466 struct urb *urb;
46467
46468 urb = serial->rx_urb[0];
46469 - if (serial->port.count > 0) {
46470 + if (atomic_read(&serial->port.count) > 0) {
46471 count = put_rxbuf_data(urb, serial);
46472 if (count == -1)
46473 return;
46474 @@ -1217,7 +1217,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
46475 DUMP1(urb->transfer_buffer, urb->actual_length);
46476
46477 /* Anyone listening? */
46478 - if (serial->port.count == 0)
46479 + if (atomic_read(&serial->port.count) == 0)
46480 return;
46481
46482 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
46483 @@ -1287,8 +1287,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
46484 tty_port_tty_set(&serial->port, tty);
46485
46486 /* check for port already opened, if not set the termios */
46487 - serial->port.count++;
46488 - if (serial->port.count == 1) {
46489 + if (atomic_inc_return(&serial->port.count) == 1) {
46490 serial->rx_state = RX_IDLE;
46491 /* Force default termio settings */
46492 _hso_serial_set_termios(tty, NULL);
46493 @@ -1300,7 +1299,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
46494 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
46495 if (result) {
46496 hso_stop_serial_device(serial->parent);
46497 - serial->port.count--;
46498 + atomic_dec(&serial->port.count);
46499 kref_put(&serial->parent->ref, hso_serial_ref_free);
46500 }
46501 } else {
46502 @@ -1337,10 +1336,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
46503
46504 /* reset the rts and dtr */
46505 /* do the actual close */
46506 - serial->port.count--;
46507 + atomic_dec(&serial->port.count);
46508
46509 - if (serial->port.count <= 0) {
46510 - serial->port.count = 0;
46511 + if (atomic_read(&serial->port.count) <= 0) {
46512 + atomic_set(&serial->port.count, 0);
46513 tty_port_tty_set(&serial->port, NULL);
46514 if (!usb_gone)
46515 hso_stop_serial_device(serial->parent);
46516 @@ -1416,7 +1415,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
46517
46518 /* the actual setup */
46519 spin_lock_irqsave(&serial->serial_lock, flags);
46520 - if (serial->port.count)
46521 + if (atomic_read(&serial->port.count))
46522 _hso_serial_set_termios(tty, old);
46523 else
46524 tty->termios = *old;
46525 @@ -1885,7 +1884,7 @@ static void intr_callback(struct urb *urb)
46526 D1("Pending read interrupt on port %d\n", i);
46527 spin_lock(&serial->serial_lock);
46528 if (serial->rx_state == RX_IDLE &&
46529 - serial->port.count > 0) {
46530 + atomic_read(&serial->port.count) > 0) {
46531 /* Setup and send a ctrl req read on
46532 * port i */
46533 if (!serial->rx_urb_filled[0]) {
46534 @@ -3061,7 +3060,7 @@ static int hso_resume(struct usb_interface *iface)
46535 /* Start all serial ports */
46536 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
46537 if (serial_table[i] && (serial_table[i]->interface == iface)) {
46538 - if (dev2ser(serial_table[i])->port.count) {
46539 + if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
46540 result =
46541 hso_start_serial_device(serial_table[i], GFP_NOIO);
46542 hso_kick_transmit(dev2ser(serial_table[i]));
46543 diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
46544 index 3fbfb08..2c16265 100644
46545 --- a/drivers/net/usb/r8152.c
46546 +++ b/drivers/net/usb/r8152.c
46547 @@ -567,7 +567,7 @@ struct r8152 {
46548 void (*up)(struct r8152 *);
46549 void (*down)(struct r8152 *);
46550 void (*unload)(struct r8152 *);
46551 - } rtl_ops;
46552 + } __no_const rtl_ops;
46553
46554 int intr_interval;
46555 u32 saved_wolopts;
46556 diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
46557 index a2515887..6d13233 100644
46558 --- a/drivers/net/usb/sierra_net.c
46559 +++ b/drivers/net/usb/sierra_net.c
46560 @@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
46561 /* atomic counter partially included in MAC address to make sure 2 devices
46562 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
46563 */
46564 -static atomic_t iface_counter = ATOMIC_INIT(0);
46565 +static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
46566
46567 /*
46568 * SYNC Timer Delay definition used to set the expiry time
46569 @@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
46570 dev->net->netdev_ops = &sierra_net_device_ops;
46571
46572 /* change MAC addr to include, ifacenum, and to be unique */
46573 - dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
46574 + dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
46575 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
46576
46577 /* we will have to manufacture ethernet headers, prepare template */
46578 diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
46579 index 8a852b5..668a4b6 100644
46580 --- a/drivers/net/virtio_net.c
46581 +++ b/drivers/net/virtio_net.c
46582 @@ -47,7 +47,7 @@ module_param(gso, bool, 0444);
46583 #define RECEIVE_AVG_WEIGHT 64
46584
46585 /* Minimum alignment for mergeable packet buffers. */
46586 -#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
46587 +#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
46588
46589 #define VIRTNET_DRIVER_VERSION "1.0.0"
46590
46591 diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
46592 index 77dcf92..549924a 100644
46593 --- a/drivers/net/vxlan.c
46594 +++ b/drivers/net/vxlan.c
46595 @@ -2839,7 +2839,7 @@ nla_put_failure:
46596 return -EMSGSIZE;
46597 }
46598
46599 -static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
46600 +static struct rtnl_link_ops vxlan_link_ops = {
46601 .kind = "vxlan",
46602 .maxtype = IFLA_VXLAN_MAX,
46603 .policy = vxlan_policy,
46604 @@ -2886,7 +2886,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
46605 return NOTIFY_DONE;
46606 }
46607
46608 -static struct notifier_block vxlan_notifier_block __read_mostly = {
46609 +static struct notifier_block vxlan_notifier_block = {
46610 .notifier_call = vxlan_lowerdev_event,
46611 };
46612
46613 diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
46614 index 5920c99..ff2e4a5 100644
46615 --- a/drivers/net/wan/lmc/lmc_media.c
46616 +++ b/drivers/net/wan/lmc/lmc_media.c
46617 @@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
46618 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
46619
46620 lmc_media_t lmc_ds3_media = {
46621 - lmc_ds3_init, /* special media init stuff */
46622 - lmc_ds3_default, /* reset to default state */
46623 - lmc_ds3_set_status, /* reset status to state provided */
46624 - lmc_dummy_set_1, /* set clock source */
46625 - lmc_dummy_set2_1, /* set line speed */
46626 - lmc_ds3_set_100ft, /* set cable length */
46627 - lmc_ds3_set_scram, /* set scrambler */
46628 - lmc_ds3_get_link_status, /* get link status */
46629 - lmc_dummy_set_1, /* set link status */
46630 - lmc_ds3_set_crc_length, /* set CRC length */
46631 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
46632 - lmc_ds3_watchdog
46633 + .init = lmc_ds3_init, /* special media init stuff */
46634 + .defaults = lmc_ds3_default, /* reset to default state */
46635 + .set_status = lmc_ds3_set_status, /* reset status to state provided */
46636 + .set_clock_source = lmc_dummy_set_1, /* set clock source */
46637 + .set_speed = lmc_dummy_set2_1, /* set line speed */
46638 + .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
46639 + .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
46640 + .get_link_status = lmc_ds3_get_link_status, /* get link status */
46641 + .set_link_status = lmc_dummy_set_1, /* set link status */
46642 + .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
46643 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
46644 + .watchdog = lmc_ds3_watchdog
46645 };
46646
46647 lmc_media_t lmc_hssi_media = {
46648 - lmc_hssi_init, /* special media init stuff */
46649 - lmc_hssi_default, /* reset to default state */
46650 - lmc_hssi_set_status, /* reset status to state provided */
46651 - lmc_hssi_set_clock, /* set clock source */
46652 - lmc_dummy_set2_1, /* set line speed */
46653 - lmc_dummy_set_1, /* set cable length */
46654 - lmc_dummy_set_1, /* set scrambler */
46655 - lmc_hssi_get_link_status, /* get link status */
46656 - lmc_hssi_set_link_status, /* set link status */
46657 - lmc_hssi_set_crc_length, /* set CRC length */
46658 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
46659 - lmc_hssi_watchdog
46660 + .init = lmc_hssi_init, /* special media init stuff */
46661 + .defaults = lmc_hssi_default, /* reset to default state */
46662 + .set_status = lmc_hssi_set_status, /* reset status to state provided */
46663 + .set_clock_source = lmc_hssi_set_clock, /* set clock source */
46664 + .set_speed = lmc_dummy_set2_1, /* set line speed */
46665 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
46666 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
46667 + .get_link_status = lmc_hssi_get_link_status, /* get link status */
46668 + .set_link_status = lmc_hssi_set_link_status, /* set link status */
46669 + .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
46670 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
46671 + .watchdog = lmc_hssi_watchdog
46672 };
46673
46674 -lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
46675 - lmc_ssi_default, /* reset to default state */
46676 - lmc_ssi_set_status, /* reset status to state provided */
46677 - lmc_ssi_set_clock, /* set clock source */
46678 - lmc_ssi_set_speed, /* set line speed */
46679 - lmc_dummy_set_1, /* set cable length */
46680 - lmc_dummy_set_1, /* set scrambler */
46681 - lmc_ssi_get_link_status, /* get link status */
46682 - lmc_ssi_set_link_status, /* set link status */
46683 - lmc_ssi_set_crc_length, /* set CRC length */
46684 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
46685 - lmc_ssi_watchdog
46686 +lmc_media_t lmc_ssi_media = {
46687 + .init = lmc_ssi_init, /* special media init stuff */
46688 + .defaults = lmc_ssi_default, /* reset to default state */
46689 + .set_status = lmc_ssi_set_status, /* reset status to state provided */
46690 + .set_clock_source = lmc_ssi_set_clock, /* set clock source */
46691 + .set_speed = lmc_ssi_set_speed, /* set line speed */
46692 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
46693 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
46694 + .get_link_status = lmc_ssi_get_link_status, /* get link status */
46695 + .set_link_status = lmc_ssi_set_link_status, /* set link status */
46696 + .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
46697 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
46698 + .watchdog = lmc_ssi_watchdog
46699 };
46700
46701 lmc_media_t lmc_t1_media = {
46702 - lmc_t1_init, /* special media init stuff */
46703 - lmc_t1_default, /* reset to default state */
46704 - lmc_t1_set_status, /* reset status to state provided */
46705 - lmc_t1_set_clock, /* set clock source */
46706 - lmc_dummy_set2_1, /* set line speed */
46707 - lmc_dummy_set_1, /* set cable length */
46708 - lmc_dummy_set_1, /* set scrambler */
46709 - lmc_t1_get_link_status, /* get link status */
46710 - lmc_dummy_set_1, /* set link status */
46711 - lmc_t1_set_crc_length, /* set CRC length */
46712 - lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
46713 - lmc_t1_watchdog
46714 + .init = lmc_t1_init, /* special media init stuff */
46715 + .defaults = lmc_t1_default, /* reset to default state */
46716 + .set_status = lmc_t1_set_status, /* reset status to state provided */
46717 + .set_clock_source = lmc_t1_set_clock, /* set clock source */
46718 + .set_speed = lmc_dummy_set2_1, /* set line speed */
46719 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
46720 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
46721 + .get_link_status = lmc_t1_get_link_status, /* get link status */
46722 + .set_link_status = lmc_dummy_set_1, /* set link status */
46723 + .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
46724 + .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
46725 + .watchdog = lmc_t1_watchdog
46726 };
46727
46728 static void
46729 diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
46730 index feacc3b..5bac0de 100644
46731 --- a/drivers/net/wan/z85230.c
46732 +++ b/drivers/net/wan/z85230.c
46733 @@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
46734
46735 struct z8530_irqhandler z8530_sync =
46736 {
46737 - z8530_rx,
46738 - z8530_tx,
46739 - z8530_status
46740 + .rx = z8530_rx,
46741 + .tx = z8530_tx,
46742 + .status = z8530_status
46743 };
46744
46745 EXPORT_SYMBOL(z8530_sync);
46746 @@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
46747 }
46748
46749 static struct z8530_irqhandler z8530_dma_sync = {
46750 - z8530_dma_rx,
46751 - z8530_dma_tx,
46752 - z8530_dma_status
46753 + .rx = z8530_dma_rx,
46754 + .tx = z8530_dma_tx,
46755 + .status = z8530_dma_status
46756 };
46757
46758 static struct z8530_irqhandler z8530_txdma_sync = {
46759 - z8530_rx,
46760 - z8530_dma_tx,
46761 - z8530_dma_status
46762 + .rx = z8530_rx,
46763 + .tx = z8530_dma_tx,
46764 + .status = z8530_dma_status
46765 };
46766
46767 /**
46768 @@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
46769
46770 struct z8530_irqhandler z8530_nop=
46771 {
46772 - z8530_rx_clear,
46773 - z8530_tx_clear,
46774 - z8530_status_clear
46775 + .rx = z8530_rx_clear,
46776 + .tx = z8530_tx_clear,
46777 + .status = z8530_status_clear
46778 };
46779
46780
46781 diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
46782 index 0b60295..b8bfa5b 100644
46783 --- a/drivers/net/wimax/i2400m/rx.c
46784 +++ b/drivers/net/wimax/i2400m/rx.c
46785 @@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
46786 if (i2400m->rx_roq == NULL)
46787 goto error_roq_alloc;
46788
46789 - rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
46790 + rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
46791 GFP_KERNEL);
46792 if (rd == NULL) {
46793 result = -ENOMEM;
46794 diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
46795 index 64747d4..17c4cf3 100644
46796 --- a/drivers/net/wireless/airo.c
46797 +++ b/drivers/net/wireless/airo.c
46798 @@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
46799 struct airo_info *ai = dev->ml_priv;
46800 int ridcode;
46801 int enabled;
46802 - static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
46803 + int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
46804 unsigned char *iobuf;
46805
46806 /* Only super-user can write RIDs */
46807 diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
46808 index 99b3bfa..9559372 100644
46809 --- a/drivers/net/wireless/at76c50x-usb.c
46810 +++ b/drivers/net/wireless/at76c50x-usb.c
46811 @@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
46812 }
46813
46814 /* Convert timeout from the DFU status to jiffies */
46815 -static inline unsigned long at76_get_timeout(struct dfu_status *s)
46816 +static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
46817 {
46818 return msecs_to_jiffies((s->poll_timeout[2] << 16)
46819 | (s->poll_timeout[1] << 8)
46820 diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
46821 index 7f1bccd..ca2ffca 100644
46822 --- a/drivers/net/wireless/ath/ath10k/htc.c
46823 +++ b/drivers/net/wireless/ath/ath10k/htc.c
46824 @@ -840,7 +840,10 @@ void ath10k_htc_stop(struct ath10k_htc *htc)
46825 /* registered target arrival callback from the HIF layer */
46826 int ath10k_htc_init(struct ath10k *ar)
46827 {
46828 - struct ath10k_hif_cb htc_callbacks;
46829 + static struct ath10k_hif_cb htc_callbacks = {
46830 + .rx_completion = ath10k_htc_rx_completion_handler,
46831 + .tx_completion = ath10k_htc_tx_completion_handler,
46832 + };
46833 struct ath10k_htc_ep *ep = NULL;
46834 struct ath10k_htc *htc = &ar->htc;
46835
46836 @@ -850,8 +853,6 @@ int ath10k_htc_init(struct ath10k *ar)
46837 ath10k_htc_reset_endpoint_states(htc);
46838
46839 /* setup HIF layer callbacks */
46840 - htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
46841 - htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
46842 htc->ar = ar;
46843
46844 /* Get HIF default pipe for HTC message exchange */
46845 diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
46846 index 4716d33..a688310 100644
46847 --- a/drivers/net/wireless/ath/ath10k/htc.h
46848 +++ b/drivers/net/wireless/ath/ath10k/htc.h
46849 @@ -271,13 +271,13 @@ enum ath10k_htc_ep_id {
46850
46851 struct ath10k_htc_ops {
46852 void (*target_send_suspend_complete)(struct ath10k *ar);
46853 -};
46854 +} __no_const;
46855
46856 struct ath10k_htc_ep_ops {
46857 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
46858 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
46859 void (*ep_tx_credits)(struct ath10k *);
46860 -};
46861 +} __no_const;
46862
46863 /* service connection information */
46864 struct ath10k_htc_svc_conn_req {
46865 diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
46866 index 741b38d..b7ae41b 100644
46867 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
46868 +++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
46869 @@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46870 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
46871 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
46872
46873 - ACCESS_ONCE(ads->ds_link) = i->link;
46874 - ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
46875 + ACCESS_ONCE_RW(ads->ds_link) = i->link;
46876 + ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
46877
46878 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
46879 ctl6 = SM(i->keytype, AR_EncrType);
46880 @@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46881
46882 if ((i->is_first || i->is_last) &&
46883 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
46884 - ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
46885 + ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
46886 | set11nTries(i->rates, 1)
46887 | set11nTries(i->rates, 2)
46888 | set11nTries(i->rates, 3)
46889 | (i->dur_update ? AR_DurUpdateEna : 0)
46890 | SM(0, AR_BurstDur);
46891
46892 - ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
46893 + ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
46894 | set11nRate(i->rates, 1)
46895 | set11nRate(i->rates, 2)
46896 | set11nRate(i->rates, 3);
46897 } else {
46898 - ACCESS_ONCE(ads->ds_ctl2) = 0;
46899 - ACCESS_ONCE(ads->ds_ctl3) = 0;
46900 + ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
46901 + ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
46902 }
46903
46904 if (!i->is_first) {
46905 - ACCESS_ONCE(ads->ds_ctl0) = 0;
46906 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
46907 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
46908 + ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
46909 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
46910 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
46911 return;
46912 }
46913
46914 @@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46915 break;
46916 }
46917
46918 - ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
46919 + ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
46920 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
46921 | SM(i->txpower, AR_XmitPower)
46922 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
46923 @@ -289,19 +289,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46924 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
46925 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
46926
46927 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
46928 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
46929 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
46930 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
46931
46932 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
46933 return;
46934
46935 - ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
46936 + ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
46937 | set11nPktDurRTSCTS(i->rates, 1);
46938
46939 - ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
46940 + ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
46941 | set11nPktDurRTSCTS(i->rates, 3);
46942
46943 - ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
46944 + ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
46945 | set11nRateFlags(i->rates, 1)
46946 | set11nRateFlags(i->rates, 2)
46947 | set11nRateFlags(i->rates, 3)
46948 diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
46949 index 729ffbf..49f50e3 100644
46950 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
46951 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
46952 @@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46953 (i->qcu << AR_TxQcuNum_S) | desc_len;
46954
46955 checksum += val;
46956 - ACCESS_ONCE(ads->info) = val;
46957 + ACCESS_ONCE_RW(ads->info) = val;
46958
46959 checksum += i->link;
46960 - ACCESS_ONCE(ads->link) = i->link;
46961 + ACCESS_ONCE_RW(ads->link) = i->link;
46962
46963 checksum += i->buf_addr[0];
46964 - ACCESS_ONCE(ads->data0) = i->buf_addr[0];
46965 + ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
46966 checksum += i->buf_addr[1];
46967 - ACCESS_ONCE(ads->data1) = i->buf_addr[1];
46968 + ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
46969 checksum += i->buf_addr[2];
46970 - ACCESS_ONCE(ads->data2) = i->buf_addr[2];
46971 + ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
46972 checksum += i->buf_addr[3];
46973 - ACCESS_ONCE(ads->data3) = i->buf_addr[3];
46974 + ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
46975
46976 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
46977 - ACCESS_ONCE(ads->ctl3) = val;
46978 + ACCESS_ONCE_RW(ads->ctl3) = val;
46979 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
46980 - ACCESS_ONCE(ads->ctl5) = val;
46981 + ACCESS_ONCE_RW(ads->ctl5) = val;
46982 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
46983 - ACCESS_ONCE(ads->ctl7) = val;
46984 + ACCESS_ONCE_RW(ads->ctl7) = val;
46985 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
46986 - ACCESS_ONCE(ads->ctl9) = val;
46987 + ACCESS_ONCE_RW(ads->ctl9) = val;
46988
46989 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
46990 - ACCESS_ONCE(ads->ctl10) = checksum;
46991 + ACCESS_ONCE_RW(ads->ctl10) = checksum;
46992
46993 if (i->is_first || i->is_last) {
46994 - ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
46995 + ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
46996 | set11nTries(i->rates, 1)
46997 | set11nTries(i->rates, 2)
46998 | set11nTries(i->rates, 3)
46999 | (i->dur_update ? AR_DurUpdateEna : 0)
47000 | SM(0, AR_BurstDur);
47001
47002 - ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
47003 + ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
47004 | set11nRate(i->rates, 1)
47005 | set11nRate(i->rates, 2)
47006 | set11nRate(i->rates, 3);
47007 } else {
47008 - ACCESS_ONCE(ads->ctl13) = 0;
47009 - ACCESS_ONCE(ads->ctl14) = 0;
47010 + ACCESS_ONCE_RW(ads->ctl13) = 0;
47011 + ACCESS_ONCE_RW(ads->ctl14) = 0;
47012 }
47013
47014 ads->ctl20 = 0;
47015 @@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
47016
47017 ctl17 = SM(i->keytype, AR_EncrType);
47018 if (!i->is_first) {
47019 - ACCESS_ONCE(ads->ctl11) = 0;
47020 - ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
47021 - ACCESS_ONCE(ads->ctl15) = 0;
47022 - ACCESS_ONCE(ads->ctl16) = 0;
47023 - ACCESS_ONCE(ads->ctl17) = ctl17;
47024 - ACCESS_ONCE(ads->ctl18) = 0;
47025 - ACCESS_ONCE(ads->ctl19) = 0;
47026 + ACCESS_ONCE_RW(ads->ctl11) = 0;
47027 + ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
47028 + ACCESS_ONCE_RW(ads->ctl15) = 0;
47029 + ACCESS_ONCE_RW(ads->ctl16) = 0;
47030 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
47031 + ACCESS_ONCE_RW(ads->ctl18) = 0;
47032 + ACCESS_ONCE_RW(ads->ctl19) = 0;
47033 return;
47034 }
47035
47036 - ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
47037 + ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
47038 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
47039 | SM(i->txpower, AR_XmitPower)
47040 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
47041 @@ -135,22 +135,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
47042 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
47043 ctl12 |= SM(val, AR_PAPRDChainMask);
47044
47045 - ACCESS_ONCE(ads->ctl12) = ctl12;
47046 - ACCESS_ONCE(ads->ctl17) = ctl17;
47047 + ACCESS_ONCE_RW(ads->ctl12) = ctl12;
47048 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
47049
47050 - ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
47051 + ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
47052 | set11nPktDurRTSCTS(i->rates, 1);
47053
47054 - ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
47055 + ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
47056 | set11nPktDurRTSCTS(i->rates, 3);
47057
47058 - ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
47059 + ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
47060 | set11nRateFlags(i->rates, 1)
47061 | set11nRateFlags(i->rates, 2)
47062 | set11nRateFlags(i->rates, 3)
47063 | SM(i->rtscts_rate, AR_RTSCTSRate);
47064
47065 - ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
47066 + ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
47067 }
47068
47069 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
47070 diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
47071 index 0acd4b5..0591c91 100644
47072 --- a/drivers/net/wireless/ath/ath9k/hw.h
47073 +++ b/drivers/net/wireless/ath/ath9k/hw.h
47074 @@ -629,7 +629,7 @@ struct ath_hw_private_ops {
47075
47076 /* ANI */
47077 void (*ani_cache_ini_regs)(struct ath_hw *ah);
47078 -};
47079 +} __no_const;
47080
47081 /**
47082 * struct ath_spec_scan - parameters for Atheros spectral scan
47083 @@ -706,7 +706,7 @@ struct ath_hw_ops {
47084 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
47085 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
47086 #endif
47087 -};
47088 +} __no_const;
47089
47090 struct ath_nf_limits {
47091 s16 max;
47092 diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
47093 index 92190da..f3a4c4c 100644
47094 --- a/drivers/net/wireless/b43/phy_lp.c
47095 +++ b/drivers/net/wireless/b43/phy_lp.c
47096 @@ -2514,7 +2514,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
47097 {
47098 struct ssb_bus *bus = dev->dev->sdev->bus;
47099
47100 - static const struct b206x_channel *chandata = NULL;
47101 + const struct b206x_channel *chandata = NULL;
47102 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
47103 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
47104 u16 old_comm15, scale;
47105 diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
47106 index dc1d20c..f7a4f06 100644
47107 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
47108 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
47109 @@ -3633,7 +3633,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
47110 */
47111 if (il3945_mod_params.disable_hw_scan) {
47112 D_INFO("Disabling hw_scan\n");
47113 - il3945_mac_ops.hw_scan = NULL;
47114 + pax_open_kernel();
47115 + *(void **)&il3945_mac_ops.hw_scan = NULL;
47116 + pax_close_kernel();
47117 }
47118
47119 D_INFO("*** LOAD DRIVER ***\n");
47120 diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
47121 index d2fe259..0c4c682 100644
47122 --- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
47123 +++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
47124 @@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
47125 {
47126 struct iwl_priv *priv = file->private_data;
47127 char buf[64];
47128 - int buf_size;
47129 + size_t buf_size;
47130 u32 offset, len;
47131
47132 memset(buf, 0, sizeof(buf));
47133 @@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
47134 struct iwl_priv *priv = file->private_data;
47135
47136 char buf[8];
47137 - int buf_size;
47138 + size_t buf_size;
47139 u32 reset_flag;
47140
47141 memset(buf, 0, sizeof(buf));
47142 @@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
47143 {
47144 struct iwl_priv *priv = file->private_data;
47145 char buf[8];
47146 - int buf_size;
47147 + size_t buf_size;
47148 int ht40;
47149
47150 memset(buf, 0, sizeof(buf));
47151 @@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
47152 {
47153 struct iwl_priv *priv = file->private_data;
47154 char buf[8];
47155 - int buf_size;
47156 + size_t buf_size;
47157 int value;
47158
47159 memset(buf, 0, sizeof(buf));
47160 @@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
47161 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
47162 DEBUGFS_READ_FILE_OPS(current_sleep_command);
47163
47164 -static const char *fmt_value = " %-30s %10u\n";
47165 -static const char *fmt_hex = " %-30s 0x%02X\n";
47166 -static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
47167 -static const char *fmt_header =
47168 +static const char fmt_value[] = " %-30s %10u\n";
47169 +static const char fmt_hex[] = " %-30s 0x%02X\n";
47170 +static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
47171 +static const char fmt_header[] =
47172 "%-32s current cumulative delta max\n";
47173
47174 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
47175 @@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
47176 {
47177 struct iwl_priv *priv = file->private_data;
47178 char buf[8];
47179 - int buf_size;
47180 + size_t buf_size;
47181 int clear;
47182
47183 memset(buf, 0, sizeof(buf));
47184 @@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
47185 {
47186 struct iwl_priv *priv = file->private_data;
47187 char buf[8];
47188 - int buf_size;
47189 + size_t buf_size;
47190 int trace;
47191
47192 memset(buf, 0, sizeof(buf));
47193 @@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
47194 {
47195 struct iwl_priv *priv = file->private_data;
47196 char buf[8];
47197 - int buf_size;
47198 + size_t buf_size;
47199 int missed;
47200
47201 memset(buf, 0, sizeof(buf));
47202 @@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
47203
47204 struct iwl_priv *priv = file->private_data;
47205 char buf[8];
47206 - int buf_size;
47207 + size_t buf_size;
47208 int plcp;
47209
47210 memset(buf, 0, sizeof(buf));
47211 @@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
47212
47213 struct iwl_priv *priv = file->private_data;
47214 char buf[8];
47215 - int buf_size;
47216 + size_t buf_size;
47217 int flush;
47218
47219 memset(buf, 0, sizeof(buf));
47220 @@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
47221
47222 struct iwl_priv *priv = file->private_data;
47223 char buf[8];
47224 - int buf_size;
47225 + size_t buf_size;
47226 int rts;
47227
47228 if (!priv->cfg->ht_params)
47229 @@ -2205,7 +2205,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
47230 {
47231 struct iwl_priv *priv = file->private_data;
47232 char buf[8];
47233 - int buf_size;
47234 + size_t buf_size;
47235
47236 memset(buf, 0, sizeof(buf));
47237 buf_size = min(count, sizeof(buf) - 1);
47238 @@ -2239,7 +2239,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
47239 struct iwl_priv *priv = file->private_data;
47240 u32 event_log_flag;
47241 char buf[8];
47242 - int buf_size;
47243 + size_t buf_size;
47244
47245 /* check that the interface is up */
47246 if (!iwl_is_ready(priv))
47247 @@ -2293,7 +2293,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
47248 struct iwl_priv *priv = file->private_data;
47249 char buf[8];
47250 u32 calib_disabled;
47251 - int buf_size;
47252 + size_t buf_size;
47253
47254 memset(buf, 0, sizeof(buf));
47255 buf_size = min(count, sizeof(buf) - 1);
47256 diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
47257 index 6a6df71..eb5c93a 100644
47258 --- a/drivers/net/wireless/iwlwifi/dvm/main.c
47259 +++ b/drivers/net/wireless/iwlwifi/dvm/main.c
47260 @@ -1127,7 +1127,7 @@ static void iwl_option_config(struct iwl_priv *priv)
47261 static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
47262 {
47263 struct iwl_nvm_data *data = priv->nvm_data;
47264 - char *debug_msg;
47265 + static const char debug_msg[] = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
47266
47267 if (data->sku_cap_11n_enable &&
47268 !priv->cfg->ht_params) {
47269 @@ -1141,7 +1141,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
47270 return -EINVAL;
47271 }
47272
47273 - debug_msg = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
47274 IWL_DEBUG_INFO(priv, debug_msg,
47275 data->sku_cap_band_24GHz_enable ? "" : "NOT", "enabled",
47276 data->sku_cap_band_52GHz_enable ? "" : "NOT", "enabled",
47277 diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
47278 index 295b24c..cb4f823 100644
47279 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
47280 +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
47281 @@ -1558,7 +1558,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
47282 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
47283
47284 char buf[8];
47285 - int buf_size;
47286 + size_t buf_size;
47287 u32 reset_flag;
47288
47289 memset(buf, 0, sizeof(buf));
47290 @@ -1579,7 +1579,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
47291 {
47292 struct iwl_trans *trans = file->private_data;
47293 char buf[8];
47294 - int buf_size;
47295 + size_t buf_size;
47296 int csr;
47297
47298 memset(buf, 0, sizeof(buf));
47299 diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
47300 index 9d7a52f..2729a99 100644
47301 --- a/drivers/net/wireless/mac80211_hwsim.c
47302 +++ b/drivers/net/wireless/mac80211_hwsim.c
47303 @@ -2570,20 +2570,20 @@ static int __init init_mac80211_hwsim(void)
47304 if (channels < 1)
47305 return -EINVAL;
47306
47307 - mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
47308 - mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
47309 - mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
47310 - mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
47311 - mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
47312 - mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
47313 - mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
47314 - mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
47315 - mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
47316 - mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
47317 - mac80211_hwsim_mchan_ops.assign_vif_chanctx =
47318 - mac80211_hwsim_assign_vif_chanctx;
47319 - mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
47320 - mac80211_hwsim_unassign_vif_chanctx;
47321 + pax_open_kernel();
47322 + memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
47323 + *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
47324 + *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
47325 + *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
47326 + *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
47327 + *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
47328 + *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
47329 + *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
47330 + *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
47331 + *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
47332 + *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
47333 + *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
47334 + pax_close_kernel();
47335
47336 spin_lock_init(&hwsim_radio_lock);
47337 INIT_LIST_HEAD(&hwsim_radios);
47338 diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
47339 index 39d22a1..4ec8612 100644
47340 --- a/drivers/net/wireless/rndis_wlan.c
47341 +++ b/drivers/net/wireless/rndis_wlan.c
47342 @@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
47343
47344 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
47345
47346 - if (rts_threshold < 0 || rts_threshold > 2347)
47347 + if (rts_threshold > 2347)
47348 rts_threshold = 2347;
47349
47350 tmp = cpu_to_le32(rts_threshold);
47351 diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
47352 index 5d45a1a..6f5f041 100644
47353 --- a/drivers/net/wireless/rt2x00/rt2x00.h
47354 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
47355 @@ -375,7 +375,7 @@ struct rt2x00_intf {
47356 * for hardware which doesn't support hardware
47357 * sequence counting.
47358 */
47359 - atomic_t seqno;
47360 + atomic_unchecked_t seqno;
47361 };
47362
47363 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
47364 diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
47365 index 5642ccc..01f03eb 100644
47366 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c
47367 +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
47368 @@ -250,9 +250,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
47369 * sequence counter given by mac80211.
47370 */
47371 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
47372 - seqno = atomic_add_return(0x10, &intf->seqno);
47373 + seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
47374 else
47375 - seqno = atomic_read(&intf->seqno);
47376 + seqno = atomic_read_unchecked(&intf->seqno);
47377
47378 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
47379 hdr->seq_ctrl |= cpu_to_le16(seqno);
47380 diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
47381 index b661f896..ddf7d2b 100644
47382 --- a/drivers/net/wireless/ti/wl1251/sdio.c
47383 +++ b/drivers/net/wireless/ti/wl1251/sdio.c
47384 @@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
47385
47386 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
47387
47388 - wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
47389 - wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
47390 + pax_open_kernel();
47391 + *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
47392 + *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
47393 + pax_close_kernel();
47394
47395 wl1251_info("using dedicated interrupt line");
47396 } else {
47397 - wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
47398 - wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
47399 + pax_open_kernel();
47400 + *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
47401 + *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
47402 + pax_close_kernel();
47403
47404 wl1251_info("using SDIO interrupt");
47405 }
47406 diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
47407 index d50dfac..0a6f5be3 100644
47408 --- a/drivers/net/wireless/ti/wl12xx/main.c
47409 +++ b/drivers/net/wireless/ti/wl12xx/main.c
47410 @@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
47411 sizeof(wl->conf.mem));
47412
47413 /* read data preparation is only needed by wl127x */
47414 - wl->ops->prepare_read = wl127x_prepare_read;
47415 + pax_open_kernel();
47416 + *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
47417 + pax_close_kernel();
47418
47419 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
47420 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
47421 @@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
47422 sizeof(wl->conf.mem));
47423
47424 /* read data preparation is only needed by wl127x */
47425 - wl->ops->prepare_read = wl127x_prepare_read;
47426 + pax_open_kernel();
47427 + *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
47428 + pax_close_kernel();
47429
47430 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
47431 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
47432 diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
47433 index de5b4fa..7996ec6 100644
47434 --- a/drivers/net/wireless/ti/wl18xx/main.c
47435 +++ b/drivers/net/wireless/ti/wl18xx/main.c
47436 @@ -1900,8 +1900,10 @@ static int wl18xx_setup(struct wl1271 *wl)
47437 }
47438
47439 if (!checksum_param) {
47440 - wl18xx_ops.set_rx_csum = NULL;
47441 - wl18xx_ops.init_vif = NULL;
47442 + pax_open_kernel();
47443 + *(void **)&wl18xx_ops.set_rx_csum = NULL;
47444 + *(void **)&wl18xx_ops.init_vif = NULL;
47445 + pax_close_kernel();
47446 }
47447
47448 /* Enable 11a Band only if we have 5G antennas */
47449 diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
47450 index a912dc0..a8225ba 100644
47451 --- a/drivers/net/wireless/zd1211rw/zd_usb.c
47452 +++ b/drivers/net/wireless/zd1211rw/zd_usb.c
47453 @@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
47454 {
47455 struct zd_usb *usb = urb->context;
47456 struct zd_usb_interrupt *intr = &usb->intr;
47457 - int len;
47458 + unsigned int len;
47459 u16 int_num;
47460
47461 ZD_ASSERT(in_interrupt());
47462 diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
47463 index 683671a..4519fc2 100644
47464 --- a/drivers/nfc/nfcwilink.c
47465 +++ b/drivers/nfc/nfcwilink.c
47466 @@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
47467
47468 static int nfcwilink_probe(struct platform_device *pdev)
47469 {
47470 - static struct nfcwilink *drv;
47471 + struct nfcwilink *drv;
47472 int rc;
47473 __u32 protocols;
47474
47475 diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
47476 index d93b2b6..ae50401 100644
47477 --- a/drivers/oprofile/buffer_sync.c
47478 +++ b/drivers/oprofile/buffer_sync.c
47479 @@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
47480 if (cookie == NO_COOKIE)
47481 offset = pc;
47482 if (cookie == INVALID_COOKIE) {
47483 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
47484 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
47485 offset = pc;
47486 }
47487 if (cookie != last_cookie) {
47488 @@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
47489 /* add userspace sample */
47490
47491 if (!mm) {
47492 - atomic_inc(&oprofile_stats.sample_lost_no_mm);
47493 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
47494 return 0;
47495 }
47496
47497 cookie = lookup_dcookie(mm, s->eip, &offset);
47498
47499 if (cookie == INVALID_COOKIE) {
47500 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
47501 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
47502 return 0;
47503 }
47504
47505 @@ -552,7 +552,7 @@ void sync_buffer(int cpu)
47506 /* ignore backtraces if failed to add a sample */
47507 if (state == sb_bt_start) {
47508 state = sb_bt_ignore;
47509 - atomic_inc(&oprofile_stats.bt_lost_no_mapping);
47510 + atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
47511 }
47512 }
47513 release_mm(mm);
47514 diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
47515 index c0cc4e7..44d4e54 100644
47516 --- a/drivers/oprofile/event_buffer.c
47517 +++ b/drivers/oprofile/event_buffer.c
47518 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
47519 }
47520
47521 if (buffer_pos == buffer_size) {
47522 - atomic_inc(&oprofile_stats.event_lost_overflow);
47523 + atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
47524 return;
47525 }
47526
47527 diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
47528 index ed2c3ec..deda85a 100644
47529 --- a/drivers/oprofile/oprof.c
47530 +++ b/drivers/oprofile/oprof.c
47531 @@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
47532 if (oprofile_ops.switch_events())
47533 return;
47534
47535 - atomic_inc(&oprofile_stats.multiplex_counter);
47536 + atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
47537 start_switch_worker();
47538 }
47539
47540 diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
47541 index ee2cfce..7f8f699 100644
47542 --- a/drivers/oprofile/oprofile_files.c
47543 +++ b/drivers/oprofile/oprofile_files.c
47544 @@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
47545
47546 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
47547
47548 -static ssize_t timeout_read(struct file *file, char __user *buf,
47549 +static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
47550 size_t count, loff_t *offset)
47551 {
47552 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
47553 diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
47554 index 59659ce..6c860a0 100644
47555 --- a/drivers/oprofile/oprofile_stats.c
47556 +++ b/drivers/oprofile/oprofile_stats.c
47557 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
47558 cpu_buf->sample_invalid_eip = 0;
47559 }
47560
47561 - atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
47562 - atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
47563 - atomic_set(&oprofile_stats.event_lost_overflow, 0);
47564 - atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
47565 - atomic_set(&oprofile_stats.multiplex_counter, 0);
47566 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
47567 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
47568 + atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
47569 + atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
47570 + atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
47571 }
47572
47573
47574 diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
47575 index 1fc622b..8c48fc3 100644
47576 --- a/drivers/oprofile/oprofile_stats.h
47577 +++ b/drivers/oprofile/oprofile_stats.h
47578 @@ -13,11 +13,11 @@
47579 #include <linux/atomic.h>
47580
47581 struct oprofile_stat_struct {
47582 - atomic_t sample_lost_no_mm;
47583 - atomic_t sample_lost_no_mapping;
47584 - atomic_t bt_lost_no_mapping;
47585 - atomic_t event_lost_overflow;
47586 - atomic_t multiplex_counter;
47587 + atomic_unchecked_t sample_lost_no_mm;
47588 + atomic_unchecked_t sample_lost_no_mapping;
47589 + atomic_unchecked_t bt_lost_no_mapping;
47590 + atomic_unchecked_t event_lost_overflow;
47591 + atomic_unchecked_t multiplex_counter;
47592 };
47593
47594 extern struct oprofile_stat_struct oprofile_stats;
47595 diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
47596 index 3f49345..c750d0b 100644
47597 --- a/drivers/oprofile/oprofilefs.c
47598 +++ b/drivers/oprofile/oprofilefs.c
47599 @@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
47600
47601 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
47602 {
47603 - atomic_t *val = file->private_data;
47604 - return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
47605 + atomic_unchecked_t *val = file->private_data;
47606 + return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
47607 }
47608
47609
47610 @@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
47611
47612
47613 int oprofilefs_create_ro_atomic(struct dentry *root,
47614 - char const *name, atomic_t *val)
47615 + char const *name, atomic_unchecked_t *val)
47616 {
47617 return __oprofilefs_create_file(root, name,
47618 &atomic_ro_fops, 0444, val);
47619 diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
47620 index 61be1d9..dec05d7 100644
47621 --- a/drivers/oprofile/timer_int.c
47622 +++ b/drivers/oprofile/timer_int.c
47623 @@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
47624 return NOTIFY_OK;
47625 }
47626
47627 -static struct notifier_block __refdata oprofile_cpu_notifier = {
47628 +static struct notifier_block oprofile_cpu_notifier = {
47629 .notifier_call = oprofile_cpu_notify,
47630 };
47631
47632 diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
47633 index 92ed045..62d39bd7 100644
47634 --- a/drivers/parport/procfs.c
47635 +++ b/drivers/parport/procfs.c
47636 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
47637
47638 *ppos += len;
47639
47640 - return copy_to_user(result, buffer, len) ? -EFAULT : 0;
47641 + return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
47642 }
47643
47644 #ifdef CONFIG_PARPORT_1284
47645 @@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
47646
47647 *ppos += len;
47648
47649 - return copy_to_user (result, buffer, len) ? -EFAULT : 0;
47650 + return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
47651 }
47652 #endif /* IEEE1284.3 support. */
47653
47654 diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
47655 index 8dcccff..35d701d 100644
47656 --- a/drivers/pci/hotplug/acpiphp_ibm.c
47657 +++ b/drivers/pci/hotplug/acpiphp_ibm.c
47658 @@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
47659 goto init_cleanup;
47660 }
47661
47662 - ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
47663 + pax_open_kernel();
47664 + *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
47665 + pax_close_kernel();
47666 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
47667
47668 return retval;
47669 diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
47670 index 7536eef..52dc8fa 100644
47671 --- a/drivers/pci/hotplug/cpcihp_generic.c
47672 +++ b/drivers/pci/hotplug/cpcihp_generic.c
47673 @@ -73,7 +73,6 @@ static u16 port;
47674 static unsigned int enum_bit;
47675 static u8 enum_mask;
47676
47677 -static struct cpci_hp_controller_ops generic_hpc_ops;
47678 static struct cpci_hp_controller generic_hpc;
47679
47680 static int __init validate_parameters(void)
47681 @@ -139,6 +138,10 @@ static int query_enum(void)
47682 return ((value & enum_mask) == enum_mask);
47683 }
47684
47685 +static struct cpci_hp_controller_ops generic_hpc_ops = {
47686 + .query_enum = query_enum,
47687 +};
47688 +
47689 static int __init cpcihp_generic_init(void)
47690 {
47691 int status;
47692 @@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
47693 pci_dev_put(dev);
47694
47695 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
47696 - generic_hpc_ops.query_enum = query_enum;
47697 generic_hpc.ops = &generic_hpc_ops;
47698
47699 status = cpci_hp_register_controller(&generic_hpc);
47700 diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
47701 index e8c4a7c..7046f5c 100644
47702 --- a/drivers/pci/hotplug/cpcihp_zt5550.c
47703 +++ b/drivers/pci/hotplug/cpcihp_zt5550.c
47704 @@ -59,7 +59,6 @@
47705 /* local variables */
47706 static bool debug;
47707 static bool poll;
47708 -static struct cpci_hp_controller_ops zt5550_hpc_ops;
47709 static struct cpci_hp_controller zt5550_hpc;
47710
47711 /* Primary cPCI bus bridge device */
47712 @@ -205,6 +204,10 @@ static int zt5550_hc_disable_irq(void)
47713 return 0;
47714 }
47715
47716 +static struct cpci_hp_controller_ops zt5550_hpc_ops = {
47717 + .query_enum = zt5550_hc_query_enum,
47718 +};
47719 +
47720 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
47721 {
47722 int status;
47723 @@ -216,16 +219,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
47724 dbg("returned from zt5550_hc_config");
47725
47726 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
47727 - zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
47728 zt5550_hpc.ops = &zt5550_hpc_ops;
47729 if(!poll) {
47730 zt5550_hpc.irq = hc_dev->irq;
47731 zt5550_hpc.irq_flags = IRQF_SHARED;
47732 zt5550_hpc.dev_id = hc_dev;
47733
47734 - zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
47735 - zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
47736 - zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
47737 + pax_open_kernel();
47738 + *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
47739 + *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
47740 + *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
47741 + pax_open_kernel();
47742 } else {
47743 info("using ENUM# polling mode");
47744 }
47745 diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
47746 index 76ba8a1..20ca857 100644
47747 --- a/drivers/pci/hotplug/cpqphp_nvram.c
47748 +++ b/drivers/pci/hotplug/cpqphp_nvram.c
47749 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
47750
47751 void compaq_nvram_init (void __iomem *rom_start)
47752 {
47753 +
47754 +#ifndef CONFIG_PAX_KERNEXEC
47755 if (rom_start) {
47756 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
47757 }
47758 +#endif
47759 +
47760 dbg("int15 entry = %p\n", compaq_int15_entry_point);
47761
47762 /* initialize our int15 lock */
47763 diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
47764 index cfa92a9..29539c5 100644
47765 --- a/drivers/pci/hotplug/pci_hotplug_core.c
47766 +++ b/drivers/pci/hotplug/pci_hotplug_core.c
47767 @@ -441,8 +441,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
47768 return -EINVAL;
47769 }
47770
47771 - slot->ops->owner = owner;
47772 - slot->ops->mod_name = mod_name;
47773 + pax_open_kernel();
47774 + *(struct module **)&slot->ops->owner = owner;
47775 + *(const char **)&slot->ops->mod_name = mod_name;
47776 + pax_close_kernel();
47777
47778 mutex_lock(&pci_hp_mutex);
47779 /*
47780 diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
47781 index 0e0a2ff..29dff57 100644
47782 --- a/drivers/pci/hotplug/pciehp_core.c
47783 +++ b/drivers/pci/hotplug/pciehp_core.c
47784 @@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
47785 struct slot *slot = ctrl->slot;
47786 struct hotplug_slot *hotplug = NULL;
47787 struct hotplug_slot_info *info = NULL;
47788 - struct hotplug_slot_ops *ops = NULL;
47789 + hotplug_slot_ops_no_const *ops = NULL;
47790 char name[SLOT_NAME_SIZE];
47791 int retval = -ENOMEM;
47792
47793 diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
47794 index fb02fc2..83dc2c3 100644
47795 --- a/drivers/pci/msi.c
47796 +++ b/drivers/pci/msi.c
47797 @@ -524,8 +524,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
47798 {
47799 struct attribute **msi_attrs;
47800 struct attribute *msi_attr;
47801 - struct device_attribute *msi_dev_attr;
47802 - struct attribute_group *msi_irq_group;
47803 + device_attribute_no_const *msi_dev_attr;
47804 + attribute_group_no_const *msi_irq_group;
47805 const struct attribute_group **msi_irq_groups;
47806 struct msi_desc *entry;
47807 int ret = -ENOMEM;
47808 @@ -589,7 +589,7 @@ error_attrs:
47809 count = 0;
47810 msi_attr = msi_attrs[count];
47811 while (msi_attr) {
47812 - msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
47813 + msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
47814 kfree(msi_attr->name);
47815 kfree(msi_dev_attr);
47816 ++count;
47817 diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
47818 index 4e0acef..bd98e31 100644
47819 --- a/drivers/pci/pci-sysfs.c
47820 +++ b/drivers/pci/pci-sysfs.c
47821 @@ -1101,7 +1101,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
47822 {
47823 /* allocate attribute structure, piggyback attribute name */
47824 int name_len = write_combine ? 13 : 10;
47825 - struct bin_attribute *res_attr;
47826 + bin_attribute_no_const *res_attr;
47827 int retval;
47828
47829 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
47830 @@ -1286,7 +1286,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
47831 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
47832 {
47833 int retval;
47834 - struct bin_attribute *attr;
47835 + bin_attribute_no_const *attr;
47836
47837 /* If the device has VPD, try to expose it in sysfs. */
47838 if (dev->vpd) {
47839 @@ -1333,7 +1333,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
47840 {
47841 int retval;
47842 int rom_size = 0;
47843 - struct bin_attribute *attr;
47844 + bin_attribute_no_const *attr;
47845
47846 if (!sysfs_initialized)
47847 return -EACCES;
47848 diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
47849 index 6bd0822..35bc2b3 100644
47850 --- a/drivers/pci/pci.h
47851 +++ b/drivers/pci/pci.h
47852 @@ -91,7 +91,7 @@ struct pci_vpd_ops {
47853 struct pci_vpd {
47854 unsigned int len;
47855 const struct pci_vpd_ops *ops;
47856 - struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
47857 + bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
47858 };
47859
47860 int pci_vpd_pci22_init(struct pci_dev *dev);
47861 diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
47862 index e1e7026..d28dd33 100644
47863 --- a/drivers/pci/pcie/aspm.c
47864 +++ b/drivers/pci/pcie/aspm.c
47865 @@ -27,9 +27,9 @@
47866 #define MODULE_PARAM_PREFIX "pcie_aspm."
47867
47868 /* Note: those are not register definitions */
47869 -#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
47870 -#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
47871 -#define ASPM_STATE_L1 (4) /* L1 state */
47872 +#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
47873 +#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
47874 +#define ASPM_STATE_L1 (4U) /* L1 state */
47875 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
47876 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
47877
47878 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
47879 index ef09f5f..49ac62f 100644
47880 --- a/drivers/pci/probe.c
47881 +++ b/drivers/pci/probe.c
47882 @@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
47883 struct pci_bus_region region, inverted_region;
47884 bool bar_too_big = false, bar_disabled = false;
47885
47886 - mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
47887 + mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
47888
47889 /* No printks while decoding is disabled! */
47890 if (!dev->mmio_always_on) {
47891 diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
47892 index 46d1378..30e452b 100644
47893 --- a/drivers/pci/proc.c
47894 +++ b/drivers/pci/proc.c
47895 @@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
47896 static int __init pci_proc_init(void)
47897 {
47898 struct pci_dev *dev = NULL;
47899 +
47900 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
47901 +#ifdef CONFIG_GRKERNSEC_PROC_USER
47902 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
47903 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
47904 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
47905 +#endif
47906 +#else
47907 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
47908 +#endif
47909 proc_create("devices", 0, proc_bus_pci_dir,
47910 &proc_bus_pci_dev_operations);
47911 proc_initialized = 1;
47912 diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
47913 index 7f3aad0..7d604bb 100644
47914 --- a/drivers/platform/chrome/chromeos_laptop.c
47915 +++ b/drivers/platform/chrome/chromeos_laptop.c
47916 @@ -406,7 +406,7 @@ static struct chromeos_laptop cr48 = {
47917 .callback = chromeos_laptop_dmi_matched, \
47918 .driver_data = (void *)&board_
47919
47920 -static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
47921 +static struct dmi_system_id chromeos_laptop_dmi_table[] __initconst = {
47922 {
47923 .ident = "Samsung Series 5 550",
47924 .matches = {
47925 diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
47926 index 541f951..4dfd598 100644
47927 --- a/drivers/platform/x86/alienware-wmi.c
47928 +++ b/drivers/platform/x86/alienware-wmi.c
47929 @@ -132,7 +132,7 @@ struct wmax_led_args {
47930 } __packed;
47931
47932 static struct platform_device *platform_device;
47933 -static struct device_attribute *zone_dev_attrs;
47934 +static device_attribute_no_const *zone_dev_attrs;
47935 static struct attribute **zone_attrs;
47936 static struct platform_zone *zone_data;
47937
47938 @@ -143,7 +143,7 @@ static struct platform_driver platform_driver = {
47939 }
47940 };
47941
47942 -static struct attribute_group zone_attribute_group = {
47943 +static attribute_group_no_const zone_attribute_group = {
47944 .name = "rgb_zones",
47945 };
47946
47947 diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
47948 index c5e082f..d6307a0 100644
47949 --- a/drivers/platform/x86/asus-wmi.c
47950 +++ b/drivers/platform/x86/asus-wmi.c
47951 @@ -1595,6 +1595,10 @@ static int show_dsts(struct seq_file *m, void *data)
47952 int err;
47953 u32 retval = -1;
47954
47955 +#ifdef CONFIG_GRKERNSEC_KMEM
47956 + return -EPERM;
47957 +#endif
47958 +
47959 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
47960
47961 if (err < 0)
47962 @@ -1611,6 +1615,10 @@ static int show_devs(struct seq_file *m, void *data)
47963 int err;
47964 u32 retval = -1;
47965
47966 +#ifdef CONFIG_GRKERNSEC_KMEM
47967 + return -EPERM;
47968 +#endif
47969 +
47970 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
47971 &retval);
47972
47973 @@ -1635,6 +1643,10 @@ static int show_call(struct seq_file *m, void *data)
47974 union acpi_object *obj;
47975 acpi_status status;
47976
47977 +#ifdef CONFIG_GRKERNSEC_KMEM
47978 + return -EPERM;
47979 +#endif
47980 +
47981 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
47982 1, asus->debug.method_id,
47983 &input, &output);
47984 diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
47985 index 62f8030..c7f2a45 100644
47986 --- a/drivers/platform/x86/msi-laptop.c
47987 +++ b/drivers/platform/x86/msi-laptop.c
47988 @@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
47989
47990 if (!quirks->ec_read_only) {
47991 /* allow userland write sysfs file */
47992 - dev_attr_bluetooth.store = store_bluetooth;
47993 - dev_attr_wlan.store = store_wlan;
47994 - dev_attr_threeg.store = store_threeg;
47995 - dev_attr_bluetooth.attr.mode |= S_IWUSR;
47996 - dev_attr_wlan.attr.mode |= S_IWUSR;
47997 - dev_attr_threeg.attr.mode |= S_IWUSR;
47998 + pax_open_kernel();
47999 + *(void **)&dev_attr_bluetooth.store = store_bluetooth;
48000 + *(void **)&dev_attr_wlan.store = store_wlan;
48001 + *(void **)&dev_attr_threeg.store = store_threeg;
48002 + *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
48003 + *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
48004 + *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
48005 + pax_close_kernel();
48006 }
48007
48008 /* disable hardware control by fn key */
48009 diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
48010 index 70222f2..8c8ce66 100644
48011 --- a/drivers/platform/x86/msi-wmi.c
48012 +++ b/drivers/platform/x86/msi-wmi.c
48013 @@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
48014 static void msi_wmi_notify(u32 value, void *context)
48015 {
48016 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
48017 - static struct key_entry *key;
48018 + struct key_entry *key;
48019 union acpi_object *obj;
48020 acpi_status status;
48021
48022 diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
48023 index 9c5a074..06c976a 100644
48024 --- a/drivers/platform/x86/sony-laptop.c
48025 +++ b/drivers/platform/x86/sony-laptop.c
48026 @@ -2527,7 +2527,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
48027 }
48028
48029 /* High speed charging function */
48030 -static struct device_attribute *hsc_handle;
48031 +static device_attribute_no_const *hsc_handle;
48032
48033 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
48034 struct device_attribute *attr,
48035 @@ -2601,7 +2601,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
48036 }
48037
48038 /* low battery function */
48039 -static struct device_attribute *lowbatt_handle;
48040 +static device_attribute_no_const *lowbatt_handle;
48041
48042 static ssize_t sony_nc_lowbatt_store(struct device *dev,
48043 struct device_attribute *attr,
48044 @@ -2667,7 +2667,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
48045 }
48046
48047 /* fan speed function */
48048 -static struct device_attribute *fan_handle, *hsf_handle;
48049 +static device_attribute_no_const *fan_handle, *hsf_handle;
48050
48051 static ssize_t sony_nc_hsfan_store(struct device *dev,
48052 struct device_attribute *attr,
48053 @@ -2774,7 +2774,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
48054 }
48055
48056 /* USB charge function */
48057 -static struct device_attribute *uc_handle;
48058 +static device_attribute_no_const *uc_handle;
48059
48060 static ssize_t sony_nc_usb_charge_store(struct device *dev,
48061 struct device_attribute *attr,
48062 @@ -2848,7 +2848,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
48063 }
48064
48065 /* Panel ID function */
48066 -static struct device_attribute *panel_handle;
48067 +static device_attribute_no_const *panel_handle;
48068
48069 static ssize_t sony_nc_panelid_show(struct device *dev,
48070 struct device_attribute *attr, char *buffer)
48071 @@ -2895,7 +2895,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
48072 }
48073
48074 /* smart connect function */
48075 -static struct device_attribute *sc_handle;
48076 +static device_attribute_no_const *sc_handle;
48077
48078 static ssize_t sony_nc_smart_conn_store(struct device *dev,
48079 struct device_attribute *attr,
48080 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
48081 index 15e61c1..40a39c7 100644
48082 --- a/drivers/platform/x86/thinkpad_acpi.c
48083 +++ b/drivers/platform/x86/thinkpad_acpi.c
48084 @@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
48085 return 0;
48086 }
48087
48088 -void static hotkey_mask_warn_incomplete_mask(void)
48089 +static void hotkey_mask_warn_incomplete_mask(void)
48090 {
48091 /* log only what the user can fix... */
48092 const u32 wantedmask = hotkey_driver_mask &
48093 @@ -2438,10 +2438,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
48094 && !tp_features.bright_unkfw)
48095 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
48096 }
48097 +}
48098
48099 #undef TPACPI_COMPARE_KEY
48100 #undef TPACPI_MAY_SEND_KEY
48101 -}
48102
48103 /*
48104 * Polling driver
48105 diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
48106 index 438d4c7..ca8a2fb 100644
48107 --- a/drivers/pnp/pnpbios/bioscalls.c
48108 +++ b/drivers/pnp/pnpbios/bioscalls.c
48109 @@ -59,7 +59,7 @@ do { \
48110 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
48111 } while(0)
48112
48113 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
48114 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
48115 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
48116
48117 /*
48118 @@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
48119
48120 cpu = get_cpu();
48121 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
48122 +
48123 + pax_open_kernel();
48124 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
48125 + pax_close_kernel();
48126
48127 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
48128 spin_lock_irqsave(&pnp_bios_lock, flags);
48129 @@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
48130 :"memory");
48131 spin_unlock_irqrestore(&pnp_bios_lock, flags);
48132
48133 + pax_open_kernel();
48134 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
48135 + pax_close_kernel();
48136 +
48137 put_cpu();
48138
48139 /* If we get here and this is set then the PnP BIOS faulted on us. */
48140 @@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
48141 return status;
48142 }
48143
48144 -void pnpbios_calls_init(union pnp_bios_install_struct *header)
48145 +void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
48146 {
48147 int i;
48148
48149 @@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
48150 pnp_bios_callpoint.offset = header->fields.pm16offset;
48151 pnp_bios_callpoint.segment = PNP_CS16;
48152
48153 + pax_open_kernel();
48154 +
48155 for_each_possible_cpu(i) {
48156 struct desc_struct *gdt = get_cpu_gdt_table(i);
48157 if (!gdt)
48158 @@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
48159 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
48160 (unsigned long)__va(header->fields.pm16dseg));
48161 }
48162 +
48163 + pax_close_kernel();
48164 }
48165 diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
48166 index 01712cb..782e822 100644
48167 --- a/drivers/pnp/resource.c
48168 +++ b/drivers/pnp/resource.c
48169 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
48170 return 1;
48171
48172 /* check if the resource is valid */
48173 - if (*irq < 0 || *irq > 15)
48174 + if (*irq > 15)
48175 return 0;
48176
48177 /* check if the resource is reserved */
48178 @@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
48179 return 1;
48180
48181 /* check if the resource is valid */
48182 - if (*dma < 0 || *dma == 4 || *dma > 7)
48183 + if (*dma == 4 || *dma > 7)
48184 return 0;
48185
48186 /* check if the resource is reserved */
48187 diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
48188 index 0c52e2a..3421ab7 100644
48189 --- a/drivers/power/pda_power.c
48190 +++ b/drivers/power/pda_power.c
48191 @@ -37,7 +37,11 @@ static int polling;
48192
48193 #if IS_ENABLED(CONFIG_USB_PHY)
48194 static struct usb_phy *transceiver;
48195 -static struct notifier_block otg_nb;
48196 +static int otg_handle_notification(struct notifier_block *nb,
48197 + unsigned long event, void *unused);
48198 +static struct notifier_block otg_nb = {
48199 + .notifier_call = otg_handle_notification
48200 +};
48201 #endif
48202
48203 static struct regulator *ac_draw;
48204 @@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
48205
48206 #if IS_ENABLED(CONFIG_USB_PHY)
48207 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
48208 - otg_nb.notifier_call = otg_handle_notification;
48209 ret = usb_register_notifier(transceiver, &otg_nb);
48210 if (ret) {
48211 dev_err(dev, "failure to register otg notifier\n");
48212 diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
48213 index cc439fd..8fa30df 100644
48214 --- a/drivers/power/power_supply.h
48215 +++ b/drivers/power/power_supply.h
48216 @@ -16,12 +16,12 @@ struct power_supply;
48217
48218 #ifdef CONFIG_SYSFS
48219
48220 -extern void power_supply_init_attrs(struct device_type *dev_type);
48221 +extern void power_supply_init_attrs(void);
48222 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
48223
48224 #else
48225
48226 -static inline void power_supply_init_attrs(struct device_type *dev_type) {}
48227 +static inline void power_supply_init_attrs(void) {}
48228 #define power_supply_uevent NULL
48229
48230 #endif /* CONFIG_SYSFS */
48231 diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
48232 index 2660664..75fcb04 100644
48233 --- a/drivers/power/power_supply_core.c
48234 +++ b/drivers/power/power_supply_core.c
48235 @@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
48236 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
48237 EXPORT_SYMBOL_GPL(power_supply_notifier);
48238
48239 -static struct device_type power_supply_dev_type;
48240 +extern const struct attribute_group *power_supply_attr_groups[];
48241 +static struct device_type power_supply_dev_type = {
48242 + .groups = power_supply_attr_groups,
48243 +};
48244
48245 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
48246 struct power_supply *supply)
48247 @@ -628,7 +631,7 @@ static int __init power_supply_class_init(void)
48248 return PTR_ERR(power_supply_class);
48249
48250 power_supply_class->dev_uevent = power_supply_uevent;
48251 - power_supply_init_attrs(&power_supply_dev_type);
48252 + power_supply_init_attrs();
48253
48254 return 0;
48255 }
48256 diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
48257 index 44420d1..967126e 100644
48258 --- a/drivers/power/power_supply_sysfs.c
48259 +++ b/drivers/power/power_supply_sysfs.c
48260 @@ -230,17 +230,15 @@ static struct attribute_group power_supply_attr_group = {
48261 .is_visible = power_supply_attr_is_visible,
48262 };
48263
48264 -static const struct attribute_group *power_supply_attr_groups[] = {
48265 +const struct attribute_group *power_supply_attr_groups[] = {
48266 &power_supply_attr_group,
48267 NULL,
48268 };
48269
48270 -void power_supply_init_attrs(struct device_type *dev_type)
48271 +void power_supply_init_attrs(void)
48272 {
48273 int i;
48274
48275 - dev_type->groups = power_supply_attr_groups;
48276 -
48277 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
48278 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
48279 }
48280 diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
48281 index 84419af..268ede8 100644
48282 --- a/drivers/powercap/powercap_sys.c
48283 +++ b/drivers/powercap/powercap_sys.c
48284 @@ -154,8 +154,77 @@ struct powercap_constraint_attr {
48285 struct device_attribute name_attr;
48286 };
48287
48288 +static ssize_t show_constraint_name(struct device *dev,
48289 + struct device_attribute *dev_attr,
48290 + char *buf);
48291 +
48292 static struct powercap_constraint_attr
48293 - constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
48294 + constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
48295 + [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
48296 + .power_limit_attr = {
48297 + .attr = {
48298 + .name = NULL,
48299 + .mode = S_IWUSR | S_IRUGO
48300 + },
48301 + .show = show_constraint_power_limit_uw,
48302 + .store = store_constraint_power_limit_uw
48303 + },
48304 +
48305 + .time_window_attr = {
48306 + .attr = {
48307 + .name = NULL,
48308 + .mode = S_IWUSR | S_IRUGO
48309 + },
48310 + .show = show_constraint_time_window_us,
48311 + .store = store_constraint_time_window_us
48312 + },
48313 +
48314 + .max_power_attr = {
48315 + .attr = {
48316 + .name = NULL,
48317 + .mode = S_IRUGO
48318 + },
48319 + .show = show_constraint_max_power_uw,
48320 + .store = NULL
48321 + },
48322 +
48323 + .min_power_attr = {
48324 + .attr = {
48325 + .name = NULL,
48326 + .mode = S_IRUGO
48327 + },
48328 + .show = show_constraint_min_power_uw,
48329 + .store = NULL
48330 + },
48331 +
48332 + .max_time_window_attr = {
48333 + .attr = {
48334 + .name = NULL,
48335 + .mode = S_IRUGO
48336 + },
48337 + .show = show_constraint_max_time_window_us,
48338 + .store = NULL
48339 + },
48340 +
48341 + .min_time_window_attr = {
48342 + .attr = {
48343 + .name = NULL,
48344 + .mode = S_IRUGO
48345 + },
48346 + .show = show_constraint_min_time_window_us,
48347 + .store = NULL
48348 + },
48349 +
48350 + .name_attr = {
48351 + .attr = {
48352 + .name = NULL,
48353 + .mode = S_IRUGO
48354 + },
48355 + .show = show_constraint_name,
48356 + .store = NULL
48357 + }
48358 + }
48359 +};
48360
48361 /* A list of powercap control_types */
48362 static LIST_HEAD(powercap_cntrl_list);
48363 @@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
48364 }
48365
48366 static int create_constraint_attribute(int id, const char *name,
48367 - int mode,
48368 - struct device_attribute *dev_attr,
48369 - ssize_t (*show)(struct device *,
48370 - struct device_attribute *, char *),
48371 - ssize_t (*store)(struct device *,
48372 - struct device_attribute *,
48373 - const char *, size_t)
48374 - )
48375 + struct device_attribute *dev_attr)
48376 {
48377 + name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
48378
48379 - dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
48380 - id, name);
48381 - if (!dev_attr->attr.name)
48382 + if (!name)
48383 return -ENOMEM;
48384 - dev_attr->attr.mode = mode;
48385 - dev_attr->show = show;
48386 - dev_attr->store = store;
48387 +
48388 + pax_open_kernel();
48389 + *(const char **)&dev_attr->attr.name = name;
48390 + pax_close_kernel();
48391
48392 return 0;
48393 }
48394 @@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
48395
48396 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
48397 ret = create_constraint_attribute(i, "power_limit_uw",
48398 - S_IWUSR | S_IRUGO,
48399 - &constraint_attrs[i].power_limit_attr,
48400 - show_constraint_power_limit_uw,
48401 - store_constraint_power_limit_uw);
48402 + &constraint_attrs[i].power_limit_attr);
48403 if (ret)
48404 goto err_alloc;
48405 ret = create_constraint_attribute(i, "time_window_us",
48406 - S_IWUSR | S_IRUGO,
48407 - &constraint_attrs[i].time_window_attr,
48408 - show_constraint_time_window_us,
48409 - store_constraint_time_window_us);
48410 + &constraint_attrs[i].time_window_attr);
48411 if (ret)
48412 goto err_alloc;
48413 - ret = create_constraint_attribute(i, "name", S_IRUGO,
48414 - &constraint_attrs[i].name_attr,
48415 - show_constraint_name,
48416 - NULL);
48417 + ret = create_constraint_attribute(i, "name",
48418 + &constraint_attrs[i].name_attr);
48419 if (ret)
48420 goto err_alloc;
48421 - ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
48422 - &constraint_attrs[i].max_power_attr,
48423 - show_constraint_max_power_uw,
48424 - NULL);
48425 + ret = create_constraint_attribute(i, "max_power_uw",
48426 + &constraint_attrs[i].max_power_attr);
48427 if (ret)
48428 goto err_alloc;
48429 - ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
48430 - &constraint_attrs[i].min_power_attr,
48431 - show_constraint_min_power_uw,
48432 - NULL);
48433 + ret = create_constraint_attribute(i, "min_power_uw",
48434 + &constraint_attrs[i].min_power_attr);
48435 if (ret)
48436 goto err_alloc;
48437 ret = create_constraint_attribute(i, "max_time_window_us",
48438 - S_IRUGO,
48439 - &constraint_attrs[i].max_time_window_attr,
48440 - show_constraint_max_time_window_us,
48441 - NULL);
48442 + &constraint_attrs[i].max_time_window_attr);
48443 if (ret)
48444 goto err_alloc;
48445 ret = create_constraint_attribute(i, "min_time_window_us",
48446 - S_IRUGO,
48447 - &constraint_attrs[i].min_time_window_attr,
48448 - show_constraint_min_time_window_us,
48449 - NULL);
48450 + &constraint_attrs[i].min_time_window_attr);
48451 if (ret)
48452 goto err_alloc;
48453
48454 @@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
48455 power_zone->zone_dev_attrs[count++] =
48456 &dev_attr_max_energy_range_uj.attr;
48457 if (power_zone->ops->get_energy_uj) {
48458 + pax_open_kernel();
48459 if (power_zone->ops->reset_energy_uj)
48460 - dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
48461 + *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
48462 else
48463 - dev_attr_energy_uj.attr.mode = S_IRUGO;
48464 + *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
48465 + pax_close_kernel();
48466 power_zone->zone_dev_attrs[count++] =
48467 &dev_attr_energy_uj.attr;
48468 }
48469 diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
48470 index 9c5d414..c7900ce 100644
48471 --- a/drivers/ptp/ptp_private.h
48472 +++ b/drivers/ptp/ptp_private.h
48473 @@ -51,7 +51,7 @@ struct ptp_clock {
48474 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
48475 wait_queue_head_t tsev_wq;
48476 int defunct; /* tells readers to go away when clock is being removed */
48477 - struct device_attribute *pin_dev_attr;
48478 + device_attribute_no_const *pin_dev_attr;
48479 struct attribute **pin_attr;
48480 struct attribute_group pin_attr_group;
48481 };
48482 diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
48483 index 302e626..12579af 100644
48484 --- a/drivers/ptp/ptp_sysfs.c
48485 +++ b/drivers/ptp/ptp_sysfs.c
48486 @@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
48487 goto no_pin_attr;
48488
48489 for (i = 0; i < n_pins; i++) {
48490 - struct device_attribute *da = &ptp->pin_dev_attr[i];
48491 + device_attribute_no_const *da = &ptp->pin_dev_attr[i];
48492 sysfs_attr_init(&da->attr);
48493 da->attr.name = info->pin_config[i].name;
48494 da->attr.mode = 0644;
48495 diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
48496 index 9a09f3c..450b523 100644
48497 --- a/drivers/regulator/core.c
48498 +++ b/drivers/regulator/core.c
48499 @@ -3380,7 +3380,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
48500 {
48501 const struct regulation_constraints *constraints = NULL;
48502 const struct regulator_init_data *init_data;
48503 - static atomic_t regulator_no = ATOMIC_INIT(0);
48504 + static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
48505 struct regulator_dev *rdev;
48506 struct device *dev;
48507 int ret, i;
48508 @@ -3450,7 +3450,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
48509 rdev->dev.of_node = config->of_node;
48510 rdev->dev.parent = dev;
48511 dev_set_name(&rdev->dev, "regulator.%d",
48512 - atomic_inc_return(&regulator_no) - 1);
48513 + atomic_inc_return_unchecked(&regulator_no) - 1);
48514 ret = device_register(&rdev->dev);
48515 if (ret != 0) {
48516 put_device(&rdev->dev);
48517 diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
48518 index 2fc4111..6aa88ca 100644
48519 --- a/drivers/regulator/max8660.c
48520 +++ b/drivers/regulator/max8660.c
48521 @@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
48522 max8660->shadow_regs[MAX8660_OVER1] = 5;
48523 } else {
48524 /* Otherwise devices can be toggled via software */
48525 - max8660_dcdc_ops.enable = max8660_dcdc_enable;
48526 - max8660_dcdc_ops.disable = max8660_dcdc_disable;
48527 + pax_open_kernel();
48528 + *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
48529 + *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
48530 + pax_close_kernel();
48531 }
48532
48533 /*
48534 diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
48535 index dbedf17..18ff6b7 100644
48536 --- a/drivers/regulator/max8973-regulator.c
48537 +++ b/drivers/regulator/max8973-regulator.c
48538 @@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
48539 if (!pdata || !pdata->enable_ext_control) {
48540 max->desc.enable_reg = MAX8973_VOUT;
48541 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
48542 - max->ops.enable = regulator_enable_regmap;
48543 - max->ops.disable = regulator_disable_regmap;
48544 - max->ops.is_enabled = regulator_is_enabled_regmap;
48545 + pax_open_kernel();
48546 + *(void **)&max->ops.enable = regulator_enable_regmap;
48547 + *(void **)&max->ops.disable = regulator_disable_regmap;
48548 + *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
48549 + pax_close_kernel();
48550 }
48551
48552 if (pdata) {
48553 diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
48554 index f374fa5..26f0683 100644
48555 --- a/drivers/regulator/mc13892-regulator.c
48556 +++ b/drivers/regulator/mc13892-regulator.c
48557 @@ -582,10 +582,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
48558 }
48559 mc13xxx_unlock(mc13892);
48560
48561 - mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
48562 + pax_open_kernel();
48563 + *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
48564 = mc13892_vcam_set_mode;
48565 - mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
48566 + *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
48567 = mc13892_vcam_get_mode;
48568 + pax_close_kernel();
48569
48570 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
48571 ARRAY_SIZE(mc13892_regulators));
48572 diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
48573 index 0963c93..ea29cce 100644
48574 --- a/drivers/rtc/rtc-cmos.c
48575 +++ b/drivers/rtc/rtc-cmos.c
48576 @@ -777,7 +777,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
48577 hpet_rtc_timer_init();
48578
48579 /* export at least the first block of NVRAM */
48580 - nvram.size = address_space - NVRAM_OFFSET;
48581 + pax_open_kernel();
48582 + *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
48583 + pax_close_kernel();
48584 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
48585 if (retval < 0) {
48586 dev_dbg(dev, "can't create nvram file? %d\n", retval);
48587 diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
48588 index d049393..bb20be0 100644
48589 --- a/drivers/rtc/rtc-dev.c
48590 +++ b/drivers/rtc/rtc-dev.c
48591 @@ -16,6 +16,7 @@
48592 #include <linux/module.h>
48593 #include <linux/rtc.h>
48594 #include <linux/sched.h>
48595 +#include <linux/grsecurity.h>
48596 #include "rtc-core.h"
48597
48598 static dev_t rtc_devt;
48599 @@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
48600 if (copy_from_user(&tm, uarg, sizeof(tm)))
48601 return -EFAULT;
48602
48603 + gr_log_timechange();
48604 +
48605 return rtc_set_time(rtc, &tm);
48606
48607 case RTC_PIE_ON:
48608 diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
48609 index f03d5ba..8325bf6 100644
48610 --- a/drivers/rtc/rtc-ds1307.c
48611 +++ b/drivers/rtc/rtc-ds1307.c
48612 @@ -107,7 +107,7 @@ struct ds1307 {
48613 u8 offset; /* register's offset */
48614 u8 regs[11];
48615 u16 nvram_offset;
48616 - struct bin_attribute *nvram;
48617 + bin_attribute_no_const *nvram;
48618 enum ds_type type;
48619 unsigned long flags;
48620 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
48621 diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
48622 index 11880c1..b823aa4 100644
48623 --- a/drivers/rtc/rtc-m48t59.c
48624 +++ b/drivers/rtc/rtc-m48t59.c
48625 @@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
48626 if (IS_ERR(m48t59->rtc))
48627 return PTR_ERR(m48t59->rtc);
48628
48629 - m48t59_nvram_attr.size = pdata->offset;
48630 + pax_open_kernel();
48631 + *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
48632 + pax_close_kernel();
48633
48634 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
48635 if (ret)
48636 diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
48637 index 14b5f8d..cc9bd26 100644
48638 --- a/drivers/scsi/aic7xxx/aic79xx_pci.c
48639 +++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
48640 @@ -827,7 +827,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
48641 for (bit = 0; bit < 8; bit++) {
48642
48643 if ((pci_status[i] & (0x1 << bit)) != 0) {
48644 - static const char *s;
48645 + const char *s;
48646
48647 s = pci_status_strings[bit];
48648 if (i == 7/*TARG*/ && bit == 3)
48649 @@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
48650
48651 for (bit = 0; bit < 8; bit++) {
48652
48653 - if ((split_status[i] & (0x1 << bit)) != 0) {
48654 - static const char *s;
48655 -
48656 - s = split_status_strings[bit];
48657 - printk(s, ahd_name(ahd),
48658 + if ((split_status[i] & (0x1 << bit)) != 0)
48659 + printk(split_status_strings[bit], ahd_name(ahd),
48660 split_status_source[i]);
48661 - }
48662
48663 if (i > 1)
48664 continue;
48665
48666 - if ((sg_split_status[i] & (0x1 << bit)) != 0) {
48667 - static const char *s;
48668 -
48669 - s = split_status_strings[bit];
48670 - printk(s, ahd_name(ahd), "SG");
48671 - }
48672 + if ((sg_split_status[i] & (0x1 << bit)) != 0)
48673 + printk(split_status_strings[bit], ahd_name(ahd), "SG");
48674 }
48675 }
48676 /*
48677 diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
48678 index e693af6..2e525b6 100644
48679 --- a/drivers/scsi/bfa/bfa_fcpim.h
48680 +++ b/drivers/scsi/bfa/bfa_fcpim.h
48681 @@ -36,7 +36,7 @@ struct bfa_iotag_s {
48682
48683 struct bfa_itn_s {
48684 bfa_isr_func_t isr;
48685 -};
48686 +} __no_const;
48687
48688 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
48689 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
48690 diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
48691 index a3ab5cc..8143622 100644
48692 --- a/drivers/scsi/bfa/bfa_fcs.c
48693 +++ b/drivers/scsi/bfa/bfa_fcs.c
48694 @@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
48695 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
48696
48697 static struct bfa_fcs_mod_s fcs_modules[] = {
48698 - { bfa_fcs_port_attach, NULL, NULL },
48699 - { bfa_fcs_uf_attach, NULL, NULL },
48700 - { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
48701 - bfa_fcs_fabric_modexit },
48702 + {
48703 + .attach = bfa_fcs_port_attach,
48704 + .modinit = NULL,
48705 + .modexit = NULL
48706 + },
48707 + {
48708 + .attach = bfa_fcs_uf_attach,
48709 + .modinit = NULL,
48710 + .modexit = NULL
48711 + },
48712 + {
48713 + .attach = bfa_fcs_fabric_attach,
48714 + .modinit = bfa_fcs_fabric_modinit,
48715 + .modexit = bfa_fcs_fabric_modexit
48716 + },
48717 };
48718
48719 /*
48720 diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
48721 index ff75ef8..2dfe00a 100644
48722 --- a/drivers/scsi/bfa/bfa_fcs_lport.c
48723 +++ b/drivers/scsi/bfa/bfa_fcs_lport.c
48724 @@ -89,15 +89,26 @@ static struct {
48725 void (*offline) (struct bfa_fcs_lport_s *port);
48726 } __port_action[] = {
48727 {
48728 - bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
48729 - bfa_fcs_lport_unknown_offline}, {
48730 - bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
48731 - bfa_fcs_lport_fab_offline}, {
48732 - bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
48733 - bfa_fcs_lport_n2n_offline}, {
48734 - bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
48735 - bfa_fcs_lport_loop_offline},
48736 - };
48737 + .init = bfa_fcs_lport_unknown_init,
48738 + .online = bfa_fcs_lport_unknown_online,
48739 + .offline = bfa_fcs_lport_unknown_offline
48740 + },
48741 + {
48742 + .init = bfa_fcs_lport_fab_init,
48743 + .online = bfa_fcs_lport_fab_online,
48744 + .offline = bfa_fcs_lport_fab_offline
48745 + },
48746 + {
48747 + .init = bfa_fcs_lport_n2n_init,
48748 + .online = bfa_fcs_lport_n2n_online,
48749 + .offline = bfa_fcs_lport_n2n_offline
48750 + },
48751 + {
48752 + .init = bfa_fcs_lport_loop_init,
48753 + .online = bfa_fcs_lport_loop_online,
48754 + .offline = bfa_fcs_lport_loop_offline
48755 + },
48756 +};
48757
48758 /*
48759 * fcs_port_sm FCS logical port state machine
48760 diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
48761 index 2e28392..9d865b6 100644
48762 --- a/drivers/scsi/bfa/bfa_ioc.h
48763 +++ b/drivers/scsi/bfa/bfa_ioc.h
48764 @@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
48765 bfa_ioc_disable_cbfn_t disable_cbfn;
48766 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
48767 bfa_ioc_reset_cbfn_t reset_cbfn;
48768 -};
48769 +} __no_const;
48770
48771 /*
48772 * IOC event notification mechanism.
48773 @@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
48774 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
48775 enum bfi_ioc_state fwstate);
48776 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
48777 -};
48778 +} __no_const;
48779
48780 /*
48781 * Queue element to wait for room in request queue. FIFO order is
48782 diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
48783 index a14c784..6de6790 100644
48784 --- a/drivers/scsi/bfa/bfa_modules.h
48785 +++ b/drivers/scsi/bfa/bfa_modules.h
48786 @@ -78,12 +78,12 @@ enum {
48787 \
48788 extern struct bfa_module_s hal_mod_ ## __mod; \
48789 struct bfa_module_s hal_mod_ ## __mod = { \
48790 - bfa_ ## __mod ## _meminfo, \
48791 - bfa_ ## __mod ## _attach, \
48792 - bfa_ ## __mod ## _detach, \
48793 - bfa_ ## __mod ## _start, \
48794 - bfa_ ## __mod ## _stop, \
48795 - bfa_ ## __mod ## _iocdisable, \
48796 + .meminfo = bfa_ ## __mod ## _meminfo, \
48797 + .attach = bfa_ ## __mod ## _attach, \
48798 + .detach = bfa_ ## __mod ## _detach, \
48799 + .start = bfa_ ## __mod ## _start, \
48800 + .stop = bfa_ ## __mod ## _stop, \
48801 + .iocdisable = bfa_ ## __mod ## _iocdisable, \
48802 }
48803
48804 #define BFA_CACHELINE_SZ (256)
48805 diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
48806 index 045c4e1..13de803 100644
48807 --- a/drivers/scsi/fcoe/fcoe_sysfs.c
48808 +++ b/drivers/scsi/fcoe/fcoe_sysfs.c
48809 @@ -33,8 +33,8 @@
48810 */
48811 #include "libfcoe.h"
48812
48813 -static atomic_t ctlr_num;
48814 -static atomic_t fcf_num;
48815 +static atomic_unchecked_t ctlr_num;
48816 +static atomic_unchecked_t fcf_num;
48817
48818 /*
48819 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
48820 @@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
48821 if (!ctlr)
48822 goto out;
48823
48824 - ctlr->id = atomic_inc_return(&ctlr_num) - 1;
48825 + ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
48826 ctlr->f = f;
48827 ctlr->mode = FIP_CONN_TYPE_FABRIC;
48828 INIT_LIST_HEAD(&ctlr->fcfs);
48829 @@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
48830 fcf->dev.parent = &ctlr->dev;
48831 fcf->dev.bus = &fcoe_bus_type;
48832 fcf->dev.type = &fcoe_fcf_device_type;
48833 - fcf->id = atomic_inc_return(&fcf_num) - 1;
48834 + fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
48835 fcf->state = FCOE_FCF_STATE_UNKNOWN;
48836
48837 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
48838 @@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
48839 {
48840 int error;
48841
48842 - atomic_set(&ctlr_num, 0);
48843 - atomic_set(&fcf_num, 0);
48844 + atomic_set_unchecked(&ctlr_num, 0);
48845 + atomic_set_unchecked(&fcf_num, 0);
48846
48847 error = bus_register(&fcoe_bus_type);
48848 if (error)
48849 diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
48850 index 3cbb57a..95e47a3 100644
48851 --- a/drivers/scsi/hosts.c
48852 +++ b/drivers/scsi/hosts.c
48853 @@ -42,7 +42,7 @@
48854 #include "scsi_logging.h"
48855
48856
48857 -static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
48858 +static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
48859
48860
48861 static void scsi_host_cls_release(struct device *dev)
48862 @@ -369,7 +369,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
48863 * subtract one because we increment first then return, but we need to
48864 * know what the next host number was before increment
48865 */
48866 - shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
48867 + shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
48868 shost->dma_channel = 0xff;
48869
48870 /* These three are default values which can be overridden */
48871 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
48872 index fda6cf1..7a6b5d8 100644
48873 --- a/drivers/scsi/hpsa.c
48874 +++ b/drivers/scsi/hpsa.c
48875 @@ -699,10 +699,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
48876 unsigned long flags;
48877
48878 if (h->transMethod & CFGTBL_Trans_io_accel1)
48879 - return h->access.command_completed(h, q);
48880 + return h->access->command_completed(h, q);
48881
48882 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
48883 - return h->access.command_completed(h, q);
48884 + return h->access->command_completed(h, q);
48885
48886 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
48887 a = rq->head[rq->current_entry];
48888 @@ -5460,7 +5460,7 @@ static void start_io(struct ctlr_info *h)
48889 while (!list_empty(&h->reqQ)) {
48890 c = list_entry(h->reqQ.next, struct CommandList, list);
48891 /* can't do anything if fifo is full */
48892 - if ((h->access.fifo_full(h))) {
48893 + if ((h->access->fifo_full(h))) {
48894 h->fifo_recently_full = 1;
48895 dev_warn(&h->pdev->dev, "fifo full\n");
48896 break;
48897 @@ -5484,7 +5484,7 @@ static void start_io(struct ctlr_info *h)
48898
48899 /* Tell the controller execute command */
48900 spin_unlock_irqrestore(&h->lock, flags);
48901 - h->access.submit_command(h, c);
48902 + h->access->submit_command(h, c);
48903 spin_lock_irqsave(&h->lock, flags);
48904 }
48905 spin_unlock_irqrestore(&h->lock, flags);
48906 @@ -5492,17 +5492,17 @@ static void start_io(struct ctlr_info *h)
48907
48908 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
48909 {
48910 - return h->access.command_completed(h, q);
48911 + return h->access->command_completed(h, q);
48912 }
48913
48914 static inline bool interrupt_pending(struct ctlr_info *h)
48915 {
48916 - return h->access.intr_pending(h);
48917 + return h->access->intr_pending(h);
48918 }
48919
48920 static inline long interrupt_not_for_us(struct ctlr_info *h)
48921 {
48922 - return (h->access.intr_pending(h) == 0) ||
48923 + return (h->access->intr_pending(h) == 0) ||
48924 (h->interrupts_enabled == 0);
48925 }
48926
48927 @@ -6456,7 +6456,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
48928 if (prod_index < 0)
48929 return -ENODEV;
48930 h->product_name = products[prod_index].product_name;
48931 - h->access = *(products[prod_index].access);
48932 + h->access = products[prod_index].access;
48933
48934 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
48935 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
48936 @@ -6735,7 +6735,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
48937 {
48938 unsigned long flags;
48939
48940 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
48941 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
48942 spin_lock_irqsave(&h->lock, flags);
48943 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
48944 spin_unlock_irqrestore(&h->lock, flags);
48945 @@ -6963,7 +6963,7 @@ reinit_after_soft_reset:
48946 }
48947
48948 /* make sure the board interrupts are off */
48949 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
48950 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
48951
48952 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
48953 goto clean2;
48954 @@ -6998,7 +6998,7 @@ reinit_after_soft_reset:
48955 * fake ones to scoop up any residual completions.
48956 */
48957 spin_lock_irqsave(&h->lock, flags);
48958 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
48959 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
48960 spin_unlock_irqrestore(&h->lock, flags);
48961 free_irqs(h);
48962 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
48963 @@ -7017,9 +7017,9 @@ reinit_after_soft_reset:
48964 dev_info(&h->pdev->dev, "Board READY.\n");
48965 dev_info(&h->pdev->dev,
48966 "Waiting for stale completions to drain.\n");
48967 - h->access.set_intr_mask(h, HPSA_INTR_ON);
48968 + h->access->set_intr_mask(h, HPSA_INTR_ON);
48969 msleep(10000);
48970 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
48971 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
48972
48973 rc = controller_reset_failed(h->cfgtable);
48974 if (rc)
48975 @@ -7045,7 +7045,7 @@ reinit_after_soft_reset:
48976 h->drv_req_rescan = 0;
48977
48978 /* Turn the interrupts on so we can service requests */
48979 - h->access.set_intr_mask(h, HPSA_INTR_ON);
48980 + h->access->set_intr_mask(h, HPSA_INTR_ON);
48981
48982 hpsa_hba_inquiry(h);
48983 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
48984 @@ -7114,7 +7114,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
48985 * To write all data in the battery backed cache to disks
48986 */
48987 hpsa_flush_cache(h);
48988 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
48989 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
48990 hpsa_free_irqs_and_disable_msix(h);
48991 }
48992
48993 @@ -7232,7 +7232,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
48994 CFGTBL_Trans_enable_directed_msix |
48995 (trans_support & (CFGTBL_Trans_io_accel1 |
48996 CFGTBL_Trans_io_accel2));
48997 - struct access_method access = SA5_performant_access;
48998 + struct access_method *access = &SA5_performant_access;
48999
49000 /* This is a bit complicated. There are 8 registers on
49001 * the controller which we write to to tell it 8 different
49002 @@ -7297,12 +7297,12 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
49003 * enable outbound interrupt coalescing in accelerator mode;
49004 */
49005 if (trans_support & CFGTBL_Trans_io_accel1) {
49006 - access = SA5_ioaccel_mode1_access;
49007 + access = &SA5_ioaccel_mode1_access;
49008 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
49009 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
49010 } else {
49011 if (trans_support & CFGTBL_Trans_io_accel2) {
49012 - access = SA5_ioaccel_mode2_access;
49013 + access = &SA5_ioaccel_mode2_access;
49014 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
49015 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
49016 }
49017 diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
49018 index 44235a2..962e91b 100644
49019 --- a/drivers/scsi/hpsa.h
49020 +++ b/drivers/scsi/hpsa.h
49021 @@ -128,7 +128,7 @@ struct ctlr_info {
49022 unsigned int msix_vector;
49023 unsigned int msi_vector;
49024 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
49025 - struct access_method access;
49026 + struct access_method *access;
49027 char hba_mode_enabled;
49028
49029 /* queue and queue Info */
49030 @@ -541,35 +541,35 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
49031 }
49032
49033 static struct access_method SA5_access = {
49034 - SA5_submit_command,
49035 - SA5_intr_mask,
49036 - SA5_fifo_full,
49037 - SA5_intr_pending,
49038 - SA5_completed,
49039 + .submit_command = SA5_submit_command,
49040 + .set_intr_mask = SA5_intr_mask,
49041 + .fifo_full = SA5_fifo_full,
49042 + .intr_pending = SA5_intr_pending,
49043 + .command_completed = SA5_completed,
49044 };
49045
49046 static struct access_method SA5_ioaccel_mode1_access = {
49047 - SA5_submit_command,
49048 - SA5_performant_intr_mask,
49049 - SA5_fifo_full,
49050 - SA5_ioaccel_mode1_intr_pending,
49051 - SA5_ioaccel_mode1_completed,
49052 + .submit_command = SA5_submit_command,
49053 + .set_intr_mask = SA5_performant_intr_mask,
49054 + .fifo_full = SA5_fifo_full,
49055 + .intr_pending = SA5_ioaccel_mode1_intr_pending,
49056 + .command_completed = SA5_ioaccel_mode1_completed,
49057 };
49058
49059 static struct access_method SA5_ioaccel_mode2_access = {
49060 - SA5_submit_command_ioaccel2,
49061 - SA5_performant_intr_mask,
49062 - SA5_fifo_full,
49063 - SA5_performant_intr_pending,
49064 - SA5_performant_completed,
49065 + .submit_command = SA5_submit_command_ioaccel2,
49066 + .set_intr_mask = SA5_performant_intr_mask,
49067 + .fifo_full = SA5_fifo_full,
49068 + .intr_pending = SA5_performant_intr_pending,
49069 + .command_completed = SA5_performant_completed,
49070 };
49071
49072 static struct access_method SA5_performant_access = {
49073 - SA5_submit_command,
49074 - SA5_performant_intr_mask,
49075 - SA5_fifo_full,
49076 - SA5_performant_intr_pending,
49077 - SA5_performant_completed,
49078 + .submit_command = SA5_submit_command,
49079 + .set_intr_mask = SA5_performant_intr_mask,
49080 + .fifo_full = SA5_fifo_full,
49081 + .intr_pending = SA5_performant_intr_pending,
49082 + .command_completed = SA5_performant_completed,
49083 };
49084
49085 struct board_type {
49086 diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
49087 index 1b3a094..068e683 100644
49088 --- a/drivers/scsi/libfc/fc_exch.c
49089 +++ b/drivers/scsi/libfc/fc_exch.c
49090 @@ -101,12 +101,12 @@ struct fc_exch_mgr {
49091 u16 pool_max_index;
49092
49093 struct {
49094 - atomic_t no_free_exch;
49095 - atomic_t no_free_exch_xid;
49096 - atomic_t xid_not_found;
49097 - atomic_t xid_busy;
49098 - atomic_t seq_not_found;
49099 - atomic_t non_bls_resp;
49100 + atomic_unchecked_t no_free_exch;
49101 + atomic_unchecked_t no_free_exch_xid;
49102 + atomic_unchecked_t xid_not_found;
49103 + atomic_unchecked_t xid_busy;
49104 + atomic_unchecked_t seq_not_found;
49105 + atomic_unchecked_t non_bls_resp;
49106 } stats;
49107 };
49108
49109 @@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
49110 /* allocate memory for exchange */
49111 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
49112 if (!ep) {
49113 - atomic_inc(&mp->stats.no_free_exch);
49114 + atomic_inc_unchecked(&mp->stats.no_free_exch);
49115 goto out;
49116 }
49117 memset(ep, 0, sizeof(*ep));
49118 @@ -874,7 +874,7 @@ out:
49119 return ep;
49120 err:
49121 spin_unlock_bh(&pool->lock);
49122 - atomic_inc(&mp->stats.no_free_exch_xid);
49123 + atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
49124 mempool_free(ep, mp->ep_pool);
49125 return NULL;
49126 }
49127 @@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
49128 xid = ntohs(fh->fh_ox_id); /* we originated exch */
49129 ep = fc_exch_find(mp, xid);
49130 if (!ep) {
49131 - atomic_inc(&mp->stats.xid_not_found);
49132 + atomic_inc_unchecked(&mp->stats.xid_not_found);
49133 reject = FC_RJT_OX_ID;
49134 goto out;
49135 }
49136 @@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
49137 ep = fc_exch_find(mp, xid);
49138 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
49139 if (ep) {
49140 - atomic_inc(&mp->stats.xid_busy);
49141 + atomic_inc_unchecked(&mp->stats.xid_busy);
49142 reject = FC_RJT_RX_ID;
49143 goto rel;
49144 }
49145 @@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
49146 }
49147 xid = ep->xid; /* get our XID */
49148 } else if (!ep) {
49149 - atomic_inc(&mp->stats.xid_not_found);
49150 + atomic_inc_unchecked(&mp->stats.xid_not_found);
49151 reject = FC_RJT_RX_ID; /* XID not found */
49152 goto out;
49153 }
49154 @@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
49155 } else {
49156 sp = &ep->seq;
49157 if (sp->id != fh->fh_seq_id) {
49158 - atomic_inc(&mp->stats.seq_not_found);
49159 + atomic_inc_unchecked(&mp->stats.seq_not_found);
49160 if (f_ctl & FC_FC_END_SEQ) {
49161 /*
49162 * Update sequence_id based on incoming last
49163 @@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
49164
49165 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
49166 if (!ep) {
49167 - atomic_inc(&mp->stats.xid_not_found);
49168 + atomic_inc_unchecked(&mp->stats.xid_not_found);
49169 goto out;
49170 }
49171 if (ep->esb_stat & ESB_ST_COMPLETE) {
49172 - atomic_inc(&mp->stats.xid_not_found);
49173 + atomic_inc_unchecked(&mp->stats.xid_not_found);
49174 goto rel;
49175 }
49176 if (ep->rxid == FC_XID_UNKNOWN)
49177 ep->rxid = ntohs(fh->fh_rx_id);
49178 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
49179 - atomic_inc(&mp->stats.xid_not_found);
49180 + atomic_inc_unchecked(&mp->stats.xid_not_found);
49181 goto rel;
49182 }
49183 if (ep->did != ntoh24(fh->fh_s_id) &&
49184 ep->did != FC_FID_FLOGI) {
49185 - atomic_inc(&mp->stats.xid_not_found);
49186 + atomic_inc_unchecked(&mp->stats.xid_not_found);
49187 goto rel;
49188 }
49189 sof = fr_sof(fp);
49190 @@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
49191 sp->ssb_stat |= SSB_ST_RESP;
49192 sp->id = fh->fh_seq_id;
49193 } else if (sp->id != fh->fh_seq_id) {
49194 - atomic_inc(&mp->stats.seq_not_found);
49195 + atomic_inc_unchecked(&mp->stats.seq_not_found);
49196 goto rel;
49197 }
49198
49199 @@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
49200 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
49201
49202 if (!sp)
49203 - atomic_inc(&mp->stats.xid_not_found);
49204 + atomic_inc_unchecked(&mp->stats.xid_not_found);
49205 else
49206 - atomic_inc(&mp->stats.non_bls_resp);
49207 + atomic_inc_unchecked(&mp->stats.non_bls_resp);
49208
49209 fc_frame_free(fp);
49210 }
49211 @@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
49212
49213 list_for_each_entry(ema, &lport->ema_list, ema_list) {
49214 mp = ema->mp;
49215 - st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
49216 + st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
49217 st->fc_no_free_exch_xid +=
49218 - atomic_read(&mp->stats.no_free_exch_xid);
49219 - st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
49220 - st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
49221 - st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
49222 - st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
49223 + atomic_read_unchecked(&mp->stats.no_free_exch_xid);
49224 + st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
49225 + st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
49226 + st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
49227 + st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
49228 }
49229 }
49230 EXPORT_SYMBOL(fc_exch_update_stats);
49231 diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
49232 index 766098a..1c6c971 100644
49233 --- a/drivers/scsi/libsas/sas_ata.c
49234 +++ b/drivers/scsi/libsas/sas_ata.c
49235 @@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
49236 .postreset = ata_std_postreset,
49237 .error_handler = ata_std_error_handler,
49238 .post_internal_cmd = sas_ata_post_internal,
49239 - .qc_defer = ata_std_qc_defer,
49240 + .qc_defer = ata_std_qc_defer,
49241 .qc_prep = ata_noop_qc_prep,
49242 .qc_issue = sas_ata_qc_issue,
49243 .qc_fill_rtf = sas_ata_qc_fill_rtf,
49244 diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
49245 index 94a3caf..a118dec 100644
49246 --- a/drivers/scsi/lpfc/lpfc.h
49247 +++ b/drivers/scsi/lpfc/lpfc.h
49248 @@ -430,7 +430,7 @@ struct lpfc_vport {
49249 struct dentry *debug_nodelist;
49250 struct dentry *vport_debugfs_root;
49251 struct lpfc_debugfs_trc *disc_trc;
49252 - atomic_t disc_trc_cnt;
49253 + atomic_unchecked_t disc_trc_cnt;
49254 #endif
49255 uint8_t stat_data_enabled;
49256 uint8_t stat_data_blocked;
49257 @@ -879,8 +879,8 @@ struct lpfc_hba {
49258 struct timer_list fabric_block_timer;
49259 unsigned long bit_flags;
49260 #define FABRIC_COMANDS_BLOCKED 0
49261 - atomic_t num_rsrc_err;
49262 - atomic_t num_cmd_success;
49263 + atomic_unchecked_t num_rsrc_err;
49264 + atomic_unchecked_t num_cmd_success;
49265 unsigned long last_rsrc_error_time;
49266 unsigned long last_ramp_down_time;
49267 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
49268 @@ -915,7 +915,7 @@ struct lpfc_hba {
49269
49270 struct dentry *debug_slow_ring_trc;
49271 struct lpfc_debugfs_trc *slow_ring_trc;
49272 - atomic_t slow_ring_trc_cnt;
49273 + atomic_unchecked_t slow_ring_trc_cnt;
49274 /* iDiag debugfs sub-directory */
49275 struct dentry *idiag_root;
49276 struct dentry *idiag_pci_cfg;
49277 diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
49278 index 828c08e..e3378e0 100644
49279 --- a/drivers/scsi/lpfc/lpfc_debugfs.c
49280 +++ b/drivers/scsi/lpfc/lpfc_debugfs.c
49281 @@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
49282
49283 #include <linux/debugfs.h>
49284
49285 -static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
49286 +static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
49287 static unsigned long lpfc_debugfs_start_time = 0L;
49288
49289 /* iDiag */
49290 @@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
49291 lpfc_debugfs_enable = 0;
49292
49293 len = 0;
49294 - index = (atomic_read(&vport->disc_trc_cnt) + 1) &
49295 + index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
49296 (lpfc_debugfs_max_disc_trc - 1);
49297 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
49298 dtp = vport->disc_trc + i;
49299 @@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
49300 lpfc_debugfs_enable = 0;
49301
49302 len = 0;
49303 - index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
49304 + index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
49305 (lpfc_debugfs_max_slow_ring_trc - 1);
49306 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
49307 dtp = phba->slow_ring_trc + i;
49308 @@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
49309 !vport || !vport->disc_trc)
49310 return;
49311
49312 - index = atomic_inc_return(&vport->disc_trc_cnt) &
49313 + index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
49314 (lpfc_debugfs_max_disc_trc - 1);
49315 dtp = vport->disc_trc + index;
49316 dtp->fmt = fmt;
49317 dtp->data1 = data1;
49318 dtp->data2 = data2;
49319 dtp->data3 = data3;
49320 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
49321 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
49322 dtp->jif = jiffies;
49323 #endif
49324 return;
49325 @@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
49326 !phba || !phba->slow_ring_trc)
49327 return;
49328
49329 - index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
49330 + index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
49331 (lpfc_debugfs_max_slow_ring_trc - 1);
49332 dtp = phba->slow_ring_trc + index;
49333 dtp->fmt = fmt;
49334 dtp->data1 = data1;
49335 dtp->data2 = data2;
49336 dtp->data3 = data3;
49337 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
49338 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
49339 dtp->jif = jiffies;
49340 #endif
49341 return;
49342 @@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
49343 "slow_ring buffer\n");
49344 goto debug_failed;
49345 }
49346 - atomic_set(&phba->slow_ring_trc_cnt, 0);
49347 + atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
49348 memset(phba->slow_ring_trc, 0,
49349 (sizeof(struct lpfc_debugfs_trc) *
49350 lpfc_debugfs_max_slow_ring_trc));
49351 @@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
49352 "buffer\n");
49353 goto debug_failed;
49354 }
49355 - atomic_set(&vport->disc_trc_cnt, 0);
49356 + atomic_set_unchecked(&vport->disc_trc_cnt, 0);
49357
49358 snprintf(name, sizeof(name), "discovery_trace");
49359 vport->debug_disc_trc =
49360 diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
49361 index 635eeb3..038aef6 100644
49362 --- a/drivers/scsi/lpfc/lpfc_init.c
49363 +++ b/drivers/scsi/lpfc/lpfc_init.c
49364 @@ -11194,8 +11194,10 @@ lpfc_init(void)
49365 "misc_register returned with status %d", error);
49366
49367 if (lpfc_enable_npiv) {
49368 - lpfc_transport_functions.vport_create = lpfc_vport_create;
49369 - lpfc_transport_functions.vport_delete = lpfc_vport_delete;
49370 + pax_open_kernel();
49371 + *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
49372 + *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
49373 + pax_close_kernel();
49374 }
49375 lpfc_transport_template =
49376 fc_attach_transport(&lpfc_transport_functions);
49377 diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
49378 index 462453e..c0023a6 100644
49379 --- a/drivers/scsi/lpfc/lpfc_scsi.c
49380 +++ b/drivers/scsi/lpfc/lpfc_scsi.c
49381 @@ -382,7 +382,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
49382 uint32_t evt_posted;
49383
49384 spin_lock_irqsave(&phba->hbalock, flags);
49385 - atomic_inc(&phba->num_rsrc_err);
49386 + atomic_inc_unchecked(&phba->num_rsrc_err);
49387 phba->last_rsrc_error_time = jiffies;
49388
49389 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
49390 @@ -423,8 +423,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
49391 unsigned long num_rsrc_err, num_cmd_success;
49392 int i;
49393
49394 - num_rsrc_err = atomic_read(&phba->num_rsrc_err);
49395 - num_cmd_success = atomic_read(&phba->num_cmd_success);
49396 + num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
49397 + num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
49398
49399 /*
49400 * The error and success command counters are global per
49401 @@ -452,8 +452,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
49402 }
49403 }
49404 lpfc_destroy_vport_work_array(phba, vports);
49405 - atomic_set(&phba->num_rsrc_err, 0);
49406 - atomic_set(&phba->num_cmd_success, 0);
49407 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
49408 + atomic_set_unchecked(&phba->num_cmd_success, 0);
49409 }
49410
49411 /**
49412 diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
49413 index 6fd7d40..b444223 100644
49414 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
49415 +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
49416 @@ -1557,7 +1557,7 @@ _scsih_get_resync(struct device *dev)
49417 {
49418 struct scsi_device *sdev = to_scsi_device(dev);
49419 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
49420 - static struct _raid_device *raid_device;
49421 + struct _raid_device *raid_device;
49422 unsigned long flags;
49423 Mpi2RaidVolPage0_t vol_pg0;
49424 Mpi2ConfigReply_t mpi_reply;
49425 @@ -1609,7 +1609,7 @@ _scsih_get_state(struct device *dev)
49426 {
49427 struct scsi_device *sdev = to_scsi_device(dev);
49428 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
49429 - static struct _raid_device *raid_device;
49430 + struct _raid_device *raid_device;
49431 unsigned long flags;
49432 Mpi2RaidVolPage0_t vol_pg0;
49433 Mpi2ConfigReply_t mpi_reply;
49434 @@ -6637,7 +6637,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
49435 struct fw_event_work *fw_event)
49436 {
49437 Mpi2EventDataIrOperationStatus_t *event_data = fw_event->event_data;
49438 - static struct _raid_device *raid_device;
49439 + struct _raid_device *raid_device;
49440 unsigned long flags;
49441 u16 handle;
49442
49443 @@ -7108,7 +7108,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
49444 u64 sas_address;
49445 struct _sas_device *sas_device;
49446 struct _sas_node *expander_device;
49447 - static struct _raid_device *raid_device;
49448 + struct _raid_device *raid_device;
49449 u8 retry_count;
49450 unsigned long flags;
49451
49452 diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
49453 index be8ce54..94ed33a 100644
49454 --- a/drivers/scsi/pmcraid.c
49455 +++ b/drivers/scsi/pmcraid.c
49456 @@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
49457 res->scsi_dev = scsi_dev;
49458 scsi_dev->hostdata = res;
49459 res->change_detected = 0;
49460 - atomic_set(&res->read_failures, 0);
49461 - atomic_set(&res->write_failures, 0);
49462 + atomic_set_unchecked(&res->read_failures, 0);
49463 + atomic_set_unchecked(&res->write_failures, 0);
49464 rc = 0;
49465 }
49466 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
49467 @@ -2687,9 +2687,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
49468
49469 /* If this was a SCSI read/write command keep count of errors */
49470 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
49471 - atomic_inc(&res->read_failures);
49472 + atomic_inc_unchecked(&res->read_failures);
49473 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
49474 - atomic_inc(&res->write_failures);
49475 + atomic_inc_unchecked(&res->write_failures);
49476
49477 if (!RES_IS_GSCSI(res->cfg_entry) &&
49478 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
49479 @@ -3545,7 +3545,7 @@ static int pmcraid_queuecommand_lck(
49480 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
49481 * hrrq_id assigned here in queuecommand
49482 */
49483 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
49484 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
49485 pinstance->num_hrrq;
49486 cmd->cmd_done = pmcraid_io_done;
49487
49488 @@ -3857,7 +3857,7 @@ static long pmcraid_ioctl_passthrough(
49489 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
49490 * hrrq_id assigned here in queuecommand
49491 */
49492 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
49493 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
49494 pinstance->num_hrrq;
49495
49496 if (request_size) {
49497 @@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
49498
49499 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
49500 /* add resources only after host is added into system */
49501 - if (!atomic_read(&pinstance->expose_resources))
49502 + if (!atomic_read_unchecked(&pinstance->expose_resources))
49503 return;
49504
49505 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
49506 @@ -5322,8 +5322,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
49507 init_waitqueue_head(&pinstance->reset_wait_q);
49508
49509 atomic_set(&pinstance->outstanding_cmds, 0);
49510 - atomic_set(&pinstance->last_message_id, 0);
49511 - atomic_set(&pinstance->expose_resources, 0);
49512 + atomic_set_unchecked(&pinstance->last_message_id, 0);
49513 + atomic_set_unchecked(&pinstance->expose_resources, 0);
49514
49515 INIT_LIST_HEAD(&pinstance->free_res_q);
49516 INIT_LIST_HEAD(&pinstance->used_res_q);
49517 @@ -6036,7 +6036,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
49518 /* Schedule worker thread to handle CCN and take care of adding and
49519 * removing devices to OS
49520 */
49521 - atomic_set(&pinstance->expose_resources, 1);
49522 + atomic_set_unchecked(&pinstance->expose_resources, 1);
49523 schedule_work(&pinstance->worker_q);
49524 return rc;
49525
49526 diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
49527 index e1d150f..6c6df44 100644
49528 --- a/drivers/scsi/pmcraid.h
49529 +++ b/drivers/scsi/pmcraid.h
49530 @@ -748,7 +748,7 @@ struct pmcraid_instance {
49531 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
49532
49533 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
49534 - atomic_t last_message_id;
49535 + atomic_unchecked_t last_message_id;
49536
49537 /* configuration table */
49538 struct pmcraid_config_table *cfg_table;
49539 @@ -777,7 +777,7 @@ struct pmcraid_instance {
49540 atomic_t outstanding_cmds;
49541
49542 /* should add/delete resources to mid-layer now ?*/
49543 - atomic_t expose_resources;
49544 + atomic_unchecked_t expose_resources;
49545
49546
49547
49548 @@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
49549 struct pmcraid_config_table_entry_ext cfg_entry_ext;
49550 };
49551 struct scsi_device *scsi_dev; /* Link scsi_device structure */
49552 - atomic_t read_failures; /* count of failed READ commands */
49553 - atomic_t write_failures; /* count of failed WRITE commands */
49554 + atomic_unchecked_t read_failures; /* count of failed READ commands */
49555 + atomic_unchecked_t write_failures; /* count of failed WRITE commands */
49556
49557 /* To indicate add/delete/modify during CCN */
49558 u8 change_detected;
49559 diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
49560 index 07befcf..c0bff13 100644
49561 --- a/drivers/scsi/qla2xxx/qla_attr.c
49562 +++ b/drivers/scsi/qla2xxx/qla_attr.c
49563 @@ -2188,7 +2188,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
49564 return 0;
49565 }
49566
49567 -struct fc_function_template qla2xxx_transport_functions = {
49568 +fc_function_template_no_const qla2xxx_transport_functions = {
49569
49570 .show_host_node_name = 1,
49571 .show_host_port_name = 1,
49572 @@ -2236,7 +2236,7 @@ struct fc_function_template qla2xxx_transport_functions = {
49573 .bsg_timeout = qla24xx_bsg_timeout,
49574 };
49575
49576 -struct fc_function_template qla2xxx_transport_vport_functions = {
49577 +fc_function_template_no_const qla2xxx_transport_vport_functions = {
49578
49579 .show_host_node_name = 1,
49580 .show_host_port_name = 1,
49581 diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
49582 index e665e81..16e84e6 100644
49583 --- a/drivers/scsi/qla2xxx/qla_gbl.h
49584 +++ b/drivers/scsi/qla2xxx/qla_gbl.h
49585 @@ -557,8 +557,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
49586 struct device_attribute;
49587 extern struct device_attribute *qla2x00_host_attrs[];
49588 struct fc_function_template;
49589 -extern struct fc_function_template qla2xxx_transport_functions;
49590 -extern struct fc_function_template qla2xxx_transport_vport_functions;
49591 +extern fc_function_template_no_const qla2xxx_transport_functions;
49592 +extern fc_function_template_no_const qla2xxx_transport_vport_functions;
49593 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
49594 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
49595 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
49596 diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
49597 index 19e99cc..b3c0b7b 100644
49598 --- a/drivers/scsi/qla2xxx/qla_os.c
49599 +++ b/drivers/scsi/qla2xxx/qla_os.c
49600 @@ -1493,8 +1493,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
49601 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
49602 /* Ok, a 64bit DMA mask is applicable. */
49603 ha->flags.enable_64bit_addressing = 1;
49604 - ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
49605 - ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
49606 + pax_open_kernel();
49607 + *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
49608 + *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
49609 + pax_close_kernel();
49610 return;
49611 }
49612 }
49613 diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
49614 index 73a5022..4e0797c 100644
49615 --- a/drivers/scsi/qla4xxx/ql4_def.h
49616 +++ b/drivers/scsi/qla4xxx/ql4_def.h
49617 @@ -305,7 +305,7 @@ struct ddb_entry {
49618 * (4000 only) */
49619 atomic_t relogin_timer; /* Max Time to wait for
49620 * relogin to complete */
49621 - atomic_t relogin_retry_count; /* Num of times relogin has been
49622 + atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
49623 * retried */
49624 uint32_t default_time2wait; /* Default Min time between
49625 * relogins (+aens) */
49626 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
49627 index 459b9f7..2930a68 100644
49628 --- a/drivers/scsi/qla4xxx/ql4_os.c
49629 +++ b/drivers/scsi/qla4xxx/ql4_os.c
49630 @@ -4499,12 +4499,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
49631 */
49632 if (!iscsi_is_session_online(cls_sess)) {
49633 /* Reset retry relogin timer */
49634 - atomic_inc(&ddb_entry->relogin_retry_count);
49635 + atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
49636 DEBUG2(ql4_printk(KERN_INFO, ha,
49637 "%s: index[%d] relogin timed out-retrying"
49638 " relogin (%d), retry (%d)\n", __func__,
49639 ddb_entry->fw_ddb_index,
49640 - atomic_read(&ddb_entry->relogin_retry_count),
49641 + atomic_read_unchecked(&ddb_entry->relogin_retry_count),
49642 ddb_entry->default_time2wait + 4));
49643 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
49644 atomic_set(&ddb_entry->retry_relogin_timer,
49645 @@ -6609,7 +6609,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
49646
49647 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
49648 atomic_set(&ddb_entry->relogin_timer, 0);
49649 - atomic_set(&ddb_entry->relogin_retry_count, 0);
49650 + atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
49651 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
49652 ddb_entry->default_relogin_timeout =
49653 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
49654 diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
49655 index 88d46fe..7351be5 100644
49656 --- a/drivers/scsi/scsi.c
49657 +++ b/drivers/scsi/scsi.c
49658 @@ -640,7 +640,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
49659 struct Scsi_Host *host = cmd->device->host;
49660 int rtn = 0;
49661
49662 - atomic_inc(&cmd->device->iorequest_cnt);
49663 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
49664
49665 /* check if the device is still usable */
49666 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
49667 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
49668 index 9db097a..ca5c291 100644
49669 --- a/drivers/scsi/scsi_lib.c
49670 +++ b/drivers/scsi/scsi_lib.c
49671 @@ -1464,7 +1464,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
49672 shost = sdev->host;
49673 scsi_init_cmd_errh(cmd);
49674 cmd->result = DID_NO_CONNECT << 16;
49675 - atomic_inc(&cmd->device->iorequest_cnt);
49676 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
49677
49678 /*
49679 * SCSI request completion path will do scsi_device_unbusy(),
49680 @@ -1490,9 +1490,9 @@ static void scsi_softirq_done(struct request *rq)
49681
49682 INIT_LIST_HEAD(&cmd->eh_entry);
49683
49684 - atomic_inc(&cmd->device->iodone_cnt);
49685 + atomic_inc_unchecked(&cmd->device->iodone_cnt);
49686 if (cmd->result)
49687 - atomic_inc(&cmd->device->ioerr_cnt);
49688 + atomic_inc_unchecked(&cmd->device->ioerr_cnt);
49689
49690 disposition = scsi_decide_disposition(cmd);
49691 if (disposition != SUCCESS &&
49692 diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
49693 index 074e8cc..f612e5c 100644
49694 --- a/drivers/scsi/scsi_sysfs.c
49695 +++ b/drivers/scsi/scsi_sysfs.c
49696 @@ -780,7 +780,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
49697 char *buf) \
49698 { \
49699 struct scsi_device *sdev = to_scsi_device(dev); \
49700 - unsigned long long count = atomic_read(&sdev->field); \
49701 + unsigned long long count = atomic_read_unchecked(&sdev->field); \
49702 return snprintf(buf, 20, "0x%llx\n", count); \
49703 } \
49704 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
49705 diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
49706 index e51add0..1e06a96 100644
49707 --- a/drivers/scsi/scsi_tgt_lib.c
49708 +++ b/drivers/scsi/scsi_tgt_lib.c
49709 @@ -363,7 +363,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
49710 int err;
49711
49712 dprintk("%lx %u\n", uaddr, len);
49713 - err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
49714 + err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
49715 if (err) {
49716 /*
49717 * TODO: need to fixup sg_tablesize, max_segment_size,
49718 diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
49719 index f80908f..22aba76 100644
49720 --- a/drivers/scsi/scsi_transport_fc.c
49721 +++ b/drivers/scsi/scsi_transport_fc.c
49722 @@ -498,7 +498,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
49723 * Netlink Infrastructure
49724 */
49725
49726 -static atomic_t fc_event_seq;
49727 +static atomic_unchecked_t fc_event_seq;
49728
49729 /**
49730 * fc_get_event_number - Obtain the next sequential FC event number
49731 @@ -511,7 +511,7 @@ static atomic_t fc_event_seq;
49732 u32
49733 fc_get_event_number(void)
49734 {
49735 - return atomic_add_return(1, &fc_event_seq);
49736 + return atomic_add_return_unchecked(1, &fc_event_seq);
49737 }
49738 EXPORT_SYMBOL(fc_get_event_number);
49739
49740 @@ -655,7 +655,7 @@ static __init int fc_transport_init(void)
49741 {
49742 int error;
49743
49744 - atomic_set(&fc_event_seq, 0);
49745 + atomic_set_unchecked(&fc_event_seq, 0);
49746
49747 error = transport_class_register(&fc_host_class);
49748 if (error)
49749 @@ -845,7 +845,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
49750 char *cp;
49751
49752 *val = simple_strtoul(buf, &cp, 0);
49753 - if ((*cp && (*cp != '\n')) || (*val < 0))
49754 + if (*cp && (*cp != '\n'))
49755 return -EINVAL;
49756 /*
49757 * Check for overflow; dev_loss_tmo is u32
49758 diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
49759 index 0102a2d..cc3f8e9 100644
49760 --- a/drivers/scsi/scsi_transport_iscsi.c
49761 +++ b/drivers/scsi/scsi_transport_iscsi.c
49762 @@ -79,7 +79,7 @@ struct iscsi_internal {
49763 struct transport_container session_cont;
49764 };
49765
49766 -static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
49767 +static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
49768 static struct workqueue_struct *iscsi_eh_timer_workq;
49769
49770 static DEFINE_IDA(iscsi_sess_ida);
49771 @@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
49772 int err;
49773
49774 ihost = shost->shost_data;
49775 - session->sid = atomic_add_return(1, &iscsi_session_nr);
49776 + session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
49777
49778 if (target_id == ISCSI_MAX_TARGET) {
49779 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
49780 @@ -4511,7 +4511,7 @@ static __init int iscsi_transport_init(void)
49781 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
49782 ISCSI_TRANSPORT_VERSION);
49783
49784 - atomic_set(&iscsi_session_nr, 0);
49785 + atomic_set_unchecked(&iscsi_session_nr, 0);
49786
49787 err = class_register(&iscsi_transport_class);
49788 if (err)
49789 diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
49790 index 13e8983..d306a68 100644
49791 --- a/drivers/scsi/scsi_transport_srp.c
49792 +++ b/drivers/scsi/scsi_transport_srp.c
49793 @@ -36,7 +36,7 @@
49794 #include "scsi_transport_srp_internal.h"
49795
49796 struct srp_host_attrs {
49797 - atomic_t next_port_id;
49798 + atomic_unchecked_t next_port_id;
49799 };
49800 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
49801
49802 @@ -101,7 +101,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
49803 struct Scsi_Host *shost = dev_to_shost(dev);
49804 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
49805
49806 - atomic_set(&srp_host->next_port_id, 0);
49807 + atomic_set_unchecked(&srp_host->next_port_id, 0);
49808 return 0;
49809 }
49810
49811 @@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
49812 rport_fast_io_fail_timedout);
49813 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
49814
49815 - id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
49816 + id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
49817 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
49818
49819 transport_setup_device(&rport->dev);
49820 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
49821 index bffbd4b..cb1b68a 100644
49822 --- a/drivers/scsi/sd.c
49823 +++ b/drivers/scsi/sd.c
49824 @@ -2971,7 +2971,7 @@ static int sd_probe(struct device *dev)
49825 sdkp->disk = gd;
49826 sdkp->index = index;
49827 atomic_set(&sdkp->openers, 0);
49828 - atomic_set(&sdkp->device->ioerr_cnt, 0);
49829 + atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
49830
49831 if (!sdp->request_queue->rq_timeout) {
49832 if (sdp->type != TYPE_MOD)
49833 diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
49834 index df5e961..df6b97f 100644
49835 --- a/drivers/scsi/sg.c
49836 +++ b/drivers/scsi/sg.c
49837 @@ -1102,7 +1102,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
49838 sdp->disk->disk_name,
49839 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
49840 NULL,
49841 - (char *)arg);
49842 + (char __user *)arg);
49843 case BLKTRACESTART:
49844 return blk_trace_startstop(sdp->device->request_queue, 1);
49845 case BLKTRACESTOP:
49846 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
49847 index 939edf4..3f50423 100644
49848 --- a/drivers/spi/spi.c
49849 +++ b/drivers/spi/spi.c
49850 @@ -2204,7 +2204,7 @@ int spi_bus_unlock(struct spi_master *master)
49851 EXPORT_SYMBOL_GPL(spi_bus_unlock);
49852
49853 /* portable code must never pass more than 32 bytes */
49854 -#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
49855 +#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
49856
49857 static u8 *buf;
49858
49859 diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
49860 index 2c61783..4d49e4e 100644
49861 --- a/drivers/staging/android/timed_output.c
49862 +++ b/drivers/staging/android/timed_output.c
49863 @@ -25,7 +25,7 @@
49864 #include "timed_output.h"
49865
49866 static struct class *timed_output_class;
49867 -static atomic_t device_count;
49868 +static atomic_unchecked_t device_count;
49869
49870 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
49871 char *buf)
49872 @@ -63,7 +63,7 @@ static int create_timed_output_class(void)
49873 timed_output_class = class_create(THIS_MODULE, "timed_output");
49874 if (IS_ERR(timed_output_class))
49875 return PTR_ERR(timed_output_class);
49876 - atomic_set(&device_count, 0);
49877 + atomic_set_unchecked(&device_count, 0);
49878 timed_output_class->dev_groups = timed_output_groups;
49879 }
49880
49881 @@ -81,7 +81,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
49882 if (ret < 0)
49883 return ret;
49884
49885 - tdev->index = atomic_inc_return(&device_count);
49886 + tdev->index = atomic_inc_return_unchecked(&device_count);
49887 tdev->dev = device_create(timed_output_class, NULL,
49888 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
49889 if (IS_ERR(tdev->dev))
49890 diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
49891 index fe47cd3..19a1bd1 100644
49892 --- a/drivers/staging/gdm724x/gdm_tty.c
49893 +++ b/drivers/staging/gdm724x/gdm_tty.c
49894 @@ -44,7 +44,7 @@
49895 #define gdm_tty_send_control(n, r, v, d, l) (\
49896 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
49897
49898 -#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
49899 +#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
49900
49901 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
49902 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
49903 diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
49904 index c270c9a..94ddf82 100644
49905 --- a/drivers/staging/imx-drm/imx-drm-core.c
49906 +++ b/drivers/staging/imx-drm/imx-drm-core.c
49907 @@ -362,7 +362,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
49908 if (imxdrm->pipes >= MAX_CRTC)
49909 return -EINVAL;
49910
49911 - if (imxdrm->drm->open_count)
49912 + if (local_read(&imxdrm->drm->open_count))
49913 return -EBUSY;
49914
49915 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
49916 diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
49917 index 3f8020c..649fded 100644
49918 --- a/drivers/staging/lustre/lnet/selftest/brw_test.c
49919 +++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
49920 @@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
49921 return 0;
49922 }
49923
49924 -sfw_test_client_ops_t brw_test_client;
49925 -void brw_init_test_client(void)
49926 -{
49927 - brw_test_client.tso_init = brw_client_init;
49928 - brw_test_client.tso_fini = brw_client_fini;
49929 - brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
49930 - brw_test_client.tso_done_rpc = brw_client_done_rpc;
49931 +sfw_test_client_ops_t brw_test_client = {
49932 + .tso_init = brw_client_init,
49933 + .tso_fini = brw_client_fini,
49934 + .tso_prep_rpc = brw_client_prep_rpc,
49935 + .tso_done_rpc = brw_client_done_rpc,
49936 };
49937
49938 srpc_service_t brw_test_service;
49939 diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
49940 index 050723a..fa6fdf1 100644
49941 --- a/drivers/staging/lustre/lnet/selftest/framework.c
49942 +++ b/drivers/staging/lustre/lnet/selftest/framework.c
49943 @@ -1635,12 +1635,10 @@ static srpc_service_t sfw_services[] =
49944
49945 extern sfw_test_client_ops_t ping_test_client;
49946 extern srpc_service_t ping_test_service;
49947 -extern void ping_init_test_client(void);
49948 extern void ping_init_test_service(void);
49949
49950 extern sfw_test_client_ops_t brw_test_client;
49951 extern srpc_service_t brw_test_service;
49952 -extern void brw_init_test_client(void);
49953 extern void brw_init_test_service(void);
49954
49955
49956 @@ -1684,12 +1682,10 @@ sfw_startup (void)
49957 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
49958 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
49959
49960 - brw_init_test_client();
49961 brw_init_test_service();
49962 rc = sfw_register_test(&brw_test_service, &brw_test_client);
49963 LASSERT (rc == 0);
49964
49965 - ping_init_test_client();
49966 ping_init_test_service();
49967 rc = sfw_register_test(&ping_test_service, &ping_test_client);
49968 LASSERT (rc == 0);
49969 diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
49970 index 750cac4..e4d751f 100644
49971 --- a/drivers/staging/lustre/lnet/selftest/ping_test.c
49972 +++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
49973 @@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
49974 return 0;
49975 }
49976
49977 -sfw_test_client_ops_t ping_test_client;
49978 -void ping_init_test_client(void)
49979 -{
49980 - ping_test_client.tso_init = ping_client_init;
49981 - ping_test_client.tso_fini = ping_client_fini;
49982 - ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
49983 - ping_test_client.tso_done_rpc = ping_client_done_rpc;
49984 -}
49985 +sfw_test_client_ops_t ping_test_client = {
49986 + .tso_init = ping_client_init,
49987 + .tso_fini = ping_client_fini,
49988 + .tso_prep_rpc = ping_client_prep_rpc,
49989 + .tso_done_rpc = ping_client_done_rpc,
49990 +};
49991
49992 srpc_service_t ping_test_service;
49993 void ping_init_test_service(void)
49994 diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
49995 index 3e25f00..0d59cf5 100644
49996 --- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
49997 +++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
49998 @@ -1141,7 +1141,7 @@ struct ldlm_callback_suite {
49999 ldlm_completion_callback lcs_completion;
50000 ldlm_blocking_callback lcs_blocking;
50001 ldlm_glimpse_callback lcs_glimpse;
50002 -};
50003 +} __no_const;
50004
50005 /* ldlm_lockd.c */
50006 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
50007 diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
50008 index 72cf3fe..4beac19 100644
50009 --- a/drivers/staging/lustre/lustre/include/obd.h
50010 +++ b/drivers/staging/lustre/lustre/include/obd.h
50011 @@ -1427,7 +1427,7 @@ struct md_ops {
50012 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
50013 * wrapper function in include/linux/obd_class.h.
50014 */
50015 -};
50016 +} __no_const;
50017
50018 struct lsm_operations {
50019 void (*lsm_free)(struct lov_stripe_md *);
50020 diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
50021 index 986bf38..eab2558f 100644
50022 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
50023 +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
50024 @@ -259,7 +259,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
50025 int added = (mode == LCK_NL);
50026 int overlaps = 0;
50027 int splitted = 0;
50028 - const struct ldlm_callback_suite null_cbs = { NULL };
50029 + const struct ldlm_callback_suite null_cbs = { };
50030
50031 CDEBUG(D_DLMTRACE, "flags %#llx owner "LPU64" pid %u mode %u start "
50032 LPU64" end "LPU64"\n", *flags,
50033 diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
50034 index e947b91..f408990 100644
50035 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
50036 +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
50037 @@ -217,7 +217,7 @@ DECLARE_PROC_HANDLER(proc_debug_mb)
50038 int LL_PROC_PROTO(proc_console_max_delay_cs)
50039 {
50040 int rc, max_delay_cs;
50041 - ctl_table_t dummy = *table;
50042 + ctl_table_no_const dummy = *table;
50043 cfs_duration_t d;
50044
50045 dummy.data = &max_delay_cs;
50046 @@ -248,7 +248,7 @@ int LL_PROC_PROTO(proc_console_max_delay_cs)
50047 int LL_PROC_PROTO(proc_console_min_delay_cs)
50048 {
50049 int rc, min_delay_cs;
50050 - ctl_table_t dummy = *table;
50051 + ctl_table_no_const dummy = *table;
50052 cfs_duration_t d;
50053
50054 dummy.data = &min_delay_cs;
50055 @@ -279,7 +279,7 @@ int LL_PROC_PROTO(proc_console_min_delay_cs)
50056 int LL_PROC_PROTO(proc_console_backoff)
50057 {
50058 int rc, backoff;
50059 - ctl_table_t dummy = *table;
50060 + ctl_table_no_const dummy = *table;
50061
50062 dummy.data = &backoff;
50063 dummy.proc_handler = &proc_dointvec;
50064 diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
50065 index 24ae26d..9d09cab 100644
50066 --- a/drivers/staging/lustre/lustre/libcfs/module.c
50067 +++ b/drivers/staging/lustre/lustre/libcfs/module.c
50068 @@ -313,11 +313,11 @@ out:
50069
50070
50071 struct cfs_psdev_ops libcfs_psdev_ops = {
50072 - libcfs_psdev_open,
50073 - libcfs_psdev_release,
50074 - NULL,
50075 - NULL,
50076 - libcfs_ioctl
50077 + .p_open = libcfs_psdev_open,
50078 + .p_close = libcfs_psdev_release,
50079 + .p_read = NULL,
50080 + .p_write = NULL,
50081 + .p_ioctl = libcfs_ioctl
50082 };
50083
50084 extern int insert_proc(void);
50085 diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
50086 index 7fbc18e..f982071 100644
50087 --- a/drivers/staging/lustre/lustre/llite/dir.c
50088 +++ b/drivers/staging/lustre/lustre/llite/dir.c
50089 @@ -660,7 +660,7 @@ int ll_dir_setdirstripe(struct inode *dir, struct lmv_user_md *lump,
50090 int mode;
50091 int err;
50092
50093 - mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
50094 + mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current_umask()) | S_IFDIR;
50095 op_data = ll_prep_md_op_data(NULL, dir, NULL, filename,
50096 strlen(filename), mode, LUSTRE_OPC_MKDIR,
50097 lump);
50098 diff --git a/drivers/staging/media/solo6x10/solo6x10-core.c b/drivers/staging/media/solo6x10/solo6x10-core.c
50099 index f670469..03b7438 100644
50100 --- a/drivers/staging/media/solo6x10/solo6x10-core.c
50101 +++ b/drivers/staging/media/solo6x10/solo6x10-core.c
50102 @@ -434,7 +434,7 @@ static void solo_device_release(struct device *dev)
50103
50104 static int solo_sysfs_init(struct solo_dev *solo_dev)
50105 {
50106 - struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
50107 + bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
50108 struct device *dev = &solo_dev->dev;
50109 const char *driver;
50110 int i;
50111 diff --git a/drivers/staging/media/solo6x10/solo6x10-g723.c b/drivers/staging/media/solo6x10/solo6x10-g723.c
50112 index 74f037b..5b5bb76 100644
50113 --- a/drivers/staging/media/solo6x10/solo6x10-g723.c
50114 +++ b/drivers/staging/media/solo6x10/solo6x10-g723.c
50115 @@ -355,7 +355,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
50116
50117 int solo_g723_init(struct solo_dev *solo_dev)
50118 {
50119 - static struct snd_device_ops ops = { NULL };
50120 + static struct snd_device_ops ops = { };
50121 struct snd_card *card;
50122 struct snd_kcontrol_new kctl;
50123 char name[32];
50124 diff --git a/drivers/staging/media/solo6x10/solo6x10-p2m.c b/drivers/staging/media/solo6x10/solo6x10-p2m.c
50125 index 7f2f247..d999137 100644
50126 --- a/drivers/staging/media/solo6x10/solo6x10-p2m.c
50127 +++ b/drivers/staging/media/solo6x10/solo6x10-p2m.c
50128 @@ -77,7 +77,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
50129
50130 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
50131 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
50132 - p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
50133 + p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
50134 if (p2m_id < 0)
50135 p2m_id = -p2m_id;
50136 }
50137 diff --git a/drivers/staging/media/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h
50138 index 8964f8b..36eb087 100644
50139 --- a/drivers/staging/media/solo6x10/solo6x10.h
50140 +++ b/drivers/staging/media/solo6x10/solo6x10.h
50141 @@ -237,7 +237,7 @@ struct solo_dev {
50142
50143 /* P2M DMA Engine */
50144 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
50145 - atomic_t p2m_count;
50146 + atomic_unchecked_t p2m_count;
50147 int p2m_jiffies;
50148 unsigned int p2m_timeouts;
50149
50150 diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
50151 index a0f4868..139f1fb 100644
50152 --- a/drivers/staging/octeon/ethernet-rx.c
50153 +++ b/drivers/staging/octeon/ethernet-rx.c
50154 @@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
50155 /* Increment RX stats for virtual ports */
50156 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
50157 #ifdef CONFIG_64BIT
50158 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
50159 - atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
50160 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
50161 + atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
50162 #else
50163 - atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
50164 - atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
50165 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
50166 + atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
50167 #endif
50168 }
50169 netif_receive_skb(skb);
50170 @@ -432,9 +432,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
50171 dev->name);
50172 */
50173 #ifdef CONFIG_64BIT
50174 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
50175 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
50176 #else
50177 - atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
50178 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
50179 #endif
50180 dev_kfree_skb_irq(skb);
50181 }
50182 diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
50183 index ff7214a..6dd90f0 100644
50184 --- a/drivers/staging/octeon/ethernet.c
50185 +++ b/drivers/staging/octeon/ethernet.c
50186 @@ -247,11 +247,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
50187 * since the RX tasklet also increments it.
50188 */
50189 #ifdef CONFIG_64BIT
50190 - atomic64_add(rx_status.dropped_packets,
50191 - (atomic64_t *)&priv->stats.rx_dropped);
50192 + atomic64_add_unchecked(rx_status.dropped_packets,
50193 + (atomic64_unchecked_t *)&priv->stats.rx_dropped);
50194 #else
50195 - atomic_add(rx_status.dropped_packets,
50196 - (atomic_t *)&priv->stats.rx_dropped);
50197 + atomic_add_unchecked(rx_status.dropped_packets,
50198 + (atomic_unchecked_t *)&priv->stats.rx_dropped);
50199 #endif
50200 }
50201
50202 diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
50203 index c274b34..f84de76 100644
50204 --- a/drivers/staging/rtl8188eu/include/hal_intf.h
50205 +++ b/drivers/staging/rtl8188eu/include/hal_intf.h
50206 @@ -271,7 +271,7 @@ struct hal_ops {
50207 s32 (*c2h_handler)(struct adapter *padapter,
50208 struct c2h_evt_hdr *c2h_evt);
50209 c2h_id_filter c2h_id_filter_ccx;
50210 -};
50211 +} __no_const;
50212
50213 enum rt_eeprom_type {
50214 EEPROM_93C46,
50215 diff --git a/drivers/staging/rtl8188eu/include/rtw_io.h b/drivers/staging/rtl8188eu/include/rtw_io.h
50216 index e8790f8..b4a5980 100644
50217 --- a/drivers/staging/rtl8188eu/include/rtw_io.h
50218 +++ b/drivers/staging/rtl8188eu/include/rtw_io.h
50219 @@ -124,7 +124,7 @@ struct _io_ops {
50220 u32 (*_write_scsi)(struct intf_hdl *pintfhdl, u32 cnt, u8 *pmem);
50221 void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
50222 void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
50223 -};
50224 +} __no_const;
50225
50226 struct io_req {
50227 struct list_head list;
50228 diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
50229 index dc23395..cf7e9b1 100644
50230 --- a/drivers/staging/rtl8712/rtl871x_io.h
50231 +++ b/drivers/staging/rtl8712/rtl871x_io.h
50232 @@ -108,7 +108,7 @@ struct _io_ops {
50233 u8 *pmem);
50234 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
50235 u8 *pmem);
50236 -};
50237 +} __no_const;
50238
50239 struct io_req {
50240 struct list_head list;
50241 diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
50242 index d183f4b..3f4903d 100644
50243 --- a/drivers/staging/rtl8723au/include/hal_intf.h
50244 +++ b/drivers/staging/rtl8723au/include/hal_intf.h
50245 @@ -251,7 +251,7 @@ struct hal_ops {
50246 void (*hal_reset_security_engine)(struct rtw_adapter *adapter);
50247 s32 (*c2h_handler)(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt);
50248 c2h_id_filter c2h_id_filter_ccx;
50249 -};
50250 +} __no_const;
50251
50252 enum rt_eeprom_type {
50253 EEPROM_93C46,
50254 diff --git a/drivers/staging/rtl8723au/include/rtw_io.h b/drivers/staging/rtl8723au/include/rtw_io.h
50255 index 8d39d800..3f21c0c 100644
50256 --- a/drivers/staging/rtl8723au/include/rtw_io.h
50257 +++ b/drivers/staging/rtl8723au/include/rtw_io.h
50258 @@ -130,7 +130,7 @@ struct _io_ops
50259 void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
50260 void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
50261
50262 -};
50263 +} __no_const;
50264
50265 struct io_req {
50266 struct list_head list;
50267 diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
50268 index fe6c951..72935ba 100644
50269 --- a/drivers/staging/sbe-2t3e3/netdev.c
50270 +++ b/drivers/staging/sbe-2t3e3/netdev.c
50271 @@ -51,7 +51,7 @@ static int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
50272 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
50273
50274 if (rlen)
50275 - if (copy_to_user(data, &resp, rlen))
50276 + if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
50277 return -EFAULT;
50278
50279 return 0;
50280 diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
50281 index a863a98..d272795 100644
50282 --- a/drivers/staging/usbip/vhci.h
50283 +++ b/drivers/staging/usbip/vhci.h
50284 @@ -83,7 +83,7 @@ struct vhci_hcd {
50285 unsigned resuming:1;
50286 unsigned long re_timeout;
50287
50288 - atomic_t seqnum;
50289 + atomic_unchecked_t seqnum;
50290
50291 /*
50292 * NOTE:
50293 diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
50294 index 70e1755..de41855 100644
50295 --- a/drivers/staging/usbip/vhci_hcd.c
50296 +++ b/drivers/staging/usbip/vhci_hcd.c
50297 @@ -439,7 +439,7 @@ static void vhci_tx_urb(struct urb *urb)
50298
50299 spin_lock(&vdev->priv_lock);
50300
50301 - priv->seqnum = atomic_inc_return(&the_controller->seqnum);
50302 + priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
50303 if (priv->seqnum == 0xffff)
50304 dev_info(&urb->dev->dev, "seqnum max\n");
50305
50306 @@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
50307 return -ENOMEM;
50308 }
50309
50310 - unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
50311 + unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
50312 if (unlink->seqnum == 0xffff)
50313 pr_info("seqnum max\n");
50314
50315 @@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
50316 vdev->rhport = rhport;
50317 }
50318
50319 - atomic_set(&vhci->seqnum, 0);
50320 + atomic_set_unchecked(&vhci->seqnum, 0);
50321 spin_lock_init(&vhci->lock);
50322
50323 hcd->power_budget = 0; /* no limit */
50324 diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
50325 index d07fcb5..358e1e1 100644
50326 --- a/drivers/staging/usbip/vhci_rx.c
50327 +++ b/drivers/staging/usbip/vhci_rx.c
50328 @@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
50329 if (!urb) {
50330 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
50331 pr_info("max seqnum %d\n",
50332 - atomic_read(&the_controller->seqnum));
50333 + atomic_read_unchecked(&the_controller->seqnum));
50334 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
50335 return;
50336 }
50337 diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
50338 index 6eecd53..29317c6 100644
50339 --- a/drivers/staging/vt6655/hostap.c
50340 +++ b/drivers/staging/vt6655/hostap.c
50341 @@ -69,14 +69,13 @@ static int msglevel = MSG_LEVEL_INFO;
50342 *
50343 */
50344
50345 +static net_device_ops_no_const apdev_netdev_ops;
50346 +
50347 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
50348 {
50349 PSDevice apdev_priv;
50350 struct net_device *dev = pDevice->dev;
50351 int ret;
50352 - const struct net_device_ops apdev_netdev_ops = {
50353 - .ndo_start_xmit = pDevice->tx_80211,
50354 - };
50355
50356 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
50357
50358 @@ -88,6 +87,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
50359 *apdev_priv = *pDevice;
50360 eth_hw_addr_inherit(pDevice->apdev, dev);
50361
50362 + /* only half broken now */
50363 + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
50364 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
50365
50366 pDevice->apdev->type = ARPHRD_IEEE80211;
50367 diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
50368 index 67ba48b..24e602f 100644
50369 --- a/drivers/staging/vt6656/hostap.c
50370 +++ b/drivers/staging/vt6656/hostap.c
50371 @@ -60,14 +60,13 @@ static int msglevel =MSG_LEVEL_INFO;
50372 *
50373 */
50374
50375 +static net_device_ops_no_const apdev_netdev_ops;
50376 +
50377 static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
50378 {
50379 struct vnt_private *apdev_priv;
50380 struct net_device *dev = pDevice->dev;
50381 int ret;
50382 - const struct net_device_ops apdev_netdev_ops = {
50383 - .ndo_start_xmit = pDevice->tx_80211,
50384 - };
50385
50386 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
50387
50388 @@ -79,6 +78,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
50389 *apdev_priv = *pDevice;
50390 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
50391
50392 + /* only half broken now */
50393 + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
50394 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
50395
50396 pDevice->apdev->type = ARPHRD_IEEE80211;
50397 diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
50398 index e7e9372..161f530 100644
50399 --- a/drivers/target/sbp/sbp_target.c
50400 +++ b/drivers/target/sbp/sbp_target.c
50401 @@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
50402
50403 #define SESSION_MAINTENANCE_INTERVAL HZ
50404
50405 -static atomic_t login_id = ATOMIC_INIT(0);
50406 +static atomic_unchecked_t login_id = ATOMIC_INIT(0);
50407
50408 static void session_maintenance_work(struct work_struct *);
50409 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
50410 @@ -444,7 +444,7 @@ static void sbp_management_request_login(
50411 login->lun = se_lun;
50412 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
50413 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
50414 - login->login_id = atomic_inc_return(&login_id);
50415 + login->login_id = atomic_inc_return_unchecked(&login_id);
50416
50417 login->tgt_agt = sbp_target_agent_register(login);
50418 if (IS_ERR(login->tgt_agt)) {
50419 diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
50420 index 6ea95d2..88607b4 100644
50421 --- a/drivers/target/target_core_device.c
50422 +++ b/drivers/target/target_core_device.c
50423 @@ -1525,7 +1525,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
50424 spin_lock_init(&dev->se_tmr_lock);
50425 spin_lock_init(&dev->qf_cmd_lock);
50426 sema_init(&dev->caw_sem, 1);
50427 - atomic_set(&dev->dev_ordered_id, 0);
50428 + atomic_set_unchecked(&dev->dev_ordered_id, 0);
50429 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
50430 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
50431 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
50432 diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
50433 index 14772e9..42d9f63 100644
50434 --- a/drivers/target/target_core_transport.c
50435 +++ b/drivers/target/target_core_transport.c
50436 @@ -1165,7 +1165,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
50437 * Used to determine when ORDERED commands should go from
50438 * Dormant to Active status.
50439 */
50440 - cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
50441 + cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
50442 smp_mb__after_atomic_inc();
50443 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
50444 cmd->se_ordered_id, cmd->sam_task_attr,
50445 diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
50446 index 04b1be7..5eff86d 100644
50447 --- a/drivers/thermal/of-thermal.c
50448 +++ b/drivers/thermal/of-thermal.c
50449 @@ -30,6 +30,7 @@
50450 #include <linux/err.h>
50451 #include <linux/export.h>
50452 #include <linux/string.h>
50453 +#include <linux/mm.h>
50454
50455 #include "thermal_core.h"
50456
50457 @@ -341,8 +342,10 @@ thermal_zone_of_add_sensor(struct device_node *zone,
50458 tz->get_trend = get_trend;
50459 tz->sensor_data = data;
50460
50461 - tzd->ops->get_temp = of_thermal_get_temp;
50462 - tzd->ops->get_trend = of_thermal_get_trend;
50463 + pax_open_kernel();
50464 + *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
50465 + *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
50466 + pax_close_kernel();
50467 mutex_unlock(&tzd->lock);
50468
50469 return tzd;
50470 @@ -461,8 +464,10 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
50471 return;
50472
50473 mutex_lock(&tzd->lock);
50474 - tzd->ops->get_temp = NULL;
50475 - tzd->ops->get_trend = NULL;
50476 + pax_open_kernel();
50477 + *(void **)&tzd->ops->get_temp = NULL;
50478 + *(void **)&tzd->ops->get_trend = NULL;
50479 + pax_close_kernel();
50480
50481 tz->get_temp = NULL;
50482 tz->get_trend = NULL;
50483 diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
50484 index a57bb5a..1f727d33 100644
50485 --- a/drivers/tty/cyclades.c
50486 +++ b/drivers/tty/cyclades.c
50487 @@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
50488 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
50489 info->port.count);
50490 #endif
50491 - info->port.count++;
50492 + atomic_inc(&info->port.count);
50493 #ifdef CY_DEBUG_COUNT
50494 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
50495 - current->pid, info->port.count);
50496 + current->pid, atomic_read(&info->port.count));
50497 #endif
50498
50499 /*
50500 @@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
50501 for (j = 0; j < cy_card[i].nports; j++) {
50502 info = &cy_card[i].ports[j];
50503
50504 - if (info->port.count) {
50505 + if (atomic_read(&info->port.count)) {
50506 /* XXX is the ldisc num worth this? */
50507 struct tty_struct *tty;
50508 struct tty_ldisc *ld;
50509 diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
50510 index 0ff7fda..dbc7d52 100644
50511 --- a/drivers/tty/hvc/hvc_console.c
50512 +++ b/drivers/tty/hvc/hvc_console.c
50513 @@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
50514
50515 spin_lock_irqsave(&hp->port.lock, flags);
50516 /* Check and then increment for fast path open. */
50517 - if (hp->port.count++ > 0) {
50518 + if (atomic_inc_return(&hp->port.count) > 1) {
50519 spin_unlock_irqrestore(&hp->port.lock, flags);
50520 hvc_kick();
50521 return 0;
50522 @@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
50523
50524 spin_lock_irqsave(&hp->port.lock, flags);
50525
50526 - if (--hp->port.count == 0) {
50527 + if (atomic_dec_return(&hp->port.count) == 0) {
50528 spin_unlock_irqrestore(&hp->port.lock, flags);
50529 /* We are done with the tty pointer now. */
50530 tty_port_tty_set(&hp->port, NULL);
50531 @@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
50532 */
50533 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
50534 } else {
50535 - if (hp->port.count < 0)
50536 + if (atomic_read(&hp->port.count) < 0)
50537 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
50538 - hp->vtermno, hp->port.count);
50539 + hp->vtermno, atomic_read(&hp->port.count));
50540 spin_unlock_irqrestore(&hp->port.lock, flags);
50541 }
50542 }
50543 @@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
50544 * open->hangup case this can be called after the final close so prevent
50545 * that from happening for now.
50546 */
50547 - if (hp->port.count <= 0) {
50548 + if (atomic_read(&hp->port.count) <= 0) {
50549 spin_unlock_irqrestore(&hp->port.lock, flags);
50550 return;
50551 }
50552
50553 - hp->port.count = 0;
50554 + atomic_set(&hp->port.count, 0);
50555 spin_unlock_irqrestore(&hp->port.lock, flags);
50556 tty_port_tty_set(&hp->port, NULL);
50557
50558 @@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
50559 return -EPIPE;
50560
50561 /* FIXME what's this (unprotected) check for? */
50562 - if (hp->port.count <= 0)
50563 + if (atomic_read(&hp->port.count) <= 0)
50564 return -EIO;
50565
50566 spin_lock_irqsave(&hp->lock, flags);
50567 diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
50568 index 81e939e..95ead10 100644
50569 --- a/drivers/tty/hvc/hvcs.c
50570 +++ b/drivers/tty/hvc/hvcs.c
50571 @@ -83,6 +83,7 @@
50572 #include <asm/hvcserver.h>
50573 #include <asm/uaccess.h>
50574 #include <asm/vio.h>
50575 +#include <asm/local.h>
50576
50577 /*
50578 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
50579 @@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
50580
50581 spin_lock_irqsave(&hvcsd->lock, flags);
50582
50583 - if (hvcsd->port.count > 0) {
50584 + if (atomic_read(&hvcsd->port.count) > 0) {
50585 spin_unlock_irqrestore(&hvcsd->lock, flags);
50586 printk(KERN_INFO "HVCS: vterm state unchanged. "
50587 "The hvcs device node is still in use.\n");
50588 @@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
50589 }
50590 }
50591
50592 - hvcsd->port.count = 0;
50593 + atomic_set(&hvcsd->port.count, 0);
50594 hvcsd->port.tty = tty;
50595 tty->driver_data = hvcsd;
50596
50597 @@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
50598 unsigned long flags;
50599
50600 spin_lock_irqsave(&hvcsd->lock, flags);
50601 - hvcsd->port.count++;
50602 + atomic_inc(&hvcsd->port.count);
50603 hvcsd->todo_mask |= HVCS_SCHED_READ;
50604 spin_unlock_irqrestore(&hvcsd->lock, flags);
50605
50606 @@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
50607 hvcsd = tty->driver_data;
50608
50609 spin_lock_irqsave(&hvcsd->lock, flags);
50610 - if (--hvcsd->port.count == 0) {
50611 + if (atomic_dec_and_test(&hvcsd->port.count)) {
50612
50613 vio_disable_interrupts(hvcsd->vdev);
50614
50615 @@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
50616
50617 free_irq(irq, hvcsd);
50618 return;
50619 - } else if (hvcsd->port.count < 0) {
50620 + } else if (atomic_read(&hvcsd->port.count) < 0) {
50621 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
50622 " is missmanaged.\n",
50623 - hvcsd->vdev->unit_address, hvcsd->port.count);
50624 + hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
50625 }
50626
50627 spin_unlock_irqrestore(&hvcsd->lock, flags);
50628 @@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
50629
50630 spin_lock_irqsave(&hvcsd->lock, flags);
50631 /* Preserve this so that we know how many kref refs to put */
50632 - temp_open_count = hvcsd->port.count;
50633 + temp_open_count = atomic_read(&hvcsd->port.count);
50634
50635 /*
50636 * Don't kref put inside the spinlock because the destruction
50637 @@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
50638 tty->driver_data = NULL;
50639 hvcsd->port.tty = NULL;
50640
50641 - hvcsd->port.count = 0;
50642 + atomic_set(&hvcsd->port.count, 0);
50643
50644 /* This will drop any buffered data on the floor which is OK in a hangup
50645 * scenario. */
50646 @@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
50647 * the middle of a write operation? This is a crummy place to do this
50648 * but we want to keep it all in the spinlock.
50649 */
50650 - if (hvcsd->port.count <= 0) {
50651 + if (atomic_read(&hvcsd->port.count) <= 0) {
50652 spin_unlock_irqrestore(&hvcsd->lock, flags);
50653 return -ENODEV;
50654 }
50655 @@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
50656 {
50657 struct hvcs_struct *hvcsd = tty->driver_data;
50658
50659 - if (!hvcsd || hvcsd->port.count <= 0)
50660 + if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
50661 return 0;
50662
50663 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
50664 diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
50665 index 4190199..06d5bfa 100644
50666 --- a/drivers/tty/hvc/hvsi.c
50667 +++ b/drivers/tty/hvc/hvsi.c
50668 @@ -85,7 +85,7 @@ struct hvsi_struct {
50669 int n_outbuf;
50670 uint32_t vtermno;
50671 uint32_t virq;
50672 - atomic_t seqno; /* HVSI packet sequence number */
50673 + atomic_unchecked_t seqno; /* HVSI packet sequence number */
50674 uint16_t mctrl;
50675 uint8_t state; /* HVSI protocol state */
50676 uint8_t flags;
50677 @@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
50678
50679 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
50680 packet.hdr.len = sizeof(struct hvsi_query_response);
50681 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50682 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50683 packet.verb = VSV_SEND_VERSION_NUMBER;
50684 packet.u.version = HVSI_VERSION;
50685 packet.query_seqno = query_seqno+1;
50686 @@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
50687
50688 packet.hdr.type = VS_QUERY_PACKET_HEADER;
50689 packet.hdr.len = sizeof(struct hvsi_query);
50690 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50691 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50692 packet.verb = verb;
50693
50694 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
50695 @@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
50696 int wrote;
50697
50698 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
50699 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50700 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50701 packet.hdr.len = sizeof(struct hvsi_control);
50702 packet.verb = VSV_SET_MODEM_CTL;
50703 packet.mask = HVSI_TSDTR;
50704 @@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
50705 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
50706
50707 packet.hdr.type = VS_DATA_PACKET_HEADER;
50708 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50709 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50710 packet.hdr.len = count + sizeof(struct hvsi_header);
50711 memcpy(&packet.data, buf, count);
50712
50713 @@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
50714 struct hvsi_control packet __ALIGNED__;
50715
50716 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
50717 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50718 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50719 packet.hdr.len = 6;
50720 packet.verb = VSV_CLOSE_PROTOCOL;
50721
50722 @@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
50723
50724 tty_port_tty_set(&hp->port, tty);
50725 spin_lock_irqsave(&hp->lock, flags);
50726 - hp->port.count++;
50727 + atomic_inc(&hp->port.count);
50728 atomic_set(&hp->seqno, 0);
50729 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
50730 spin_unlock_irqrestore(&hp->lock, flags);
50731 @@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
50732
50733 spin_lock_irqsave(&hp->lock, flags);
50734
50735 - if (--hp->port.count == 0) {
50736 + if (atomic_dec_return(&hp->port.count) == 0) {
50737 tty_port_tty_set(&hp->port, NULL);
50738 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
50739
50740 @@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
50741
50742 spin_lock_irqsave(&hp->lock, flags);
50743 }
50744 - } else if (hp->port.count < 0)
50745 + } else if (atomic_read(&hp->port.count) < 0)
50746 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
50747 - hp - hvsi_ports, hp->port.count);
50748 + hp - hvsi_ports, atomic_read(&hp->port.count));
50749
50750 spin_unlock_irqrestore(&hp->lock, flags);
50751 }
50752 @@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
50753 tty_port_tty_set(&hp->port, NULL);
50754
50755 spin_lock_irqsave(&hp->lock, flags);
50756 - hp->port.count = 0;
50757 + atomic_set(&hp->port.count, 0);
50758 hp->n_outbuf = 0;
50759 spin_unlock_irqrestore(&hp->lock, flags);
50760 }
50761 diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
50762 index 7ae6c29..05c6dba 100644
50763 --- a/drivers/tty/hvc/hvsi_lib.c
50764 +++ b/drivers/tty/hvc/hvsi_lib.c
50765 @@ -8,7 +8,7 @@
50766
50767 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
50768 {
50769 - packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
50770 + packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
50771
50772 /* Assumes that always succeeds, works in practice */
50773 return pv->put_chars(pv->termno, (char *)packet, packet->len);
50774 @@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
50775
50776 /* Reset state */
50777 pv->established = 0;
50778 - atomic_set(&pv->seqno, 0);
50779 + atomic_set_unchecked(&pv->seqno, 0);
50780
50781 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
50782
50783 diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
50784 index 17ee3bf..8d2520d 100644
50785 --- a/drivers/tty/ipwireless/tty.c
50786 +++ b/drivers/tty/ipwireless/tty.c
50787 @@ -28,6 +28,7 @@
50788 #include <linux/tty_driver.h>
50789 #include <linux/tty_flip.h>
50790 #include <linux/uaccess.h>
50791 +#include <asm/local.h>
50792
50793 #include "tty.h"
50794 #include "network.h"
50795 @@ -98,10 +99,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
50796 mutex_unlock(&tty->ipw_tty_mutex);
50797 return -ENODEV;
50798 }
50799 - if (tty->port.count == 0)
50800 + if (atomic_read(&tty->port.count) == 0)
50801 tty->tx_bytes_queued = 0;
50802
50803 - tty->port.count++;
50804 + atomic_inc(&tty->port.count);
50805
50806 tty->port.tty = linux_tty;
50807 linux_tty->driver_data = tty;
50808 @@ -117,9 +118,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
50809
50810 static void do_ipw_close(struct ipw_tty *tty)
50811 {
50812 - tty->port.count--;
50813 -
50814 - if (tty->port.count == 0) {
50815 + if (atomic_dec_return(&tty->port.count) == 0) {
50816 struct tty_struct *linux_tty = tty->port.tty;
50817
50818 if (linux_tty != NULL) {
50819 @@ -140,7 +139,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
50820 return;
50821
50822 mutex_lock(&tty->ipw_tty_mutex);
50823 - if (tty->port.count == 0) {
50824 + if (atomic_read(&tty->port.count) == 0) {
50825 mutex_unlock(&tty->ipw_tty_mutex);
50826 return;
50827 }
50828 @@ -163,7 +162,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
50829
50830 mutex_lock(&tty->ipw_tty_mutex);
50831
50832 - if (!tty->port.count) {
50833 + if (!atomic_read(&tty->port.count)) {
50834 mutex_unlock(&tty->ipw_tty_mutex);
50835 return;
50836 }
50837 @@ -202,7 +201,7 @@ static int ipw_write(struct tty_struct *linux_tty,
50838 return -ENODEV;
50839
50840 mutex_lock(&tty->ipw_tty_mutex);
50841 - if (!tty->port.count) {
50842 + if (!atomic_read(&tty->port.count)) {
50843 mutex_unlock(&tty->ipw_tty_mutex);
50844 return -EINVAL;
50845 }
50846 @@ -242,7 +241,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
50847 if (!tty)
50848 return -ENODEV;
50849
50850 - if (!tty->port.count)
50851 + if (!atomic_read(&tty->port.count))
50852 return -EINVAL;
50853
50854 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
50855 @@ -284,7 +283,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
50856 if (!tty)
50857 return 0;
50858
50859 - if (!tty->port.count)
50860 + if (!atomic_read(&tty->port.count))
50861 return 0;
50862
50863 return tty->tx_bytes_queued;
50864 @@ -365,7 +364,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
50865 if (!tty)
50866 return -ENODEV;
50867
50868 - if (!tty->port.count)
50869 + if (!atomic_read(&tty->port.count))
50870 return -EINVAL;
50871
50872 return get_control_lines(tty);
50873 @@ -381,7 +380,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
50874 if (!tty)
50875 return -ENODEV;
50876
50877 - if (!tty->port.count)
50878 + if (!atomic_read(&tty->port.count))
50879 return -EINVAL;
50880
50881 return set_control_lines(tty, set, clear);
50882 @@ -395,7 +394,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
50883 if (!tty)
50884 return -ENODEV;
50885
50886 - if (!tty->port.count)
50887 + if (!atomic_read(&tty->port.count))
50888 return -EINVAL;
50889
50890 /* FIXME: Exactly how is the tty object locked here .. */
50891 @@ -551,7 +550,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
50892 * are gone */
50893 mutex_lock(&ttyj->ipw_tty_mutex);
50894 }
50895 - while (ttyj->port.count)
50896 + while (atomic_read(&ttyj->port.count))
50897 do_ipw_close(ttyj);
50898 ipwireless_disassociate_network_ttys(network,
50899 ttyj->channel_idx);
50900 diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
50901 index 1deaca4..c8582d4 100644
50902 --- a/drivers/tty/moxa.c
50903 +++ b/drivers/tty/moxa.c
50904 @@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
50905 }
50906
50907 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
50908 - ch->port.count++;
50909 + atomic_inc(&ch->port.count);
50910 tty->driver_data = ch;
50911 tty_port_tty_set(&ch->port, tty);
50912 mutex_lock(&ch->port.mutex);
50913 diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
50914 index 2ebe47b..3205833 100644
50915 --- a/drivers/tty/n_gsm.c
50916 +++ b/drivers/tty/n_gsm.c
50917 @@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
50918 spin_lock_init(&dlci->lock);
50919 mutex_init(&dlci->mutex);
50920 dlci->fifo = &dlci->_fifo;
50921 - if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
50922 + if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
50923 kfree(dlci);
50924 return NULL;
50925 }
50926 @@ -2954,7 +2954,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
50927 struct gsm_dlci *dlci = tty->driver_data;
50928 struct tty_port *port = &dlci->port;
50929
50930 - port->count++;
50931 + atomic_inc(&port->count);
50932 tty_port_tty_set(port, tty);
50933
50934 dlci->modem_rx = 0;
50935 diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
50936 index 0391f17..31fa586 100644
50937 --- a/drivers/tty/n_tty.c
50938 +++ b/drivers/tty/n_tty.c
50939 @@ -115,7 +115,7 @@ struct n_tty_data {
50940 int minimum_to_wake;
50941
50942 /* consumer-published */
50943 - size_t read_tail;
50944 + size_t read_tail __intentional_overflow(-1);
50945 size_t line_start;
50946
50947 /* protected by output lock */
50948 @@ -2517,6 +2517,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
50949 {
50950 *ops = tty_ldisc_N_TTY;
50951 ops->owner = NULL;
50952 - ops->refcount = ops->flags = 0;
50953 + atomic_set(&ops->refcount, 0);
50954 + ops->flags = 0;
50955 }
50956 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
50957 diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
50958 index 25c9bc7..24077b7 100644
50959 --- a/drivers/tty/pty.c
50960 +++ b/drivers/tty/pty.c
50961 @@ -790,8 +790,10 @@ static void __init unix98_pty_init(void)
50962 panic("Couldn't register Unix98 pts driver");
50963
50964 /* Now create the /dev/ptmx special device */
50965 + pax_open_kernel();
50966 tty_default_fops(&ptmx_fops);
50967 - ptmx_fops.open = ptmx_open;
50968 + *(void **)&ptmx_fops.open = ptmx_open;
50969 + pax_close_kernel();
50970
50971 cdev_init(&ptmx_cdev, &ptmx_fops);
50972 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
50973 diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
50974 index 383c4c7..d408e21 100644
50975 --- a/drivers/tty/rocket.c
50976 +++ b/drivers/tty/rocket.c
50977 @@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
50978 tty->driver_data = info;
50979 tty_port_tty_set(port, tty);
50980
50981 - if (port->count++ == 0) {
50982 + if (atomic_inc_return(&port->count) == 1) {
50983 atomic_inc(&rp_num_ports_open);
50984
50985 #ifdef ROCKET_DEBUG_OPEN
50986 @@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
50987 #endif
50988 }
50989 #ifdef ROCKET_DEBUG_OPEN
50990 - printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
50991 + printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
50992 #endif
50993
50994 /*
50995 @@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
50996 spin_unlock_irqrestore(&info->port.lock, flags);
50997 return;
50998 }
50999 - if (info->port.count)
51000 + if (atomic_read(&info->port.count))
51001 atomic_dec(&rp_num_ports_open);
51002 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
51003 spin_unlock_irqrestore(&info->port.lock, flags);
51004 diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
51005 index 1274499..f541382 100644
51006 --- a/drivers/tty/serial/ioc4_serial.c
51007 +++ b/drivers/tty/serial/ioc4_serial.c
51008 @@ -437,7 +437,7 @@ struct ioc4_soft {
51009 } is_intr_info[MAX_IOC4_INTR_ENTS];
51010
51011 /* Number of entries active in the above array */
51012 - atomic_t is_num_intrs;
51013 + atomic_unchecked_t is_num_intrs;
51014 } is_intr_type[IOC4_NUM_INTR_TYPES];
51015
51016 /* is_ir_lock must be held while
51017 @@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
51018 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
51019 || (type == IOC4_OTHER_INTR_TYPE)));
51020
51021 - i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
51022 + i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
51023 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
51024
51025 /* Save off the lower level interrupt handler */
51026 @@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
51027
51028 soft = arg;
51029 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
51030 - num_intrs = (int)atomic_read(
51031 + num_intrs = (int)atomic_read_unchecked(
51032 &soft->is_intr_type[intr_type].is_num_intrs);
51033
51034 this_mir = this_ir = pending_intrs(soft, intr_type);
51035 diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
51036 index a260cde..6b2b5ce 100644
51037 --- a/drivers/tty/serial/kgdboc.c
51038 +++ b/drivers/tty/serial/kgdboc.c
51039 @@ -24,8 +24,9 @@
51040 #define MAX_CONFIG_LEN 40
51041
51042 static struct kgdb_io kgdboc_io_ops;
51043 +static struct kgdb_io kgdboc_io_ops_console;
51044
51045 -/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
51046 +/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
51047 static int configured = -1;
51048
51049 static char config[MAX_CONFIG_LEN];
51050 @@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
51051 kgdboc_unregister_kbd();
51052 if (configured == 1)
51053 kgdb_unregister_io_module(&kgdboc_io_ops);
51054 + else if (configured == 2)
51055 + kgdb_unregister_io_module(&kgdboc_io_ops_console);
51056 }
51057
51058 static int configure_kgdboc(void)
51059 @@ -160,13 +163,13 @@ static int configure_kgdboc(void)
51060 int err;
51061 char *cptr = config;
51062 struct console *cons;
51063 + int is_console = 0;
51064
51065 err = kgdboc_option_setup(config);
51066 if (err || !strlen(config) || isspace(config[0]))
51067 goto noconfig;
51068
51069 err = -ENODEV;
51070 - kgdboc_io_ops.is_console = 0;
51071 kgdb_tty_driver = NULL;
51072
51073 kgdboc_use_kms = 0;
51074 @@ -187,7 +190,7 @@ static int configure_kgdboc(void)
51075 int idx;
51076 if (cons->device && cons->device(cons, &idx) == p &&
51077 idx == tty_line) {
51078 - kgdboc_io_ops.is_console = 1;
51079 + is_console = 1;
51080 break;
51081 }
51082 cons = cons->next;
51083 @@ -197,7 +200,13 @@ static int configure_kgdboc(void)
51084 kgdb_tty_line = tty_line;
51085
51086 do_register:
51087 - err = kgdb_register_io_module(&kgdboc_io_ops);
51088 + if (is_console) {
51089 + err = kgdb_register_io_module(&kgdboc_io_ops_console);
51090 + configured = 2;
51091 + } else {
51092 + err = kgdb_register_io_module(&kgdboc_io_ops);
51093 + configured = 1;
51094 + }
51095 if (err)
51096 goto noconfig;
51097
51098 @@ -205,8 +214,6 @@ do_register:
51099 if (err)
51100 goto nmi_con_failed;
51101
51102 - configured = 1;
51103 -
51104 return 0;
51105
51106 nmi_con_failed:
51107 @@ -223,7 +230,7 @@ noconfig:
51108 static int __init init_kgdboc(void)
51109 {
51110 /* Already configured? */
51111 - if (configured == 1)
51112 + if (configured >= 1)
51113 return 0;
51114
51115 return configure_kgdboc();
51116 @@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
51117 if (config[len - 1] == '\n')
51118 config[len - 1] = '\0';
51119
51120 - if (configured == 1)
51121 + if (configured >= 1)
51122 cleanup_kgdboc();
51123
51124 /* Go and configure with the new params. */
51125 @@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
51126 .post_exception = kgdboc_post_exp_handler,
51127 };
51128
51129 +static struct kgdb_io kgdboc_io_ops_console = {
51130 + .name = "kgdboc",
51131 + .read_char = kgdboc_get_char,
51132 + .write_char = kgdboc_put_char,
51133 + .pre_exception = kgdboc_pre_exp_handler,
51134 + .post_exception = kgdboc_post_exp_handler,
51135 + .is_console = 1
51136 +};
51137 +
51138 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
51139 /* This is only available if kgdboc is a built in for early debugging */
51140 static int __init kgdboc_early_init(char *opt)
51141 diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
51142 index 7307dc4..ce4fe90 100644
51143 --- a/drivers/tty/serial/msm_serial.c
51144 +++ b/drivers/tty/serial/msm_serial.c
51145 @@ -1026,7 +1026,7 @@ static struct uart_driver msm_uart_driver = {
51146 .cons = MSM_CONSOLE,
51147 };
51148
51149 -static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
51150 +static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
51151
51152 static const struct of_device_id msm_uartdm_table[] = {
51153 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
51154 @@ -1045,7 +1045,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
51155 int irq;
51156
51157 if (pdev->id == -1)
51158 - pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
51159 + pdev->id = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
51160
51161 if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
51162 return -ENXIO;
51163 diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
51164 index 1f5505e..a1a767d 100644
51165 --- a/drivers/tty/serial/samsung.c
51166 +++ b/drivers/tty/serial/samsung.c
51167 @@ -463,11 +463,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
51168 }
51169 }
51170
51171 +static int s3c64xx_serial_startup(struct uart_port *port);
51172 static int s3c24xx_serial_startup(struct uart_port *port)
51173 {
51174 struct s3c24xx_uart_port *ourport = to_ourport(port);
51175 int ret;
51176
51177 + /* Startup sequence is different for s3c64xx and higher SoC's */
51178 + if (s3c24xx_serial_has_interrupt_mask(port))
51179 + return s3c64xx_serial_startup(port);
51180 +
51181 dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
51182 port->mapbase, port->membase);
51183
51184 @@ -1141,10 +1146,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
51185 /* setup info for port */
51186 port->dev = &platdev->dev;
51187
51188 - /* Startup sequence is different for s3c64xx and higher SoC's */
51189 - if (s3c24xx_serial_has_interrupt_mask(port))
51190 - s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
51191 -
51192 port->uartclk = 1;
51193
51194 if (cfg->uart_flags & UPF_CONS_FLOW) {
51195 diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
51196 index b68550d..a62d7f8 100644
51197 --- a/drivers/tty/serial/serial_core.c
51198 +++ b/drivers/tty/serial/serial_core.c
51199 @@ -1329,7 +1329,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
51200
51201 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
51202
51203 - if (!port->count || tty_port_close_start(port, tty, filp) == 0)
51204 + if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
51205 return;
51206
51207 /*
51208 @@ -1456,7 +1456,7 @@ static void uart_hangup(struct tty_struct *tty)
51209 uart_flush_buffer(tty);
51210 uart_shutdown(tty, state);
51211 spin_lock_irqsave(&port->lock, flags);
51212 - port->count = 0;
51213 + atomic_set(&port->count, 0);
51214 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
51215 spin_unlock_irqrestore(&port->lock, flags);
51216 tty_port_tty_set(port, NULL);
51217 @@ -1554,7 +1554,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
51218 goto end;
51219 }
51220
51221 - port->count++;
51222 + atomic_inc(&port->count);
51223 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
51224 retval = -ENXIO;
51225 goto err_dec_count;
51226 @@ -1594,7 +1594,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
51227 end:
51228 return retval;
51229 err_dec_count:
51230 - port->count--;
51231 + atomic_inc(&port->count);
51232 mutex_unlock(&port->mutex);
51233 goto end;
51234 }
51235 diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
51236 index d48e040..0f52764 100644
51237 --- a/drivers/tty/synclink.c
51238 +++ b/drivers/tty/synclink.c
51239 @@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
51240
51241 if (debug_level >= DEBUG_LEVEL_INFO)
51242 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
51243 - __FILE__,__LINE__, info->device_name, info->port.count);
51244 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
51245
51246 if (tty_port_close_start(&info->port, tty, filp) == 0)
51247 goto cleanup;
51248 @@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
51249 cleanup:
51250 if (debug_level >= DEBUG_LEVEL_INFO)
51251 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
51252 - tty->driver->name, info->port.count);
51253 + tty->driver->name, atomic_read(&info->port.count));
51254
51255 } /* end of mgsl_close() */
51256
51257 @@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
51258
51259 mgsl_flush_buffer(tty);
51260 shutdown(info);
51261 -
51262 - info->port.count = 0;
51263 +
51264 + atomic_set(&info->port.count, 0);
51265 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
51266 info->port.tty = NULL;
51267
51268 @@ -3297,12 +3297,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
51269
51270 if (debug_level >= DEBUG_LEVEL_INFO)
51271 printk("%s(%d):block_til_ready before block on %s count=%d\n",
51272 - __FILE__,__LINE__, tty->driver->name, port->count );
51273 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51274
51275 spin_lock_irqsave(&info->irq_spinlock, flags);
51276 if (!tty_hung_up_p(filp)) {
51277 extra_count = true;
51278 - port->count--;
51279 + atomic_dec(&port->count);
51280 }
51281 spin_unlock_irqrestore(&info->irq_spinlock, flags);
51282 port->blocked_open++;
51283 @@ -3331,7 +3331,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
51284
51285 if (debug_level >= DEBUG_LEVEL_INFO)
51286 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
51287 - __FILE__,__LINE__, tty->driver->name, port->count );
51288 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51289
51290 tty_unlock(tty);
51291 schedule();
51292 @@ -3343,12 +3343,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
51293
51294 /* FIXME: Racy on hangup during close wait */
51295 if (extra_count)
51296 - port->count++;
51297 + atomic_inc(&port->count);
51298 port->blocked_open--;
51299
51300 if (debug_level >= DEBUG_LEVEL_INFO)
51301 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
51302 - __FILE__,__LINE__, tty->driver->name, port->count );
51303 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51304
51305 if (!retval)
51306 port->flags |= ASYNC_NORMAL_ACTIVE;
51307 @@ -3400,7 +3400,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
51308
51309 if (debug_level >= DEBUG_LEVEL_INFO)
51310 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
51311 - __FILE__,__LINE__,tty->driver->name, info->port.count);
51312 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
51313
51314 /* If port is closing, signal caller to try again */
51315 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
51316 @@ -3419,10 +3419,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
51317 spin_unlock_irqrestore(&info->netlock, flags);
51318 goto cleanup;
51319 }
51320 - info->port.count++;
51321 + atomic_inc(&info->port.count);
51322 spin_unlock_irqrestore(&info->netlock, flags);
51323
51324 - if (info->port.count == 1) {
51325 + if (atomic_read(&info->port.count) == 1) {
51326 /* 1st open on this device, init hardware */
51327 retval = startup(info);
51328 if (retval < 0)
51329 @@ -3446,8 +3446,8 @@ cleanup:
51330 if (retval) {
51331 if (tty->count == 1)
51332 info->port.tty = NULL; /* tty layer will release tty struct */
51333 - if(info->port.count)
51334 - info->port.count--;
51335 + if (atomic_read(&info->port.count))
51336 + atomic_dec(&info->port.count);
51337 }
51338
51339 return retval;
51340 @@ -7665,7 +7665,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
51341 unsigned short new_crctype;
51342
51343 /* return error if TTY interface open */
51344 - if (info->port.count)
51345 + if (atomic_read(&info->port.count))
51346 return -EBUSY;
51347
51348 switch (encoding)
51349 @@ -7760,7 +7760,7 @@ static int hdlcdev_open(struct net_device *dev)
51350
51351 /* arbitrate between network and tty opens */
51352 spin_lock_irqsave(&info->netlock, flags);
51353 - if (info->port.count != 0 || info->netcount != 0) {
51354 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
51355 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
51356 spin_unlock_irqrestore(&info->netlock, flags);
51357 return -EBUSY;
51358 @@ -7846,7 +7846,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
51359 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
51360
51361 /* return error if TTY interface open */
51362 - if (info->port.count)
51363 + if (atomic_read(&info->port.count))
51364 return -EBUSY;
51365
51366 if (cmd != SIOCWANDEV)
51367 diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
51368 index c359a91..959fc26 100644
51369 --- a/drivers/tty/synclink_gt.c
51370 +++ b/drivers/tty/synclink_gt.c
51371 @@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
51372 tty->driver_data = info;
51373 info->port.tty = tty;
51374
51375 - DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
51376 + DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
51377
51378 /* If port is closing, signal caller to try again */
51379 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
51380 @@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
51381 mutex_unlock(&info->port.mutex);
51382 goto cleanup;
51383 }
51384 - info->port.count++;
51385 + atomic_inc(&info->port.count);
51386 spin_unlock_irqrestore(&info->netlock, flags);
51387
51388 - if (info->port.count == 1) {
51389 + if (atomic_read(&info->port.count) == 1) {
51390 /* 1st open on this device, init hardware */
51391 retval = startup(info);
51392 if (retval < 0) {
51393 @@ -715,8 +715,8 @@ cleanup:
51394 if (retval) {
51395 if (tty->count == 1)
51396 info->port.tty = NULL; /* tty layer will release tty struct */
51397 - if(info->port.count)
51398 - info->port.count--;
51399 + if(atomic_read(&info->port.count))
51400 + atomic_dec(&info->port.count);
51401 }
51402
51403 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
51404 @@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
51405
51406 if (sanity_check(info, tty->name, "close"))
51407 return;
51408 - DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
51409 + DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
51410
51411 if (tty_port_close_start(&info->port, tty, filp) == 0)
51412 goto cleanup;
51413 @@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
51414 tty_port_close_end(&info->port, tty);
51415 info->port.tty = NULL;
51416 cleanup:
51417 - DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
51418 + DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
51419 }
51420
51421 static void hangup(struct tty_struct *tty)
51422 @@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
51423 shutdown(info);
51424
51425 spin_lock_irqsave(&info->port.lock, flags);
51426 - info->port.count = 0;
51427 + atomic_set(&info->port.count, 0);
51428 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
51429 info->port.tty = NULL;
51430 spin_unlock_irqrestore(&info->port.lock, flags);
51431 @@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
51432 unsigned short new_crctype;
51433
51434 /* return error if TTY interface open */
51435 - if (info->port.count)
51436 + if (atomic_read(&info->port.count))
51437 return -EBUSY;
51438
51439 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
51440 @@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
51441
51442 /* arbitrate between network and tty opens */
51443 spin_lock_irqsave(&info->netlock, flags);
51444 - if (info->port.count != 0 || info->netcount != 0) {
51445 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
51446 DBGINFO(("%s hdlc_open busy\n", dev->name));
51447 spin_unlock_irqrestore(&info->netlock, flags);
51448 return -EBUSY;
51449 @@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
51450 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
51451
51452 /* return error if TTY interface open */
51453 - if (info->port.count)
51454 + if (atomic_read(&info->port.count))
51455 return -EBUSY;
51456
51457 if (cmd != SIOCWANDEV)
51458 @@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
51459 if (port == NULL)
51460 continue;
51461 spin_lock(&port->lock);
51462 - if ((port->port.count || port->netcount) &&
51463 + if ((atomic_read(&port->port.count) || port->netcount) &&
51464 port->pending_bh && !port->bh_running &&
51465 !port->bh_requested) {
51466 DBGISR(("%s bh queued\n", port->device_name));
51467 @@ -3302,7 +3302,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51468 spin_lock_irqsave(&info->lock, flags);
51469 if (!tty_hung_up_p(filp)) {
51470 extra_count = true;
51471 - port->count--;
51472 + atomic_dec(&port->count);
51473 }
51474 spin_unlock_irqrestore(&info->lock, flags);
51475 port->blocked_open++;
51476 @@ -3339,7 +3339,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51477 remove_wait_queue(&port->open_wait, &wait);
51478
51479 if (extra_count)
51480 - port->count++;
51481 + atomic_inc(&port->count);
51482 port->blocked_open--;
51483
51484 if (!retval)
51485 diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
51486 index 53ba853..3c30f6d 100644
51487 --- a/drivers/tty/synclinkmp.c
51488 +++ b/drivers/tty/synclinkmp.c
51489 @@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
51490
51491 if (debug_level >= DEBUG_LEVEL_INFO)
51492 printk("%s(%d):%s open(), old ref count = %d\n",
51493 - __FILE__,__LINE__,tty->driver->name, info->port.count);
51494 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
51495
51496 /* If port is closing, signal caller to try again */
51497 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
51498 @@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
51499 spin_unlock_irqrestore(&info->netlock, flags);
51500 goto cleanup;
51501 }
51502 - info->port.count++;
51503 + atomic_inc(&info->port.count);
51504 spin_unlock_irqrestore(&info->netlock, flags);
51505
51506 - if (info->port.count == 1) {
51507 + if (atomic_read(&info->port.count) == 1) {
51508 /* 1st open on this device, init hardware */
51509 retval = startup(info);
51510 if (retval < 0)
51511 @@ -796,8 +796,8 @@ cleanup:
51512 if (retval) {
51513 if (tty->count == 1)
51514 info->port.tty = NULL; /* tty layer will release tty struct */
51515 - if(info->port.count)
51516 - info->port.count--;
51517 + if(atomic_read(&info->port.count))
51518 + atomic_dec(&info->port.count);
51519 }
51520
51521 return retval;
51522 @@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
51523
51524 if (debug_level >= DEBUG_LEVEL_INFO)
51525 printk("%s(%d):%s close() entry, count=%d\n",
51526 - __FILE__,__LINE__, info->device_name, info->port.count);
51527 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
51528
51529 if (tty_port_close_start(&info->port, tty, filp) == 0)
51530 goto cleanup;
51531 @@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
51532 cleanup:
51533 if (debug_level >= DEBUG_LEVEL_INFO)
51534 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
51535 - tty->driver->name, info->port.count);
51536 + tty->driver->name, atomic_read(&info->port.count));
51537 }
51538
51539 /* Called by tty_hangup() when a hangup is signaled.
51540 @@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
51541 shutdown(info);
51542
51543 spin_lock_irqsave(&info->port.lock, flags);
51544 - info->port.count = 0;
51545 + atomic_set(&info->port.count, 0);
51546 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
51547 info->port.tty = NULL;
51548 spin_unlock_irqrestore(&info->port.lock, flags);
51549 @@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
51550 unsigned short new_crctype;
51551
51552 /* return error if TTY interface open */
51553 - if (info->port.count)
51554 + if (atomic_read(&info->port.count))
51555 return -EBUSY;
51556
51557 switch (encoding)
51558 @@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
51559
51560 /* arbitrate between network and tty opens */
51561 spin_lock_irqsave(&info->netlock, flags);
51562 - if (info->port.count != 0 || info->netcount != 0) {
51563 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
51564 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
51565 spin_unlock_irqrestore(&info->netlock, flags);
51566 return -EBUSY;
51567 @@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
51568 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
51569
51570 /* return error if TTY interface open */
51571 - if (info->port.count)
51572 + if (atomic_read(&info->port.count))
51573 return -EBUSY;
51574
51575 if (cmd != SIOCWANDEV)
51576 @@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
51577 * do not request bottom half processing if the
51578 * device is not open in a normal mode.
51579 */
51580 - if ( port && (port->port.count || port->netcount) &&
51581 + if ( port && (atomic_read(&port->port.count) || port->netcount) &&
51582 port->pending_bh && !port->bh_running &&
51583 !port->bh_requested ) {
51584 if ( debug_level >= DEBUG_LEVEL_ISR )
51585 @@ -3319,12 +3319,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51586
51587 if (debug_level >= DEBUG_LEVEL_INFO)
51588 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
51589 - __FILE__,__LINE__, tty->driver->name, port->count );
51590 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51591
51592 spin_lock_irqsave(&info->lock, flags);
51593 if (!tty_hung_up_p(filp)) {
51594 extra_count = true;
51595 - port->count--;
51596 + atomic_dec(&port->count);
51597 }
51598 spin_unlock_irqrestore(&info->lock, flags);
51599 port->blocked_open++;
51600 @@ -3353,7 +3353,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51601
51602 if (debug_level >= DEBUG_LEVEL_INFO)
51603 printk("%s(%d):%s block_til_ready() count=%d\n",
51604 - __FILE__,__LINE__, tty->driver->name, port->count );
51605 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51606
51607 tty_unlock(tty);
51608 schedule();
51609 @@ -3364,12 +3364,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51610 remove_wait_queue(&port->open_wait, &wait);
51611
51612 if (extra_count)
51613 - port->count++;
51614 + atomic_inc(&port->count);
51615 port->blocked_open--;
51616
51617 if (debug_level >= DEBUG_LEVEL_INFO)
51618 printk("%s(%d):%s block_til_ready() after, count=%d\n",
51619 - __FILE__,__LINE__, tty->driver->name, port->count );
51620 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51621
51622 if (!retval)
51623 port->flags |= ASYNC_NORMAL_ACTIVE;
51624 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
51625 index ce396ec..04a37be 100644
51626 --- a/drivers/tty/sysrq.c
51627 +++ b/drivers/tty/sysrq.c
51628 @@ -1075,7 +1075,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
51629 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
51630 size_t count, loff_t *ppos)
51631 {
51632 - if (count) {
51633 + if (count && capable(CAP_SYS_ADMIN)) {
51634 char c;
51635
51636 if (get_user(c, buf))
51637 diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
51638 index 3411071..86f2cf2 100644
51639 --- a/drivers/tty/tty_io.c
51640 +++ b/drivers/tty/tty_io.c
51641 @@ -3475,7 +3475,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
51642
51643 void tty_default_fops(struct file_operations *fops)
51644 {
51645 - *fops = tty_fops;
51646 + memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
51647 }
51648
51649 /*
51650 diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
51651 index 2d822aa..a566234 100644
51652 --- a/drivers/tty/tty_ldisc.c
51653 +++ b/drivers/tty/tty_ldisc.c
51654 @@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
51655 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
51656 tty_ldiscs[disc] = new_ldisc;
51657 new_ldisc->num = disc;
51658 - new_ldisc->refcount = 0;
51659 + atomic_set(&new_ldisc->refcount, 0);
51660 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
51661
51662 return ret;
51663 @@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
51664 return -EINVAL;
51665
51666 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
51667 - if (tty_ldiscs[disc]->refcount)
51668 + if (atomic_read(&tty_ldiscs[disc]->refcount))
51669 ret = -EBUSY;
51670 else
51671 tty_ldiscs[disc] = NULL;
51672 @@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
51673 if (ldops) {
51674 ret = ERR_PTR(-EAGAIN);
51675 if (try_module_get(ldops->owner)) {
51676 - ldops->refcount++;
51677 + atomic_inc(&ldops->refcount);
51678 ret = ldops;
51679 }
51680 }
51681 @@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
51682 unsigned long flags;
51683
51684 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
51685 - ldops->refcount--;
51686 + atomic_dec(&ldops->refcount);
51687 module_put(ldops->owner);
51688 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
51689 }
51690 diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
51691 index 3f746c8..2f2fcaa 100644
51692 --- a/drivers/tty/tty_port.c
51693 +++ b/drivers/tty/tty_port.c
51694 @@ -235,7 +235,7 @@ void tty_port_hangup(struct tty_port *port)
51695 unsigned long flags;
51696
51697 spin_lock_irqsave(&port->lock, flags);
51698 - port->count = 0;
51699 + atomic_set(&port->count, 0);
51700 port->flags &= ~ASYNC_NORMAL_ACTIVE;
51701 tty = port->tty;
51702 if (tty)
51703 @@ -393,7 +393,7 @@ int tty_port_block_til_ready(struct tty_port *port,
51704 /* The port lock protects the port counts */
51705 spin_lock_irqsave(&port->lock, flags);
51706 if (!tty_hung_up_p(filp))
51707 - port->count--;
51708 + atomic_dec(&port->count);
51709 port->blocked_open++;
51710 spin_unlock_irqrestore(&port->lock, flags);
51711
51712 @@ -435,7 +435,7 @@ int tty_port_block_til_ready(struct tty_port *port,
51713 we must not mess that up further */
51714 spin_lock_irqsave(&port->lock, flags);
51715 if (!tty_hung_up_p(filp))
51716 - port->count++;
51717 + atomic_inc(&port->count);
51718 port->blocked_open--;
51719 if (retval == 0)
51720 port->flags |= ASYNC_NORMAL_ACTIVE;
51721 @@ -469,19 +469,19 @@ int tty_port_close_start(struct tty_port *port,
51722 return 0;
51723 }
51724
51725 - if (tty->count == 1 && port->count != 1) {
51726 + if (tty->count == 1 && atomic_read(&port->count) != 1) {
51727 printk(KERN_WARNING
51728 "tty_port_close_start: tty->count = 1 port count = %d.\n",
51729 - port->count);
51730 - port->count = 1;
51731 + atomic_read(&port->count));
51732 + atomic_set(&port->count, 1);
51733 }
51734 - if (--port->count < 0) {
51735 + if (atomic_dec_return(&port->count) < 0) {
51736 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
51737 - port->count);
51738 - port->count = 0;
51739 + atomic_read(&port->count));
51740 + atomic_set(&port->count, 0);
51741 }
51742
51743 - if (port->count) {
51744 + if (atomic_read(&port->count)) {
51745 spin_unlock_irqrestore(&port->lock, flags);
51746 return 0;
51747 }
51748 @@ -563,7 +563,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
51749 {
51750 spin_lock_irq(&port->lock);
51751 if (!tty_hung_up_p(filp))
51752 - ++port->count;
51753 + atomic_inc(&port->count);
51754 spin_unlock_irq(&port->lock);
51755 tty_port_tty_set(port, tty);
51756
51757 diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
51758 index d0e3a44..5f8b754 100644
51759 --- a/drivers/tty/vt/keyboard.c
51760 +++ b/drivers/tty/vt/keyboard.c
51761 @@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
51762 kbd->kbdmode == VC_OFF) &&
51763 value != KVAL(K_SAK))
51764 return; /* SAK is allowed even in raw mode */
51765 +
51766 +#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
51767 + {
51768 + void *func = fn_handler[value];
51769 + if (func == fn_show_state || func == fn_show_ptregs ||
51770 + func == fn_show_mem)
51771 + return;
51772 + }
51773 +#endif
51774 +
51775 fn_handler[value](vc);
51776 }
51777
51778 @@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
51779 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
51780 return -EFAULT;
51781
51782 - if (!capable(CAP_SYS_TTY_CONFIG))
51783 - perm = 0;
51784 -
51785 switch (cmd) {
51786 case KDGKBENT:
51787 /* Ensure another thread doesn't free it under us */
51788 @@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
51789 spin_unlock_irqrestore(&kbd_event_lock, flags);
51790 return put_user(val, &user_kbe->kb_value);
51791 case KDSKBENT:
51792 + if (!capable(CAP_SYS_TTY_CONFIG))
51793 + perm = 0;
51794 +
51795 if (!perm)
51796 return -EPERM;
51797 if (!i && v == K_NOSUCHMAP) {
51798 @@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
51799 int i, j, k;
51800 int ret;
51801
51802 - if (!capable(CAP_SYS_TTY_CONFIG))
51803 - perm = 0;
51804 -
51805 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
51806 if (!kbs) {
51807 ret = -ENOMEM;
51808 @@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
51809 kfree(kbs);
51810 return ((p && *p) ? -EOVERFLOW : 0);
51811 case KDSKBSENT:
51812 + if (!capable(CAP_SYS_TTY_CONFIG))
51813 + perm = 0;
51814 +
51815 if (!perm) {
51816 ret = -EPERM;
51817 goto reterr;
51818 diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
51819 index a673e5b..36e5d32 100644
51820 --- a/drivers/uio/uio.c
51821 +++ b/drivers/uio/uio.c
51822 @@ -25,6 +25,7 @@
51823 #include <linux/kobject.h>
51824 #include <linux/cdev.h>
51825 #include <linux/uio_driver.h>
51826 +#include <asm/local.h>
51827
51828 #define UIO_MAX_DEVICES (1U << MINORBITS)
51829
51830 @@ -32,7 +33,7 @@ struct uio_device {
51831 struct module *owner;
51832 struct device *dev;
51833 int minor;
51834 - atomic_t event;
51835 + atomic_unchecked_t event;
51836 struct fasync_struct *async_queue;
51837 wait_queue_head_t wait;
51838 struct uio_info *info;
51839 @@ -243,7 +244,7 @@ static ssize_t event_show(struct device *dev,
51840 struct device_attribute *attr, char *buf)
51841 {
51842 struct uio_device *idev = dev_get_drvdata(dev);
51843 - return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
51844 + return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
51845 }
51846 static DEVICE_ATTR_RO(event);
51847
51848 @@ -405,7 +406,7 @@ void uio_event_notify(struct uio_info *info)
51849 {
51850 struct uio_device *idev = info->uio_dev;
51851
51852 - atomic_inc(&idev->event);
51853 + atomic_inc_unchecked(&idev->event);
51854 wake_up_interruptible(&idev->wait);
51855 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
51856 }
51857 @@ -458,7 +459,7 @@ static int uio_open(struct inode *inode, struct file *filep)
51858 }
51859
51860 listener->dev = idev;
51861 - listener->event_count = atomic_read(&idev->event);
51862 + listener->event_count = atomic_read_unchecked(&idev->event);
51863 filep->private_data = listener;
51864
51865 if (idev->info->open) {
51866 @@ -509,7 +510,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
51867 return -EIO;
51868
51869 poll_wait(filep, &idev->wait, wait);
51870 - if (listener->event_count != atomic_read(&idev->event))
51871 + if (listener->event_count != atomic_read_unchecked(&idev->event))
51872 return POLLIN | POLLRDNORM;
51873 return 0;
51874 }
51875 @@ -534,7 +535,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
51876 do {
51877 set_current_state(TASK_INTERRUPTIBLE);
51878
51879 - event_count = atomic_read(&idev->event);
51880 + event_count = atomic_read_unchecked(&idev->event);
51881 if (event_count != listener->event_count) {
51882 if (copy_to_user(buf, &event_count, count))
51883 retval = -EFAULT;
51884 @@ -591,9 +592,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
51885 static int uio_find_mem_index(struct vm_area_struct *vma)
51886 {
51887 struct uio_device *idev = vma->vm_private_data;
51888 + unsigned long size;
51889
51890 if (vma->vm_pgoff < MAX_UIO_MAPS) {
51891 - if (idev->info->mem[vma->vm_pgoff].size == 0)
51892 + size = idev->info->mem[vma->vm_pgoff].size;
51893 + if (size == 0)
51894 + return -1;
51895 + if (vma->vm_end - vma->vm_start > size)
51896 return -1;
51897 return (int)vma->vm_pgoff;
51898 }
51899 @@ -825,7 +830,7 @@ int __uio_register_device(struct module *owner,
51900 idev->owner = owner;
51901 idev->info = info;
51902 init_waitqueue_head(&idev->wait);
51903 - atomic_set(&idev->event, 0);
51904 + atomic_set_unchecked(&idev->event, 0);
51905
51906 ret = uio_get_minor(idev);
51907 if (ret)
51908 diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
51909 index 813d4d3..a71934f 100644
51910 --- a/drivers/usb/atm/cxacru.c
51911 +++ b/drivers/usb/atm/cxacru.c
51912 @@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
51913 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
51914 if (ret < 2)
51915 return -EINVAL;
51916 - if (index < 0 || index > 0x7f)
51917 + if (index > 0x7f)
51918 return -EINVAL;
51919 pos += tmp;
51920
51921 diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
51922 index dada014..1d0d517 100644
51923 --- a/drivers/usb/atm/usbatm.c
51924 +++ b/drivers/usb/atm/usbatm.c
51925 @@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51926 if (printk_ratelimit())
51927 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
51928 __func__, vpi, vci);
51929 - atomic_inc(&vcc->stats->rx_err);
51930 + atomic_inc_unchecked(&vcc->stats->rx_err);
51931 return;
51932 }
51933
51934 @@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51935 if (length > ATM_MAX_AAL5_PDU) {
51936 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
51937 __func__, length, vcc);
51938 - atomic_inc(&vcc->stats->rx_err);
51939 + atomic_inc_unchecked(&vcc->stats->rx_err);
51940 goto out;
51941 }
51942
51943 @@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51944 if (sarb->len < pdu_length) {
51945 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
51946 __func__, pdu_length, sarb->len, vcc);
51947 - atomic_inc(&vcc->stats->rx_err);
51948 + atomic_inc_unchecked(&vcc->stats->rx_err);
51949 goto out;
51950 }
51951
51952 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
51953 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
51954 __func__, vcc);
51955 - atomic_inc(&vcc->stats->rx_err);
51956 + atomic_inc_unchecked(&vcc->stats->rx_err);
51957 goto out;
51958 }
51959
51960 @@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51961 if (printk_ratelimit())
51962 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
51963 __func__, length);
51964 - atomic_inc(&vcc->stats->rx_drop);
51965 + atomic_inc_unchecked(&vcc->stats->rx_drop);
51966 goto out;
51967 }
51968
51969 @@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51970
51971 vcc->push(vcc, skb);
51972
51973 - atomic_inc(&vcc->stats->rx);
51974 + atomic_inc_unchecked(&vcc->stats->rx);
51975 out:
51976 skb_trim(sarb, 0);
51977 }
51978 @@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
51979 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
51980
51981 usbatm_pop(vcc, skb);
51982 - atomic_inc(&vcc->stats->tx);
51983 + atomic_inc_unchecked(&vcc->stats->tx);
51984
51985 skb = skb_dequeue(&instance->sndqueue);
51986 }
51987 @@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
51988 if (!left--)
51989 return sprintf(page,
51990 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
51991 - atomic_read(&atm_dev->stats.aal5.tx),
51992 - atomic_read(&atm_dev->stats.aal5.tx_err),
51993 - atomic_read(&atm_dev->stats.aal5.rx),
51994 - atomic_read(&atm_dev->stats.aal5.rx_err),
51995 - atomic_read(&atm_dev->stats.aal5.rx_drop));
51996 + atomic_read_unchecked(&atm_dev->stats.aal5.tx),
51997 + atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
51998 + atomic_read_unchecked(&atm_dev->stats.aal5.rx),
51999 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
52000 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
52001
52002 if (!left--) {
52003 if (instance->disconnected)
52004 diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
52005 index 2a3bbdf..91d72cf 100644
52006 --- a/drivers/usb/core/devices.c
52007 +++ b/drivers/usb/core/devices.c
52008 @@ -126,7 +126,7 @@ static const char format_endpt[] =
52009 * time it gets called.
52010 */
52011 static struct device_connect_event {
52012 - atomic_t count;
52013 + atomic_unchecked_t count;
52014 wait_queue_head_t wait;
52015 } device_event = {
52016 .count = ATOMIC_INIT(1),
52017 @@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
52018
52019 void usbfs_conn_disc_event(void)
52020 {
52021 - atomic_add(2, &device_event.count);
52022 + atomic_add_unchecked(2, &device_event.count);
52023 wake_up(&device_event.wait);
52024 }
52025
52026 @@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
52027
52028 poll_wait(file, &device_event.wait, wait);
52029
52030 - event_count = atomic_read(&device_event.count);
52031 + event_count = atomic_read_unchecked(&device_event.count);
52032 if (file->f_version != event_count) {
52033 file->f_version = event_count;
52034 return POLLIN | POLLRDNORM;
52035 diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
52036 index 257876e..4304364 100644
52037 --- a/drivers/usb/core/devio.c
52038 +++ b/drivers/usb/core/devio.c
52039 @@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
52040 struct usb_dev_state *ps = file->private_data;
52041 struct usb_device *dev = ps->dev;
52042 ssize_t ret = 0;
52043 - unsigned len;
52044 + size_t len;
52045 loff_t pos;
52046 int i;
52047
52048 @@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
52049 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
52050 struct usb_config_descriptor *config =
52051 (struct usb_config_descriptor *)dev->rawdescriptors[i];
52052 - unsigned int length = le16_to_cpu(config->wTotalLength);
52053 + size_t length = le16_to_cpu(config->wTotalLength);
52054
52055 if (*ppos < pos + length) {
52056
52057 /* The descriptor may claim to be longer than it
52058 * really is. Here is the actual allocated length. */
52059 - unsigned alloclen =
52060 + size_t alloclen =
52061 le16_to_cpu(dev->config[i].desc.wTotalLength);
52062
52063 - len = length - (*ppos - pos);
52064 + len = length + pos - *ppos;
52065 if (len > nbytes)
52066 len = nbytes;
52067
52068 /* Simply don't write (skip over) unallocated parts */
52069 if (alloclen > (*ppos - pos)) {
52070 - alloclen -= (*ppos - pos);
52071 + alloclen = alloclen + pos - *ppos;
52072 if (copy_to_user(buf,
52073 dev->rawdescriptors[i] + (*ppos - pos),
52074 min(len, alloclen))) {
52075 diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
52076 index 9c4e292..b89877f 100644
52077 --- a/drivers/usb/core/hcd.c
52078 +++ b/drivers/usb/core/hcd.c
52079 @@ -1550,7 +1550,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
52080 */
52081 usb_get_urb(urb);
52082 atomic_inc(&urb->use_count);
52083 - atomic_inc(&urb->dev->urbnum);
52084 + atomic_inc_unchecked(&urb->dev->urbnum);
52085 usbmon_urb_submit(&hcd->self, urb);
52086
52087 /* NOTE requirements on root-hub callers (usbfs and the hub
52088 @@ -1577,7 +1577,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
52089 urb->hcpriv = NULL;
52090 INIT_LIST_HEAD(&urb->urb_list);
52091 atomic_dec(&urb->use_count);
52092 - atomic_dec(&urb->dev->urbnum);
52093 + atomic_dec_unchecked(&urb->dev->urbnum);
52094 if (atomic_read(&urb->reject))
52095 wake_up(&usb_kill_urb_queue);
52096 usb_put_urb(urb);
52097 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
52098 index 229a73f..ef86f98 100644
52099 --- a/drivers/usb/core/hub.c
52100 +++ b/drivers/usb/core/hub.c
52101 @@ -27,6 +27,7 @@
52102 #include <linux/freezer.h>
52103 #include <linux/random.h>
52104 #include <linux/pm_qos.h>
52105 +#include <linux/grsecurity.h>
52106
52107 #include <asm/uaccess.h>
52108 #include <asm/byteorder.h>
52109 @@ -4512,6 +4513,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
52110 goto done;
52111 return;
52112 }
52113 +
52114 + if (gr_handle_new_usb())
52115 + goto done;
52116 +
52117 if (hub_is_superspeed(hub->hdev))
52118 unit_load = 150;
52119 else
52120 diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
52121 index 0c8a7fc..c45b40a 100644
52122 --- a/drivers/usb/core/message.c
52123 +++ b/drivers/usb/core/message.c
52124 @@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
52125 * Return: If successful, the number of bytes transferred. Otherwise, a negative
52126 * error number.
52127 */
52128 -int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
52129 +int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
52130 __u8 requesttype, __u16 value, __u16 index, void *data,
52131 __u16 size, int timeout)
52132 {
52133 @@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
52134 * If successful, 0. Otherwise a negative error number. The number of actual
52135 * bytes transferred will be stored in the @actual_length parameter.
52136 */
52137 -int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
52138 +int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
52139 void *data, int len, int *actual_length, int timeout)
52140 {
52141 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
52142 @@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
52143 * bytes transferred will be stored in the @actual_length parameter.
52144 *
52145 */
52146 -int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
52147 +int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
52148 void *data, int len, int *actual_length, int timeout)
52149 {
52150 struct urb *urb;
52151 diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
52152 index 1236c60..d47a51c 100644
52153 --- a/drivers/usb/core/sysfs.c
52154 +++ b/drivers/usb/core/sysfs.c
52155 @@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
52156 struct usb_device *udev;
52157
52158 udev = to_usb_device(dev);
52159 - return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
52160 + return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
52161 }
52162 static DEVICE_ATTR_RO(urbnum);
52163
52164 diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
52165 index 4d11449..f4ccabf 100644
52166 --- a/drivers/usb/core/usb.c
52167 +++ b/drivers/usb/core/usb.c
52168 @@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
52169 set_dev_node(&dev->dev, dev_to_node(bus->controller));
52170 dev->state = USB_STATE_ATTACHED;
52171 dev->lpm_disable_count = 1;
52172 - atomic_set(&dev->urbnum, 0);
52173 + atomic_set_unchecked(&dev->urbnum, 0);
52174
52175 INIT_LIST_HEAD(&dev->ep0.urb_list);
52176 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
52177 diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
52178 index 85f398d..d375bbe 100644
52179 --- a/drivers/usb/dwc3/gadget.c
52180 +++ b/drivers/usb/dwc3/gadget.c
52181 @@ -550,8 +550,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
52182 if (!usb_endpoint_xfer_isoc(desc))
52183 return 0;
52184
52185 - memset(&trb_link, 0, sizeof(trb_link));
52186 -
52187 /* Link TRB for ISOC. The HWO bit is never reset */
52188 trb_st_hw = &dep->trb_pool[0];
52189
52190 diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
52191 index 8cfc319..4868255 100644
52192 --- a/drivers/usb/early/ehci-dbgp.c
52193 +++ b/drivers/usb/early/ehci-dbgp.c
52194 @@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
52195
52196 #ifdef CONFIG_KGDB
52197 static struct kgdb_io kgdbdbgp_io_ops;
52198 -#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
52199 +static struct kgdb_io kgdbdbgp_io_ops_console;
52200 +#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
52201 #else
52202 #define dbgp_kgdb_mode (0)
52203 #endif
52204 @@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
52205 .write_char = kgdbdbgp_write_char,
52206 };
52207
52208 +static struct kgdb_io kgdbdbgp_io_ops_console = {
52209 + .name = "kgdbdbgp",
52210 + .read_char = kgdbdbgp_read_char,
52211 + .write_char = kgdbdbgp_write_char,
52212 + .is_console = 1
52213 +};
52214 +
52215 static int kgdbdbgp_wait_time;
52216
52217 static int __init kgdbdbgp_parse_config(char *str)
52218 @@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
52219 ptr++;
52220 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
52221 }
52222 - kgdb_register_io_module(&kgdbdbgp_io_ops);
52223 - kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
52224 + if (early_dbgp_console.index != -1)
52225 + kgdb_register_io_module(&kgdbdbgp_io_ops_console);
52226 + else
52227 + kgdb_register_io_module(&kgdbdbgp_io_ops);
52228
52229 return 0;
52230 }
52231 diff --git a/drivers/usb/gadget/f_uac1.c b/drivers/usb/gadget/f_uac1.c
52232 index 2b4c82d..06a8ee6 100644
52233 --- a/drivers/usb/gadget/f_uac1.c
52234 +++ b/drivers/usb/gadget/f_uac1.c
52235 @@ -13,6 +13,7 @@
52236 #include <linux/kernel.h>
52237 #include <linux/device.h>
52238 #include <linux/atomic.h>
52239 +#include <linux/module.h>
52240
52241 #include "u_uac1.h"
52242
52243 diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
52244 index ad0aca8..8ff84865 100644
52245 --- a/drivers/usb/gadget/u_serial.c
52246 +++ b/drivers/usb/gadget/u_serial.c
52247 @@ -733,9 +733,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
52248 spin_lock_irq(&port->port_lock);
52249
52250 /* already open? Great. */
52251 - if (port->port.count) {
52252 + if (atomic_read(&port->port.count)) {
52253 status = 0;
52254 - port->port.count++;
52255 + atomic_inc(&port->port.count);
52256
52257 /* currently opening/closing? wait ... */
52258 } else if (port->openclose) {
52259 @@ -794,7 +794,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
52260 tty->driver_data = port;
52261 port->port.tty = tty;
52262
52263 - port->port.count = 1;
52264 + atomic_set(&port->port.count, 1);
52265 port->openclose = false;
52266
52267 /* if connected, start the I/O stream */
52268 @@ -836,11 +836,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
52269
52270 spin_lock_irq(&port->port_lock);
52271
52272 - if (port->port.count != 1) {
52273 - if (port->port.count == 0)
52274 + if (atomic_read(&port->port.count) != 1) {
52275 + if (atomic_read(&port->port.count) == 0)
52276 WARN_ON(1);
52277 else
52278 - --port->port.count;
52279 + atomic_dec(&port->port.count);
52280 goto exit;
52281 }
52282
52283 @@ -850,7 +850,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
52284 * and sleep if necessary
52285 */
52286 port->openclose = true;
52287 - port->port.count = 0;
52288 + atomic_set(&port->port.count, 0);
52289
52290 gser = port->port_usb;
52291 if (gser && gser->disconnect)
52292 @@ -1066,7 +1066,7 @@ static int gs_closed(struct gs_port *port)
52293 int cond;
52294
52295 spin_lock_irq(&port->port_lock);
52296 - cond = (port->port.count == 0) && !port->openclose;
52297 + cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
52298 spin_unlock_irq(&port->port_lock);
52299 return cond;
52300 }
52301 @@ -1209,7 +1209,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
52302 /* if it's already open, start I/O ... and notify the serial
52303 * protocol about open/close status (connect/disconnect).
52304 */
52305 - if (port->port.count) {
52306 + if (atomic_read(&port->port.count)) {
52307 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
52308 gs_start_io(port);
52309 if (gser->connect)
52310 @@ -1256,7 +1256,7 @@ void gserial_disconnect(struct gserial *gser)
52311
52312 port->port_usb = NULL;
52313 gser->ioport = NULL;
52314 - if (port->port.count > 0 || port->openclose) {
52315 + if (atomic_read(&port->port.count) > 0 || port->openclose) {
52316 wake_up_interruptible(&port->drain_wait);
52317 if (port->port.tty)
52318 tty_hangup(port->port.tty);
52319 @@ -1272,7 +1272,7 @@ void gserial_disconnect(struct gserial *gser)
52320
52321 /* finally, free any unused/unusable I/O buffers */
52322 spin_lock_irqsave(&port->port_lock, flags);
52323 - if (port->port.count == 0 && !port->openclose)
52324 + if (atomic_read(&port->port.count) == 0 && !port->openclose)
52325 gs_buf_free(&port->port_write_buf);
52326 gs_free_requests(gser->out, &port->read_pool, NULL);
52327 gs_free_requests(gser->out, &port->read_queue, NULL);
52328 diff --git a/drivers/usb/gadget/u_uac1.c b/drivers/usb/gadget/u_uac1.c
52329 index 7a55fea..cc0ed4f 100644
52330 --- a/drivers/usb/gadget/u_uac1.c
52331 +++ b/drivers/usb/gadget/u_uac1.c
52332 @@ -16,6 +16,7 @@
52333 #include <linux/ctype.h>
52334 #include <linux/random.h>
52335 #include <linux/syscalls.h>
52336 +#include <linux/module.h>
52337
52338 #include "u_uac1.h"
52339
52340 diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
52341 index 7ae0c4d..35521b7 100644
52342 --- a/drivers/usb/host/ehci-hub.c
52343 +++ b/drivers/usb/host/ehci-hub.c
52344 @@ -780,7 +780,7 @@ static struct urb *request_single_step_set_feature_urb(
52345 urb->transfer_flags = URB_DIR_IN;
52346 usb_get_urb(urb);
52347 atomic_inc(&urb->use_count);
52348 - atomic_inc(&urb->dev->urbnum);
52349 + atomic_inc_unchecked(&urb->dev->urbnum);
52350 urb->setup_dma = dma_map_single(
52351 hcd->self.controller,
52352 urb->setup_packet,
52353 @@ -847,7 +847,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
52354 urb->status = -EINPROGRESS;
52355 usb_get_urb(urb);
52356 atomic_inc(&urb->use_count);
52357 - atomic_inc(&urb->dev->urbnum);
52358 + atomic_inc_unchecked(&urb->dev->urbnum);
52359 retval = submit_single_step_set_feature(hcd, urb, 0);
52360 if (!retval && !wait_for_completion_timeout(&done,
52361 msecs_to_jiffies(2000))) {
52362 diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
52363 index d0d8fad..668ef7b 100644
52364 --- a/drivers/usb/host/hwa-hc.c
52365 +++ b/drivers/usb/host/hwa-hc.c
52366 @@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
52367 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
52368 struct wahc *wa = &hwahc->wa;
52369 struct device *dev = &wa->usb_iface->dev;
52370 - u8 mas_le[UWB_NUM_MAS/8];
52371 + u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
52372 +
52373 + if (mas_le == NULL)
52374 + return -ENOMEM;
52375
52376 /* Set the stream index */
52377 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
52378 @@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
52379 WUSB_REQ_SET_WUSB_MAS,
52380 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
52381 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
52382 - mas_le, 32, USB_CTRL_SET_TIMEOUT);
52383 + mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
52384 if (result < 0)
52385 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
52386 out:
52387 + kfree(mas_le);
52388 +
52389 return result;
52390 }
52391
52392 diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
52393 index ba6a5d6..f88f7f3 100644
52394 --- a/drivers/usb/misc/appledisplay.c
52395 +++ b/drivers/usb/misc/appledisplay.c
52396 @@ -83,7 +83,7 @@ struct appledisplay {
52397 spinlock_t lock;
52398 };
52399
52400 -static atomic_t count_displays = ATOMIC_INIT(0);
52401 +static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
52402 static struct workqueue_struct *wq;
52403
52404 static void appledisplay_complete(struct urb *urb)
52405 @@ -281,7 +281,7 @@ static int appledisplay_probe(struct usb_interface *iface,
52406
52407 /* Register backlight device */
52408 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
52409 - atomic_inc_return(&count_displays) - 1);
52410 + atomic_inc_return_unchecked(&count_displays) - 1);
52411 memset(&props, 0, sizeof(struct backlight_properties));
52412 props.type = BACKLIGHT_RAW;
52413 props.max_brightness = 0xff;
52414 diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
52415 index 8d7fc48..01c4986 100644
52416 --- a/drivers/usb/serial/console.c
52417 +++ b/drivers/usb/serial/console.c
52418 @@ -123,7 +123,7 @@ static int usb_console_setup(struct console *co, char *options)
52419
52420 info->port = port;
52421
52422 - ++port->port.count;
52423 + atomic_inc(&port->port.count);
52424 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
52425 if (serial->type->set_termios) {
52426 /*
52427 @@ -167,7 +167,7 @@ static int usb_console_setup(struct console *co, char *options)
52428 }
52429 /* Now that any required fake tty operations are completed restore
52430 * the tty port count */
52431 - --port->port.count;
52432 + atomic_dec(&port->port.count);
52433 /* The console is special in terms of closing the device so
52434 * indicate this port is now acting as a system console. */
52435 port->port.console = 1;
52436 @@ -180,7 +180,7 @@ static int usb_console_setup(struct console *co, char *options)
52437 free_tty:
52438 kfree(tty);
52439 reset_open_count:
52440 - port->port.count = 0;
52441 + atomic_set(&port->port.count, 0);
52442 usb_autopm_put_interface(serial->interface);
52443 error_get_interface:
52444 usb_serial_put(serial);
52445 @@ -191,7 +191,7 @@ static int usb_console_setup(struct console *co, char *options)
52446 static void usb_console_write(struct console *co,
52447 const char *buf, unsigned count)
52448 {
52449 - static struct usbcons_info *info = &usbcons_info;
52450 + struct usbcons_info *info = &usbcons_info;
52451 struct usb_serial_port *port = info->port;
52452 struct usb_serial *serial;
52453 int retval = -ENODEV;
52454 diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
52455 index 307e339..6aa97cb 100644
52456 --- a/drivers/usb/storage/usb.h
52457 +++ b/drivers/usb/storage/usb.h
52458 @@ -63,7 +63,7 @@ struct us_unusual_dev {
52459 __u8 useProtocol;
52460 __u8 useTransport;
52461 int (*initFunction)(struct us_data *);
52462 -};
52463 +} __do_const;
52464
52465
52466 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
52467 diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
52468 index f2a8d29..7bc3fe7 100644
52469 --- a/drivers/usb/wusbcore/wa-hc.h
52470 +++ b/drivers/usb/wusbcore/wa-hc.h
52471 @@ -240,7 +240,7 @@ struct wahc {
52472 spinlock_t xfer_list_lock;
52473 struct work_struct xfer_enqueue_work;
52474 struct work_struct xfer_error_work;
52475 - atomic_t xfer_id_count;
52476 + atomic_unchecked_t xfer_id_count;
52477
52478 kernel_ulong_t quirks;
52479 };
52480 @@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
52481 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
52482 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
52483 wa->dto_in_use = 0;
52484 - atomic_set(&wa->xfer_id_count, 1);
52485 + atomic_set_unchecked(&wa->xfer_id_count, 1);
52486 /* init the buf in URBs */
52487 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
52488 usb_init_urb(&(wa->buf_in_urbs[index]));
52489 diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
52490 index 3e2e4ed..060c9b8 100644
52491 --- a/drivers/usb/wusbcore/wa-xfer.c
52492 +++ b/drivers/usb/wusbcore/wa-xfer.c
52493 @@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
52494 */
52495 static void wa_xfer_id_init(struct wa_xfer *xfer)
52496 {
52497 - xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
52498 + xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
52499 }
52500
52501 /* Return the xfer's ID. */
52502 diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
52503 index 512f479..7e041d0 100644
52504 --- a/drivers/vfio/vfio.c
52505 +++ b/drivers/vfio/vfio.c
52506 @@ -487,7 +487,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
52507 return 0;
52508
52509 /* TODO Prevent device auto probing */
52510 - WARN("Device %s added to live group %d!\n", dev_name(dev),
52511 + WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
52512 iommu_group_id(group->iommu_group));
52513
52514 return 0;
52515 diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
52516 index 5174eba..451e6bc 100644
52517 --- a/drivers/vhost/vringh.c
52518 +++ b/drivers/vhost/vringh.c
52519 @@ -530,17 +530,17 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
52520 /* Userspace access helpers: in this case, addresses are really userspace. */
52521 static inline int getu16_user(u16 *val, const u16 *p)
52522 {
52523 - return get_user(*val, (__force u16 __user *)p);
52524 + return get_user(*val, (u16 __force_user *)p);
52525 }
52526
52527 static inline int putu16_user(u16 *p, u16 val)
52528 {
52529 - return put_user(val, (__force u16 __user *)p);
52530 + return put_user(val, (u16 __force_user *)p);
52531 }
52532
52533 static inline int copydesc_user(void *dst, const void *src, size_t len)
52534 {
52535 - return copy_from_user(dst, (__force void __user *)src, len) ?
52536 + return copy_from_user(dst, (void __force_user *)src, len) ?
52537 -EFAULT : 0;
52538 }
52539
52540 @@ -548,19 +548,19 @@ static inline int putused_user(struct vring_used_elem *dst,
52541 const struct vring_used_elem *src,
52542 unsigned int num)
52543 {
52544 - return copy_to_user((__force void __user *)dst, src,
52545 + return copy_to_user((void __force_user *)dst, src,
52546 sizeof(*dst) * num) ? -EFAULT : 0;
52547 }
52548
52549 static inline int xfer_from_user(void *src, void *dst, size_t len)
52550 {
52551 - return copy_from_user(dst, (__force void __user *)src, len) ?
52552 + return copy_from_user(dst, (void __force_user *)src, len) ?
52553 -EFAULT : 0;
52554 }
52555
52556 static inline int xfer_to_user(void *dst, void *src, size_t len)
52557 {
52558 - return copy_to_user((__force void __user *)dst, src, len) ?
52559 + return copy_to_user((void __force_user *)dst, src, len) ?
52560 -EFAULT : 0;
52561 }
52562
52563 @@ -596,9 +596,9 @@ int vringh_init_user(struct vringh *vrh, u32 features,
52564 vrh->last_used_idx = 0;
52565 vrh->vring.num = num;
52566 /* vring expects kernel addresses, but only used via accessors. */
52567 - vrh->vring.desc = (__force struct vring_desc *)desc;
52568 - vrh->vring.avail = (__force struct vring_avail *)avail;
52569 - vrh->vring.used = (__force struct vring_used *)used;
52570 + vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
52571 + vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
52572 + vrh->vring.used = (__force_kernel struct vring_used *)used;
52573 return 0;
52574 }
52575 EXPORT_SYMBOL(vringh_init_user);
52576 @@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
52577
52578 static inline int putu16_kern(u16 *p, u16 val)
52579 {
52580 - ACCESS_ONCE(*p) = val;
52581 + ACCESS_ONCE_RW(*p) = val;
52582 return 0;
52583 }
52584
52585 diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
52586 index 84a110a..96312c3 100644
52587 --- a/drivers/video/backlight/kb3886_bl.c
52588 +++ b/drivers/video/backlight/kb3886_bl.c
52589 @@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
52590 static unsigned long kb3886bl_flags;
52591 #define KB3886BL_SUSPENDED 0x01
52592
52593 -static struct dmi_system_id kb3886bl_device_table[] __initdata = {
52594 +static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
52595 {
52596 .ident = "Sahara Touch-iT",
52597 .matches = {
52598 diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
52599 index 1b0b233..6f34c2c 100644
52600 --- a/drivers/video/fbdev/arcfb.c
52601 +++ b/drivers/video/fbdev/arcfb.c
52602 @@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
52603 return -ENOSPC;
52604
52605 err = 0;
52606 - if ((count + p) > fbmemlength) {
52607 + if (count > (fbmemlength - p)) {
52608 count = fbmemlength - p;
52609 err = -ENOSPC;
52610 }
52611 diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
52612 index 52108be..c7c110d 100644
52613 --- a/drivers/video/fbdev/aty/aty128fb.c
52614 +++ b/drivers/video/fbdev/aty/aty128fb.c
52615 @@ -149,7 +149,7 @@ enum {
52616 };
52617
52618 /* Must match above enum */
52619 -static char * const r128_family[] = {
52620 +static const char * const r128_family[] = {
52621 "AGP",
52622 "PCI",
52623 "PRO AGP",
52624 diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
52625 index c3d0074..0b9077e 100644
52626 --- a/drivers/video/fbdev/aty/atyfb_base.c
52627 +++ b/drivers/video/fbdev/aty/atyfb_base.c
52628 @@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
52629 par->accel_flags = var->accel_flags; /* hack */
52630
52631 if (var->accel_flags) {
52632 - info->fbops->fb_sync = atyfb_sync;
52633 + pax_open_kernel();
52634 + *(void **)&info->fbops->fb_sync = atyfb_sync;
52635 + pax_close_kernel();
52636 info->flags &= ~FBINFO_HWACCEL_DISABLED;
52637 } else {
52638 - info->fbops->fb_sync = NULL;
52639 + pax_open_kernel();
52640 + *(void **)&info->fbops->fb_sync = NULL;
52641 + pax_close_kernel();
52642 info->flags |= FBINFO_HWACCEL_DISABLED;
52643 }
52644
52645 diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
52646 index 2fa0317..4983f2a 100644
52647 --- a/drivers/video/fbdev/aty/mach64_cursor.c
52648 +++ b/drivers/video/fbdev/aty/mach64_cursor.c
52649 @@ -8,6 +8,7 @@
52650 #include "../core/fb_draw.h"
52651
52652 #include <asm/io.h>
52653 +#include <asm/pgtable.h>
52654
52655 #ifdef __sparc__
52656 #include <asm/fbio.h>
52657 @@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
52658 info->sprite.buf_align = 16; /* and 64 lines tall. */
52659 info->sprite.flags = FB_PIXMAP_IO;
52660
52661 - info->fbops->fb_cursor = atyfb_cursor;
52662 + pax_open_kernel();
52663 + *(void **)&info->fbops->fb_cursor = atyfb_cursor;
52664 + pax_close_kernel();
52665
52666 return 0;
52667 }
52668 diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
52669 index 900aa4e..6d49418 100644
52670 --- a/drivers/video/fbdev/core/fb_defio.c
52671 +++ b/drivers/video/fbdev/core/fb_defio.c
52672 @@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
52673
52674 BUG_ON(!fbdefio);
52675 mutex_init(&fbdefio->lock);
52676 - info->fbops->fb_mmap = fb_deferred_io_mmap;
52677 + pax_open_kernel();
52678 + *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
52679 + pax_close_kernel();
52680 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
52681 INIT_LIST_HEAD(&fbdefio->pagelist);
52682 if (fbdefio->delay == 0) /* set a default of 1 s */
52683 @@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
52684 page->mapping = NULL;
52685 }
52686
52687 - info->fbops->fb_mmap = NULL;
52688 + *(void **)&info->fbops->fb_mmap = NULL;
52689 mutex_destroy(&fbdefio->lock);
52690 }
52691 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
52692 diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
52693 index b6d5008..5bca7bf 100644
52694 --- a/drivers/video/fbdev/core/fbmem.c
52695 +++ b/drivers/video/fbdev/core/fbmem.c
52696 @@ -433,7 +433,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
52697 image->dx += image->width + 8;
52698 }
52699 } else if (rotate == FB_ROTATE_UD) {
52700 - for (x = 0; x < num && image->dx >= 0; x++) {
52701 + for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
52702 info->fbops->fb_imageblit(info, image);
52703 image->dx -= image->width + 8;
52704 }
52705 @@ -445,7 +445,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
52706 image->dy += image->height + 8;
52707 }
52708 } else if (rotate == FB_ROTATE_CCW) {
52709 - for (x = 0; x < num && image->dy >= 0; x++) {
52710 + for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
52711 info->fbops->fb_imageblit(info, image);
52712 image->dy -= image->height + 8;
52713 }
52714 @@ -1179,7 +1179,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
52715 return -EFAULT;
52716 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
52717 return -EINVAL;
52718 - if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
52719 + if (con2fb.framebuffer >= FB_MAX)
52720 return -EINVAL;
52721 if (!registered_fb[con2fb.framebuffer])
52722 request_module("fb%d", con2fb.framebuffer);
52723 @@ -1300,7 +1300,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
52724 __u32 data;
52725 int err;
52726
52727 - err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
52728 + err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
52729
52730 data = (__u32) (unsigned long) fix->smem_start;
52731 err |= put_user(data, &fix32->smem_start);
52732 diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
52733 index e23392e..8a77540 100644
52734 --- a/drivers/video/fbdev/hyperv_fb.c
52735 +++ b/drivers/video/fbdev/hyperv_fb.c
52736 @@ -235,7 +235,7 @@ static uint screen_fb_size;
52737 static inline int synthvid_send(struct hv_device *hdev,
52738 struct synthvid_msg *msg)
52739 {
52740 - static atomic64_t request_id = ATOMIC64_INIT(0);
52741 + static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
52742 int ret;
52743
52744 msg->pipe_hdr.type = PIPE_MSG_DATA;
52745 @@ -243,7 +243,7 @@ static inline int synthvid_send(struct hv_device *hdev,
52746
52747 ret = vmbus_sendpacket(hdev->channel, msg,
52748 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
52749 - atomic64_inc_return(&request_id),
52750 + atomic64_inc_return_unchecked(&request_id),
52751 VM_PKT_DATA_INBAND, 0);
52752
52753 if (ret)
52754 diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
52755 index 7672d2e..b56437f 100644
52756 --- a/drivers/video/fbdev/i810/i810_accel.c
52757 +++ b/drivers/video/fbdev/i810/i810_accel.c
52758 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
52759 }
52760 }
52761 printk("ringbuffer lockup!!!\n");
52762 + printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
52763 i810_report_error(mmio);
52764 par->dev_flags |= LOCKUP;
52765 info->pixmap.scan_align = 1;
52766 diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
52767 index a01147f..5d896f8 100644
52768 --- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
52769 +++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
52770 @@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
52771
52772 #ifdef CONFIG_FB_MATROX_MYSTIQUE
52773 struct matrox_switch matrox_mystique = {
52774 - MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
52775 + .preinit = MGA1064_preinit,
52776 + .reset = MGA1064_reset,
52777 + .init = MGA1064_init,
52778 + .restore = MGA1064_restore,
52779 };
52780 EXPORT_SYMBOL(matrox_mystique);
52781 #endif
52782
52783 #ifdef CONFIG_FB_MATROX_G
52784 struct matrox_switch matrox_G100 = {
52785 - MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
52786 + .preinit = MGAG100_preinit,
52787 + .reset = MGAG100_reset,
52788 + .init = MGAG100_init,
52789 + .restore = MGAG100_restore,
52790 };
52791 EXPORT_SYMBOL(matrox_G100);
52792 #endif
52793 diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
52794 index 195ad7c..09743fc 100644
52795 --- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
52796 +++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
52797 @@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
52798 }
52799
52800 struct matrox_switch matrox_millennium = {
52801 - Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
52802 + .preinit = Ti3026_preinit,
52803 + .reset = Ti3026_reset,
52804 + .init = Ti3026_init,
52805 + .restore = Ti3026_restore
52806 };
52807 EXPORT_SYMBOL(matrox_millennium);
52808 #endif
52809 diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
52810 index fe92eed..106e085 100644
52811 --- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
52812 +++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
52813 @@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
52814 struct mb862xxfb_par *par = info->par;
52815
52816 if (info->var.bits_per_pixel == 32) {
52817 - info->fbops->fb_fillrect = cfb_fillrect;
52818 - info->fbops->fb_copyarea = cfb_copyarea;
52819 - info->fbops->fb_imageblit = cfb_imageblit;
52820 + pax_open_kernel();
52821 + *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
52822 + *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
52823 + *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
52824 + pax_close_kernel();
52825 } else {
52826 outreg(disp, GC_L0EM, 3);
52827 - info->fbops->fb_fillrect = mb86290fb_fillrect;
52828 - info->fbops->fb_copyarea = mb86290fb_copyarea;
52829 - info->fbops->fb_imageblit = mb86290fb_imageblit;
52830 + pax_open_kernel();
52831 + *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
52832 + *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
52833 + *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
52834 + pax_close_kernel();
52835 }
52836 outreg(draw, GDC_REG_DRAW_BASE, 0);
52837 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
52838 diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
52839 index def0412..fed6529 100644
52840 --- a/drivers/video/fbdev/nvidia/nvidia.c
52841 +++ b/drivers/video/fbdev/nvidia/nvidia.c
52842 @@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
52843 info->fix.line_length = (info->var.xres_virtual *
52844 info->var.bits_per_pixel) >> 3;
52845 if (info->var.accel_flags) {
52846 - info->fbops->fb_imageblit = nvidiafb_imageblit;
52847 - info->fbops->fb_fillrect = nvidiafb_fillrect;
52848 - info->fbops->fb_copyarea = nvidiafb_copyarea;
52849 - info->fbops->fb_sync = nvidiafb_sync;
52850 + pax_open_kernel();
52851 + *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
52852 + *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
52853 + *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
52854 + *(void **)&info->fbops->fb_sync = nvidiafb_sync;
52855 + pax_close_kernel();
52856 info->pixmap.scan_align = 4;
52857 info->flags &= ~FBINFO_HWACCEL_DISABLED;
52858 info->flags |= FBINFO_READS_FAST;
52859 NVResetGraphics(info);
52860 } else {
52861 - info->fbops->fb_imageblit = cfb_imageblit;
52862 - info->fbops->fb_fillrect = cfb_fillrect;
52863 - info->fbops->fb_copyarea = cfb_copyarea;
52864 - info->fbops->fb_sync = NULL;
52865 + pax_open_kernel();
52866 + *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
52867 + *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
52868 + *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
52869 + *(void **)&info->fbops->fb_sync = NULL;
52870 + pax_close_kernel();
52871 info->pixmap.scan_align = 1;
52872 info->flags |= FBINFO_HWACCEL_DISABLED;
52873 info->flags &= ~FBINFO_READS_FAST;
52874 @@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
52875 info->pixmap.size = 8 * 1024;
52876 info->pixmap.flags = FB_PIXMAP_SYSTEM;
52877
52878 - if (!hwcur)
52879 - info->fbops->fb_cursor = NULL;
52880 + if (!hwcur) {
52881 + pax_open_kernel();
52882 + *(void **)&info->fbops->fb_cursor = NULL;
52883 + pax_close_kernel();
52884 + }
52885
52886 info->var.accel_flags = (!noaccel);
52887
52888 diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
52889 index 2412a0d..294215b 100644
52890 --- a/drivers/video/fbdev/omap2/dss/display.c
52891 +++ b/drivers/video/fbdev/omap2/dss/display.c
52892 @@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
52893 if (dssdev->name == NULL)
52894 dssdev->name = dssdev->alias;
52895
52896 + pax_open_kernel();
52897 if (drv && drv->get_resolution == NULL)
52898 - drv->get_resolution = omapdss_default_get_resolution;
52899 + *(void **)&drv->get_resolution = omapdss_default_get_resolution;
52900 if (drv && drv->get_recommended_bpp == NULL)
52901 - drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
52902 + *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
52903 if (drv && drv->get_timings == NULL)
52904 - drv->get_timings = omapdss_default_get_timings;
52905 + *(void **)&drv->get_timings = omapdss_default_get_timings;
52906 + pax_close_kernel();
52907
52908 mutex_lock(&panel_list_mutex);
52909 list_add_tail(&dssdev->panel_list, &panel_list);
52910 diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
52911 index 83433cb..71e9b98 100644
52912 --- a/drivers/video/fbdev/s1d13xxxfb.c
52913 +++ b/drivers/video/fbdev/s1d13xxxfb.c
52914 @@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
52915
52916 switch(prod_id) {
52917 case S1D13506_PROD_ID: /* activate acceleration */
52918 - s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
52919 - s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
52920 + pax_open_kernel();
52921 + *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
52922 + *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
52923 + pax_close_kernel();
52924 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
52925 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
52926 break;
52927 diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
52928 index 2bcc84a..29dd1ea 100644
52929 --- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
52930 +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
52931 @@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
52932 }
52933
52934 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
52935 - lcdc_sys_write_index,
52936 - lcdc_sys_write_data,
52937 - lcdc_sys_read_data,
52938 + .write_index = lcdc_sys_write_index,
52939 + .write_data = lcdc_sys_write_data,
52940 + .read_data = lcdc_sys_read_data,
52941 };
52942
52943 static int sh_mobile_lcdc_sginit(struct fb_info *info,
52944 diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
52945 index d513ed6..90b0de9 100644
52946 --- a/drivers/video/fbdev/smscufx.c
52947 +++ b/drivers/video/fbdev/smscufx.c
52948 @@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
52949 fb_deferred_io_cleanup(info);
52950 kfree(info->fbdefio);
52951 info->fbdefio = NULL;
52952 - info->fbops->fb_mmap = ufx_ops_mmap;
52953 + pax_open_kernel();
52954 + *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
52955 + pax_close_kernel();
52956 }
52957
52958 pr_debug("released /dev/fb%d user=%d count=%d",
52959 diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
52960 index 77b890e..458e666 100644
52961 --- a/drivers/video/fbdev/udlfb.c
52962 +++ b/drivers/video/fbdev/udlfb.c
52963 @@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
52964 dlfb_urb_completion(urb);
52965
52966 error:
52967 - atomic_add(bytes_sent, &dev->bytes_sent);
52968 - atomic_add(bytes_identical, &dev->bytes_identical);
52969 - atomic_add(width*height*2, &dev->bytes_rendered);
52970 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
52971 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
52972 + atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
52973 end_cycles = get_cycles();
52974 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
52975 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
52976 >> 10)), /* Kcycles */
52977 &dev->cpu_kcycles_used);
52978
52979 @@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
52980 dlfb_urb_completion(urb);
52981
52982 error:
52983 - atomic_add(bytes_sent, &dev->bytes_sent);
52984 - atomic_add(bytes_identical, &dev->bytes_identical);
52985 - atomic_add(bytes_rendered, &dev->bytes_rendered);
52986 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
52987 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
52988 + atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
52989 end_cycles = get_cycles();
52990 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
52991 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
52992 >> 10)), /* Kcycles */
52993 &dev->cpu_kcycles_used);
52994 }
52995 @@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
52996 fb_deferred_io_cleanup(info);
52997 kfree(info->fbdefio);
52998 info->fbdefio = NULL;
52999 - info->fbops->fb_mmap = dlfb_ops_mmap;
53000 + pax_open_kernel();
53001 + *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
53002 + pax_close_kernel();
53003 }
53004
53005 pr_warn("released /dev/fb%d user=%d count=%d\n",
53006 @@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
53007 struct fb_info *fb_info = dev_get_drvdata(fbdev);
53008 struct dlfb_data *dev = fb_info->par;
53009 return snprintf(buf, PAGE_SIZE, "%u\n",
53010 - atomic_read(&dev->bytes_rendered));
53011 + atomic_read_unchecked(&dev->bytes_rendered));
53012 }
53013
53014 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
53015 @@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
53016 struct fb_info *fb_info = dev_get_drvdata(fbdev);
53017 struct dlfb_data *dev = fb_info->par;
53018 return snprintf(buf, PAGE_SIZE, "%u\n",
53019 - atomic_read(&dev->bytes_identical));
53020 + atomic_read_unchecked(&dev->bytes_identical));
53021 }
53022
53023 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
53024 @@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
53025 struct fb_info *fb_info = dev_get_drvdata(fbdev);
53026 struct dlfb_data *dev = fb_info->par;
53027 return snprintf(buf, PAGE_SIZE, "%u\n",
53028 - atomic_read(&dev->bytes_sent));
53029 + atomic_read_unchecked(&dev->bytes_sent));
53030 }
53031
53032 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
53033 @@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
53034 struct fb_info *fb_info = dev_get_drvdata(fbdev);
53035 struct dlfb_data *dev = fb_info->par;
53036 return snprintf(buf, PAGE_SIZE, "%u\n",
53037 - atomic_read(&dev->cpu_kcycles_used));
53038 + atomic_read_unchecked(&dev->cpu_kcycles_used));
53039 }
53040
53041 static ssize_t edid_show(
53042 @@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
53043 struct fb_info *fb_info = dev_get_drvdata(fbdev);
53044 struct dlfb_data *dev = fb_info->par;
53045
53046 - atomic_set(&dev->bytes_rendered, 0);
53047 - atomic_set(&dev->bytes_identical, 0);
53048 - atomic_set(&dev->bytes_sent, 0);
53049 - atomic_set(&dev->cpu_kcycles_used, 0);
53050 + atomic_set_unchecked(&dev->bytes_rendered, 0);
53051 + atomic_set_unchecked(&dev->bytes_identical, 0);
53052 + atomic_set_unchecked(&dev->bytes_sent, 0);
53053 + atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
53054
53055 return count;
53056 }
53057 diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
53058 index 509d452..7c9d2de 100644
53059 --- a/drivers/video/fbdev/uvesafb.c
53060 +++ b/drivers/video/fbdev/uvesafb.c
53061 @@ -19,6 +19,7 @@
53062 #include <linux/io.h>
53063 #include <linux/mutex.h>
53064 #include <linux/slab.h>
53065 +#include <linux/moduleloader.h>
53066 #include <video/edid.h>
53067 #include <video/uvesafb.h>
53068 #ifdef CONFIG_X86
53069 @@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
53070 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
53071 par->pmi_setpal = par->ypan = 0;
53072 } else {
53073 +
53074 +#ifdef CONFIG_PAX_KERNEXEC
53075 +#ifdef CONFIG_MODULES
53076 + par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
53077 +#endif
53078 + if (!par->pmi_code) {
53079 + par->pmi_setpal = par->ypan = 0;
53080 + return 0;
53081 + }
53082 +#endif
53083 +
53084 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
53085 + task->t.regs.edi);
53086 +
53087 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53088 + pax_open_kernel();
53089 + memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
53090 + pax_close_kernel();
53091 +
53092 + par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
53093 + par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
53094 +#else
53095 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
53096 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
53097 +#endif
53098 +
53099 printk(KERN_INFO "uvesafb: protected mode interface info at "
53100 "%04x:%04x\n",
53101 (u16)task->t.regs.es, (u16)task->t.regs.edi);
53102 @@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
53103 par->ypan = ypan;
53104
53105 if (par->pmi_setpal || par->ypan) {
53106 +#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
53107 if (__supported_pte_mask & _PAGE_NX) {
53108 par->pmi_setpal = par->ypan = 0;
53109 printk(KERN_WARNING "uvesafb: NX protection is active, "
53110 "better not use the PMI.\n");
53111 - } else {
53112 + } else
53113 +#endif
53114 uvesafb_vbe_getpmi(task, par);
53115 - }
53116 }
53117 #else
53118 /* The protected mode interface is not available on non-x86. */
53119 @@ -1453,8 +1477,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
53120 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
53121
53122 /* Disable blanking if the user requested so. */
53123 - if (!blank)
53124 - info->fbops->fb_blank = NULL;
53125 + if (!blank) {
53126 + pax_open_kernel();
53127 + *(void **)&info->fbops->fb_blank = NULL;
53128 + pax_close_kernel();
53129 + }
53130
53131 /*
53132 * Find out how much IO memory is required for the mode with
53133 @@ -1525,8 +1552,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
53134 info->flags = FBINFO_FLAG_DEFAULT |
53135 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
53136
53137 - if (!par->ypan)
53138 - info->fbops->fb_pan_display = NULL;
53139 + if (!par->ypan) {
53140 + pax_open_kernel();
53141 + *(void **)&info->fbops->fb_pan_display = NULL;
53142 + pax_close_kernel();
53143 + }
53144 }
53145
53146 static void uvesafb_init_mtrr(struct fb_info *info)
53147 @@ -1787,6 +1817,11 @@ out_mode:
53148 out:
53149 kfree(par->vbe_modes);
53150
53151 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53152 + if (par->pmi_code)
53153 + module_free_exec(NULL, par->pmi_code);
53154 +#endif
53155 +
53156 framebuffer_release(info);
53157 return err;
53158 }
53159 @@ -1811,6 +1846,11 @@ static int uvesafb_remove(struct platform_device *dev)
53160 kfree(par->vbe_state_orig);
53161 kfree(par->vbe_state_saved);
53162
53163 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53164 + if (par->pmi_code)
53165 + module_free_exec(NULL, par->pmi_code);
53166 +#endif
53167 +
53168 framebuffer_release(info);
53169 }
53170 return 0;
53171 diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
53172 index 6170e7f..dd63031 100644
53173 --- a/drivers/video/fbdev/vesafb.c
53174 +++ b/drivers/video/fbdev/vesafb.c
53175 @@ -9,6 +9,7 @@
53176 */
53177
53178 #include <linux/module.h>
53179 +#include <linux/moduleloader.h>
53180 #include <linux/kernel.h>
53181 #include <linux/errno.h>
53182 #include <linux/string.h>
53183 @@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
53184 static int vram_total; /* Set total amount of memory */
53185 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
53186 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
53187 -static void (*pmi_start)(void) __read_mostly;
53188 -static void (*pmi_pal) (void) __read_mostly;
53189 +static void (*pmi_start)(void) __read_only;
53190 +static void (*pmi_pal) (void) __read_only;
53191 static int depth __read_mostly;
53192 static int vga_compat __read_mostly;
53193 /* --------------------------------------------------------------------- */
53194 @@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
53195 unsigned int size_remap;
53196 unsigned int size_total;
53197 char *option = NULL;
53198 + void *pmi_code = NULL;
53199
53200 /* ignore error return of fb_get_options */
53201 fb_get_options("vesafb", &option);
53202 @@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
53203 size_remap = size_total;
53204 vesafb_fix.smem_len = size_remap;
53205
53206 -#ifndef __i386__
53207 - screen_info.vesapm_seg = 0;
53208 -#endif
53209 -
53210 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
53211 printk(KERN_WARNING
53212 "vesafb: cannot reserve video memory at 0x%lx\n",
53213 @@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
53214 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
53215 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
53216
53217 +#ifdef __i386__
53218 +
53219 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53220 + pmi_code = module_alloc_exec(screen_info.vesapm_size);
53221 + if (!pmi_code)
53222 +#elif !defined(CONFIG_PAX_KERNEXEC)
53223 + if (0)
53224 +#endif
53225 +
53226 +#endif
53227 + screen_info.vesapm_seg = 0;
53228 +
53229 if (screen_info.vesapm_seg) {
53230 - printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
53231 - screen_info.vesapm_seg,screen_info.vesapm_off);
53232 + printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
53233 + screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
53234 }
53235
53236 if (screen_info.vesapm_seg < 0xc000)
53237 @@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
53238
53239 if (ypan || pmi_setpal) {
53240 unsigned short *pmi_base;
53241 +
53242 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
53243 - pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
53244 - pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
53245 +
53246 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53247 + pax_open_kernel();
53248 + memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
53249 +#else
53250 + pmi_code = pmi_base;
53251 +#endif
53252 +
53253 + pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
53254 + pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
53255 +
53256 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53257 + pmi_start = ktva_ktla(pmi_start);
53258 + pmi_pal = ktva_ktla(pmi_pal);
53259 + pax_close_kernel();
53260 +#endif
53261 +
53262 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
53263 if (pmi_base[3]) {
53264 printk(KERN_INFO "vesafb: pmi: ports = ");
53265 @@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
53266 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
53267 (ypan ? FBINFO_HWACCEL_YPAN : 0);
53268
53269 - if (!ypan)
53270 - info->fbops->fb_pan_display = NULL;
53271 + if (!ypan) {
53272 + pax_open_kernel();
53273 + *(void **)&info->fbops->fb_pan_display = NULL;
53274 + pax_close_kernel();
53275 + }
53276
53277 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
53278 err = -ENOMEM;
53279 @@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
53280 fb_info(info, "%s frame buffer device\n", info->fix.id);
53281 return 0;
53282 err:
53283 +
53284 +#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53285 + module_free_exec(NULL, pmi_code);
53286 +#endif
53287 +
53288 if (info->screen_base)
53289 iounmap(info->screen_base);
53290 framebuffer_release(info);
53291 diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
53292 index 88714ae..16c2e11 100644
53293 --- a/drivers/video/fbdev/via/via_clock.h
53294 +++ b/drivers/video/fbdev/via/via_clock.h
53295 @@ -56,7 +56,7 @@ struct via_clock {
53296
53297 void (*set_engine_pll_state)(u8 state);
53298 void (*set_engine_pll)(struct via_pll_config config);
53299 -};
53300 +} __no_const;
53301
53302
53303 static inline u32 get_pll_internal_frequency(u32 ref_freq,
53304 diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
53305 index 3c14e43..2630570 100644
53306 --- a/drivers/video/logo/logo_linux_clut224.ppm
53307 +++ b/drivers/video/logo/logo_linux_clut224.ppm
53308 @@ -2,1603 +2,1123 @@ P3
53309 # Standard 224-color Linux logo
53310 80 80
53311 255
53312 - 0 0 0 0 0 0 0 0 0 0 0 0
53313 - 0 0 0 0 0 0 0 0 0 0 0 0
53314 - 0 0 0 0 0 0 0 0 0 0 0 0
53315 - 0 0 0 0 0 0 0 0 0 0 0 0
53316 - 0 0 0 0 0 0 0 0 0 0 0 0
53317 - 0 0 0 0 0 0 0 0 0 0 0 0
53318 - 0 0 0 0 0 0 0 0 0 0 0 0
53319 - 0 0 0 0 0 0 0 0 0 0 0 0
53320 - 0 0 0 0 0 0 0 0 0 0 0 0
53321 - 6 6 6 6 6 6 10 10 10 10 10 10
53322 - 10 10 10 6 6 6 6 6 6 6 6 6
53323 - 0 0 0 0 0 0 0 0 0 0 0 0
53324 - 0 0 0 0 0 0 0 0 0 0 0 0
53325 - 0 0 0 0 0 0 0 0 0 0 0 0
53326 - 0 0 0 0 0 0 0 0 0 0 0 0
53327 - 0 0 0 0 0 0 0 0 0 0 0 0
53328 - 0 0 0 0 0 0 0 0 0 0 0 0
53329 - 0 0 0 0 0 0 0 0 0 0 0 0
53330 - 0 0 0 0 0 0 0 0 0 0 0 0
53331 - 0 0 0 0 0 0 0 0 0 0 0 0
53332 - 0 0 0 0 0 0 0 0 0 0 0 0
53333 - 0 0 0 0 0 0 0 0 0 0 0 0
53334 - 0 0 0 0 0 0 0 0 0 0 0 0
53335 - 0 0 0 0 0 0 0 0 0 0 0 0
53336 - 0 0 0 0 0 0 0 0 0 0 0 0
53337 - 0 0 0 0 0 0 0 0 0 0 0 0
53338 - 0 0 0 0 0 0 0 0 0 0 0 0
53339 - 0 0 0 0 0 0 0 0 0 0 0 0
53340 - 0 0 0 6 6 6 10 10 10 14 14 14
53341 - 22 22 22 26 26 26 30 30 30 34 34 34
53342 - 30 30 30 30 30 30 26 26 26 18 18 18
53343 - 14 14 14 10 10 10 6 6 6 0 0 0
53344 - 0 0 0 0 0 0 0 0 0 0 0 0
53345 - 0 0 0 0 0 0 0 0 0 0 0 0
53346 - 0 0 0 0 0 0 0 0 0 0 0 0
53347 - 0 0 0 0 0 0 0 0 0 0 0 0
53348 - 0 0 0 0 0 0 0 0 0 0 0 0
53349 - 0 0 0 0 0 0 0 0 0 0 0 0
53350 - 0 0 0 0 0 0 0 0 0 0 0 0
53351 - 0 0 0 0 0 0 0 0 0 0 0 0
53352 - 0 0 0 0 0 0 0 0 0 0 0 0
53353 - 0 0 0 0 0 1 0 0 1 0 0 0
53354 - 0 0 0 0 0 0 0 0 0 0 0 0
53355 - 0 0 0 0 0 0 0 0 0 0 0 0
53356 - 0 0 0 0 0 0 0 0 0 0 0 0
53357 - 0 0 0 0 0 0 0 0 0 0 0 0
53358 - 0 0 0 0 0 0 0 0 0 0 0 0
53359 - 0 0 0 0 0 0 0 0 0 0 0 0
53360 - 6 6 6 14 14 14 26 26 26 42 42 42
53361 - 54 54 54 66 66 66 78 78 78 78 78 78
53362 - 78 78 78 74 74 74 66 66 66 54 54 54
53363 - 42 42 42 26 26 26 18 18 18 10 10 10
53364 - 6 6 6 0 0 0 0 0 0 0 0 0
53365 - 0 0 0 0 0 0 0 0 0 0 0 0
53366 - 0 0 0 0 0 0 0 0 0 0 0 0
53367 - 0 0 0 0 0 0 0 0 0 0 0 0
53368 - 0 0 0 0 0 0 0 0 0 0 0 0
53369 - 0 0 0 0 0 0 0 0 0 0 0 0
53370 - 0 0 0 0 0 0 0 0 0 0 0 0
53371 - 0 0 0 0 0 0 0 0 0 0 0 0
53372 - 0 0 0 0 0 0 0 0 0 0 0 0
53373 - 0 0 1 0 0 0 0 0 0 0 0 0
53374 - 0 0 0 0 0 0 0 0 0 0 0 0
53375 - 0 0 0 0 0 0 0 0 0 0 0 0
53376 - 0 0 0 0 0 0 0 0 0 0 0 0
53377 - 0 0 0 0 0 0 0 0 0 0 0 0
53378 - 0 0 0 0 0 0 0 0 0 0 0 0
53379 - 0 0 0 0 0 0 0 0 0 10 10 10
53380 - 22 22 22 42 42 42 66 66 66 86 86 86
53381 - 66 66 66 38 38 38 38 38 38 22 22 22
53382 - 26 26 26 34 34 34 54 54 54 66 66 66
53383 - 86 86 86 70 70 70 46 46 46 26 26 26
53384 - 14 14 14 6 6 6 0 0 0 0 0 0
53385 - 0 0 0 0 0 0 0 0 0 0 0 0
53386 - 0 0 0 0 0 0 0 0 0 0 0 0
53387 - 0 0 0 0 0 0 0 0 0 0 0 0
53388 - 0 0 0 0 0 0 0 0 0 0 0 0
53389 - 0 0 0 0 0 0 0 0 0 0 0 0
53390 - 0 0 0 0 0 0 0 0 0 0 0 0
53391 - 0 0 0 0 0 0 0 0 0 0 0 0
53392 - 0 0 0 0 0 0 0 0 0 0 0 0
53393 - 0 0 1 0 0 1 0 0 1 0 0 0
53394 - 0 0 0 0 0 0 0 0 0 0 0 0
53395 - 0 0 0 0 0 0 0 0 0 0 0 0
53396 - 0 0 0 0 0 0 0 0 0 0 0 0
53397 - 0 0 0 0 0 0 0 0 0 0 0 0
53398 - 0 0 0 0 0 0 0 0 0 0 0 0
53399 - 0 0 0 0 0 0 10 10 10 26 26 26
53400 - 50 50 50 82 82 82 58 58 58 6 6 6
53401 - 2 2 6 2 2 6 2 2 6 2 2 6
53402 - 2 2 6 2 2 6 2 2 6 2 2 6
53403 - 6 6 6 54 54 54 86 86 86 66 66 66
53404 - 38 38 38 18 18 18 6 6 6 0 0 0
53405 - 0 0 0 0 0 0 0 0 0 0 0 0
53406 - 0 0 0 0 0 0 0 0 0 0 0 0
53407 - 0 0 0 0 0 0 0 0 0 0 0 0
53408 - 0 0 0 0 0 0 0 0 0 0 0 0
53409 - 0 0 0 0 0 0 0 0 0 0 0 0
53410 - 0 0 0 0 0 0 0 0 0 0 0 0
53411 - 0 0 0 0 0 0 0 0 0 0 0 0
53412 - 0 0 0 0 0 0 0 0 0 0 0 0
53413 - 0 0 0 0 0 0 0 0 0 0 0 0
53414 - 0 0 0 0 0 0 0 0 0 0 0 0
53415 - 0 0 0 0 0 0 0 0 0 0 0 0
53416 - 0 0 0 0 0 0 0 0 0 0 0 0
53417 - 0 0 0 0 0 0 0 0 0 0 0 0
53418 - 0 0 0 0 0 0 0 0 0 0 0 0
53419 - 0 0 0 6 6 6 22 22 22 50 50 50
53420 - 78 78 78 34 34 34 2 2 6 2 2 6
53421 - 2 2 6 2 2 6 2 2 6 2 2 6
53422 - 2 2 6 2 2 6 2 2 6 2 2 6
53423 - 2 2 6 2 2 6 6 6 6 70 70 70
53424 - 78 78 78 46 46 46 22 22 22 6 6 6
53425 - 0 0 0 0 0 0 0 0 0 0 0 0
53426 - 0 0 0 0 0 0 0 0 0 0 0 0
53427 - 0 0 0 0 0 0 0 0 0 0 0 0
53428 - 0 0 0 0 0 0 0 0 0 0 0 0
53429 - 0 0 0 0 0 0 0 0 0 0 0 0
53430 - 0 0 0 0 0 0 0 0 0 0 0 0
53431 - 0 0 0 0 0 0 0 0 0 0 0 0
53432 - 0 0 0 0 0 0 0 0 0 0 0 0
53433 - 0 0 1 0 0 1 0 0 1 0 0 0
53434 - 0 0 0 0 0 0 0 0 0 0 0 0
53435 - 0 0 0 0 0 0 0 0 0 0 0 0
53436 - 0 0 0 0 0 0 0 0 0 0 0 0
53437 - 0 0 0 0 0 0 0 0 0 0 0 0
53438 - 0 0 0 0 0 0 0 0 0 0 0 0
53439 - 6 6 6 18 18 18 42 42 42 82 82 82
53440 - 26 26 26 2 2 6 2 2 6 2 2 6
53441 - 2 2 6 2 2 6 2 2 6 2 2 6
53442 - 2 2 6 2 2 6 2 2 6 14 14 14
53443 - 46 46 46 34 34 34 6 6 6 2 2 6
53444 - 42 42 42 78 78 78 42 42 42 18 18 18
53445 - 6 6 6 0 0 0 0 0 0 0 0 0
53446 - 0 0 0 0 0 0 0 0 0 0 0 0
53447 - 0 0 0 0 0 0 0 0 0 0 0 0
53448 - 0 0 0 0 0 0 0 0 0 0 0 0
53449 - 0 0 0 0 0 0 0 0 0 0 0 0
53450 - 0 0 0 0 0 0 0 0 0 0 0 0
53451 - 0 0 0 0 0 0 0 0 0 0 0 0
53452 - 0 0 0 0 0 0 0 0 0 0 0 0
53453 - 0 0 1 0 0 0 0 0 1 0 0 0
53454 - 0 0 0 0 0 0 0 0 0 0 0 0
53455 - 0 0 0 0 0 0 0 0 0 0 0 0
53456 - 0 0 0 0 0 0 0 0 0 0 0 0
53457 - 0 0 0 0 0 0 0 0 0 0 0 0
53458 - 0 0 0 0 0 0 0 0 0 0 0 0
53459 - 10 10 10 30 30 30 66 66 66 58 58 58
53460 - 2 2 6 2 2 6 2 2 6 2 2 6
53461 - 2 2 6 2 2 6 2 2 6 2 2 6
53462 - 2 2 6 2 2 6 2 2 6 26 26 26
53463 - 86 86 86 101 101 101 46 46 46 10 10 10
53464 - 2 2 6 58 58 58 70 70 70 34 34 34
53465 - 10 10 10 0 0 0 0 0 0 0 0 0
53466 - 0 0 0 0 0 0 0 0 0 0 0 0
53467 - 0 0 0 0 0 0 0 0 0 0 0 0
53468 - 0 0 0 0 0 0 0 0 0 0 0 0
53469 - 0 0 0 0 0 0 0 0 0 0 0 0
53470 - 0 0 0 0 0 0 0 0 0 0 0 0
53471 - 0 0 0 0 0 0 0 0 0 0 0 0
53472 - 0 0 0 0 0 0 0 0 0 0 0 0
53473 - 0 0 1 0 0 1 0 0 1 0 0 0
53474 - 0 0 0 0 0 0 0 0 0 0 0 0
53475 - 0 0 0 0 0 0 0 0 0 0 0 0
53476 - 0 0 0 0 0 0 0 0 0 0 0 0
53477 - 0 0 0 0 0 0 0 0 0 0 0 0
53478 - 0 0 0 0 0 0 0 0 0 0 0 0
53479 - 14 14 14 42 42 42 86 86 86 10 10 10
53480 - 2 2 6 2 2 6 2 2 6 2 2 6
53481 - 2 2 6 2 2 6 2 2 6 2 2 6
53482 - 2 2 6 2 2 6 2 2 6 30 30 30
53483 - 94 94 94 94 94 94 58 58 58 26 26 26
53484 - 2 2 6 6 6 6 78 78 78 54 54 54
53485 - 22 22 22 6 6 6 0 0 0 0 0 0
53486 - 0 0 0 0 0 0 0 0 0 0 0 0
53487 - 0 0 0 0 0 0 0 0 0 0 0 0
53488 - 0 0 0 0 0 0 0 0 0 0 0 0
53489 - 0 0 0 0 0 0 0 0 0 0 0 0
53490 - 0 0 0 0 0 0 0 0 0 0 0 0
53491 - 0 0 0 0 0 0 0 0 0 0 0 0
53492 - 0 0 0 0 0 0 0 0 0 0 0 0
53493 - 0 0 0 0 0 0 0 0 0 0 0 0
53494 - 0 0 0 0 0 0 0 0 0 0 0 0
53495 - 0 0 0 0 0 0 0 0 0 0 0 0
53496 - 0 0 0 0 0 0 0 0 0 0 0 0
53497 - 0 0 0 0 0 0 0 0 0 0 0 0
53498 - 0 0 0 0 0 0 0 0 0 6 6 6
53499 - 22 22 22 62 62 62 62 62 62 2 2 6
53500 - 2 2 6 2 2 6 2 2 6 2 2 6
53501 - 2 2 6 2 2 6 2 2 6 2 2 6
53502 - 2 2 6 2 2 6 2 2 6 26 26 26
53503 - 54 54 54 38 38 38 18 18 18 10 10 10
53504 - 2 2 6 2 2 6 34 34 34 82 82 82
53505 - 38 38 38 14 14 14 0 0 0 0 0 0
53506 - 0 0 0 0 0 0 0 0 0 0 0 0
53507 - 0 0 0 0 0 0 0 0 0 0 0 0
53508 - 0 0 0 0 0 0 0 0 0 0 0 0
53509 - 0 0 0 0 0 0 0 0 0 0 0 0
53510 - 0 0 0 0 0 0 0 0 0 0 0 0
53511 - 0 0 0 0 0 0 0 0 0 0 0 0
53512 - 0 0 0 0 0 0 0 0 0 0 0 0
53513 - 0 0 0 0 0 1 0 0 1 0 0 0
53514 - 0 0 0 0 0 0 0 0 0 0 0 0
53515 - 0 0 0 0 0 0 0 0 0 0 0 0
53516 - 0 0 0 0 0 0 0 0 0 0 0 0
53517 - 0 0 0 0 0 0 0 0 0 0 0 0
53518 - 0 0 0 0 0 0 0 0 0 6 6 6
53519 - 30 30 30 78 78 78 30 30 30 2 2 6
53520 - 2 2 6 2 2 6 2 2 6 2 2 6
53521 - 2 2 6 2 2 6 2 2 6 2 2 6
53522 - 2 2 6 2 2 6 2 2 6 10 10 10
53523 - 10 10 10 2 2 6 2 2 6 2 2 6
53524 - 2 2 6 2 2 6 2 2 6 78 78 78
53525 - 50 50 50 18 18 18 6 6 6 0 0 0
53526 - 0 0 0 0 0 0 0 0 0 0 0 0
53527 - 0 0 0 0 0 0 0 0 0 0 0 0
53528 - 0 0 0 0 0 0 0 0 0 0 0 0
53529 - 0 0 0 0 0 0 0 0 0 0 0 0
53530 - 0 0 0 0 0 0 0 0 0 0 0 0
53531 - 0 0 0 0 0 0 0 0 0 0 0 0
53532 - 0 0 0 0 0 0 0 0 0 0 0 0
53533 - 0 0 1 0 0 0 0 0 0 0 0 0
53534 - 0 0 0 0 0 0 0 0 0 0 0 0
53535 - 0 0 0 0 0 0 0 0 0 0 0 0
53536 - 0 0 0 0 0 0 0 0 0 0 0 0
53537 - 0 0 0 0 0 0 0 0 0 0 0 0
53538 - 0 0 0 0 0 0 0 0 0 10 10 10
53539 - 38 38 38 86 86 86 14 14 14 2 2 6
53540 - 2 2 6 2 2 6 2 2 6 2 2 6
53541 - 2 2 6 2 2 6 2 2 6 2 2 6
53542 - 2 2 6 2 2 6 2 2 6 2 2 6
53543 - 2 2 6 2 2 6 2 2 6 2 2 6
53544 - 2 2 6 2 2 6 2 2 6 54 54 54
53545 - 66 66 66 26 26 26 6 6 6 0 0 0
53546 - 0 0 0 0 0 0 0 0 0 0 0 0
53547 - 0 0 0 0 0 0 0 0 0 0 0 0
53548 - 0 0 0 0 0 0 0 0 0 0 0 0
53549 - 0 0 0 0 0 0 0 0 0 0 0 0
53550 - 0 0 0 0 0 0 0 0 0 0 0 0
53551 - 0 0 0 0 0 0 0 0 0 0 0 0
53552 - 0 0 0 0 0 0 0 0 0 0 0 0
53553 - 0 0 0 0 0 1 0 0 1 0 0 0
53554 - 0 0 0 0 0 0 0 0 0 0 0 0
53555 - 0 0 0 0 0 0 0 0 0 0 0 0
53556 - 0 0 0 0 0 0 0 0 0 0 0 0
53557 - 0 0 0 0 0 0 0 0 0 0 0 0
53558 - 0 0 0 0 0 0 0 0 0 14 14 14
53559 - 42 42 42 82 82 82 2 2 6 2 2 6
53560 - 2 2 6 6 6 6 10 10 10 2 2 6
53561 - 2 2 6 2 2 6 2 2 6 2 2 6
53562 - 2 2 6 2 2 6 2 2 6 6 6 6
53563 - 14 14 14 10 10 10 2 2 6 2 2 6
53564 - 2 2 6 2 2 6 2 2 6 18 18 18
53565 - 82 82 82 34 34 34 10 10 10 0 0 0
53566 - 0 0 0 0 0 0 0 0 0 0 0 0
53567 - 0 0 0 0 0 0 0 0 0 0 0 0
53568 - 0 0 0 0 0 0 0 0 0 0 0 0
53569 - 0 0 0 0 0 0 0 0 0 0 0 0
53570 - 0 0 0 0 0 0 0 0 0 0 0 0
53571 - 0 0 0 0 0 0 0 0 0 0 0 0
53572 - 0 0 0 0 0 0 0 0 0 0 0 0
53573 - 0 0 1 0 0 0 0 0 0 0 0 0
53574 - 0 0 0 0 0 0 0 0 0 0 0 0
53575 - 0 0 0 0 0 0 0 0 0 0 0 0
53576 - 0 0 0 0 0 0 0 0 0 0 0 0
53577 - 0 0 0 0 0 0 0 0 0 0 0 0
53578 - 0 0 0 0 0 0 0 0 0 14 14 14
53579 - 46 46 46 86 86 86 2 2 6 2 2 6
53580 - 6 6 6 6 6 6 22 22 22 34 34 34
53581 - 6 6 6 2 2 6 2 2 6 2 2 6
53582 - 2 2 6 2 2 6 18 18 18 34 34 34
53583 - 10 10 10 50 50 50 22 22 22 2 2 6
53584 - 2 2 6 2 2 6 2 2 6 10 10 10
53585 - 86 86 86 42 42 42 14 14 14 0 0 0
53586 - 0 0 0 0 0 0 0 0 0 0 0 0
53587 - 0 0 0 0 0 0 0 0 0 0 0 0
53588 - 0 0 0 0 0 0 0 0 0 0 0 0
53589 - 0 0 0 0 0 0 0 0 0 0 0 0
53590 - 0 0 0 0 0 0 0 0 0 0 0 0
53591 - 0 0 0 0 0 0 0 0 0 0 0 0
53592 - 0 0 0 0 0 0 0 0 0 0 0 0
53593 - 0 0 1 0 0 1 0 0 1 0 0 0
53594 - 0 0 0 0 0 0 0 0 0 0 0 0
53595 - 0 0 0 0 0 0 0 0 0 0 0 0
53596 - 0 0 0 0 0 0 0 0 0 0 0 0
53597 - 0 0 0 0 0 0 0 0 0 0 0 0
53598 - 0 0 0 0 0 0 0 0 0 14 14 14
53599 - 46 46 46 86 86 86 2 2 6 2 2 6
53600 - 38 38 38 116 116 116 94 94 94 22 22 22
53601 - 22 22 22 2 2 6 2 2 6 2 2 6
53602 - 14 14 14 86 86 86 138 138 138 162 162 162
53603 -154 154 154 38 38 38 26 26 26 6 6 6
53604 - 2 2 6 2 2 6 2 2 6 2 2 6
53605 - 86 86 86 46 46 46 14 14 14 0 0 0
53606 - 0 0 0 0 0 0 0 0 0 0 0 0
53607 - 0 0 0 0 0 0 0 0 0 0 0 0
53608 - 0 0 0 0 0 0 0 0 0 0 0 0
53609 - 0 0 0 0 0 0 0 0 0 0 0 0
53610 - 0 0 0 0 0 0 0 0 0 0 0 0
53611 - 0 0 0 0 0 0 0 0 0 0 0 0
53612 - 0 0 0 0 0 0 0 0 0 0 0 0
53613 - 0 0 0 0 0 0 0 0 0 0 0 0
53614 - 0 0 0 0 0 0 0 0 0 0 0 0
53615 - 0 0 0 0 0 0 0 0 0 0 0 0
53616 - 0 0 0 0 0 0 0 0 0 0 0 0
53617 - 0 0 0 0 0 0 0 0 0 0 0 0
53618 - 0 0 0 0 0 0 0 0 0 14 14 14
53619 - 46 46 46 86 86 86 2 2 6 14 14 14
53620 -134 134 134 198 198 198 195 195 195 116 116 116
53621 - 10 10 10 2 2 6 2 2 6 6 6 6
53622 -101 98 89 187 187 187 210 210 210 218 218 218
53623 -214 214 214 134 134 134 14 14 14 6 6 6
53624 - 2 2 6 2 2 6 2 2 6 2 2 6
53625 - 86 86 86 50 50 50 18 18 18 6 6 6
53626 - 0 0 0 0 0 0 0 0 0 0 0 0
53627 - 0 0 0 0 0 0 0 0 0 0 0 0
53628 - 0 0 0 0 0 0 0 0 0 0 0 0
53629 - 0 0 0 0 0 0 0 0 0 0 0 0
53630 - 0 0 0 0 0 0 0 0 0 0 0 0
53631 - 0 0 0 0 0 0 0 0 0 0 0 0
53632 - 0 0 0 0 0 0 0 0 1 0 0 0
53633 - 0 0 1 0 0 1 0 0 1 0 0 0
53634 - 0 0 0 0 0 0 0 0 0 0 0 0
53635 - 0 0 0 0 0 0 0 0 0 0 0 0
53636 - 0 0 0 0 0 0 0 0 0 0 0 0
53637 - 0 0 0 0 0 0 0 0 0 0 0 0
53638 - 0 0 0 0 0 0 0 0 0 14 14 14
53639 - 46 46 46 86 86 86 2 2 6 54 54 54
53640 -218 218 218 195 195 195 226 226 226 246 246 246
53641 - 58 58 58 2 2 6 2 2 6 30 30 30
53642 -210 210 210 253 253 253 174 174 174 123 123 123
53643 -221 221 221 234 234 234 74 74 74 2 2 6
53644 - 2 2 6 2 2 6 2 2 6 2 2 6
53645 - 70 70 70 58 58 58 22 22 22 6 6 6
53646 - 0 0 0 0 0 0 0 0 0 0 0 0
53647 - 0 0 0 0 0 0 0 0 0 0 0 0
53648 - 0 0 0 0 0 0 0 0 0 0 0 0
53649 - 0 0 0 0 0 0 0 0 0 0 0 0
53650 - 0 0 0 0 0 0 0 0 0 0 0 0
53651 - 0 0 0 0 0 0 0 0 0 0 0 0
53652 - 0 0 0 0 0 0 0 0 0 0 0 0
53653 - 0 0 0 0 0 0 0 0 0 0 0 0
53654 - 0 0 0 0 0 0 0 0 0 0 0 0
53655 - 0 0 0 0 0 0 0 0 0 0 0 0
53656 - 0 0 0 0 0 0 0 0 0 0 0 0
53657 - 0 0 0 0 0 0 0 0 0 0 0 0
53658 - 0 0 0 0 0 0 0 0 0 14 14 14
53659 - 46 46 46 82 82 82 2 2 6 106 106 106
53660 -170 170 170 26 26 26 86 86 86 226 226 226
53661 -123 123 123 10 10 10 14 14 14 46 46 46
53662 -231 231 231 190 190 190 6 6 6 70 70 70
53663 - 90 90 90 238 238 238 158 158 158 2 2 6
53664 - 2 2 6 2 2 6 2 2 6 2 2 6
53665 - 70 70 70 58 58 58 22 22 22 6 6 6
53666 - 0 0 0 0 0 0 0 0 0 0 0 0
53667 - 0 0 0 0 0 0 0 0 0 0 0 0
53668 - 0 0 0 0 0 0 0 0 0 0 0 0
53669 - 0 0 0 0 0 0 0 0 0 0 0 0
53670 - 0 0 0 0 0 0 0 0 0 0 0 0
53671 - 0 0 0 0 0 0 0 0 0 0 0 0
53672 - 0 0 0 0 0 0 0 0 1 0 0 0
53673 - 0 0 1 0 0 1 0 0 1 0 0 0
53674 - 0 0 0 0 0 0 0 0 0 0 0 0
53675 - 0 0 0 0 0 0 0 0 0 0 0 0
53676 - 0 0 0 0 0 0 0 0 0 0 0 0
53677 - 0 0 0 0 0 0 0 0 0 0 0 0
53678 - 0 0 0 0 0 0 0 0 0 14 14 14
53679 - 42 42 42 86 86 86 6 6 6 116 116 116
53680 -106 106 106 6 6 6 70 70 70 149 149 149
53681 -128 128 128 18 18 18 38 38 38 54 54 54
53682 -221 221 221 106 106 106 2 2 6 14 14 14
53683 - 46 46 46 190 190 190 198 198 198 2 2 6
53684 - 2 2 6 2 2 6 2 2 6 2 2 6
53685 - 74 74 74 62 62 62 22 22 22 6 6 6
53686 - 0 0 0 0 0 0 0 0 0 0 0 0
53687 - 0 0 0 0 0 0 0 0 0 0 0 0
53688 - 0 0 0 0 0 0 0 0 0 0 0 0
53689 - 0 0 0 0 0 0 0 0 0 0 0 0
53690 - 0 0 0 0 0 0 0 0 0 0 0 0
53691 - 0 0 0 0 0 0 0 0 0 0 0 0
53692 - 0 0 0 0 0 0 0 0 1 0 0 0
53693 - 0 0 1 0 0 0 0 0 1 0 0 0
53694 - 0 0 0 0 0 0 0 0 0 0 0 0
53695 - 0 0 0 0 0 0 0 0 0 0 0 0
53696 - 0 0 0 0 0 0 0 0 0 0 0 0
53697 - 0 0 0 0 0 0 0 0 0 0 0 0
53698 - 0 0 0 0 0 0 0 0 0 14 14 14
53699 - 42 42 42 94 94 94 14 14 14 101 101 101
53700 -128 128 128 2 2 6 18 18 18 116 116 116
53701 -118 98 46 121 92 8 121 92 8 98 78 10
53702 -162 162 162 106 106 106 2 2 6 2 2 6
53703 - 2 2 6 195 195 195 195 195 195 6 6 6
53704 - 2 2 6 2 2 6 2 2 6 2 2 6
53705 - 74 74 74 62 62 62 22 22 22 6 6 6
53706 - 0 0 0 0 0 0 0 0 0 0 0 0
53707 - 0 0 0 0 0 0 0 0 0 0 0 0
53708 - 0 0 0 0 0 0 0 0 0 0 0 0
53709 - 0 0 0 0 0 0 0 0 0 0 0 0
53710 - 0 0 0 0 0 0 0 0 0 0 0 0
53711 - 0 0 0 0 0 0 0 0 0 0 0 0
53712 - 0 0 0 0 0 0 0 0 1 0 0 1
53713 - 0 0 1 0 0 0 0 0 1 0 0 0
53714 - 0 0 0 0 0 0 0 0 0 0 0 0
53715 - 0 0 0 0 0 0 0 0 0 0 0 0
53716 - 0 0 0 0 0 0 0 0 0 0 0 0
53717 - 0 0 0 0 0 0 0 0 0 0 0 0
53718 - 0 0 0 0 0 0 0 0 0 10 10 10
53719 - 38 38 38 90 90 90 14 14 14 58 58 58
53720 -210 210 210 26 26 26 54 38 6 154 114 10
53721 -226 170 11 236 186 11 225 175 15 184 144 12
53722 -215 174 15 175 146 61 37 26 9 2 2 6
53723 - 70 70 70 246 246 246 138 138 138 2 2 6
53724 - 2 2 6 2 2 6 2 2 6 2 2 6
53725 - 70 70 70 66 66 66 26 26 26 6 6 6
53726 - 0 0 0 0 0 0 0 0 0 0 0 0
53727 - 0 0 0 0 0 0 0 0 0 0 0 0
53728 - 0 0 0 0 0 0 0 0 0 0 0 0
53729 - 0 0 0 0 0 0 0 0 0 0 0 0
53730 - 0 0 0 0 0 0 0 0 0 0 0 0
53731 - 0 0 0 0 0 0 0 0 0 0 0 0
53732 - 0 0 0 0 0 0 0 0 0 0 0 0
53733 - 0 0 0 0 0 0 0 0 0 0 0 0
53734 - 0 0 0 0 0 0 0 0 0 0 0 0
53735 - 0 0 0 0 0 0 0 0 0 0 0 0
53736 - 0 0 0 0 0 0 0 0 0 0 0 0
53737 - 0 0 0 0 0 0 0 0 0 0 0 0
53738 - 0 0 0 0 0 0 0 0 0 10 10 10
53739 - 38 38 38 86 86 86 14 14 14 10 10 10
53740 -195 195 195 188 164 115 192 133 9 225 175 15
53741 -239 182 13 234 190 10 232 195 16 232 200 30
53742 -245 207 45 241 208 19 232 195 16 184 144 12
53743 -218 194 134 211 206 186 42 42 42 2 2 6
53744 - 2 2 6 2 2 6 2 2 6 2 2 6
53745 - 50 50 50 74 74 74 30 30 30 6 6 6
53746 - 0 0 0 0 0 0 0 0 0 0 0 0
53747 - 0 0 0 0 0 0 0 0 0 0 0 0
53748 - 0 0 0 0 0 0 0 0 0 0 0 0
53749 - 0 0 0 0 0 0 0 0 0 0 0 0
53750 - 0 0 0 0 0 0 0 0 0 0 0 0
53751 - 0 0 0 0 0 0 0 0 0 0 0 0
53752 - 0 0 0 0 0 0 0 0 0 0 0 0
53753 - 0 0 0 0 0 0 0 0 0 0 0 0
53754 - 0 0 0 0 0 0 0 0 0 0 0 0
53755 - 0 0 0 0 0 0 0 0 0 0 0 0
53756 - 0 0 0 0 0 0 0 0 0 0 0 0
53757 - 0 0 0 0 0 0 0 0 0 0 0 0
53758 - 0 0 0 0 0 0 0 0 0 10 10 10
53759 - 34 34 34 86 86 86 14 14 14 2 2 6
53760 -121 87 25 192 133 9 219 162 10 239 182 13
53761 -236 186 11 232 195 16 241 208 19 244 214 54
53762 -246 218 60 246 218 38 246 215 20 241 208 19
53763 -241 208 19 226 184 13 121 87 25 2 2 6
53764 - 2 2 6 2 2 6 2 2 6 2 2 6
53765 - 50 50 50 82 82 82 34 34 34 10 10 10
53766 - 0 0 0 0 0 0 0 0 0 0 0 0
53767 - 0 0 0 0 0 0 0 0 0 0 0 0
53768 - 0 0 0 0 0 0 0 0 0 0 0 0
53769 - 0 0 0 0 0 0 0 0 0 0 0 0
53770 - 0 0 0 0 0 0 0 0 0 0 0 0
53771 - 0 0 0 0 0 0 0 0 0 0 0 0
53772 - 0 0 0 0 0 0 0 0 0 0 0 0
53773 - 0 0 0 0 0 0 0 0 0 0 0 0
53774 - 0 0 0 0 0 0 0 0 0 0 0 0
53775 - 0 0 0 0 0 0 0 0 0 0 0 0
53776 - 0 0 0 0 0 0 0 0 0 0 0 0
53777 - 0 0 0 0 0 0 0 0 0 0 0 0
53778 - 0 0 0 0 0 0 0 0 0 10 10 10
53779 - 34 34 34 82 82 82 30 30 30 61 42 6
53780 -180 123 7 206 145 10 230 174 11 239 182 13
53781 -234 190 10 238 202 15 241 208 19 246 218 74
53782 -246 218 38 246 215 20 246 215 20 246 215 20
53783 -226 184 13 215 174 15 184 144 12 6 6 6
53784 - 2 2 6 2 2 6 2 2 6 2 2 6
53785 - 26 26 26 94 94 94 42 42 42 14 14 14
53786 - 0 0 0 0 0 0 0 0 0 0 0 0
53787 - 0 0 0 0 0 0 0 0 0 0 0 0
53788 - 0 0 0 0 0 0 0 0 0 0 0 0
53789 - 0 0 0 0 0 0 0 0 0 0 0 0
53790 - 0 0 0 0 0 0 0 0 0 0 0 0
53791 - 0 0 0 0 0 0 0 0 0 0 0 0
53792 - 0 0 0 0 0 0 0 0 0 0 0 0
53793 - 0 0 0 0 0 0 0 0 0 0 0 0
53794 - 0 0 0 0 0 0 0 0 0 0 0 0
53795 - 0 0 0 0 0 0 0 0 0 0 0 0
53796 - 0 0 0 0 0 0 0 0 0 0 0 0
53797 - 0 0 0 0 0 0 0 0 0 0 0 0
53798 - 0 0 0 0 0 0 0 0 0 10 10 10
53799 - 30 30 30 78 78 78 50 50 50 104 69 6
53800 -192 133 9 216 158 10 236 178 12 236 186 11
53801 -232 195 16 241 208 19 244 214 54 245 215 43
53802 -246 215 20 246 215 20 241 208 19 198 155 10
53803 -200 144 11 216 158 10 156 118 10 2 2 6
53804 - 2 2 6 2 2 6 2 2 6 2 2 6
53805 - 6 6 6 90 90 90 54 54 54 18 18 18
53806 - 6 6 6 0 0 0 0 0 0 0 0 0
53807 - 0 0 0 0 0 0 0 0 0 0 0 0
53808 - 0 0 0 0 0 0 0 0 0 0 0 0
53809 - 0 0 0 0 0 0 0 0 0 0 0 0
53810 - 0 0 0 0 0 0 0 0 0 0 0 0
53811 - 0 0 0 0 0 0 0 0 0 0 0 0
53812 - 0 0 0 0 0 0 0 0 0 0 0 0
53813 - 0 0 0 0 0 0 0 0 0 0 0 0
53814 - 0 0 0 0 0 0 0 0 0 0 0 0
53815 - 0 0 0 0 0 0 0 0 0 0 0 0
53816 - 0 0 0 0 0 0 0 0 0 0 0 0
53817 - 0 0 0 0 0 0 0 0 0 0 0 0
53818 - 0 0 0 0 0 0 0 0 0 10 10 10
53819 - 30 30 30 78 78 78 46 46 46 22 22 22
53820 -137 92 6 210 162 10 239 182 13 238 190 10
53821 -238 202 15 241 208 19 246 215 20 246 215 20
53822 -241 208 19 203 166 17 185 133 11 210 150 10
53823 -216 158 10 210 150 10 102 78 10 2 2 6
53824 - 6 6 6 54 54 54 14 14 14 2 2 6
53825 - 2 2 6 62 62 62 74 74 74 30 30 30
53826 - 10 10 10 0 0 0 0 0 0 0 0 0
53827 - 0 0 0 0 0 0 0 0 0 0 0 0
53828 - 0 0 0 0 0 0 0 0 0 0 0 0
53829 - 0 0 0 0 0 0 0 0 0 0 0 0
53830 - 0 0 0 0 0 0 0 0 0 0 0 0
53831 - 0 0 0 0 0 0 0 0 0 0 0 0
53832 - 0 0 0 0 0 0 0 0 0 0 0 0
53833 - 0 0 0 0 0 0 0 0 0 0 0 0
53834 - 0 0 0 0 0 0 0 0 0 0 0 0
53835 - 0 0 0 0 0 0 0 0 0 0 0 0
53836 - 0 0 0 0 0 0 0 0 0 0 0 0
53837 - 0 0 0 0 0 0 0 0 0 0 0 0
53838 - 0 0 0 0 0 0 0 0 0 10 10 10
53839 - 34 34 34 78 78 78 50 50 50 6 6 6
53840 - 94 70 30 139 102 15 190 146 13 226 184 13
53841 -232 200 30 232 195 16 215 174 15 190 146 13
53842 -168 122 10 192 133 9 210 150 10 213 154 11
53843 -202 150 34 182 157 106 101 98 89 2 2 6
53844 - 2 2 6 78 78 78 116 116 116 58 58 58
53845 - 2 2 6 22 22 22 90 90 90 46 46 46
53846 - 18 18 18 6 6 6 0 0 0 0 0 0
53847 - 0 0 0 0 0 0 0 0 0 0 0 0
53848 - 0 0 0 0 0 0 0 0 0 0 0 0
53849 - 0 0 0 0 0 0 0 0 0 0 0 0
53850 - 0 0 0 0 0 0 0 0 0 0 0 0
53851 - 0 0 0 0 0 0 0 0 0 0 0 0
53852 - 0 0 0 0 0 0 0 0 0 0 0 0
53853 - 0 0 0 0 0 0 0 0 0 0 0 0
53854 - 0 0 0 0 0 0 0 0 0 0 0 0
53855 - 0 0 0 0 0 0 0 0 0 0 0 0
53856 - 0 0 0 0 0 0 0 0 0 0 0 0
53857 - 0 0 0 0 0 0 0 0 0 0 0 0
53858 - 0 0 0 0 0 0 0 0 0 10 10 10
53859 - 38 38 38 86 86 86 50 50 50 6 6 6
53860 -128 128 128 174 154 114 156 107 11 168 122 10
53861 -198 155 10 184 144 12 197 138 11 200 144 11
53862 -206 145 10 206 145 10 197 138 11 188 164 115
53863 -195 195 195 198 198 198 174 174 174 14 14 14
53864 - 2 2 6 22 22 22 116 116 116 116 116 116
53865 - 22 22 22 2 2 6 74 74 74 70 70 70
53866 - 30 30 30 10 10 10 0 0 0 0 0 0
53867 - 0 0 0 0 0 0 0 0 0 0 0 0
53868 - 0 0 0 0 0 0 0 0 0 0 0 0
53869 - 0 0 0 0 0 0 0 0 0 0 0 0
53870 - 0 0 0 0 0 0 0 0 0 0 0 0
53871 - 0 0 0 0 0 0 0 0 0 0 0 0
53872 - 0 0 0 0 0 0 0 0 0 0 0 0
53873 - 0 0 0 0 0 0 0 0 0 0 0 0
53874 - 0 0 0 0 0 0 0 0 0 0 0 0
53875 - 0 0 0 0 0 0 0 0 0 0 0 0
53876 - 0 0 0 0 0 0 0 0 0 0 0 0
53877 - 0 0 0 0 0 0 0 0 0 0 0 0
53878 - 0 0 0 0 0 0 6 6 6 18 18 18
53879 - 50 50 50 101 101 101 26 26 26 10 10 10
53880 -138 138 138 190 190 190 174 154 114 156 107 11
53881 -197 138 11 200 144 11 197 138 11 192 133 9
53882 -180 123 7 190 142 34 190 178 144 187 187 187
53883 -202 202 202 221 221 221 214 214 214 66 66 66
53884 - 2 2 6 2 2 6 50 50 50 62 62 62
53885 - 6 6 6 2 2 6 10 10 10 90 90 90
53886 - 50 50 50 18 18 18 6 6 6 0 0 0
53887 - 0 0 0 0 0 0 0 0 0 0 0 0
53888 - 0 0 0 0 0 0 0 0 0 0 0 0
53889 - 0 0 0 0 0 0 0 0 0 0 0 0
53890 - 0 0 0 0 0 0 0 0 0 0 0 0
53891 - 0 0 0 0 0 0 0 0 0 0 0 0
53892 - 0 0 0 0 0 0 0 0 0 0 0 0
53893 - 0 0 0 0 0 0 0 0 0 0 0 0
53894 - 0 0 0 0 0 0 0 0 0 0 0 0
53895 - 0 0 0 0 0 0 0 0 0 0 0 0
53896 - 0 0 0 0 0 0 0 0 0 0 0 0
53897 - 0 0 0 0 0 0 0 0 0 0 0 0
53898 - 0 0 0 0 0 0 10 10 10 34 34 34
53899 - 74 74 74 74 74 74 2 2 6 6 6 6
53900 -144 144 144 198 198 198 190 190 190 178 166 146
53901 -154 121 60 156 107 11 156 107 11 168 124 44
53902 -174 154 114 187 187 187 190 190 190 210 210 210
53903 -246 246 246 253 253 253 253 253 253 182 182 182
53904 - 6 6 6 2 2 6 2 2 6 2 2 6
53905 - 2 2 6 2 2 6 2 2 6 62 62 62
53906 - 74 74 74 34 34 34 14 14 14 0 0 0
53907 - 0 0 0 0 0 0 0 0 0 0 0 0
53908 - 0 0 0 0 0 0 0 0 0 0 0 0
53909 - 0 0 0 0 0 0 0 0 0 0 0 0
53910 - 0 0 0 0 0 0 0 0 0 0 0 0
53911 - 0 0 0 0 0 0 0 0 0 0 0 0
53912 - 0 0 0 0 0 0 0 0 0 0 0 0
53913 - 0 0 0 0 0 0 0 0 0 0 0 0
53914 - 0 0 0 0 0 0 0 0 0 0 0 0
53915 - 0 0 0 0 0 0 0 0 0 0 0 0
53916 - 0 0 0 0 0 0 0 0 0 0 0 0
53917 - 0 0 0 0 0 0 0 0 0 0 0 0
53918 - 0 0 0 10 10 10 22 22 22 54 54 54
53919 - 94 94 94 18 18 18 2 2 6 46 46 46
53920 -234 234 234 221 221 221 190 190 190 190 190 190
53921 -190 190 190 187 187 187 187 187 187 190 190 190
53922 -190 190 190 195 195 195 214 214 214 242 242 242
53923 -253 253 253 253 253 253 253 253 253 253 253 253
53924 - 82 82 82 2 2 6 2 2 6 2 2 6
53925 - 2 2 6 2 2 6 2 2 6 14 14 14
53926 - 86 86 86 54 54 54 22 22 22 6 6 6
53927 - 0 0 0 0 0 0 0 0 0 0 0 0
53928 - 0 0 0 0 0 0 0 0 0 0 0 0
53929 - 0 0 0 0 0 0 0 0 0 0 0 0
53930 - 0 0 0 0 0 0 0 0 0 0 0 0
53931 - 0 0 0 0 0 0 0 0 0 0 0 0
53932 - 0 0 0 0 0 0 0 0 0 0 0 0
53933 - 0 0 0 0 0 0 0 0 0 0 0 0
53934 - 0 0 0 0 0 0 0 0 0 0 0 0
53935 - 0 0 0 0 0 0 0 0 0 0 0 0
53936 - 0 0 0 0 0 0 0 0 0 0 0 0
53937 - 0 0 0 0 0 0 0 0 0 0 0 0
53938 - 6 6 6 18 18 18 46 46 46 90 90 90
53939 - 46 46 46 18 18 18 6 6 6 182 182 182
53940 -253 253 253 246 246 246 206 206 206 190 190 190
53941 -190 190 190 190 190 190 190 190 190 190 190 190
53942 -206 206 206 231 231 231 250 250 250 253 253 253
53943 -253 253 253 253 253 253 253 253 253 253 253 253
53944 -202 202 202 14 14 14 2 2 6 2 2 6
53945 - 2 2 6 2 2 6 2 2 6 2 2 6
53946 - 42 42 42 86 86 86 42 42 42 18 18 18
53947 - 6 6 6 0 0 0 0 0 0 0 0 0
53948 - 0 0 0 0 0 0 0 0 0 0 0 0
53949 - 0 0 0 0 0 0 0 0 0 0 0 0
53950 - 0 0 0 0 0 0 0 0 0 0 0 0
53951 - 0 0 0 0 0 0 0 0 0 0 0 0
53952 - 0 0 0 0 0 0 0 0 0 0 0 0
53953 - 0 0 0 0 0 0 0 0 0 0 0 0
53954 - 0 0 0 0 0 0 0 0 0 0 0 0
53955 - 0 0 0 0 0 0 0 0 0 0 0 0
53956 - 0 0 0 0 0 0 0 0 0 0 0 0
53957 - 0 0 0 0 0 0 0 0 0 6 6 6
53958 - 14 14 14 38 38 38 74 74 74 66 66 66
53959 - 2 2 6 6 6 6 90 90 90 250 250 250
53960 -253 253 253 253 253 253 238 238 238 198 198 198
53961 -190 190 190 190 190 190 195 195 195 221 221 221
53962 -246 246 246 253 253 253 253 253 253 253 253 253
53963 -253 253 253 253 253 253 253 253 253 253 253 253
53964 -253 253 253 82 82 82 2 2 6 2 2 6
53965 - 2 2 6 2 2 6 2 2 6 2 2 6
53966 - 2 2 6 78 78 78 70 70 70 34 34 34
53967 - 14 14 14 6 6 6 0 0 0 0 0 0
53968 - 0 0 0 0 0 0 0 0 0 0 0 0
53969 - 0 0 0 0 0 0 0 0 0 0 0 0
53970 - 0 0 0 0 0 0 0 0 0 0 0 0
53971 - 0 0 0 0 0 0 0 0 0 0 0 0
53972 - 0 0 0 0 0 0 0 0 0 0 0 0
53973 - 0 0 0 0 0 0 0 0 0 0 0 0
53974 - 0 0 0 0 0 0 0 0 0 0 0 0
53975 - 0 0 0 0 0 0 0 0 0 0 0 0
53976 - 0 0 0 0 0 0 0 0 0 0 0 0
53977 - 0 0 0 0 0 0 0 0 0 14 14 14
53978 - 34 34 34 66 66 66 78 78 78 6 6 6
53979 - 2 2 6 18 18 18 218 218 218 253 253 253
53980 -253 253 253 253 253 253 253 253 253 246 246 246
53981 -226 226 226 231 231 231 246 246 246 253 253 253
53982 -253 253 253 253 253 253 253 253 253 253 253 253
53983 -253 253 253 253 253 253 253 253 253 253 253 253
53984 -253 253 253 178 178 178 2 2 6 2 2 6
53985 - 2 2 6 2 2 6 2 2 6 2 2 6
53986 - 2 2 6 18 18 18 90 90 90 62 62 62
53987 - 30 30 30 10 10 10 0 0 0 0 0 0
53988 - 0 0 0 0 0 0 0 0 0 0 0 0
53989 - 0 0 0 0 0 0 0 0 0 0 0 0
53990 - 0 0 0 0 0 0 0 0 0 0 0 0
53991 - 0 0 0 0 0 0 0 0 0 0 0 0
53992 - 0 0 0 0 0 0 0 0 0 0 0 0
53993 - 0 0 0 0 0 0 0 0 0 0 0 0
53994 - 0 0 0 0 0 0 0 0 0 0 0 0
53995 - 0 0 0 0 0 0 0 0 0 0 0 0
53996 - 0 0 0 0 0 0 0 0 0 0 0 0
53997 - 0 0 0 0 0 0 10 10 10 26 26 26
53998 - 58 58 58 90 90 90 18 18 18 2 2 6
53999 - 2 2 6 110 110 110 253 253 253 253 253 253
54000 -253 253 253 253 253 253 253 253 253 253 253 253
54001 -250 250 250 253 253 253 253 253 253 253 253 253
54002 -253 253 253 253 253 253 253 253 253 253 253 253
54003 -253 253 253 253 253 253 253 253 253 253 253 253
54004 -253 253 253 231 231 231 18 18 18 2 2 6
54005 - 2 2 6 2 2 6 2 2 6 2 2 6
54006 - 2 2 6 2 2 6 18 18 18 94 94 94
54007 - 54 54 54 26 26 26 10 10 10 0 0 0
54008 - 0 0 0 0 0 0 0 0 0 0 0 0
54009 - 0 0 0 0 0 0 0 0 0 0 0 0
54010 - 0 0 0 0 0 0 0 0 0 0 0 0
54011 - 0 0 0 0 0 0 0 0 0 0 0 0
54012 - 0 0 0 0 0 0 0 0 0 0 0 0
54013 - 0 0 0 0 0 0 0 0 0 0 0 0
54014 - 0 0 0 0 0 0 0 0 0 0 0 0
54015 - 0 0 0 0 0 0 0 0 0 0 0 0
54016 - 0 0 0 0 0 0 0 0 0 0 0 0
54017 - 0 0 0 6 6 6 22 22 22 50 50 50
54018 - 90 90 90 26 26 26 2 2 6 2 2 6
54019 - 14 14 14 195 195 195 250 250 250 253 253 253
54020 -253 253 253 253 253 253 253 253 253 253 253 253
54021 -253 253 253 253 253 253 253 253 253 253 253 253
54022 -253 253 253 253 253 253 253 253 253 253 253 253
54023 -253 253 253 253 253 253 253 253 253 253 253 253
54024 -250 250 250 242 242 242 54 54 54 2 2 6
54025 - 2 2 6 2 2 6 2 2 6 2 2 6
54026 - 2 2 6 2 2 6 2 2 6 38 38 38
54027 - 86 86 86 50 50 50 22 22 22 6 6 6
54028 - 0 0 0 0 0 0 0 0 0 0 0 0
54029 - 0 0 0 0 0 0 0 0 0 0 0 0
54030 - 0 0 0 0 0 0 0 0 0 0 0 0
54031 - 0 0 0 0 0 0 0 0 0 0 0 0
54032 - 0 0 0 0 0 0 0 0 0 0 0 0
54033 - 0 0 0 0 0 0 0 0 0 0 0 0
54034 - 0 0 0 0 0 0 0 0 0 0 0 0
54035 - 0 0 0 0 0 0 0 0 0 0 0 0
54036 - 0 0 0 0 0 0 0 0 0 0 0 0
54037 - 6 6 6 14 14 14 38 38 38 82 82 82
54038 - 34 34 34 2 2 6 2 2 6 2 2 6
54039 - 42 42 42 195 195 195 246 246 246 253 253 253
54040 -253 253 253 253 253 253 253 253 253 250 250 250
54041 -242 242 242 242 242 242 250 250 250 253 253 253
54042 -253 253 253 253 253 253 253 253 253 253 253 253
54043 -253 253 253 250 250 250 246 246 246 238 238 238
54044 -226 226 226 231 231 231 101 101 101 6 6 6
54045 - 2 2 6 2 2 6 2 2 6 2 2 6
54046 - 2 2 6 2 2 6 2 2 6 2 2 6
54047 - 38 38 38 82 82 82 42 42 42 14 14 14
54048 - 6 6 6 0 0 0 0 0 0 0 0 0
54049 - 0 0 0 0 0 0 0 0 0 0 0 0
54050 - 0 0 0 0 0 0 0 0 0 0 0 0
54051 - 0 0 0 0 0 0 0 0 0 0 0 0
54052 - 0 0 0 0 0 0 0 0 0 0 0 0
54053 - 0 0 0 0 0 0 0 0 0 0 0 0
54054 - 0 0 0 0 0 0 0 0 0 0 0 0
54055 - 0 0 0 0 0 0 0 0 0 0 0 0
54056 - 0 0 0 0 0 0 0 0 0 0 0 0
54057 - 10 10 10 26 26 26 62 62 62 66 66 66
54058 - 2 2 6 2 2 6 2 2 6 6 6 6
54059 - 70 70 70 170 170 170 206 206 206 234 234 234
54060 -246 246 246 250 250 250 250 250 250 238 238 238
54061 -226 226 226 231 231 231 238 238 238 250 250 250
54062 -250 250 250 250 250 250 246 246 246 231 231 231
54063 -214 214 214 206 206 206 202 202 202 202 202 202
54064 -198 198 198 202 202 202 182 182 182 18 18 18
54065 - 2 2 6 2 2 6 2 2 6 2 2 6
54066 - 2 2 6 2 2 6 2 2 6 2 2 6
54067 - 2 2 6 62 62 62 66 66 66 30 30 30
54068 - 10 10 10 0 0 0 0 0 0 0 0 0
54069 - 0 0 0 0 0 0 0 0 0 0 0 0
54070 - 0 0 0 0 0 0 0 0 0 0 0 0
54071 - 0 0 0 0 0 0 0 0 0 0 0 0
54072 - 0 0 0 0 0 0 0 0 0 0 0 0
54073 - 0 0 0 0 0 0 0 0 0 0 0 0
54074 - 0 0 0 0 0 0 0 0 0 0 0 0
54075 - 0 0 0 0 0 0 0 0 0 0 0 0
54076 - 0 0 0 0 0 0 0 0 0 0 0 0
54077 - 14 14 14 42 42 42 82 82 82 18 18 18
54078 - 2 2 6 2 2 6 2 2 6 10 10 10
54079 - 94 94 94 182 182 182 218 218 218 242 242 242
54080 -250 250 250 253 253 253 253 253 253 250 250 250
54081 -234 234 234 253 253 253 253 253 253 253 253 253
54082 -253 253 253 253 253 253 253 253 253 246 246 246
54083 -238 238 238 226 226 226 210 210 210 202 202 202
54084 -195 195 195 195 195 195 210 210 210 158 158 158
54085 - 6 6 6 14 14 14 50 50 50 14 14 14
54086 - 2 2 6 2 2 6 2 2 6 2 2 6
54087 - 2 2 6 6 6 6 86 86 86 46 46 46
54088 - 18 18 18 6 6 6 0 0 0 0 0 0
54089 - 0 0 0 0 0 0 0 0 0 0 0 0
54090 - 0 0 0 0 0 0 0 0 0 0 0 0
54091 - 0 0 0 0 0 0 0 0 0 0 0 0
54092 - 0 0 0 0 0 0 0 0 0 0 0 0
54093 - 0 0 0 0 0 0 0 0 0 0 0 0
54094 - 0 0 0 0 0 0 0 0 0 0 0 0
54095 - 0 0 0 0 0 0 0 0 0 0 0 0
54096 - 0 0 0 0 0 0 0 0 0 6 6 6
54097 - 22 22 22 54 54 54 70 70 70 2 2 6
54098 - 2 2 6 10 10 10 2 2 6 22 22 22
54099 -166 166 166 231 231 231 250 250 250 253 253 253
54100 -253 253 253 253 253 253 253 253 253 250 250 250
54101 -242 242 242 253 253 253 253 253 253 253 253 253
54102 -253 253 253 253 253 253 253 253 253 253 253 253
54103 -253 253 253 253 253 253 253 253 253 246 246 246
54104 -231 231 231 206 206 206 198 198 198 226 226 226
54105 - 94 94 94 2 2 6 6 6 6 38 38 38
54106 - 30 30 30 2 2 6 2 2 6 2 2 6
54107 - 2 2 6 2 2 6 62 62 62 66 66 66
54108 - 26 26 26 10 10 10 0 0 0 0 0 0
54109 - 0 0 0 0 0 0 0 0 0 0 0 0
54110 - 0 0 0 0 0 0 0 0 0 0 0 0
54111 - 0 0 0 0 0 0 0 0 0 0 0 0
54112 - 0 0 0 0 0 0 0 0 0 0 0 0
54113 - 0 0 0 0 0 0 0 0 0 0 0 0
54114 - 0 0 0 0 0 0 0 0 0 0 0 0
54115 - 0 0 0 0 0 0 0 0 0 0 0 0
54116 - 0 0 0 0 0 0 0 0 0 10 10 10
54117 - 30 30 30 74 74 74 50 50 50 2 2 6
54118 - 26 26 26 26 26 26 2 2 6 106 106 106
54119 -238 238 238 253 253 253 253 253 253 253 253 253
54120 -253 253 253 253 253 253 253 253 253 253 253 253
54121 -253 253 253 253 253 253 253 253 253 253 253 253
54122 -253 253 253 253 253 253 253 253 253 253 253 253
54123 -253 253 253 253 253 253 253 253 253 253 253 253
54124 -253 253 253 246 246 246 218 218 218 202 202 202
54125 -210 210 210 14 14 14 2 2 6 2 2 6
54126 - 30 30 30 22 22 22 2 2 6 2 2 6
54127 - 2 2 6 2 2 6 18 18 18 86 86 86
54128 - 42 42 42 14 14 14 0 0 0 0 0 0
54129 - 0 0 0 0 0 0 0 0 0 0 0 0
54130 - 0 0 0 0 0 0 0 0 0 0 0 0
54131 - 0 0 0 0 0 0 0 0 0 0 0 0
54132 - 0 0 0 0 0 0 0 0 0 0 0 0
54133 - 0 0 0 0 0 0 0 0 0 0 0 0
54134 - 0 0 0 0 0 0 0 0 0 0 0 0
54135 - 0 0 0 0 0 0 0 0 0 0 0 0
54136 - 0 0 0 0 0 0 0 0 0 14 14 14
54137 - 42 42 42 90 90 90 22 22 22 2 2 6
54138 - 42 42 42 2 2 6 18 18 18 218 218 218
54139 -253 253 253 253 253 253 253 253 253 253 253 253
54140 -253 253 253 253 253 253 253 253 253 253 253 253
54141 -253 253 253 253 253 253 253 253 253 253 253 253
54142 -253 253 253 253 253 253 253 253 253 253 253 253
54143 -253 253 253 253 253 253 253 253 253 253 253 253
54144 -253 253 253 253 253 253 250 250 250 221 221 221
54145 -218 218 218 101 101 101 2 2 6 14 14 14
54146 - 18 18 18 38 38 38 10 10 10 2 2 6
54147 - 2 2 6 2 2 6 2 2 6 78 78 78
54148 - 58 58 58 22 22 22 6 6 6 0 0 0
54149 - 0 0 0 0 0 0 0 0 0 0 0 0
54150 - 0 0 0 0 0 0 0 0 0 0 0 0
54151 - 0 0 0 0 0 0 0 0 0 0 0 0
54152 - 0 0 0 0 0 0 0 0 0 0 0 0
54153 - 0 0 0 0 0 0 0 0 0 0 0 0
54154 - 0 0 0 0 0 0 0 0 0 0 0 0
54155 - 0 0 0 0 0 0 0 0 0 0 0 0
54156 - 0 0 0 0 0 0 6 6 6 18 18 18
54157 - 54 54 54 82 82 82 2 2 6 26 26 26
54158 - 22 22 22 2 2 6 123 123 123 253 253 253
54159 -253 253 253 253 253 253 253 253 253 253 253 253
54160 -253 253 253 253 253 253 253 253 253 253 253 253
54161 -253 253 253 253 253 253 253 253 253 253 253 253
54162 -253 253 253 253 253 253 253 253 253 253 253 253
54163 -253 253 253 253 253 253 253 253 253 253 253 253
54164 -253 253 253 253 253 253 253 253 253 250 250 250
54165 -238 238 238 198 198 198 6 6 6 38 38 38
54166 - 58 58 58 26 26 26 38 38 38 2 2 6
54167 - 2 2 6 2 2 6 2 2 6 46 46 46
54168 - 78 78 78 30 30 30 10 10 10 0 0 0
54169 - 0 0 0 0 0 0 0 0 0 0 0 0
54170 - 0 0 0 0 0 0 0 0 0 0 0 0
54171 - 0 0 0 0 0 0 0 0 0 0 0 0
54172 - 0 0 0 0 0 0 0 0 0 0 0 0
54173 - 0 0 0 0 0 0 0 0 0 0 0 0
54174 - 0 0 0 0 0 0 0 0 0 0 0 0
54175 - 0 0 0 0 0 0 0 0 0 0 0 0
54176 - 0 0 0 0 0 0 10 10 10 30 30 30
54177 - 74 74 74 58 58 58 2 2 6 42 42 42
54178 - 2 2 6 22 22 22 231 231 231 253 253 253
54179 -253 253 253 253 253 253 253 253 253 253 253 253
54180 -253 253 253 253 253 253 253 253 253 250 250 250
54181 -253 253 253 253 253 253 253 253 253 253 253 253
54182 -253 253 253 253 253 253 253 253 253 253 253 253
54183 -253 253 253 253 253 253 253 253 253 253 253 253
54184 -253 253 253 253 253 253 253 253 253 253 253 253
54185 -253 253 253 246 246 246 46 46 46 38 38 38
54186 - 42 42 42 14 14 14 38 38 38 14 14 14
54187 - 2 2 6 2 2 6 2 2 6 6 6 6
54188 - 86 86 86 46 46 46 14 14 14 0 0 0
54189 - 0 0 0 0 0 0 0 0 0 0 0 0
54190 - 0 0 0 0 0 0 0 0 0 0 0 0
54191 - 0 0 0 0 0 0 0 0 0 0 0 0
54192 - 0 0 0 0 0 0 0 0 0 0 0 0
54193 - 0 0 0 0 0 0 0 0 0 0 0 0
54194 - 0 0 0 0 0 0 0 0 0 0 0 0
54195 - 0 0 0 0 0 0 0 0 0 0 0 0
54196 - 0 0 0 6 6 6 14 14 14 42 42 42
54197 - 90 90 90 18 18 18 18 18 18 26 26 26
54198 - 2 2 6 116 116 116 253 253 253 253 253 253
54199 -253 253 253 253 253 253 253 253 253 253 253 253
54200 -253 253 253 253 253 253 250 250 250 238 238 238
54201 -253 253 253 253 253 253 253 253 253 253 253 253
54202 -253 253 253 253 253 253 253 253 253 253 253 253
54203 -253 253 253 253 253 253 253 253 253 253 253 253
54204 -253 253 253 253 253 253 253 253 253 253 253 253
54205 -253 253 253 253 253 253 94 94 94 6 6 6
54206 - 2 2 6 2 2 6 10 10 10 34 34 34
54207 - 2 2 6 2 2 6 2 2 6 2 2 6
54208 - 74 74 74 58 58 58 22 22 22 6 6 6
54209 - 0 0 0 0 0 0 0 0 0 0 0 0
54210 - 0 0 0 0 0 0 0 0 0 0 0 0
54211 - 0 0 0 0 0 0 0 0 0 0 0 0
54212 - 0 0 0 0 0 0 0 0 0 0 0 0
54213 - 0 0 0 0 0 0 0 0 0 0 0 0
54214 - 0 0 0 0 0 0 0 0 0 0 0 0
54215 - 0 0 0 0 0 0 0 0 0 0 0 0
54216 - 0 0 0 10 10 10 26 26 26 66 66 66
54217 - 82 82 82 2 2 6 38 38 38 6 6 6
54218 - 14 14 14 210 210 210 253 253 253 253 253 253
54219 -253 253 253 253 253 253 253 253 253 253 253 253
54220 -253 253 253 253 253 253 246 246 246 242 242 242
54221 -253 253 253 253 253 253 253 253 253 253 253 253
54222 -253 253 253 253 253 253 253 253 253 253 253 253
54223 -253 253 253 253 253 253 253 253 253 253 253 253
54224 -253 253 253 253 253 253 253 253 253 253 253 253
54225 -253 253 253 253 253 253 144 144 144 2 2 6
54226 - 2 2 6 2 2 6 2 2 6 46 46 46
54227 - 2 2 6 2 2 6 2 2 6 2 2 6
54228 - 42 42 42 74 74 74 30 30 30 10 10 10
54229 - 0 0 0 0 0 0 0 0 0 0 0 0
54230 - 0 0 0 0 0 0 0 0 0 0 0 0
54231 - 0 0 0 0 0 0 0 0 0 0 0 0
54232 - 0 0 0 0 0 0 0 0 0 0 0 0
54233 - 0 0 0 0 0 0 0 0 0 0 0 0
54234 - 0 0 0 0 0 0 0 0 0 0 0 0
54235 - 0 0 0 0 0 0 0 0 0 0 0 0
54236 - 6 6 6 14 14 14 42 42 42 90 90 90
54237 - 26 26 26 6 6 6 42 42 42 2 2 6
54238 - 74 74 74 250 250 250 253 253 253 253 253 253
54239 -253 253 253 253 253 253 253 253 253 253 253 253
54240 -253 253 253 253 253 253 242 242 242 242 242 242
54241 -253 253 253 253 253 253 253 253 253 253 253 253
54242 -253 253 253 253 253 253 253 253 253 253 253 253
54243 -253 253 253 253 253 253 253 253 253 253 253 253
54244 -253 253 253 253 253 253 253 253 253 253 253 253
54245 -253 253 253 253 253 253 182 182 182 2 2 6
54246 - 2 2 6 2 2 6 2 2 6 46 46 46
54247 - 2 2 6 2 2 6 2 2 6 2 2 6
54248 - 10 10 10 86 86 86 38 38 38 10 10 10
54249 - 0 0 0 0 0 0 0 0 0 0 0 0
54250 - 0 0 0 0 0 0 0 0 0 0 0 0
54251 - 0 0 0 0 0 0 0 0 0 0 0 0
54252 - 0 0 0 0 0 0 0 0 0 0 0 0
54253 - 0 0 0 0 0 0 0 0 0 0 0 0
54254 - 0 0 0 0 0 0 0 0 0 0 0 0
54255 - 0 0 0 0 0 0 0 0 0 0 0 0
54256 - 10 10 10 26 26 26 66 66 66 82 82 82
54257 - 2 2 6 22 22 22 18 18 18 2 2 6
54258 -149 149 149 253 253 253 253 253 253 253 253 253
54259 -253 253 253 253 253 253 253 253 253 253 253 253
54260 -253 253 253 253 253 253 234 234 234 242 242 242
54261 -253 253 253 253 253 253 253 253 253 253 253 253
54262 -253 253 253 253 253 253 253 253 253 253 253 253
54263 -253 253 253 253 253 253 253 253 253 253 253 253
54264 -253 253 253 253 253 253 253 253 253 253 253 253
54265 -253 253 253 253 253 253 206 206 206 2 2 6
54266 - 2 2 6 2 2 6 2 2 6 38 38 38
54267 - 2 2 6 2 2 6 2 2 6 2 2 6
54268 - 6 6 6 86 86 86 46 46 46 14 14 14
54269 - 0 0 0 0 0 0 0 0 0 0 0 0
54270 - 0 0 0 0 0 0 0 0 0 0 0 0
54271 - 0 0 0 0 0 0 0 0 0 0 0 0
54272 - 0 0 0 0 0 0 0 0 0 0 0 0
54273 - 0 0 0 0 0 0 0 0 0 0 0 0
54274 - 0 0 0 0 0 0 0 0 0 0 0 0
54275 - 0 0 0 0 0 0 0 0 0 6 6 6
54276 - 18 18 18 46 46 46 86 86 86 18 18 18
54277 - 2 2 6 34 34 34 10 10 10 6 6 6
54278 -210 210 210 253 253 253 253 253 253 253 253 253
54279 -253 253 253 253 253 253 253 253 253 253 253 253
54280 -253 253 253 253 253 253 234 234 234 242 242 242
54281 -253 253 253 253 253 253 253 253 253 253 253 253
54282 -253 253 253 253 253 253 253 253 253 253 253 253
54283 -253 253 253 253 253 253 253 253 253 253 253 253
54284 -253 253 253 253 253 253 253 253 253 253 253 253
54285 -253 253 253 253 253 253 221 221 221 6 6 6
54286 - 2 2 6 2 2 6 6 6 6 30 30 30
54287 - 2 2 6 2 2 6 2 2 6 2 2 6
54288 - 2 2 6 82 82 82 54 54 54 18 18 18
54289 - 6 6 6 0 0 0 0 0 0 0 0 0
54290 - 0 0 0 0 0 0 0 0 0 0 0 0
54291 - 0 0 0 0 0 0 0 0 0 0 0 0
54292 - 0 0 0 0 0 0 0 0 0 0 0 0
54293 - 0 0 0 0 0 0 0 0 0 0 0 0
54294 - 0 0 0 0 0 0 0 0 0 0 0 0
54295 - 0 0 0 0 0 0 0 0 0 10 10 10
54296 - 26 26 26 66 66 66 62 62 62 2 2 6
54297 - 2 2 6 38 38 38 10 10 10 26 26 26
54298 -238 238 238 253 253 253 253 253 253 253 253 253
54299 -253 253 253 253 253 253 253 253 253 253 253 253
54300 -253 253 253 253 253 253 231 231 231 238 238 238
54301 -253 253 253 253 253 253 253 253 253 253 253 253
54302 -253 253 253 253 253 253 253 253 253 253 253 253
54303 -253 253 253 253 253 253 253 253 253 253 253 253
54304 -253 253 253 253 253 253 253 253 253 253 253 253
54305 -253 253 253 253 253 253 231 231 231 6 6 6
54306 - 2 2 6 2 2 6 10 10 10 30 30 30
54307 - 2 2 6 2 2 6 2 2 6 2 2 6
54308 - 2 2 6 66 66 66 58 58 58 22 22 22
54309 - 6 6 6 0 0 0 0 0 0 0 0 0
54310 - 0 0 0 0 0 0 0 0 0 0 0 0
54311 - 0 0 0 0 0 0 0 0 0 0 0 0
54312 - 0 0 0 0 0 0 0 0 0 0 0 0
54313 - 0 0 0 0 0 0 0 0 0 0 0 0
54314 - 0 0 0 0 0 0 0 0 0 0 0 0
54315 - 0 0 0 0 0 0 0 0 0 10 10 10
54316 - 38 38 38 78 78 78 6 6 6 2 2 6
54317 - 2 2 6 46 46 46 14 14 14 42 42 42
54318 -246 246 246 253 253 253 253 253 253 253 253 253
54319 -253 253 253 253 253 253 253 253 253 253 253 253
54320 -253 253 253 253 253 253 231 231 231 242 242 242
54321 -253 253 253 253 253 253 253 253 253 253 253 253
54322 -253 253 253 253 253 253 253 253 253 253 253 253
54323 -253 253 253 253 253 253 253 253 253 253 253 253
54324 -253 253 253 253 253 253 253 253 253 253 253 253
54325 -253 253 253 253 253 253 234 234 234 10 10 10
54326 - 2 2 6 2 2 6 22 22 22 14 14 14
54327 - 2 2 6 2 2 6 2 2 6 2 2 6
54328 - 2 2 6 66 66 66 62 62 62 22 22 22
54329 - 6 6 6 0 0 0 0 0 0 0 0 0
54330 - 0 0 0 0 0 0 0 0 0 0 0 0
54331 - 0 0 0 0 0 0 0 0 0 0 0 0
54332 - 0 0 0 0 0 0 0 0 0 0 0 0
54333 - 0 0 0 0 0 0 0 0 0 0 0 0
54334 - 0 0 0 0 0 0 0 0 0 0 0 0
54335 - 0 0 0 0 0 0 6 6 6 18 18 18
54336 - 50 50 50 74 74 74 2 2 6 2 2 6
54337 - 14 14 14 70 70 70 34 34 34 62 62 62
54338 -250 250 250 253 253 253 253 253 253 253 253 253
54339 -253 253 253 253 253 253 253 253 253 253 253 253
54340 -253 253 253 253 253 253 231 231 231 246 246 246
54341 -253 253 253 253 253 253 253 253 253 253 253 253
54342 -253 253 253 253 253 253 253 253 253 253 253 253
54343 -253 253 253 253 253 253 253 253 253 253 253 253
54344 -253 253 253 253 253 253 253 253 253 253 253 253
54345 -253 253 253 253 253 253 234 234 234 14 14 14
54346 - 2 2 6 2 2 6 30 30 30 2 2 6
54347 - 2 2 6 2 2 6 2 2 6 2 2 6
54348 - 2 2 6 66 66 66 62 62 62 22 22 22
54349 - 6 6 6 0 0 0 0 0 0 0 0 0
54350 - 0 0 0 0 0 0 0 0 0 0 0 0
54351 - 0 0 0 0 0 0 0 0 0 0 0 0
54352 - 0 0 0 0 0 0 0 0 0 0 0 0
54353 - 0 0 0 0 0 0 0 0 0 0 0 0
54354 - 0 0 0 0 0 0 0 0 0 0 0 0
54355 - 0 0 0 0 0 0 6 6 6 18 18 18
54356 - 54 54 54 62 62 62 2 2 6 2 2 6
54357 - 2 2 6 30 30 30 46 46 46 70 70 70
54358 -250 250 250 253 253 253 253 253 253 253 253 253
54359 -253 253 253 253 253 253 253 253 253 253 253 253
54360 -253 253 253 253 253 253 231 231 231 246 246 246
54361 -253 253 253 253 253 253 253 253 253 253 253 253
54362 -253 253 253 253 253 253 253 253 253 253 253 253
54363 -253 253 253 253 253 253 253 253 253 253 253 253
54364 -253 253 253 253 253 253 253 253 253 253 253 253
54365 -253 253 253 253 253 253 226 226 226 10 10 10
54366 - 2 2 6 6 6 6 30 30 30 2 2 6
54367 - 2 2 6 2 2 6 2 2 6 2 2 6
54368 - 2 2 6 66 66 66 58 58 58 22 22 22
54369 - 6 6 6 0 0 0 0 0 0 0 0 0
54370 - 0 0 0 0 0 0 0 0 0 0 0 0
54371 - 0 0 0 0 0 0 0 0 0 0 0 0
54372 - 0 0 0 0 0 0 0 0 0 0 0 0
54373 - 0 0 0 0 0 0 0 0 0 0 0 0
54374 - 0 0 0 0 0 0 0 0 0 0 0 0
54375 - 0 0 0 0 0 0 6 6 6 22 22 22
54376 - 58 58 58 62 62 62 2 2 6 2 2 6
54377 - 2 2 6 2 2 6 30 30 30 78 78 78
54378 -250 250 250 253 253 253 253 253 253 253 253 253
54379 -253 253 253 253 253 253 253 253 253 253 253 253
54380 -253 253 253 253 253 253 231 231 231 246 246 246
54381 -253 253 253 253 253 253 253 253 253 253 253 253
54382 -253 253 253 253 253 253 253 253 253 253 253 253
54383 -253 253 253 253 253 253 253 253 253 253 253 253
54384 -253 253 253 253 253 253 253 253 253 253 253 253
54385 -253 253 253 253 253 253 206 206 206 2 2 6
54386 - 22 22 22 34 34 34 18 14 6 22 22 22
54387 - 26 26 26 18 18 18 6 6 6 2 2 6
54388 - 2 2 6 82 82 82 54 54 54 18 18 18
54389 - 6 6 6 0 0 0 0 0 0 0 0 0
54390 - 0 0 0 0 0 0 0 0 0 0 0 0
54391 - 0 0 0 0 0 0 0 0 0 0 0 0
54392 - 0 0 0 0 0 0 0 0 0 0 0 0
54393 - 0 0 0 0 0 0 0 0 0 0 0 0
54394 - 0 0 0 0 0 0 0 0 0 0 0 0
54395 - 0 0 0 0 0 0 6 6 6 26 26 26
54396 - 62 62 62 106 106 106 74 54 14 185 133 11
54397 -210 162 10 121 92 8 6 6 6 62 62 62
54398 -238 238 238 253 253 253 253 253 253 253 253 253
54399 -253 253 253 253 253 253 253 253 253 253 253 253
54400 -253 253 253 253 253 253 231 231 231 246 246 246
54401 -253 253 253 253 253 253 253 253 253 253 253 253
54402 -253 253 253 253 253 253 253 253 253 253 253 253
54403 -253 253 253 253 253 253 253 253 253 253 253 253
54404 -253 253 253 253 253 253 253 253 253 253 253 253
54405 -253 253 253 253 253 253 158 158 158 18 18 18
54406 - 14 14 14 2 2 6 2 2 6 2 2 6
54407 - 6 6 6 18 18 18 66 66 66 38 38 38
54408 - 6 6 6 94 94 94 50 50 50 18 18 18
54409 - 6 6 6 0 0 0 0 0 0 0 0 0
54410 - 0 0 0 0 0 0 0 0 0 0 0 0
54411 - 0 0 0 0 0 0 0 0 0 0 0 0
54412 - 0 0 0 0 0 0 0 0 0 0 0 0
54413 - 0 0 0 0 0 0 0 0 0 0 0 0
54414 - 0 0 0 0 0 0 0 0 0 6 6 6
54415 - 10 10 10 10 10 10 18 18 18 38 38 38
54416 - 78 78 78 142 134 106 216 158 10 242 186 14
54417 -246 190 14 246 190 14 156 118 10 10 10 10
54418 - 90 90 90 238 238 238 253 253 253 253 253 253
54419 -253 253 253 253 253 253 253 253 253 253 253 253
54420 -253 253 253 253 253 253 231 231 231 250 250 250
54421 -253 253 253 253 253 253 253 253 253 253 253 253
54422 -253 253 253 253 253 253 253 253 253 253 253 253
54423 -253 253 253 253 253 253 253 253 253 253 253 253
54424 -253 253 253 253 253 253 253 253 253 246 230 190
54425 -238 204 91 238 204 91 181 142 44 37 26 9
54426 - 2 2 6 2 2 6 2 2 6 2 2 6
54427 - 2 2 6 2 2 6 38 38 38 46 46 46
54428 - 26 26 26 106 106 106 54 54 54 18 18 18
54429 - 6 6 6 0 0 0 0 0 0 0 0 0
54430 - 0 0 0 0 0 0 0 0 0 0 0 0
54431 - 0 0 0 0 0 0 0 0 0 0 0 0
54432 - 0 0 0 0 0 0 0 0 0 0 0 0
54433 - 0 0 0 0 0 0 0 0 0 0 0 0
54434 - 0 0 0 6 6 6 14 14 14 22 22 22
54435 - 30 30 30 38 38 38 50 50 50 70 70 70
54436 -106 106 106 190 142 34 226 170 11 242 186 14
54437 -246 190 14 246 190 14 246 190 14 154 114 10
54438 - 6 6 6 74 74 74 226 226 226 253 253 253
54439 -253 253 253 253 253 253 253 253 253 253 253 253
54440 -253 253 253 253 253 253 231 231 231 250 250 250
54441 -253 253 253 253 253 253 253 253 253 253 253 253
54442 -253 253 253 253 253 253 253 253 253 253 253 253
54443 -253 253 253 253 253 253 253 253 253 253 253 253
54444 -253 253 253 253 253 253 253 253 253 228 184 62
54445 -241 196 14 241 208 19 232 195 16 38 30 10
54446 - 2 2 6 2 2 6 2 2 6 2 2 6
54447 - 2 2 6 6 6 6 30 30 30 26 26 26
54448 -203 166 17 154 142 90 66 66 66 26 26 26
54449 - 6 6 6 0 0 0 0 0 0 0 0 0
54450 - 0 0 0 0 0 0 0 0 0 0 0 0
54451 - 0 0 0 0 0 0 0 0 0 0 0 0
54452 - 0 0 0 0 0 0 0 0 0 0 0 0
54453 - 0 0 0 0 0 0 0 0 0 0 0 0
54454 - 6 6 6 18 18 18 38 38 38 58 58 58
54455 - 78 78 78 86 86 86 101 101 101 123 123 123
54456 -175 146 61 210 150 10 234 174 13 246 186 14
54457 -246 190 14 246 190 14 246 190 14 238 190 10
54458 -102 78 10 2 2 6 46 46 46 198 198 198
54459 -253 253 253 253 253 253 253 253 253 253 253 253
54460 -253 253 253 253 253 253 234 234 234 242 242 242
54461 -253 253 253 253 253 253 253 253 253 253 253 253
54462 -253 253 253 253 253 253 253 253 253 253 253 253
54463 -253 253 253 253 253 253 253 253 253 253 253 253
54464 -253 253 253 253 253 253 253 253 253 224 178 62
54465 -242 186 14 241 196 14 210 166 10 22 18 6
54466 - 2 2 6 2 2 6 2 2 6 2 2 6
54467 - 2 2 6 2 2 6 6 6 6 121 92 8
54468 -238 202 15 232 195 16 82 82 82 34 34 34
54469 - 10 10 10 0 0 0 0 0 0 0 0 0
54470 - 0 0 0 0 0 0 0 0 0 0 0 0
54471 - 0 0 0 0 0 0 0 0 0 0 0 0
54472 - 0 0 0 0 0 0 0 0 0 0 0 0
54473 - 0 0 0 0 0 0 0 0 0 0 0 0
54474 - 14 14 14 38 38 38 70 70 70 154 122 46
54475 -190 142 34 200 144 11 197 138 11 197 138 11
54476 -213 154 11 226 170 11 242 186 14 246 190 14
54477 -246 190 14 246 190 14 246 190 14 246 190 14
54478 -225 175 15 46 32 6 2 2 6 22 22 22
54479 -158 158 158 250 250 250 253 253 253 253 253 253
54480 -253 253 253 253 253 253 253 253 253 253 253 253
54481 -253 253 253 253 253 253 253 253 253 253 253 253
54482 -253 253 253 253 253 253 253 253 253 253 253 253
54483 -253 253 253 253 253 253 253 253 253 253 253 253
54484 -253 253 253 250 250 250 242 242 242 224 178 62
54485 -239 182 13 236 186 11 213 154 11 46 32 6
54486 - 2 2 6 2 2 6 2 2 6 2 2 6
54487 - 2 2 6 2 2 6 61 42 6 225 175 15
54488 -238 190 10 236 186 11 112 100 78 42 42 42
54489 - 14 14 14 0 0 0 0 0 0 0 0 0
54490 - 0 0 0 0 0 0 0 0 0 0 0 0
54491 - 0 0 0 0 0 0 0 0 0 0 0 0
54492 - 0 0 0 0 0 0 0 0 0 0 0 0
54493 - 0 0 0 0 0 0 0 0 0 6 6 6
54494 - 22 22 22 54 54 54 154 122 46 213 154 11
54495 -226 170 11 230 174 11 226 170 11 226 170 11
54496 -236 178 12 242 186 14 246 190 14 246 190 14
54497 -246 190 14 246 190 14 246 190 14 246 190 14
54498 -241 196 14 184 144 12 10 10 10 2 2 6
54499 - 6 6 6 116 116 116 242 242 242 253 253 253
54500 -253 253 253 253 253 253 253 253 253 253 253 253
54501 -253 253 253 253 253 253 253 253 253 253 253 253
54502 -253 253 253 253 253 253 253 253 253 253 253 253
54503 -253 253 253 253 253 253 253 253 253 253 253 253
54504 -253 253 253 231 231 231 198 198 198 214 170 54
54505 -236 178 12 236 178 12 210 150 10 137 92 6
54506 - 18 14 6 2 2 6 2 2 6 2 2 6
54507 - 6 6 6 70 47 6 200 144 11 236 178 12
54508 -239 182 13 239 182 13 124 112 88 58 58 58
54509 - 22 22 22 6 6 6 0 0 0 0 0 0
54510 - 0 0 0 0 0 0 0 0 0 0 0 0
54511 - 0 0 0 0 0 0 0 0 0 0 0 0
54512 - 0 0 0 0 0 0 0 0 0 0 0 0
54513 - 0 0 0 0 0 0 0 0 0 10 10 10
54514 - 30 30 30 70 70 70 180 133 36 226 170 11
54515 -239 182 13 242 186 14 242 186 14 246 186 14
54516 -246 190 14 246 190 14 246 190 14 246 190 14
54517 -246 190 14 246 190 14 246 190 14 246 190 14
54518 -246 190 14 232 195 16 98 70 6 2 2 6
54519 - 2 2 6 2 2 6 66 66 66 221 221 221
54520 -253 253 253 253 253 253 253 253 253 253 253 253
54521 -253 253 253 253 253 253 253 253 253 253 253 253
54522 -253 253 253 253 253 253 253 253 253 253 253 253
54523 -253 253 253 253 253 253 253 253 253 253 253 253
54524 -253 253 253 206 206 206 198 198 198 214 166 58
54525 -230 174 11 230 174 11 216 158 10 192 133 9
54526 -163 110 8 116 81 8 102 78 10 116 81 8
54527 -167 114 7 197 138 11 226 170 11 239 182 13
54528 -242 186 14 242 186 14 162 146 94 78 78 78
54529 - 34 34 34 14 14 14 6 6 6 0 0 0
54530 - 0 0 0 0 0 0 0 0 0 0 0 0
54531 - 0 0 0 0 0 0 0 0 0 0 0 0
54532 - 0 0 0 0 0 0 0 0 0 0 0 0
54533 - 0 0 0 0 0 0 0 0 0 6 6 6
54534 - 30 30 30 78 78 78 190 142 34 226 170 11
54535 -239 182 13 246 190 14 246 190 14 246 190 14
54536 -246 190 14 246 190 14 246 190 14 246 190 14
54537 -246 190 14 246 190 14 246 190 14 246 190 14
54538 -246 190 14 241 196 14 203 166 17 22 18 6
54539 - 2 2 6 2 2 6 2 2 6 38 38 38
54540 -218 218 218 253 253 253 253 253 253 253 253 253
54541 -253 253 253 253 253 253 253 253 253 253 253 253
54542 -253 253 253 253 253 253 253 253 253 253 253 253
54543 -253 253 253 253 253 253 253 253 253 253 253 253
54544 -250 250 250 206 206 206 198 198 198 202 162 69
54545 -226 170 11 236 178 12 224 166 10 210 150 10
54546 -200 144 11 197 138 11 192 133 9 197 138 11
54547 -210 150 10 226 170 11 242 186 14 246 190 14
54548 -246 190 14 246 186 14 225 175 15 124 112 88
54549 - 62 62 62 30 30 30 14 14 14 6 6 6
54550 - 0 0 0 0 0 0 0 0 0 0 0 0
54551 - 0 0 0 0 0 0 0 0 0 0 0 0
54552 - 0 0 0 0 0 0 0 0 0 0 0 0
54553 - 0 0 0 0 0 0 0 0 0 10 10 10
54554 - 30 30 30 78 78 78 174 135 50 224 166 10
54555 -239 182 13 246 190 14 246 190 14 246 190 14
54556 -246 190 14 246 190 14 246 190 14 246 190 14
54557 -246 190 14 246 190 14 246 190 14 246 190 14
54558 -246 190 14 246 190 14 241 196 14 139 102 15
54559 - 2 2 6 2 2 6 2 2 6 2 2 6
54560 - 78 78 78 250 250 250 253 253 253 253 253 253
54561 -253 253 253 253 253 253 253 253 253 253 253 253
54562 -253 253 253 253 253 253 253 253 253 253 253 253
54563 -253 253 253 253 253 253 253 253 253 253 253 253
54564 -250 250 250 214 214 214 198 198 198 190 150 46
54565 -219 162 10 236 178 12 234 174 13 224 166 10
54566 -216 158 10 213 154 11 213 154 11 216 158 10
54567 -226 170 11 239 182 13 246 190 14 246 190 14
54568 -246 190 14 246 190 14 242 186 14 206 162 42
54569 -101 101 101 58 58 58 30 30 30 14 14 14
54570 - 6 6 6 0 0 0 0 0 0 0 0 0
54571 - 0 0 0 0 0 0 0 0 0 0 0 0
54572 - 0 0 0 0 0 0 0 0 0 0 0 0
54573 - 0 0 0 0 0 0 0 0 0 10 10 10
54574 - 30 30 30 74 74 74 174 135 50 216 158 10
54575 -236 178 12 246 190 14 246 190 14 246 190 14
54576 -246 190 14 246 190 14 246 190 14 246 190 14
54577 -246 190 14 246 190 14 246 190 14 246 190 14
54578 -246 190 14 246 190 14 241 196 14 226 184 13
54579 - 61 42 6 2 2 6 2 2 6 2 2 6
54580 - 22 22 22 238 238 238 253 253 253 253 253 253
54581 -253 253 253 253 253 253 253 253 253 253 253 253
54582 -253 253 253 253 253 253 253 253 253 253 253 253
54583 -253 253 253 253 253 253 253 253 253 253 253 253
54584 -253 253 253 226 226 226 187 187 187 180 133 36
54585 -216 158 10 236 178 12 239 182 13 236 178 12
54586 -230 174 11 226 170 11 226 170 11 230 174 11
54587 -236 178 12 242 186 14 246 190 14 246 190 14
54588 -246 190 14 246 190 14 246 186 14 239 182 13
54589 -206 162 42 106 106 106 66 66 66 34 34 34
54590 - 14 14 14 6 6 6 0 0 0 0 0 0
54591 - 0 0 0 0 0 0 0 0 0 0 0 0
54592 - 0 0 0 0 0 0 0 0 0 0 0 0
54593 - 0 0 0 0 0 0 0 0 0 6 6 6
54594 - 26 26 26 70 70 70 163 133 67 213 154 11
54595 -236 178 12 246 190 14 246 190 14 246 190 14
54596 -246 190 14 246 190 14 246 190 14 246 190 14
54597 -246 190 14 246 190 14 246 190 14 246 190 14
54598 -246 190 14 246 190 14 246 190 14 241 196 14
54599 -190 146 13 18 14 6 2 2 6 2 2 6
54600 - 46 46 46 246 246 246 253 253 253 253 253 253
54601 -253 253 253 253 253 253 253 253 253 253 253 253
54602 -253 253 253 253 253 253 253 253 253 253 253 253
54603 -253 253 253 253 253 253 253 253 253 253 253 253
54604 -253 253 253 221 221 221 86 86 86 156 107 11
54605 -216 158 10 236 178 12 242 186 14 246 186 14
54606 -242 186 14 239 182 13 239 182 13 242 186 14
54607 -242 186 14 246 186 14 246 190 14 246 190 14
54608 -246 190 14 246 190 14 246 190 14 246 190 14
54609 -242 186 14 225 175 15 142 122 72 66 66 66
54610 - 30 30 30 10 10 10 0 0 0 0 0 0
54611 - 0 0 0 0 0 0 0 0 0 0 0 0
54612 - 0 0 0 0 0 0 0 0 0 0 0 0
54613 - 0 0 0 0 0 0 0 0 0 6 6 6
54614 - 26 26 26 70 70 70 163 133 67 210 150 10
54615 -236 178 12 246 190 14 246 190 14 246 190 14
54616 -246 190 14 246 190 14 246 190 14 246 190 14
54617 -246 190 14 246 190 14 246 190 14 246 190 14
54618 -246 190 14 246 190 14 246 190 14 246 190 14
54619 -232 195 16 121 92 8 34 34 34 106 106 106
54620 -221 221 221 253 253 253 253 253 253 253 253 253
54621 -253 253 253 253 253 253 253 253 253 253 253 253
54622 -253 253 253 253 253 253 253 253 253 253 253 253
54623 -253 253 253 253 253 253 253 253 253 253 253 253
54624 -242 242 242 82 82 82 18 14 6 163 110 8
54625 -216 158 10 236 178 12 242 186 14 246 190 14
54626 -246 190 14 246 190 14 246 190 14 246 190 14
54627 -246 190 14 246 190 14 246 190 14 246 190 14
54628 -246 190 14 246 190 14 246 190 14 246 190 14
54629 -246 190 14 246 190 14 242 186 14 163 133 67
54630 - 46 46 46 18 18 18 6 6 6 0 0 0
54631 - 0 0 0 0 0 0 0 0 0 0 0 0
54632 - 0 0 0 0 0 0 0 0 0 0 0 0
54633 - 0 0 0 0 0 0 0 0 0 10 10 10
54634 - 30 30 30 78 78 78 163 133 67 210 150 10
54635 -236 178 12 246 186 14 246 190 14 246 190 14
54636 -246 190 14 246 190 14 246 190 14 246 190 14
54637 -246 190 14 246 190 14 246 190 14 246 190 14
54638 -246 190 14 246 190 14 246 190 14 246 190 14
54639 -241 196 14 215 174 15 190 178 144 253 253 253
54640 -253 253 253 253 253 253 253 253 253 253 253 253
54641 -253 253 253 253 253 253 253 253 253 253 253 253
54642 -253 253 253 253 253 253 253 253 253 253 253 253
54643 -253 253 253 253 253 253 253 253 253 218 218 218
54644 - 58 58 58 2 2 6 22 18 6 167 114 7
54645 -216 158 10 236 178 12 246 186 14 246 190 14
54646 -246 190 14 246 190 14 246 190 14 246 190 14
54647 -246 190 14 246 190 14 246 190 14 246 190 14
54648 -246 190 14 246 190 14 246 190 14 246 190 14
54649 -246 190 14 246 186 14 242 186 14 190 150 46
54650 - 54 54 54 22 22 22 6 6 6 0 0 0
54651 - 0 0 0 0 0 0 0 0 0 0 0 0
54652 - 0 0 0 0 0 0 0 0 0 0 0 0
54653 - 0 0 0 0 0 0 0 0 0 14 14 14
54654 - 38 38 38 86 86 86 180 133 36 213 154 11
54655 -236 178 12 246 186 14 246 190 14 246 190 14
54656 -246 190 14 246 190 14 246 190 14 246 190 14
54657 -246 190 14 246 190 14 246 190 14 246 190 14
54658 -246 190 14 246 190 14 246 190 14 246 190 14
54659 -246 190 14 232 195 16 190 146 13 214 214 214
54660 -253 253 253 253 253 253 253 253 253 253 253 253
54661 -253 253 253 253 253 253 253 253 253 253 253 253
54662 -253 253 253 253 253 253 253 253 253 253 253 253
54663 -253 253 253 250 250 250 170 170 170 26 26 26
54664 - 2 2 6 2 2 6 37 26 9 163 110 8
54665 -219 162 10 239 182 13 246 186 14 246 190 14
54666 -246 190 14 246 190 14 246 190 14 246 190 14
54667 -246 190 14 246 190 14 246 190 14 246 190 14
54668 -246 190 14 246 190 14 246 190 14 246 190 14
54669 -246 186 14 236 178 12 224 166 10 142 122 72
54670 - 46 46 46 18 18 18 6 6 6 0 0 0
54671 - 0 0 0 0 0 0 0 0 0 0 0 0
54672 - 0 0 0 0 0 0 0 0 0 0 0 0
54673 - 0 0 0 0 0 0 6 6 6 18 18 18
54674 - 50 50 50 109 106 95 192 133 9 224 166 10
54675 -242 186 14 246 190 14 246 190 14 246 190 14
54676 -246 190 14 246 190 14 246 190 14 246 190 14
54677 -246 190 14 246 190 14 246 190 14 246 190 14
54678 -246 190 14 246 190 14 246 190 14 246 190 14
54679 -242 186 14 226 184 13 210 162 10 142 110 46
54680 -226 226 226 253 253 253 253 253 253 253 253 253
54681 -253 253 253 253 253 253 253 253 253 253 253 253
54682 -253 253 253 253 253 253 253 253 253 253 253 253
54683 -198 198 198 66 66 66 2 2 6 2 2 6
54684 - 2 2 6 2 2 6 50 34 6 156 107 11
54685 -219 162 10 239 182 13 246 186 14 246 190 14
54686 -246 190 14 246 190 14 246 190 14 246 190 14
54687 -246 190 14 246 190 14 246 190 14 246 190 14
54688 -246 190 14 246 190 14 246 190 14 242 186 14
54689 -234 174 13 213 154 11 154 122 46 66 66 66
54690 - 30 30 30 10 10 10 0 0 0 0 0 0
54691 - 0 0 0 0 0 0 0 0 0 0 0 0
54692 - 0 0 0 0 0 0 0 0 0 0 0 0
54693 - 0 0 0 0 0 0 6 6 6 22 22 22
54694 - 58 58 58 154 121 60 206 145 10 234 174 13
54695 -242 186 14 246 186 14 246 190 14 246 190 14
54696 -246 190 14 246 190 14 246 190 14 246 190 14
54697 -246 190 14 246 190 14 246 190 14 246 190 14
54698 -246 190 14 246 190 14 246 190 14 246 190 14
54699 -246 186 14 236 178 12 210 162 10 163 110 8
54700 - 61 42 6 138 138 138 218 218 218 250 250 250
54701 -253 253 253 253 253 253 253 253 253 250 250 250
54702 -242 242 242 210 210 210 144 144 144 66 66 66
54703 - 6 6 6 2 2 6 2 2 6 2 2 6
54704 - 2 2 6 2 2 6 61 42 6 163 110 8
54705 -216 158 10 236 178 12 246 190 14 246 190 14
54706 -246 190 14 246 190 14 246 190 14 246 190 14
54707 -246 190 14 246 190 14 246 190 14 246 190 14
54708 -246 190 14 239 182 13 230 174 11 216 158 10
54709 -190 142 34 124 112 88 70 70 70 38 38 38
54710 - 18 18 18 6 6 6 0 0 0 0 0 0
54711 - 0 0 0 0 0 0 0 0 0 0 0 0
54712 - 0 0 0 0 0 0 0 0 0 0 0 0
54713 - 0 0 0 0 0 0 6 6 6 22 22 22
54714 - 62 62 62 168 124 44 206 145 10 224 166 10
54715 -236 178 12 239 182 13 242 186 14 242 186 14
54716 -246 186 14 246 190 14 246 190 14 246 190 14
54717 -246 190 14 246 190 14 246 190 14 246 190 14
54718 -246 190 14 246 190 14 246 190 14 246 190 14
54719 -246 190 14 236 178 12 216 158 10 175 118 6
54720 - 80 54 7 2 2 6 6 6 6 30 30 30
54721 - 54 54 54 62 62 62 50 50 50 38 38 38
54722 - 14 14 14 2 2 6 2 2 6 2 2 6
54723 - 2 2 6 2 2 6 2 2 6 2 2 6
54724 - 2 2 6 6 6 6 80 54 7 167 114 7
54725 -213 154 11 236 178 12 246 190 14 246 190 14
54726 -246 190 14 246 190 14 246 190 14 246 190 14
54727 -246 190 14 242 186 14 239 182 13 239 182 13
54728 -230 174 11 210 150 10 174 135 50 124 112 88
54729 - 82 82 82 54 54 54 34 34 34 18 18 18
54730 - 6 6 6 0 0 0 0 0 0 0 0 0
54731 - 0 0 0 0 0 0 0 0 0 0 0 0
54732 - 0 0 0 0 0 0 0 0 0 0 0 0
54733 - 0 0 0 0 0 0 6 6 6 18 18 18
54734 - 50 50 50 158 118 36 192 133 9 200 144 11
54735 -216 158 10 219 162 10 224 166 10 226 170 11
54736 -230 174 11 236 178 12 239 182 13 239 182 13
54737 -242 186 14 246 186 14 246 190 14 246 190 14
54738 -246 190 14 246 190 14 246 190 14 246 190 14
54739 -246 186 14 230 174 11 210 150 10 163 110 8
54740 -104 69 6 10 10 10 2 2 6 2 2 6
54741 - 2 2 6 2 2 6 2 2 6 2 2 6
54742 - 2 2 6 2 2 6 2 2 6 2 2 6
54743 - 2 2 6 2 2 6 2 2 6 2 2 6
54744 - 2 2 6 6 6 6 91 60 6 167 114 7
54745 -206 145 10 230 174 11 242 186 14 246 190 14
54746 -246 190 14 246 190 14 246 186 14 242 186 14
54747 -239 182 13 230 174 11 224 166 10 213 154 11
54748 -180 133 36 124 112 88 86 86 86 58 58 58
54749 - 38 38 38 22 22 22 10 10 10 6 6 6
54750 - 0 0 0 0 0 0 0 0 0 0 0 0
54751 - 0 0 0 0 0 0 0 0 0 0 0 0
54752 - 0 0 0 0 0 0 0 0 0 0 0 0
54753 - 0 0 0 0 0 0 0 0 0 14 14 14
54754 - 34 34 34 70 70 70 138 110 50 158 118 36
54755 -167 114 7 180 123 7 192 133 9 197 138 11
54756 -200 144 11 206 145 10 213 154 11 219 162 10
54757 -224 166 10 230 174 11 239 182 13 242 186 14
54758 -246 186 14 246 186 14 246 186 14 246 186 14
54759 -239 182 13 216 158 10 185 133 11 152 99 6
54760 -104 69 6 18 14 6 2 2 6 2 2 6
54761 - 2 2 6 2 2 6 2 2 6 2 2 6
54762 - 2 2 6 2 2 6 2 2 6 2 2 6
54763 - 2 2 6 2 2 6 2 2 6 2 2 6
54764 - 2 2 6 6 6 6 80 54 7 152 99 6
54765 -192 133 9 219 162 10 236 178 12 239 182 13
54766 -246 186 14 242 186 14 239 182 13 236 178 12
54767 -224 166 10 206 145 10 192 133 9 154 121 60
54768 - 94 94 94 62 62 62 42 42 42 22 22 22
54769 - 14 14 14 6 6 6 0 0 0 0 0 0
54770 - 0 0 0 0 0 0 0 0 0 0 0 0
54771 - 0 0 0 0 0 0 0 0 0 0 0 0
54772 - 0 0 0 0 0 0 0 0 0 0 0 0
54773 - 0 0 0 0 0 0 0 0 0 6 6 6
54774 - 18 18 18 34 34 34 58 58 58 78 78 78
54775 -101 98 89 124 112 88 142 110 46 156 107 11
54776 -163 110 8 167 114 7 175 118 6 180 123 7
54777 -185 133 11 197 138 11 210 150 10 219 162 10
54778 -226 170 11 236 178 12 236 178 12 234 174 13
54779 -219 162 10 197 138 11 163 110 8 130 83 6
54780 - 91 60 6 10 10 10 2 2 6 2 2 6
54781 - 18 18 18 38 38 38 38 38 38 38 38 38
54782 - 38 38 38 38 38 38 38 38 38 38 38 38
54783 - 38 38 38 38 38 38 26 26 26 2 2 6
54784 - 2 2 6 6 6 6 70 47 6 137 92 6
54785 -175 118 6 200 144 11 219 162 10 230 174 11
54786 -234 174 13 230 174 11 219 162 10 210 150 10
54787 -192 133 9 163 110 8 124 112 88 82 82 82
54788 - 50 50 50 30 30 30 14 14 14 6 6 6
54789 - 0 0 0 0 0 0 0 0 0 0 0 0
54790 - 0 0 0 0 0 0 0 0 0 0 0 0
54791 - 0 0 0 0 0 0 0 0 0 0 0 0
54792 - 0 0 0 0 0 0 0 0 0 0 0 0
54793 - 0 0 0 0 0 0 0 0 0 0 0 0
54794 - 6 6 6 14 14 14 22 22 22 34 34 34
54795 - 42 42 42 58 58 58 74 74 74 86 86 86
54796 -101 98 89 122 102 70 130 98 46 121 87 25
54797 -137 92 6 152 99 6 163 110 8 180 123 7
54798 -185 133 11 197 138 11 206 145 10 200 144 11
54799 -180 123 7 156 107 11 130 83 6 104 69 6
54800 - 50 34 6 54 54 54 110 110 110 101 98 89
54801 - 86 86 86 82 82 82 78 78 78 78 78 78
54802 - 78 78 78 78 78 78 78 78 78 78 78 78
54803 - 78 78 78 82 82 82 86 86 86 94 94 94
54804 -106 106 106 101 101 101 86 66 34 124 80 6
54805 -156 107 11 180 123 7 192 133 9 200 144 11
54806 -206 145 10 200 144 11 192 133 9 175 118 6
54807 -139 102 15 109 106 95 70 70 70 42 42 42
54808 - 22 22 22 10 10 10 0 0 0 0 0 0
54809 - 0 0 0 0 0 0 0 0 0 0 0 0
54810 - 0 0 0 0 0 0 0 0 0 0 0 0
54811 - 0 0 0 0 0 0 0 0 0 0 0 0
54812 - 0 0 0 0 0 0 0 0 0 0 0 0
54813 - 0 0 0 0 0 0 0 0 0 0 0 0
54814 - 0 0 0 0 0 0 6 6 6 10 10 10
54815 - 14 14 14 22 22 22 30 30 30 38 38 38
54816 - 50 50 50 62 62 62 74 74 74 90 90 90
54817 -101 98 89 112 100 78 121 87 25 124 80 6
54818 -137 92 6 152 99 6 152 99 6 152 99 6
54819 -138 86 6 124 80 6 98 70 6 86 66 30
54820 -101 98 89 82 82 82 58 58 58 46 46 46
54821 - 38 38 38 34 34 34 34 34 34 34 34 34
54822 - 34 34 34 34 34 34 34 34 34 34 34 34
54823 - 34 34 34 34 34 34 38 38 38 42 42 42
54824 - 54 54 54 82 82 82 94 86 76 91 60 6
54825 -134 86 6 156 107 11 167 114 7 175 118 6
54826 -175 118 6 167 114 7 152 99 6 121 87 25
54827 -101 98 89 62 62 62 34 34 34 18 18 18
54828 - 6 6 6 0 0 0 0 0 0 0 0 0
54829 - 0 0 0 0 0 0 0 0 0 0 0 0
54830 - 0 0 0 0 0 0 0 0 0 0 0 0
54831 - 0 0 0 0 0 0 0 0 0 0 0 0
54832 - 0 0 0 0 0 0 0 0 0 0 0 0
54833 - 0 0 0 0 0 0 0 0 0 0 0 0
54834 - 0 0 0 0 0 0 0 0 0 0 0 0
54835 - 0 0 0 6 6 6 6 6 6 10 10 10
54836 - 18 18 18 22 22 22 30 30 30 42 42 42
54837 - 50 50 50 66 66 66 86 86 86 101 98 89
54838 -106 86 58 98 70 6 104 69 6 104 69 6
54839 -104 69 6 91 60 6 82 62 34 90 90 90
54840 - 62 62 62 38 38 38 22 22 22 14 14 14
54841 - 10 10 10 10 10 10 10 10 10 10 10 10
54842 - 10 10 10 10 10 10 6 6 6 10 10 10
54843 - 10 10 10 10 10 10 10 10 10 14 14 14
54844 - 22 22 22 42 42 42 70 70 70 89 81 66
54845 - 80 54 7 104 69 6 124 80 6 137 92 6
54846 -134 86 6 116 81 8 100 82 52 86 86 86
54847 - 58 58 58 30 30 30 14 14 14 6 6 6
54848 - 0 0 0 0 0 0 0 0 0 0 0 0
54849 - 0 0 0 0 0 0 0 0 0 0 0 0
54850 - 0 0 0 0 0 0 0 0 0 0 0 0
54851 - 0 0 0 0 0 0 0 0 0 0 0 0
54852 - 0 0 0 0 0 0 0 0 0 0 0 0
54853 - 0 0 0 0 0 0 0 0 0 0 0 0
54854 - 0 0 0 0 0 0 0 0 0 0 0 0
54855 - 0 0 0 0 0 0 0 0 0 0 0 0
54856 - 0 0 0 6 6 6 10 10 10 14 14 14
54857 - 18 18 18 26 26 26 38 38 38 54 54 54
54858 - 70 70 70 86 86 86 94 86 76 89 81 66
54859 - 89 81 66 86 86 86 74 74 74 50 50 50
54860 - 30 30 30 14 14 14 6 6 6 0 0 0
54861 - 0 0 0 0 0 0 0 0 0 0 0 0
54862 - 0 0 0 0 0 0 0 0 0 0 0 0
54863 - 0 0 0 0 0 0 0 0 0 0 0 0
54864 - 6 6 6 18 18 18 34 34 34 58 58 58
54865 - 82 82 82 89 81 66 89 81 66 89 81 66
54866 - 94 86 66 94 86 76 74 74 74 50 50 50
54867 - 26 26 26 14 14 14 6 6 6 0 0 0
54868 - 0 0 0 0 0 0 0 0 0 0 0 0
54869 - 0 0 0 0 0 0 0 0 0 0 0 0
54870 - 0 0 0 0 0 0 0 0 0 0 0 0
54871 - 0 0 0 0 0 0 0 0 0 0 0 0
54872 - 0 0 0 0 0 0 0 0 0 0 0 0
54873 - 0 0 0 0 0 0 0 0 0 0 0 0
54874 - 0 0 0 0 0 0 0 0 0 0 0 0
54875 - 0 0 0 0 0 0 0 0 0 0 0 0
54876 - 0 0 0 0 0 0 0 0 0 0 0 0
54877 - 6 6 6 6 6 6 14 14 14 18 18 18
54878 - 30 30 30 38 38 38 46 46 46 54 54 54
54879 - 50 50 50 42 42 42 30 30 30 18 18 18
54880 - 10 10 10 0 0 0 0 0 0 0 0 0
54881 - 0 0 0 0 0 0 0 0 0 0 0 0
54882 - 0 0 0 0 0 0 0 0 0 0 0 0
54883 - 0 0 0 0 0 0 0 0 0 0 0 0
54884 - 0 0 0 6 6 6 14 14 14 26 26 26
54885 - 38 38 38 50 50 50 58 58 58 58 58 58
54886 - 54 54 54 42 42 42 30 30 30 18 18 18
54887 - 10 10 10 0 0 0 0 0 0 0 0 0
54888 - 0 0 0 0 0 0 0 0 0 0 0 0
54889 - 0 0 0 0 0 0 0 0 0 0 0 0
54890 - 0 0 0 0 0 0 0 0 0 0 0 0
54891 - 0 0 0 0 0 0 0 0 0 0 0 0
54892 - 0 0 0 0 0 0 0 0 0 0 0 0
54893 - 0 0 0 0 0 0 0 0 0 0 0 0
54894 - 0 0 0 0 0 0 0 0 0 0 0 0
54895 - 0 0 0 0 0 0 0 0 0 0 0 0
54896 - 0 0 0 0 0 0 0 0 0 0 0 0
54897 - 0 0 0 0 0 0 0 0 0 6 6 6
54898 - 6 6 6 10 10 10 14 14 14 18 18 18
54899 - 18 18 18 14 14 14 10 10 10 6 6 6
54900 - 0 0 0 0 0 0 0 0 0 0 0 0
54901 - 0 0 0 0 0 0 0 0 0 0 0 0
54902 - 0 0 0 0 0 0 0 0 0 0 0 0
54903 - 0 0 0 0 0 0 0 0 0 0 0 0
54904 - 0 0 0 0 0 0 0 0 0 6 6 6
54905 - 14 14 14 18 18 18 22 22 22 22 22 22
54906 - 18 18 18 14 14 14 10 10 10 6 6 6
54907 - 0 0 0 0 0 0 0 0 0 0 0 0
54908 - 0 0 0 0 0 0 0 0 0 0 0 0
54909 - 0 0 0 0 0 0 0 0 0 0 0 0
54910 - 0 0 0 0 0 0 0 0 0 0 0 0
54911 - 0 0 0 0 0 0 0 0 0 0 0 0
54912 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54913 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54914 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54915 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54916 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54917 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54918 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54919 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54920 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54921 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54922 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54923 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54924 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54925 +4 4 4 4 4 4
54926 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54927 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54928 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54929 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54930 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54931 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54932 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54933 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54934 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54935 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54936 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54937 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54938 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54939 +4 4 4 4 4 4
54940 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54941 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54942 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54943 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54944 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54945 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54946 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54947 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54948 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54949 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54950 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54951 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54952 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54953 +4 4 4 4 4 4
54954 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54955 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54956 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54957 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54958 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54959 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54960 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54961 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54962 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54963 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54964 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54965 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54966 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54967 +4 4 4 4 4 4
54968 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54969 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54970 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54971 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54972 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54973 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54974 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54975 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54976 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54977 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54978 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54979 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54980 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54981 +4 4 4 4 4 4
54982 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54983 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54984 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54985 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54986 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54987 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54988 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54989 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54990 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54991 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54992 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54993 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54994 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54995 +4 4 4 4 4 4
54996 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54997 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54998 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54999 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55000 +4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
55001 +0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
55002 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55003 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55004 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55005 +4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
55006 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
55007 +4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
55008 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55009 +4 4 4 4 4 4
55010 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55011 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55012 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55013 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55014 +4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
55015 +37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
55016 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55017 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55018 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55019 +4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
55020 +2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
55021 +4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
55022 +1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55023 +4 4 4 4 4 4
55024 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55025 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55026 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55027 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55028 +2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
55029 +153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
55030 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
55031 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55032 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55033 +4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
55034 +60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
55035 +4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
55036 +2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
55037 +4 4 4 4 4 4
55038 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55039 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55040 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55041 +4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
55042 +4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
55043 +165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
55044 +1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
55045 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55046 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
55047 +3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
55048 +163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
55049 +0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
55050 +37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
55051 +4 4 4 4 4 4
55052 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55053 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55054 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55055 +4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
55056 +37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
55057 +156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
55058 +125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
55059 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
55060 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
55061 +0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
55062 +174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
55063 +0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
55064 +64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
55065 +4 4 4 4 4 4
55066 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55067 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55068 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
55069 +5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
55070 +156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
55071 +156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
55072 +174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
55073 +1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
55074 +4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
55075 +13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
55076 +174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
55077 +22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
55078 +90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
55079 +4 4 4 4 4 4
55080 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55081 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55082 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
55083 +0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
55084 +174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
55085 +156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
55086 +163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
55087 +4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
55088 +5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
55089 +131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
55090 +190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
55091 +90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
55092 +31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
55093 +4 4 4 4 4 4
55094 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55095 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55096 +4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
55097 +4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
55098 +155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
55099 +167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
55100 +153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
55101 +41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
55102 +1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
55103 +177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
55104 +125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
55105 +136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
55106 +7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
55107 +4 4 4 4 4 4
55108 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55109 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55110 +4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
55111 +125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
55112 +156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
55113 +137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
55114 +156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
55115 +167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
55116 +0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
55117 +166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
55118 +6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
55119 +90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
55120 +1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
55121 +4 4 4 4 4 4
55122 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55123 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55124 +1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
55125 +167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
55126 +157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
55127 +26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
55128 +158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
55129 +165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
55130 +60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
55131 +137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
55132 +52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
55133 +13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
55134 +4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
55135 +4 4 4 4 4 4
55136 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55137 +4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
55138 +0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
55139 +158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
55140 +167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
55141 +4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
55142 +174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
55143 +155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
55144 +137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
55145 +16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
55146 +136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
55147 +2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
55148 +4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
55149 +4 4 4 4 4 4
55150 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55151 +4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
55152 +37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
55153 +157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
55154 +153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
55155 +4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
55156 +125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
55157 +156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
55158 +174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
55159 +4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
55160 +136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
55161 +1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
55162 +2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
55163 +0 0 0 4 4 4
55164 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
55165 +4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
55166 +158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
55167 +153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
55168 +37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
55169 +4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
55170 +4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
55171 +154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
55172 +174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
55173 +32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
55174 +28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
55175 +50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
55176 +0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
55177 +2 0 0 0 0 0
55178 +4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
55179 +0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
55180 +174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
55181 +165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
55182 +4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
55183 +4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
55184 +4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
55185 +174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
55186 +60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
55187 +136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
55188 +22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
55189 +136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
55190 +26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
55191 +37 38 37 0 0 0
55192 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
55193 +13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
55194 +153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
55195 +177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
55196 +4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
55197 +5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
55198 +6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
55199 +166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
55200 +4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
55201 +146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
55202 +71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
55203 +90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
55204 +125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
55205 +85 115 134 4 0 0
55206 +4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
55207 +125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
55208 +155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
55209 +125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
55210 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
55211 +0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
55212 +5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
55213 +37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
55214 +4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
55215 +90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
55216 +2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
55217 +13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
55218 +166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
55219 +60 73 81 4 0 0
55220 +4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
55221 +174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
55222 +156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
55223 +4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
55224 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
55225 +10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
55226 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
55227 +4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
55228 +80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
55229 +28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
55230 +50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
55231 +1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
55232 +167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
55233 +16 19 21 4 0 0
55234 +4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
55235 +158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
55236 +167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
55237 +4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
55238 +4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
55239 +80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
55240 +4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
55241 +3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
55242 +146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
55243 +68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
55244 +136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
55245 +24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
55246 +163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
55247 +4 0 0 4 3 3
55248 +3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
55249 +156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
55250 +155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
55251 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
55252 +2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
55253 +136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
55254 +0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
55255 +0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
55256 +136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
55257 +28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
55258 +22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
55259 +137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
55260 +60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
55261 +3 2 2 4 4 4
55262 +3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
55263 +157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
55264 +37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
55265 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
55266 +0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
55267 +101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
55268 +14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
55269 +22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
55270 +136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
55271 +17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
55272 +2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
55273 +166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
55274 +13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
55275 +4 4 4 4 4 4
55276 +1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
55277 +163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
55278 +4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
55279 +4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
55280 +40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
55281 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
55282 +101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
55283 +136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
55284 +136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
55285 +136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
55286 +3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
55287 +174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
55288 +4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
55289 +4 4 4 4 4 4
55290 +4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
55291 +155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
55292 +4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
55293 +4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
55294 +101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
55295 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
55296 +136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
55297 +136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
55298 +136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
55299 +90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
55300 +85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
55301 +167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
55302 +6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
55303 +5 5 5 5 5 5
55304 +1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
55305 +131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
55306 +6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
55307 +0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
55308 +101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
55309 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
55310 +101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
55311 +136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
55312 +101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
55313 +7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
55314 +174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
55315 +24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
55316 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
55317 +5 5 5 4 4 4
55318 +4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
55319 +131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
55320 +6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
55321 +13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
55322 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
55323 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
55324 +101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
55325 +136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
55326 +136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
55327 +2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
55328 +174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
55329 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
55330 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55331 +4 4 4 4 4 4
55332 +1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
55333 +137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
55334 +4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
55335 +64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
55336 +90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
55337 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
55338 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
55339 +136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
55340 +101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
55341 +37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
55342 +167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
55343 +3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
55344 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55345 +4 4 4 4 4 4
55346 +4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
55347 +153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
55348 +4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
55349 +90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
55350 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
55351 +90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
55352 +101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
55353 +101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
55354 +35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
55355 +154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
55356 +60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
55357 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55358 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55359 +4 4 4 4 4 4
55360 +1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
55361 +153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
55362 +4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
55363 +64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
55364 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
55365 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
55366 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
55367 +136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
55368 +13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
55369 +174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
55370 +6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
55371 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55372 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55373 +4 4 4 4 4 4
55374 +4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
55375 +156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
55376 +4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
55377 +90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
55378 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
55379 +90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
55380 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
55381 +101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
55382 +2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
55383 +174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
55384 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55385 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55386 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55387 +4 4 4 4 4 4
55388 +3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
55389 +158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
55390 +4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
55391 +37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
55392 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
55393 +90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
55394 +101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
55395 +90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
55396 +5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
55397 +167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
55398 +6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
55399 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55400 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55401 +4 4 4 4 4 4
55402 +4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
55403 +163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
55404 +4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
55405 +18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
55406 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
55407 +90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
55408 +101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
55409 +13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
55410 +3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
55411 +174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
55412 +4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
55413 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55414 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55415 +4 4 4 4 4 4
55416 +1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
55417 +167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
55418 +4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
55419 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
55420 +26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
55421 +90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
55422 +101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
55423 +7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
55424 +4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
55425 +174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
55426 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55427 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55428 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55429 +4 4 4 4 4 4
55430 +4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
55431 +174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
55432 +5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
55433 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
55434 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
55435 +90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
55436 +101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
55437 +2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
55438 +3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
55439 +153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
55440 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55441 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55442 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55443 +4 4 4 4 4 4
55444 +1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
55445 +174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
55446 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
55447 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
55448 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
55449 +26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
55450 +35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
55451 +2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
55452 +3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
55453 +131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
55454 +4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55455 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55456 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55457 +4 4 4 4 4 4
55458 +3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
55459 +174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
55460 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
55461 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
55462 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
55463 +26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
55464 +7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
55465 +4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
55466 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
55467 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55468 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55469 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55470 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55471 +4 4 4 4 4 4
55472 +1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
55473 +174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
55474 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
55475 +18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
55476 +18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
55477 +26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
55478 +28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
55479 +3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
55480 +4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
55481 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55482 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55483 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55484 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55485 +4 4 4 4 4 4
55486 +4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
55487 +174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
55488 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
55489 +10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
55490 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
55491 +18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
55492 +90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
55493 +3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
55494 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
55495 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55496 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55497 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55498 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55499 +4 4 4 4 4 4
55500 +1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
55501 +177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
55502 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
55503 +10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
55504 +26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
55505 +6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
55506 +10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
55507 +2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
55508 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
55509 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55510 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55511 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55512 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55513 +4 4 4 4 4 4
55514 +4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
55515 +177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
55516 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
55517 +10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
55518 +26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
55519 +7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
55520 +3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
55521 +21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
55522 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
55523 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55524 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55525 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55526 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55527 +4 4 4 4 4 4
55528 +3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
55529 +190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
55530 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
55531 +10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
55532 +24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
55533 +18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
55534 +28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
55535 +26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
55536 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
55537 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55538 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55539 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55540 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55541 +4 4 4 4 4 4
55542 +4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
55543 +190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
55544 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
55545 +10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
55546 +0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
55547 +26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
55548 +37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
55549 +90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
55550 +4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
55551 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55552 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55553 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55554 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55555 +4 4 4 4 4 4
55556 +4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
55557 +193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
55558 +5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
55559 +10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
55560 +1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
55561 +26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
55562 +22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
55563 +26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
55564 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
55565 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55566 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55567 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55568 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55569 +4 4 4 4 4 4
55570 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
55571 +190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
55572 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
55573 +10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
55574 +2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
55575 +26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
55576 +10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
55577 +26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
55578 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
55579 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55580 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55581 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55582 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55583 +4 4 4 4 4 4
55584 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
55585 +193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
55586 +5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
55587 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
55588 +13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
55589 +10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
55590 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
55591 +26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
55592 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
55593 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55594 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55595 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55596 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55597 +4 4 4 4 4 4
55598 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
55599 +190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
55600 +5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
55601 +28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
55602 +10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
55603 +28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
55604 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
55605 +26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
55606 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
55607 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55608 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55609 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55610 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55611 +4 4 4 4 4 4
55612 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
55613 +193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
55614 +5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
55615 +4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
55616 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
55617 +10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
55618 +18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
55619 +22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
55620 +4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
55621 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55622 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55623 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55624 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55625 +4 4 4 4 4 4
55626 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
55627 +190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
55628 +6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
55629 +1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
55630 +18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
55631 +10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
55632 +26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
55633 +1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
55634 +5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
55635 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55636 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55637 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55638 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55639 +4 4 4 4 4 4
55640 +4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
55641 +193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
55642 +2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
55643 +4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
55644 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
55645 +10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
55646 +26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
55647 +2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
55648 +3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
55649 +131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55650 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55651 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55652 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55653 +4 4 4 4 4 4
55654 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
55655 +193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
55656 +0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
55657 +4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
55658 +13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
55659 +10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
55660 +28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
55661 +4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
55662 +0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
55663 +125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55664 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55665 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55666 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55667 +4 4 4 4 4 4
55668 +4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
55669 +193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
55670 +120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
55671 +4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
55672 +4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
55673 +10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
55674 +4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
55675 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
55676 +24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
55677 +125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
55678 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55679 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55680 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55681 +4 4 4 4 4 4
55682 +4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
55683 +174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
55684 +220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
55685 +3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
55686 +4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
55687 +10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
55688 +1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
55689 +5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
55690 +137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
55691 +125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
55692 +0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55693 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55694 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55695 +4 4 4 4 4 4
55696 +5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
55697 +193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
55698 +220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
55699 +4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
55700 +4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
55701 +22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
55702 +4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55703 +1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
55704 +166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
55705 +125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
55706 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
55707 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55708 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55709 +4 4 4 4 4 4
55710 +4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
55711 +220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
55712 +205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
55713 +24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
55714 +4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
55715 +4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
55716 +4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
55717 +2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
55718 +156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
55719 +137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
55720 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55721 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55722 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55723 +4 4 4 4 4 4
55724 +5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
55725 +125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
55726 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
55727 +193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
55728 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
55729 +1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
55730 +5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
55731 +60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
55732 +153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
55733 +125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
55734 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55735 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55736 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55737 +4 4 4 4 4 4
55738 +4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
55739 +6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
55740 +193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
55741 +244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
55742 +0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
55743 +4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
55744 +3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
55745 +220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
55746 +153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
55747 +13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
55748 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55749 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55750 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55751 +4 4 4 4 4 4
55752 +5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
55753 +6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
55754 +244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
55755 +220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
55756 +3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
55757 +4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
55758 +0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
55759 +177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
55760 +158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
55761 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
55762 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55763 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55764 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55765 +4 4 4 4 4 4
55766 +5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
55767 +6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
55768 +177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
55769 +220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
55770 +125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
55771 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
55772 +37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
55773 +174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
55774 +158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
55775 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
55776 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55777 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55778 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55779 +4 4 4 4 4 4
55780 +4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
55781 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
55782 +26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
55783 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
55784 +244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
55785 +0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
55786 +177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
55787 +174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
55788 +60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
55789 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55790 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55791 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55792 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55793 +4 4 4 4 4 4
55794 +5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
55795 +6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
55796 +6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
55797 +220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
55798 +220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
55799 +0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
55800 +220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
55801 +174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
55802 +4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
55803 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55804 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55805 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55806 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55807 +4 4 4 4 4 4
55808 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
55809 +6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
55810 +4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
55811 +220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
55812 +205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
55813 +60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
55814 +177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
55815 +190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
55816 +4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55817 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55818 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55819 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55820 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55821 +4 4 4 4 4 4
55822 +4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
55823 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
55824 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
55825 +125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
55826 +205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
55827 +193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
55828 +190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
55829 +153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
55830 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55831 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55832 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55833 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55834 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55835 +4 4 4 4 4 4
55836 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
55837 +6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
55838 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
55839 +4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
55840 +205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
55841 +220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
55842 +174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
55843 +6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
55844 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55845 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55846 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55847 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55848 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55849 +4 4 4 4 4 4
55850 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
55851 +5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
55852 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
55853 +4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
55854 +220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
55855 +190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
55856 +193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
55857 +4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
55858 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55859 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55860 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55861 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55862 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55863 +4 4 4 4 4 4
55864 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55865 +4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
55866 +4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
55867 +6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
55868 +174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
55869 +193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
55870 +193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
55871 +6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
55872 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55873 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55874 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55875 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55876 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55877 +4 4 4 4 4 4
55878 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55879 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
55880 +5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
55881 +5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
55882 +6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
55883 +193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
55884 +60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
55885 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
55886 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55887 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55888 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55889 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55890 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55891 +4 4 4 4 4 4
55892 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55893 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55894 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
55895 +5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
55896 +4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
55897 +193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
55898 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
55899 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
55900 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55901 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55902 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55903 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55904 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55905 +4 4 4 4 4 4
55906 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55907 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55908 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
55909 +4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
55910 +6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
55911 +153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
55912 +6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
55913 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55914 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55915 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55916 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55917 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55918 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55919 +4 4 4 4 4 4
55920 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55921 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55922 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55923 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
55924 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
55925 +24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
55926 +6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
55927 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55928 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55929 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55930 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55931 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55932 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55933 +4 4 4 4 4 4
55934 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55935 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55936 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55937 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
55938 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
55939 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
55940 +4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
55941 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55942 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55943 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55944 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55945 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55946 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55947 +4 4 4 4 4 4
55948 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55949 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55950 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55951 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
55952 +5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
55953 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
55954 +6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
55955 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55956 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55957 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55958 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55959 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55960 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55961 +4 4 4 4 4 4
55962 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55963 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55964 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55965 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
55966 +4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
55967 +4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
55968 +6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55969 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55970 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55971 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55972 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55973 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55974 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55975 +4 4 4 4 4 4
55976 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55977 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55978 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55979 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55980 +4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
55981 +6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
55982 +4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
55983 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55984 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55985 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55986 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55987 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55988 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55989 +4 4 4 4 4 4
55990 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55991 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55992 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55993 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55994 +4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
55995 +4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
55996 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55997 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55998 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55999 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56000 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56001 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56002 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56003 +4 4 4 4 4 4
56004 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56005 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56006 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56007 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56008 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
56009 +5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
56010 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56011 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56012 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56013 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56014 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56015 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56016 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56017 +4 4 4 4 4 4
56018 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56019 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56020 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56021 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56022 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
56023 +5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
56024 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56025 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56026 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56027 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56028 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56029 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56030 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56031 +4 4 4 4 4 4
56032 diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
56033 index fef20db..d28b1ab 100644
56034 --- a/drivers/xen/xenfs/xenstored.c
56035 +++ b/drivers/xen/xenfs/xenstored.c
56036 @@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
56037 static int xsd_kva_open(struct inode *inode, struct file *file)
56038 {
56039 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
56040 +#ifdef CONFIG_GRKERNSEC_HIDESYM
56041 + NULL);
56042 +#else
56043 xen_store_interface);
56044 +#endif
56045 +
56046 if (!file->private_data)
56047 return -ENOMEM;
56048 return 0;
56049 diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
56050 index c71e886..61d3d44b 100644
56051 --- a/fs/9p/vfs_addr.c
56052 +++ b/fs/9p/vfs_addr.c
56053 @@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
56054
56055 retval = v9fs_file_write_internal(inode,
56056 v9inode->writeback_fid,
56057 - (__force const char __user *)buffer,
56058 + (const char __force_user *)buffer,
56059 len, &offset, 0);
56060 if (retval > 0)
56061 retval = 0;
56062 diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
56063 index 53161ec..e261d8a 100644
56064 --- a/fs/9p/vfs_inode.c
56065 +++ b/fs/9p/vfs_inode.c
56066 @@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
56067 void
56068 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
56069 {
56070 - char *s = nd_get_link(nd);
56071 + const char *s = nd_get_link(nd);
56072
56073 p9_debug(P9_DEBUG_VFS, " %s %s\n",
56074 dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
56075 diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
56076 index 370b24c..ff0be7b 100644
56077 --- a/fs/Kconfig.binfmt
56078 +++ b/fs/Kconfig.binfmt
56079 @@ -103,7 +103,7 @@ config HAVE_AOUT
56080
56081 config BINFMT_AOUT
56082 tristate "Kernel support for a.out and ECOFF binaries"
56083 - depends on HAVE_AOUT
56084 + depends on HAVE_AOUT && BROKEN
56085 ---help---
56086 A.out (Assembler.OUTput) is a set of formats for libraries and
56087 executables used in the earliest versions of UNIX. Linux used
56088 diff --git a/fs/afs/inode.c b/fs/afs/inode.c
56089 index 2946712..f737435 100644
56090 --- a/fs/afs/inode.c
56091 +++ b/fs/afs/inode.c
56092 @@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
56093 struct afs_vnode *vnode;
56094 struct super_block *sb;
56095 struct inode *inode;
56096 - static atomic_t afs_autocell_ino;
56097 + static atomic_unchecked_t afs_autocell_ino;
56098
56099 _enter("{%x:%u},%*.*s,",
56100 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
56101 @@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
56102 data.fid.unique = 0;
56103 data.fid.vnode = 0;
56104
56105 - inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
56106 + inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
56107 afs_iget5_autocell_test, afs_iget5_set,
56108 &data);
56109 if (!inode) {
56110 diff --git a/fs/aio.c b/fs/aio.c
56111 index e609e15..c9fcd97 100644
56112 --- a/fs/aio.c
56113 +++ b/fs/aio.c
56114 @@ -380,7 +380,7 @@ static int aio_setup_ring(struct kioctx *ctx)
56115 size += sizeof(struct io_event) * nr_events;
56116
56117 nr_pages = PFN_UP(size);
56118 - if (nr_pages < 0)
56119 + if (nr_pages <= 0)
56120 return -EINVAL;
56121
56122 file = aio_private_file(ctx, nr_pages);
56123 diff --git a/fs/attr.c b/fs/attr.c
56124 index 6530ced..4a827e2 100644
56125 --- a/fs/attr.c
56126 +++ b/fs/attr.c
56127 @@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
56128 unsigned long limit;
56129
56130 limit = rlimit(RLIMIT_FSIZE);
56131 + gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
56132 if (limit != RLIM_INFINITY && offset > limit)
56133 goto out_sig;
56134 if (offset > inode->i_sb->s_maxbytes)
56135 diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
56136 index 116fd38..c04182da 100644
56137 --- a/fs/autofs4/waitq.c
56138 +++ b/fs/autofs4/waitq.c
56139 @@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
56140 {
56141 unsigned long sigpipe, flags;
56142 mm_segment_t fs;
56143 - const char *data = (const char *)addr;
56144 + const char __user *data = (const char __force_user *)addr;
56145 ssize_t wr = 0;
56146
56147 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
56148 @@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
56149 return 1;
56150 }
56151
56152 +#ifdef CONFIG_GRKERNSEC_HIDESYM
56153 +static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
56154 +#endif
56155 +
56156 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
56157 enum autofs_notify notify)
56158 {
56159 @@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
56160
56161 /* If this is a direct mount request create a dummy name */
56162 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
56163 +#ifdef CONFIG_GRKERNSEC_HIDESYM
56164 + /* this name does get written to userland via autofs4_write() */
56165 + qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
56166 +#else
56167 qstr.len = sprintf(name, "%p", dentry);
56168 +#endif
56169 else {
56170 qstr.len = autofs4_getpath(sbi, dentry, &name);
56171 if (!qstr.len) {
56172 diff --git a/fs/befs/endian.h b/fs/befs/endian.h
56173 index 2722387..56059b5 100644
56174 --- a/fs/befs/endian.h
56175 +++ b/fs/befs/endian.h
56176 @@ -11,7 +11,7 @@
56177
56178 #include <asm/byteorder.h>
56179
56180 -static inline u64
56181 +static inline u64 __intentional_overflow(-1)
56182 fs64_to_cpu(const struct super_block *sb, fs64 n)
56183 {
56184 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
56185 @@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
56186 return (__force fs64)cpu_to_be64(n);
56187 }
56188
56189 -static inline u32
56190 +static inline u32 __intentional_overflow(-1)
56191 fs32_to_cpu(const struct super_block *sb, fs32 n)
56192 {
56193 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
56194 @@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
56195 return (__force fs32)cpu_to_be32(n);
56196 }
56197
56198 -static inline u16
56199 +static inline u16 __intentional_overflow(-1)
56200 fs16_to_cpu(const struct super_block *sb, fs16 n)
56201 {
56202 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
56203 diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
56204 index ca0ba15..0fa3257 100644
56205 --- a/fs/binfmt_aout.c
56206 +++ b/fs/binfmt_aout.c
56207 @@ -16,6 +16,7 @@
56208 #include <linux/string.h>
56209 #include <linux/fs.h>
56210 #include <linux/file.h>
56211 +#include <linux/security.h>
56212 #include <linux/stat.h>
56213 #include <linux/fcntl.h>
56214 #include <linux/ptrace.h>
56215 @@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
56216 #endif
56217 # define START_STACK(u) ((void __user *)u.start_stack)
56218
56219 + memset(&dump, 0, sizeof(dump));
56220 +
56221 fs = get_fs();
56222 set_fs(KERNEL_DS);
56223 has_dumped = 1;
56224 @@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
56225
56226 /* If the size of the dump file exceeds the rlimit, then see what would happen
56227 if we wrote the stack, but not the data area. */
56228 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
56229 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
56230 dump.u_dsize = 0;
56231
56232 /* Make sure we have enough room to write the stack and data areas. */
56233 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
56234 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
56235 dump.u_ssize = 0;
56236
56237 @@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
56238 rlim = rlimit(RLIMIT_DATA);
56239 if (rlim >= RLIM_INFINITY)
56240 rlim = ~0;
56241 +
56242 + gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
56243 if (ex.a_data + ex.a_bss > rlim)
56244 return -ENOMEM;
56245
56246 @@ -264,6 +271,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
56247
56248 install_exec_creds(bprm);
56249
56250 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
56251 + current->mm->pax_flags = 0UL;
56252 +#endif
56253 +
56254 +#ifdef CONFIG_PAX_PAGEEXEC
56255 + if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
56256 + current->mm->pax_flags |= MF_PAX_PAGEEXEC;
56257 +
56258 +#ifdef CONFIG_PAX_EMUTRAMP
56259 + if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
56260 + current->mm->pax_flags |= MF_PAX_EMUTRAMP;
56261 +#endif
56262 +
56263 +#ifdef CONFIG_PAX_MPROTECT
56264 + if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
56265 + current->mm->pax_flags |= MF_PAX_MPROTECT;
56266 +#endif
56267 +
56268 + }
56269 +#endif
56270 +
56271 if (N_MAGIC(ex) == OMAGIC) {
56272 unsigned long text_addr, map_size;
56273 loff_t pos;
56274 @@ -321,7 +349,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
56275 }
56276
56277 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
56278 - PROT_READ | PROT_WRITE | PROT_EXEC,
56279 + PROT_READ | PROT_WRITE,
56280 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
56281 fd_offset + ex.a_text);
56282 if (error != N_DATADDR(ex)) {
56283 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
56284 index aa3cb62..bc53934 100644
56285 --- a/fs/binfmt_elf.c
56286 +++ b/fs/binfmt_elf.c
56287 @@ -34,6 +34,7 @@
56288 #include <linux/utsname.h>
56289 #include <linux/coredump.h>
56290 #include <linux/sched.h>
56291 +#include <linux/xattr.h>
56292 #include <asm/uaccess.h>
56293 #include <asm/param.h>
56294 #include <asm/page.h>
56295 @@ -47,7 +48,7 @@
56296
56297 static int load_elf_binary(struct linux_binprm *bprm);
56298 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
56299 - int, int, unsigned long);
56300 + int, int, unsigned long) __intentional_overflow(-1);
56301
56302 #ifdef CONFIG_USELIB
56303 static int load_elf_library(struct file *);
56304 @@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
56305 #define elf_core_dump NULL
56306 #endif
56307
56308 +#ifdef CONFIG_PAX_MPROTECT
56309 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
56310 +#endif
56311 +
56312 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
56313 +static void elf_handle_mmap(struct file *file);
56314 +#endif
56315 +
56316 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
56317 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
56318 #else
56319 @@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
56320 .load_binary = load_elf_binary,
56321 .load_shlib = load_elf_library,
56322 .core_dump = elf_core_dump,
56323 +
56324 +#ifdef CONFIG_PAX_MPROTECT
56325 + .handle_mprotect= elf_handle_mprotect,
56326 +#endif
56327 +
56328 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
56329 + .handle_mmap = elf_handle_mmap,
56330 +#endif
56331 +
56332 .min_coredump = ELF_EXEC_PAGESIZE,
56333 };
56334
56335 @@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
56336
56337 static int set_brk(unsigned long start, unsigned long end)
56338 {
56339 + unsigned long e = end;
56340 +
56341 start = ELF_PAGEALIGN(start);
56342 end = ELF_PAGEALIGN(end);
56343 if (end > start) {
56344 @@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
56345 if (BAD_ADDR(addr))
56346 return addr;
56347 }
56348 - current->mm->start_brk = current->mm->brk = end;
56349 + current->mm->start_brk = current->mm->brk = e;
56350 return 0;
56351 }
56352
56353 @@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
56354 elf_addr_t __user *u_rand_bytes;
56355 const char *k_platform = ELF_PLATFORM;
56356 const char *k_base_platform = ELF_BASE_PLATFORM;
56357 - unsigned char k_rand_bytes[16];
56358 + u32 k_rand_bytes[4];
56359 int items;
56360 elf_addr_t *elf_info;
56361 int ei_index = 0;
56362 const struct cred *cred = current_cred();
56363 struct vm_area_struct *vma;
56364 + unsigned long saved_auxv[AT_VECTOR_SIZE];
56365
56366 /*
56367 * In some cases (e.g. Hyper-Threading), we want to avoid L1
56368 @@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
56369 * Generate 16 random bytes for userspace PRNG seeding.
56370 */
56371 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
56372 - u_rand_bytes = (elf_addr_t __user *)
56373 - STACK_ALLOC(p, sizeof(k_rand_bytes));
56374 + prandom_seed(k_rand_bytes[0] ^ prandom_u32());
56375 + prandom_seed(k_rand_bytes[1] ^ prandom_u32());
56376 + prandom_seed(k_rand_bytes[2] ^ prandom_u32());
56377 + prandom_seed(k_rand_bytes[3] ^ prandom_u32());
56378 + p = STACK_ROUND(p, sizeof(k_rand_bytes));
56379 + u_rand_bytes = (elf_addr_t __user *) p;
56380 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
56381 return -EFAULT;
56382
56383 @@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
56384 return -EFAULT;
56385 current->mm->env_end = p;
56386
56387 + memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
56388 +
56389 /* Put the elf_info on the stack in the right place. */
56390 sp = (elf_addr_t __user *)envp + 1;
56391 - if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
56392 + if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
56393 return -EFAULT;
56394 return 0;
56395 }
56396 @@ -393,15 +420,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
56397 an ELF header */
56398
56399 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56400 - struct file *interpreter, unsigned long *interp_map_addr,
56401 - unsigned long no_base)
56402 + struct file *interpreter, unsigned long no_base)
56403 {
56404 struct elf_phdr *elf_phdata;
56405 struct elf_phdr *eppnt;
56406 - unsigned long load_addr = 0;
56407 + unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
56408 int load_addr_set = 0;
56409 unsigned long last_bss = 0, elf_bss = 0;
56410 - unsigned long error = ~0UL;
56411 + unsigned long error = -EINVAL;
56412 unsigned long total_size;
56413 int retval, i, size;
56414
56415 @@ -447,6 +473,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56416 goto out_close;
56417 }
56418
56419 +#ifdef CONFIG_PAX_SEGMEXEC
56420 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
56421 + pax_task_size = SEGMEXEC_TASK_SIZE;
56422 +#endif
56423 +
56424 eppnt = elf_phdata;
56425 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
56426 if (eppnt->p_type == PT_LOAD) {
56427 @@ -470,8 +501,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56428 map_addr = elf_map(interpreter, load_addr + vaddr,
56429 eppnt, elf_prot, elf_type, total_size);
56430 total_size = 0;
56431 - if (!*interp_map_addr)
56432 - *interp_map_addr = map_addr;
56433 error = map_addr;
56434 if (BAD_ADDR(map_addr))
56435 goto out_close;
56436 @@ -490,8 +519,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56437 k = load_addr + eppnt->p_vaddr;
56438 if (BAD_ADDR(k) ||
56439 eppnt->p_filesz > eppnt->p_memsz ||
56440 - eppnt->p_memsz > TASK_SIZE ||
56441 - TASK_SIZE - eppnt->p_memsz < k) {
56442 + eppnt->p_memsz > pax_task_size ||
56443 + pax_task_size - eppnt->p_memsz < k) {
56444 error = -ENOMEM;
56445 goto out_close;
56446 }
56447 @@ -530,9 +559,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56448 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
56449
56450 /* Map the last of the bss segment */
56451 - error = vm_brk(elf_bss, last_bss - elf_bss);
56452 - if (BAD_ADDR(error))
56453 - goto out_close;
56454 + if (last_bss > elf_bss) {
56455 + error = vm_brk(elf_bss, last_bss - elf_bss);
56456 + if (BAD_ADDR(error))
56457 + goto out_close;
56458 + }
56459 }
56460
56461 error = load_addr;
56462 @@ -543,6 +574,336 @@ out:
56463 return error;
56464 }
56465
56466 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
56467 +#ifdef CONFIG_PAX_SOFTMODE
56468 +static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
56469 +{
56470 + unsigned long pax_flags = 0UL;
56471 +
56472 +#ifdef CONFIG_PAX_PAGEEXEC
56473 + if (elf_phdata->p_flags & PF_PAGEEXEC)
56474 + pax_flags |= MF_PAX_PAGEEXEC;
56475 +#endif
56476 +
56477 +#ifdef CONFIG_PAX_SEGMEXEC
56478 + if (elf_phdata->p_flags & PF_SEGMEXEC)
56479 + pax_flags |= MF_PAX_SEGMEXEC;
56480 +#endif
56481 +
56482 +#ifdef CONFIG_PAX_EMUTRAMP
56483 + if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
56484 + pax_flags |= MF_PAX_EMUTRAMP;
56485 +#endif
56486 +
56487 +#ifdef CONFIG_PAX_MPROTECT
56488 + if (elf_phdata->p_flags & PF_MPROTECT)
56489 + pax_flags |= MF_PAX_MPROTECT;
56490 +#endif
56491 +
56492 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
56493 + if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
56494 + pax_flags |= MF_PAX_RANDMMAP;
56495 +#endif
56496 +
56497 + return pax_flags;
56498 +}
56499 +#endif
56500 +
56501 +static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
56502 +{
56503 + unsigned long pax_flags = 0UL;
56504 +
56505 +#ifdef CONFIG_PAX_PAGEEXEC
56506 + if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
56507 + pax_flags |= MF_PAX_PAGEEXEC;
56508 +#endif
56509 +
56510 +#ifdef CONFIG_PAX_SEGMEXEC
56511 + if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
56512 + pax_flags |= MF_PAX_SEGMEXEC;
56513 +#endif
56514 +
56515 +#ifdef CONFIG_PAX_EMUTRAMP
56516 + if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
56517 + pax_flags |= MF_PAX_EMUTRAMP;
56518 +#endif
56519 +
56520 +#ifdef CONFIG_PAX_MPROTECT
56521 + if (!(elf_phdata->p_flags & PF_NOMPROTECT))
56522 + pax_flags |= MF_PAX_MPROTECT;
56523 +#endif
56524 +
56525 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
56526 + if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
56527 + pax_flags |= MF_PAX_RANDMMAP;
56528 +#endif
56529 +
56530 + return pax_flags;
56531 +}
56532 +#endif
56533 +
56534 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
56535 +#ifdef CONFIG_PAX_SOFTMODE
56536 +static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
56537 +{
56538 + unsigned long pax_flags = 0UL;
56539 +
56540 +#ifdef CONFIG_PAX_PAGEEXEC
56541 + if (pax_flags_softmode & MF_PAX_PAGEEXEC)
56542 + pax_flags |= MF_PAX_PAGEEXEC;
56543 +#endif
56544 +
56545 +#ifdef CONFIG_PAX_SEGMEXEC
56546 + if (pax_flags_softmode & MF_PAX_SEGMEXEC)
56547 + pax_flags |= MF_PAX_SEGMEXEC;
56548 +#endif
56549 +
56550 +#ifdef CONFIG_PAX_EMUTRAMP
56551 + if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
56552 + pax_flags |= MF_PAX_EMUTRAMP;
56553 +#endif
56554 +
56555 +#ifdef CONFIG_PAX_MPROTECT
56556 + if (pax_flags_softmode & MF_PAX_MPROTECT)
56557 + pax_flags |= MF_PAX_MPROTECT;
56558 +#endif
56559 +
56560 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
56561 + if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
56562 + pax_flags |= MF_PAX_RANDMMAP;
56563 +#endif
56564 +
56565 + return pax_flags;
56566 +}
56567 +#endif
56568 +
56569 +static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
56570 +{
56571 + unsigned long pax_flags = 0UL;
56572 +
56573 +#ifdef CONFIG_PAX_PAGEEXEC
56574 + if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
56575 + pax_flags |= MF_PAX_PAGEEXEC;
56576 +#endif
56577 +
56578 +#ifdef CONFIG_PAX_SEGMEXEC
56579 + if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
56580 + pax_flags |= MF_PAX_SEGMEXEC;
56581 +#endif
56582 +
56583 +#ifdef CONFIG_PAX_EMUTRAMP
56584 + if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
56585 + pax_flags |= MF_PAX_EMUTRAMP;
56586 +#endif
56587 +
56588 +#ifdef CONFIG_PAX_MPROTECT
56589 + if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
56590 + pax_flags |= MF_PAX_MPROTECT;
56591 +#endif
56592 +
56593 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
56594 + if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
56595 + pax_flags |= MF_PAX_RANDMMAP;
56596 +#endif
56597 +
56598 + return pax_flags;
56599 +}
56600 +#endif
56601 +
56602 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
56603 +static unsigned long pax_parse_defaults(void)
56604 +{
56605 + unsigned long pax_flags = 0UL;
56606 +
56607 +#ifdef CONFIG_PAX_SOFTMODE
56608 + if (pax_softmode)
56609 + return pax_flags;
56610 +#endif
56611 +
56612 +#ifdef CONFIG_PAX_PAGEEXEC
56613 + pax_flags |= MF_PAX_PAGEEXEC;
56614 +#endif
56615 +
56616 +#ifdef CONFIG_PAX_SEGMEXEC
56617 + pax_flags |= MF_PAX_SEGMEXEC;
56618 +#endif
56619 +
56620 +#ifdef CONFIG_PAX_MPROTECT
56621 + pax_flags |= MF_PAX_MPROTECT;
56622 +#endif
56623 +
56624 +#ifdef CONFIG_PAX_RANDMMAP
56625 + if (randomize_va_space)
56626 + pax_flags |= MF_PAX_RANDMMAP;
56627 +#endif
56628 +
56629 + return pax_flags;
56630 +}
56631 +
56632 +static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
56633 +{
56634 + unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
56635 +
56636 +#ifdef CONFIG_PAX_EI_PAX
56637 +
56638 +#ifdef CONFIG_PAX_SOFTMODE
56639 + if (pax_softmode)
56640 + return pax_flags;
56641 +#endif
56642 +
56643 + pax_flags = 0UL;
56644 +
56645 +#ifdef CONFIG_PAX_PAGEEXEC
56646 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
56647 + pax_flags |= MF_PAX_PAGEEXEC;
56648 +#endif
56649 +
56650 +#ifdef CONFIG_PAX_SEGMEXEC
56651 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
56652 + pax_flags |= MF_PAX_SEGMEXEC;
56653 +#endif
56654 +
56655 +#ifdef CONFIG_PAX_EMUTRAMP
56656 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
56657 + pax_flags |= MF_PAX_EMUTRAMP;
56658 +#endif
56659 +
56660 +#ifdef CONFIG_PAX_MPROTECT
56661 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
56662 + pax_flags |= MF_PAX_MPROTECT;
56663 +#endif
56664 +
56665 +#ifdef CONFIG_PAX_ASLR
56666 + if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
56667 + pax_flags |= MF_PAX_RANDMMAP;
56668 +#endif
56669 +
56670 +#endif
56671 +
56672 + return pax_flags;
56673 +
56674 +}
56675 +
56676 +static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
56677 +{
56678 +
56679 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
56680 + unsigned long i;
56681 +
56682 + for (i = 0UL; i < elf_ex->e_phnum; i++)
56683 + if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
56684 + if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
56685 + ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
56686 + ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
56687 + ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
56688 + ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
56689 + return PAX_PARSE_FLAGS_FALLBACK;
56690 +
56691 +#ifdef CONFIG_PAX_SOFTMODE
56692 + if (pax_softmode)
56693 + return pax_parse_pt_pax_softmode(&elf_phdata[i]);
56694 + else
56695 +#endif
56696 +
56697 + return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
56698 + break;
56699 + }
56700 +#endif
56701 +
56702 + return PAX_PARSE_FLAGS_FALLBACK;
56703 +}
56704 +
56705 +static unsigned long pax_parse_xattr_pax(struct file * const file)
56706 +{
56707 +
56708 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
56709 + ssize_t xattr_size, i;
56710 + unsigned char xattr_value[sizeof("pemrs") - 1];
56711 + unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
56712 +
56713 + xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
56714 + if (xattr_size < 0 || xattr_size > sizeof xattr_value)
56715 + return PAX_PARSE_FLAGS_FALLBACK;
56716 +
56717 + for (i = 0; i < xattr_size; i++)
56718 + switch (xattr_value[i]) {
56719 + default:
56720 + return PAX_PARSE_FLAGS_FALLBACK;
56721 +
56722 +#define parse_flag(option1, option2, flag) \
56723 + case option1: \
56724 + if (pax_flags_hardmode & MF_PAX_##flag) \
56725 + return PAX_PARSE_FLAGS_FALLBACK;\
56726 + pax_flags_hardmode |= MF_PAX_##flag; \
56727 + break; \
56728 + case option2: \
56729 + if (pax_flags_softmode & MF_PAX_##flag) \
56730 + return PAX_PARSE_FLAGS_FALLBACK;\
56731 + pax_flags_softmode |= MF_PAX_##flag; \
56732 + break;
56733 +
56734 + parse_flag('p', 'P', PAGEEXEC);
56735 + parse_flag('e', 'E', EMUTRAMP);
56736 + parse_flag('m', 'M', MPROTECT);
56737 + parse_flag('r', 'R', RANDMMAP);
56738 + parse_flag('s', 'S', SEGMEXEC);
56739 +
56740 +#undef parse_flag
56741 + }
56742 +
56743 + if (pax_flags_hardmode & pax_flags_softmode)
56744 + return PAX_PARSE_FLAGS_FALLBACK;
56745 +
56746 +#ifdef CONFIG_PAX_SOFTMODE
56747 + if (pax_softmode)
56748 + return pax_parse_xattr_pax_softmode(pax_flags_softmode);
56749 + else
56750 +#endif
56751 +
56752 + return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
56753 +#else
56754 + return PAX_PARSE_FLAGS_FALLBACK;
56755 +#endif
56756 +
56757 +}
56758 +
56759 +static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
56760 +{
56761 + unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
56762 +
56763 + pax_flags = pax_parse_defaults();
56764 + ei_pax_flags = pax_parse_ei_pax(elf_ex);
56765 + pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
56766 + xattr_pax_flags = pax_parse_xattr_pax(file);
56767 +
56768 + if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
56769 + xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
56770 + pt_pax_flags != xattr_pax_flags)
56771 + return -EINVAL;
56772 + if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
56773 + pax_flags = xattr_pax_flags;
56774 + else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
56775 + pax_flags = pt_pax_flags;
56776 + else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
56777 + pax_flags = ei_pax_flags;
56778 +
56779 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
56780 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
56781 + if ((__supported_pte_mask & _PAGE_NX))
56782 + pax_flags &= ~MF_PAX_SEGMEXEC;
56783 + else
56784 + pax_flags &= ~MF_PAX_PAGEEXEC;
56785 + }
56786 +#endif
56787 +
56788 + if (0 > pax_check_flags(&pax_flags))
56789 + return -EINVAL;
56790 +
56791 + current->mm->pax_flags = pax_flags;
56792 + return 0;
56793 +}
56794 +#endif
56795 +
56796 /*
56797 * These are the functions used to load ELF style executables and shared
56798 * libraries. There is no binary dependent code anywhere else.
56799 @@ -556,6 +917,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
56800 {
56801 unsigned int random_variable = 0;
56802
56803 +#ifdef CONFIG_PAX_RANDUSTACK
56804 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
56805 + return stack_top - current->mm->delta_stack;
56806 +#endif
56807 +
56808 if ((current->flags & PF_RANDOMIZE) &&
56809 !(current->personality & ADDR_NO_RANDOMIZE)) {
56810 random_variable = get_random_int() & STACK_RND_MASK;
56811 @@ -574,7 +940,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
56812 unsigned long load_addr = 0, load_bias = 0;
56813 int load_addr_set = 0;
56814 char * elf_interpreter = NULL;
56815 - unsigned long error;
56816 + unsigned long error = 0;
56817 struct elf_phdr *elf_ppnt, *elf_phdata;
56818 unsigned long elf_bss, elf_brk;
56819 int retval, i;
56820 @@ -589,6 +955,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
56821 struct elfhdr elf_ex;
56822 struct elfhdr interp_elf_ex;
56823 } *loc;
56824 + unsigned long pax_task_size;
56825
56826 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
56827 if (!loc) {
56828 @@ -726,6 +1093,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
56829 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
56830 may depend on the personality. */
56831 SET_PERSONALITY(loc->elf_ex);
56832 +
56833 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
56834 + current->mm->pax_flags = 0UL;
56835 +#endif
56836 +
56837 +#ifdef CONFIG_PAX_DLRESOLVE
56838 + current->mm->call_dl_resolve = 0UL;
56839 +#endif
56840 +
56841 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
56842 + current->mm->call_syscall = 0UL;
56843 +#endif
56844 +
56845 +#ifdef CONFIG_PAX_ASLR
56846 + current->mm->delta_mmap = 0UL;
56847 + current->mm->delta_stack = 0UL;
56848 +#endif
56849 +
56850 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
56851 + if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
56852 + send_sig(SIGKILL, current, 0);
56853 + goto out_free_dentry;
56854 + }
56855 +#endif
56856 +
56857 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
56858 + pax_set_initial_flags(bprm);
56859 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
56860 + if (pax_set_initial_flags_func)
56861 + (pax_set_initial_flags_func)(bprm);
56862 +#endif
56863 +
56864 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
56865 + if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
56866 + current->mm->context.user_cs_limit = PAGE_SIZE;
56867 + current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
56868 + }
56869 +#endif
56870 +
56871 +#ifdef CONFIG_PAX_SEGMEXEC
56872 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
56873 + current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
56874 + current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
56875 + pax_task_size = SEGMEXEC_TASK_SIZE;
56876 + current->mm->def_flags |= VM_NOHUGEPAGE;
56877 + } else
56878 +#endif
56879 +
56880 + pax_task_size = TASK_SIZE;
56881 +
56882 +#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
56883 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
56884 + set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
56885 + put_cpu();
56886 + }
56887 +#endif
56888 +
56889 +#ifdef CONFIG_PAX_ASLR
56890 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
56891 + current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
56892 + current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
56893 + }
56894 +#endif
56895 +
56896 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
56897 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
56898 + executable_stack = EXSTACK_DISABLE_X;
56899 + current->personality &= ~READ_IMPLIES_EXEC;
56900 + } else
56901 +#endif
56902 +
56903 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
56904 current->personality |= READ_IMPLIES_EXEC;
56905
56906 @@ -815,6 +1253,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
56907 #else
56908 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
56909 #endif
56910 +
56911 +#ifdef CONFIG_PAX_RANDMMAP
56912 + /* PaX: randomize base address at the default exe base if requested */
56913 + if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
56914 +#ifdef CONFIG_SPARC64
56915 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
56916 +#else
56917 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
56918 +#endif
56919 + load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
56920 + elf_flags |= MAP_FIXED;
56921 + }
56922 +#endif
56923 +
56924 }
56925
56926 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
56927 @@ -847,9 +1299,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
56928 * allowed task size. Note that p_filesz must always be
56929 * <= p_memsz so it is only necessary to check p_memsz.
56930 */
56931 - if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
56932 - elf_ppnt->p_memsz > TASK_SIZE ||
56933 - TASK_SIZE - elf_ppnt->p_memsz < k) {
56934 + if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
56935 + elf_ppnt->p_memsz > pax_task_size ||
56936 + pax_task_size - elf_ppnt->p_memsz < k) {
56937 /* set_brk can never work. Avoid overflows. */
56938 send_sig(SIGKILL, current, 0);
56939 retval = -EINVAL;
56940 @@ -888,17 +1340,45 @@ static int load_elf_binary(struct linux_binprm *bprm)
56941 goto out_free_dentry;
56942 }
56943 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
56944 - send_sig(SIGSEGV, current, 0);
56945 - retval = -EFAULT; /* Nobody gets to see this, but.. */
56946 - goto out_free_dentry;
56947 + /*
56948 + * This bss-zeroing can fail if the ELF
56949 + * file specifies odd protections. So
56950 + * we don't check the return value
56951 + */
56952 }
56953
56954 +#ifdef CONFIG_PAX_RANDMMAP
56955 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
56956 + unsigned long start, size, flags;
56957 + vm_flags_t vm_flags;
56958 +
56959 + start = ELF_PAGEALIGN(elf_brk);
56960 + size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
56961 + flags = MAP_FIXED | MAP_PRIVATE;
56962 + vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
56963 +
56964 + down_write(&current->mm->mmap_sem);
56965 + start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
56966 + retval = -ENOMEM;
56967 + if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
56968 +// if (current->personality & ADDR_NO_RANDOMIZE)
56969 +// vm_flags |= VM_READ | VM_MAYREAD;
56970 + start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
56971 + retval = IS_ERR_VALUE(start) ? start : 0;
56972 + }
56973 + up_write(&current->mm->mmap_sem);
56974 + if (retval == 0)
56975 + retval = set_brk(start + size, start + size + PAGE_SIZE);
56976 + if (retval < 0) {
56977 + send_sig(SIGKILL, current, 0);
56978 + goto out_free_dentry;
56979 + }
56980 + }
56981 +#endif
56982 +
56983 if (elf_interpreter) {
56984 - unsigned long interp_map_addr = 0;
56985 -
56986 elf_entry = load_elf_interp(&loc->interp_elf_ex,
56987 interpreter,
56988 - &interp_map_addr,
56989 load_bias);
56990 if (!IS_ERR((void *)elf_entry)) {
56991 /*
56992 @@ -1122,7 +1602,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
56993 * Decide what to dump of a segment, part, all or none.
56994 */
56995 static unsigned long vma_dump_size(struct vm_area_struct *vma,
56996 - unsigned long mm_flags)
56997 + unsigned long mm_flags, long signr)
56998 {
56999 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
57000
57001 @@ -1160,7 +1640,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
57002 if (vma->vm_file == NULL)
57003 return 0;
57004
57005 - if (FILTER(MAPPED_PRIVATE))
57006 + if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
57007 goto whole;
57008
57009 /*
57010 @@ -1367,9 +1847,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
57011 {
57012 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
57013 int i = 0;
57014 - do
57015 + do {
57016 i += 2;
57017 - while (auxv[i - 2] != AT_NULL);
57018 + } while (auxv[i - 2] != AT_NULL);
57019 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
57020 }
57021
57022 @@ -1378,7 +1858,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
57023 {
57024 mm_segment_t old_fs = get_fs();
57025 set_fs(KERNEL_DS);
57026 - copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
57027 + copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
57028 set_fs(old_fs);
57029 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
57030 }
57031 @@ -2002,14 +2482,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
57032 }
57033
57034 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
57035 - unsigned long mm_flags)
57036 + struct coredump_params *cprm)
57037 {
57038 struct vm_area_struct *vma;
57039 size_t size = 0;
57040
57041 for (vma = first_vma(current, gate_vma); vma != NULL;
57042 vma = next_vma(vma, gate_vma))
57043 - size += vma_dump_size(vma, mm_flags);
57044 + size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
57045 return size;
57046 }
57047
57048 @@ -2100,7 +2580,7 @@ static int elf_core_dump(struct coredump_params *cprm)
57049
57050 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
57051
57052 - offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
57053 + offset += elf_core_vma_data_size(gate_vma, cprm);
57054 offset += elf_core_extra_data_size();
57055 e_shoff = offset;
57056
57057 @@ -2128,7 +2608,7 @@ static int elf_core_dump(struct coredump_params *cprm)
57058 phdr.p_offset = offset;
57059 phdr.p_vaddr = vma->vm_start;
57060 phdr.p_paddr = 0;
57061 - phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
57062 + phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
57063 phdr.p_memsz = vma->vm_end - vma->vm_start;
57064 offset += phdr.p_filesz;
57065 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
57066 @@ -2161,7 +2641,7 @@ static int elf_core_dump(struct coredump_params *cprm)
57067 unsigned long addr;
57068 unsigned long end;
57069
57070 - end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
57071 + end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
57072
57073 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
57074 struct page *page;
57075 @@ -2202,6 +2682,167 @@ out:
57076
57077 #endif /* CONFIG_ELF_CORE */
57078
57079 +#ifdef CONFIG_PAX_MPROTECT
57080 +/* PaX: non-PIC ELF libraries need relocations on their executable segments
57081 + * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
57082 + * we'll remove VM_MAYWRITE for good on RELRO segments.
57083 + *
57084 + * The checks favour ld-linux.so behaviour which operates on a per ELF segment
57085 + * basis because we want to allow the common case and not the special ones.
57086 + */
57087 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
57088 +{
57089 + struct elfhdr elf_h;
57090 + struct elf_phdr elf_p;
57091 + unsigned long i;
57092 + unsigned long oldflags;
57093 + bool is_textrel_rw, is_textrel_rx, is_relro;
57094 +
57095 + if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
57096 + return;
57097 +
57098 + oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
57099 + newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
57100 +
57101 +#ifdef CONFIG_PAX_ELFRELOCS
57102 + /* possible TEXTREL */
57103 + is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
57104 + is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
57105 +#else
57106 + is_textrel_rw = false;
57107 + is_textrel_rx = false;
57108 +#endif
57109 +
57110 + /* possible RELRO */
57111 + is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
57112 +
57113 + if (!is_textrel_rw && !is_textrel_rx && !is_relro)
57114 + return;
57115 +
57116 + if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
57117 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
57118 +
57119 +#ifdef CONFIG_PAX_ETEXECRELOCS
57120 + ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
57121 +#else
57122 + ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
57123 +#endif
57124 +
57125 + (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
57126 + !elf_check_arch(&elf_h) ||
57127 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
57128 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
57129 + return;
57130 +
57131 + for (i = 0UL; i < elf_h.e_phnum; i++) {
57132 + if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
57133 + return;
57134 + switch (elf_p.p_type) {
57135 + case PT_DYNAMIC:
57136 + if (!is_textrel_rw && !is_textrel_rx)
57137 + continue;
57138 + i = 0UL;
57139 + while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
57140 + elf_dyn dyn;
57141 +
57142 + if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
57143 + break;
57144 + if (dyn.d_tag == DT_NULL)
57145 + break;
57146 + if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
57147 + gr_log_textrel(vma);
57148 + if (is_textrel_rw)
57149 + vma->vm_flags |= VM_MAYWRITE;
57150 + else
57151 + /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
57152 + vma->vm_flags &= ~VM_MAYWRITE;
57153 + break;
57154 + }
57155 + i++;
57156 + }
57157 + is_textrel_rw = false;
57158 + is_textrel_rx = false;
57159 + continue;
57160 +
57161 + case PT_GNU_RELRO:
57162 + if (!is_relro)
57163 + continue;
57164 + if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
57165 + vma->vm_flags &= ~VM_MAYWRITE;
57166 + is_relro = false;
57167 + continue;
57168 +
57169 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
57170 + case PT_PAX_FLAGS: {
57171 + const char *msg_mprotect = "", *msg_emutramp = "";
57172 + char *buffer_lib, *buffer_exe;
57173 +
57174 + if (elf_p.p_flags & PF_NOMPROTECT)
57175 + msg_mprotect = "MPROTECT disabled";
57176 +
57177 +#ifdef CONFIG_PAX_EMUTRAMP
57178 + if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
57179 + msg_emutramp = "EMUTRAMP enabled";
57180 +#endif
57181 +
57182 + if (!msg_mprotect[0] && !msg_emutramp[0])
57183 + continue;
57184 +
57185 + if (!printk_ratelimit())
57186 + continue;
57187 +
57188 + buffer_lib = (char *)__get_free_page(GFP_KERNEL);
57189 + buffer_exe = (char *)__get_free_page(GFP_KERNEL);
57190 + if (buffer_lib && buffer_exe) {
57191 + char *path_lib, *path_exe;
57192 +
57193 + path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
57194 + path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
57195 +
57196 + pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
57197 + (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
57198 +
57199 + }
57200 + free_page((unsigned long)buffer_exe);
57201 + free_page((unsigned long)buffer_lib);
57202 + continue;
57203 + }
57204 +#endif
57205 +
57206 + }
57207 + }
57208 +}
57209 +#endif
57210 +
57211 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
57212 +
57213 +extern int grsec_enable_log_rwxmaps;
57214 +
57215 +static void elf_handle_mmap(struct file *file)
57216 +{
57217 + struct elfhdr elf_h;
57218 + struct elf_phdr elf_p;
57219 + unsigned long i;
57220 +
57221 + if (!grsec_enable_log_rwxmaps)
57222 + return;
57223 +
57224 + if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
57225 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
57226 + (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
57227 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
57228 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
57229 + return;
57230 +
57231 + for (i = 0UL; i < elf_h.e_phnum; i++) {
57232 + if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
57233 + return;
57234 + if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
57235 + gr_log_ptgnustack(file);
57236 + }
57237 +}
57238 +#endif
57239 +
57240 static int __init init_elf_binfmt(void)
57241 {
57242 register_binfmt(&elf_format);
57243 diff --git a/fs/bio.c b/fs/bio.c
57244 index 6f0362b..26a7496 100644
57245 --- a/fs/bio.c
57246 +++ b/fs/bio.c
57247 @@ -1144,7 +1144,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
57248 /*
57249 * Overflow, abort
57250 */
57251 - if (end < start)
57252 + if (end < start || end - start > INT_MAX - nr_pages)
57253 return ERR_PTR(-EINVAL);
57254
57255 nr_pages += end - start;
57256 @@ -1278,7 +1278,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
57257 /*
57258 * Overflow, abort
57259 */
57260 - if (end < start)
57261 + if (end < start || end - start > INT_MAX - nr_pages)
57262 return ERR_PTR(-EINVAL);
57263
57264 nr_pages += end - start;
57265 @@ -1540,7 +1540,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
57266 const int read = bio_data_dir(bio) == READ;
57267 struct bio_map_data *bmd = bio->bi_private;
57268 int i;
57269 - char *p = bmd->sgvecs[0].iov_base;
57270 + char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
57271
57272 bio_for_each_segment_all(bvec, bio, i) {
57273 char *addr = page_address(bvec->bv_page);
57274 diff --git a/fs/block_dev.c b/fs/block_dev.c
57275 index 552a8d1..d51ccf3 100644
57276 --- a/fs/block_dev.c
57277 +++ b/fs/block_dev.c
57278 @@ -637,7 +637,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
57279 else if (bdev->bd_contains == bdev)
57280 return true; /* is a whole device which isn't held */
57281
57282 - else if (whole->bd_holder == bd_may_claim)
57283 + else if (whole->bd_holder == (void *)bd_may_claim)
57284 return true; /* is a partition of a device that is being partitioned */
57285 else if (whole->bd_holder != NULL)
57286 return false; /* is a partition of a held device */
57287 diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
57288 index 1bcfcdb..e942132 100644
57289 --- a/fs/btrfs/ctree.c
57290 +++ b/fs/btrfs/ctree.c
57291 @@ -1216,9 +1216,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
57292 free_extent_buffer(buf);
57293 add_root_to_dirty_list(root);
57294 } else {
57295 - if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
57296 - parent_start = parent->start;
57297 - else
57298 + if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
57299 + if (parent)
57300 + parent_start = parent->start;
57301 + else
57302 + parent_start = 0;
57303 + } else
57304 parent_start = 0;
57305
57306 WARN_ON(trans->transid != btrfs_header_generation(parent));
57307 diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
57308 index 33e561a..16df7ae 100644
57309 --- a/fs/btrfs/delayed-inode.c
57310 +++ b/fs/btrfs/delayed-inode.c
57311 @@ -459,7 +459,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
57312
57313 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
57314 {
57315 - int seq = atomic_inc_return(&delayed_root->items_seq);
57316 + int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
57317 if ((atomic_dec_return(&delayed_root->items) <
57318 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
57319 waitqueue_active(&delayed_root->wait))
57320 @@ -1409,7 +1409,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
57321
57322 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
57323 {
57324 - int val = atomic_read(&delayed_root->items_seq);
57325 + int val = atomic_read_unchecked(&delayed_root->items_seq);
57326
57327 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
57328 return 1;
57329 @@ -1433,7 +1433,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
57330 int seq;
57331 int ret;
57332
57333 - seq = atomic_read(&delayed_root->items_seq);
57334 + seq = atomic_read_unchecked(&delayed_root->items_seq);
57335
57336 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
57337 if (ret)
57338 diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
57339 index f70119f..ab5894d 100644
57340 --- a/fs/btrfs/delayed-inode.h
57341 +++ b/fs/btrfs/delayed-inode.h
57342 @@ -43,7 +43,7 @@ struct btrfs_delayed_root {
57343 */
57344 struct list_head prepare_list;
57345 atomic_t items; /* for delayed items */
57346 - atomic_t items_seq; /* for delayed items */
57347 + atomic_unchecked_t items_seq; /* for delayed items */
57348 int nodes; /* for delayed nodes */
57349 wait_queue_head_t wait;
57350 };
57351 @@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
57352 struct btrfs_delayed_root *delayed_root)
57353 {
57354 atomic_set(&delayed_root->items, 0);
57355 - atomic_set(&delayed_root->items_seq, 0);
57356 + atomic_set_unchecked(&delayed_root->items_seq, 0);
57357 delayed_root->nodes = 0;
57358 spin_lock_init(&delayed_root->lock);
57359 init_waitqueue_head(&delayed_root->wait);
57360 diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
57361 index 2f6d7b1..f186382 100644
57362 --- a/fs/btrfs/ioctl.c
57363 +++ b/fs/btrfs/ioctl.c
57364 @@ -3575,9 +3575,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
57365 for (i = 0; i < num_types; i++) {
57366 struct btrfs_space_info *tmp;
57367
57368 + /* Don't copy in more than we allocated */
57369 if (!slot_count)
57370 break;
57371
57372 + slot_count--;
57373 +
57374 info = NULL;
57375 rcu_read_lock();
57376 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
57377 @@ -3599,10 +3602,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
57378 memcpy(dest, &space, sizeof(space));
57379 dest++;
57380 space_args.total_spaces++;
57381 - slot_count--;
57382 }
57383 - if (!slot_count)
57384 - break;
57385 }
57386 up_read(&info->groups_sem);
57387 }
57388 diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
57389 index 9601d25..2896d6c 100644
57390 --- a/fs/btrfs/super.c
57391 +++ b/fs/btrfs/super.c
57392 @@ -270,7 +270,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
57393 function, line, errstr);
57394 return;
57395 }
57396 - ACCESS_ONCE(trans->transaction->aborted) = errno;
57397 + ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
57398 /* Wake up anybody who may be waiting on this transaction */
57399 wake_up(&root->fs_info->transaction_wait);
57400 wake_up(&root->fs_info->transaction_blocked_wait);
57401 diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
57402 index 4825cd2..b2fe768 100644
57403 --- a/fs/btrfs/sysfs.c
57404 +++ b/fs/btrfs/sysfs.c
57405 @@ -438,7 +438,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
57406 for (set = 0; set < FEAT_MAX; set++) {
57407 int i;
57408 struct attribute *attrs[2];
57409 - struct attribute_group agroup = {
57410 + attribute_group_no_const agroup = {
57411 .name = "features",
57412 .attrs = attrs,
57413 };
57414 diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
57415 index e2f45fc..b036909 100644
57416 --- a/fs/btrfs/tree-log.c
57417 +++ b/fs/btrfs/tree-log.c
57418 @@ -2533,7 +2533,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
57419 blk_finish_plug(&plug);
57420 btrfs_abort_transaction(trans, root, ret);
57421 btrfs_free_logged_extents(log, log_transid);
57422 - ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
57423 + ACCESS_ONCE_RW(root->fs_info->last_trans_log_full_commit) =
57424 trans->transid;
57425 mutex_unlock(&root->log_mutex);
57426 goto out;
57427 @@ -2577,7 +2577,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
57428 list_del_init(&root_log_ctx.list);
57429
57430 blk_finish_plug(&plug);
57431 - ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
57432 + ACCESS_ONCE_RW(root->fs_info->last_trans_log_full_commit) =
57433 trans->transid;
57434 if (ret != -ENOSPC) {
57435 btrfs_abort_transaction(trans, root, ret);
57436 @@ -2622,7 +2622,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
57437 * now that we've moved on to the tree of log tree roots,
57438 * check the full commit flag again
57439 */
57440 - if (ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) ==
57441 + if (ACCESS_ONCE_RW(root->fs_info->last_trans_log_full_commit) ==
57442 trans->transid) {
57443 blk_finish_plug(&plug);
57444 btrfs_wait_marked_extents(log, &log->dirty_log_pages, mark);
57445 @@ -2637,7 +2637,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
57446 EXTENT_DIRTY | EXTENT_NEW);
57447 blk_finish_plug(&plug);
57448 if (ret) {
57449 - ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
57450 + ACCESS_ONCE_RW(root->fs_info->last_trans_log_full_commit) =
57451 trans->transid;
57452 btrfs_abort_transaction(trans, root, ret);
57453 btrfs_free_logged_extents(log, log_transid);
57454 @@ -2667,7 +2667,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
57455 */
57456 ret = write_ctree_super(trans, root->fs_info->tree_root, 1);
57457 if (ret) {
57458 - ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
57459 + ACCESS_ONCE_RW(root->fs_info->last_trans_log_full_commit) =
57460 trans->transid;
57461 btrfs_abort_transaction(trans, root, ret);
57462 goto out_wake_log_root;
57463 diff --git a/fs/buffer.c b/fs/buffer.c
57464 index 9ddb9fc..7aa2487 100644
57465 --- a/fs/buffer.c
57466 +++ b/fs/buffer.c
57467 @@ -3428,7 +3428,7 @@ void __init buffer_init(void)
57468 bh_cachep = kmem_cache_create("buffer_head",
57469 sizeof(struct buffer_head), 0,
57470 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
57471 - SLAB_MEM_SPREAD),
57472 + SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
57473 NULL);
57474
57475 /*
57476 diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
57477 index 5b99baf..47fffb5 100644
57478 --- a/fs/cachefiles/bind.c
57479 +++ b/fs/cachefiles/bind.c
57480 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
57481 args);
57482
57483 /* start by checking things over */
57484 - ASSERT(cache->fstop_percent >= 0 &&
57485 - cache->fstop_percent < cache->fcull_percent &&
57486 + ASSERT(cache->fstop_percent < cache->fcull_percent &&
57487 cache->fcull_percent < cache->frun_percent &&
57488 cache->frun_percent < 100);
57489
57490 - ASSERT(cache->bstop_percent >= 0 &&
57491 - cache->bstop_percent < cache->bcull_percent &&
57492 + ASSERT(cache->bstop_percent < cache->bcull_percent &&
57493 cache->bcull_percent < cache->brun_percent &&
57494 cache->brun_percent < 100);
57495
57496 diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
57497 index 0a1467b..6a53245 100644
57498 --- a/fs/cachefiles/daemon.c
57499 +++ b/fs/cachefiles/daemon.c
57500 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
57501 if (n > buflen)
57502 return -EMSGSIZE;
57503
57504 - if (copy_to_user(_buffer, buffer, n) != 0)
57505 + if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
57506 return -EFAULT;
57507
57508 return n;
57509 @@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
57510 if (test_bit(CACHEFILES_DEAD, &cache->flags))
57511 return -EIO;
57512
57513 - if (datalen < 0 || datalen > PAGE_SIZE - 1)
57514 + if (datalen > PAGE_SIZE - 1)
57515 return -EOPNOTSUPP;
57516
57517 /* drag the command string into the kernel so we can parse it */
57518 @@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
57519 if (args[0] != '%' || args[1] != '\0')
57520 return -EINVAL;
57521
57522 - if (fstop < 0 || fstop >= cache->fcull_percent)
57523 + if (fstop >= cache->fcull_percent)
57524 return cachefiles_daemon_range_error(cache, args);
57525
57526 cache->fstop_percent = fstop;
57527 @@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
57528 if (args[0] != '%' || args[1] != '\0')
57529 return -EINVAL;
57530
57531 - if (bstop < 0 || bstop >= cache->bcull_percent)
57532 + if (bstop >= cache->bcull_percent)
57533 return cachefiles_daemon_range_error(cache, args);
57534
57535 cache->bstop_percent = bstop;
57536 diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
57537 index 5349473..d6c0b93 100644
57538 --- a/fs/cachefiles/internal.h
57539 +++ b/fs/cachefiles/internal.h
57540 @@ -59,7 +59,7 @@ struct cachefiles_cache {
57541 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
57542 struct rb_root active_nodes; /* active nodes (can't be culled) */
57543 rwlock_t active_lock; /* lock for active_nodes */
57544 - atomic_t gravecounter; /* graveyard uniquifier */
57545 + atomic_unchecked_t gravecounter; /* graveyard uniquifier */
57546 unsigned frun_percent; /* when to stop culling (% files) */
57547 unsigned fcull_percent; /* when to start culling (% files) */
57548 unsigned fstop_percent; /* when to stop allocating (% files) */
57549 @@ -171,19 +171,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
57550 * proc.c
57551 */
57552 #ifdef CONFIG_CACHEFILES_HISTOGRAM
57553 -extern atomic_t cachefiles_lookup_histogram[HZ];
57554 -extern atomic_t cachefiles_mkdir_histogram[HZ];
57555 -extern atomic_t cachefiles_create_histogram[HZ];
57556 +extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
57557 +extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
57558 +extern atomic_unchecked_t cachefiles_create_histogram[HZ];
57559
57560 extern int __init cachefiles_proc_init(void);
57561 extern void cachefiles_proc_cleanup(void);
57562 static inline
57563 -void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
57564 +void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
57565 {
57566 unsigned long jif = jiffies - start_jif;
57567 if (jif >= HZ)
57568 jif = HZ - 1;
57569 - atomic_inc(&histogram[jif]);
57570 + atomic_inc_unchecked(&histogram[jif]);
57571 }
57572
57573 #else
57574 diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
57575 index c0a6817..ea811166 100644
57576 --- a/fs/cachefiles/namei.c
57577 +++ b/fs/cachefiles/namei.c
57578 @@ -317,7 +317,7 @@ try_again:
57579 /* first step is to make up a grave dentry in the graveyard */
57580 sprintf(nbuffer, "%08x%08x",
57581 (uint32_t) get_seconds(),
57582 - (uint32_t) atomic_inc_return(&cache->gravecounter));
57583 + (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
57584
57585 /* do the multiway lock magic */
57586 trap = lock_rename(cache->graveyard, dir);
57587 diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
57588 index eccd339..4c1d995 100644
57589 --- a/fs/cachefiles/proc.c
57590 +++ b/fs/cachefiles/proc.c
57591 @@ -14,9 +14,9 @@
57592 #include <linux/seq_file.h>
57593 #include "internal.h"
57594
57595 -atomic_t cachefiles_lookup_histogram[HZ];
57596 -atomic_t cachefiles_mkdir_histogram[HZ];
57597 -atomic_t cachefiles_create_histogram[HZ];
57598 +atomic_unchecked_t cachefiles_lookup_histogram[HZ];
57599 +atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
57600 +atomic_unchecked_t cachefiles_create_histogram[HZ];
57601
57602 /*
57603 * display the latency histogram
57604 @@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
57605 return 0;
57606 default:
57607 index = (unsigned long) v - 3;
57608 - x = atomic_read(&cachefiles_lookup_histogram[index]);
57609 - y = atomic_read(&cachefiles_mkdir_histogram[index]);
57610 - z = atomic_read(&cachefiles_create_histogram[index]);
57611 + x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
57612 + y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
57613 + z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
57614 if (x == 0 && y == 0 && z == 0)
57615 return 0;
57616
57617 diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
57618 index 4b1fb5c..0d2a699 100644
57619 --- a/fs/cachefiles/rdwr.c
57620 +++ b/fs/cachefiles/rdwr.c
57621 @@ -943,7 +943,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
57622 old_fs = get_fs();
57623 set_fs(KERNEL_DS);
57624 ret = file->f_op->write(
57625 - file, (const void __user *) data, len, &pos);
57626 + file, (const void __force_user *) data, len, &pos);
57627 set_fs(old_fs);
57628 kunmap(page);
57629 file_end_write(file);
57630 diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
57631 index c29d6ae..a56c4ae 100644
57632 --- a/fs/ceph/dir.c
57633 +++ b/fs/ceph/dir.c
57634 @@ -250,7 +250,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
57635 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
57636 struct ceph_mds_client *mdsc = fsc->mdsc;
57637 unsigned frag = fpos_frag(ctx->pos);
57638 - int off = fpos_off(ctx->pos);
57639 + unsigned int off = fpos_off(ctx->pos);
57640 int err;
57641 u32 ftype;
57642 struct ceph_mds_reply_info_parsed *rinfo;
57643 diff --git a/fs/ceph/super.c b/fs/ceph/super.c
57644 index 06150fd..192061b 100644
57645 --- a/fs/ceph/super.c
57646 +++ b/fs/ceph/super.c
57647 @@ -895,7 +895,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
57648 /*
57649 * construct our own bdi so we can control readahead, etc.
57650 */
57651 -static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
57652 +static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
57653
57654 static int ceph_register_bdi(struct super_block *sb,
57655 struct ceph_fs_client *fsc)
57656 @@ -912,7 +912,7 @@ static int ceph_register_bdi(struct super_block *sb,
57657 default_backing_dev_info.ra_pages;
57658
57659 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
57660 - atomic_long_inc_return(&bdi_seq));
57661 + atomic_long_inc_return_unchecked(&bdi_seq));
57662 if (!err)
57663 sb->s_bdi = &fsc->backing_dev_info;
57664 return err;
57665 diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
57666 index f3ac415..3d2420c 100644
57667 --- a/fs/cifs/cifs_debug.c
57668 +++ b/fs/cifs/cifs_debug.c
57669 @@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
57670
57671 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
57672 #ifdef CONFIG_CIFS_STATS2
57673 - atomic_set(&totBufAllocCount, 0);
57674 - atomic_set(&totSmBufAllocCount, 0);
57675 + atomic_set_unchecked(&totBufAllocCount, 0);
57676 + atomic_set_unchecked(&totSmBufAllocCount, 0);
57677 #endif /* CONFIG_CIFS_STATS2 */
57678 spin_lock(&cifs_tcp_ses_lock);
57679 list_for_each(tmp1, &cifs_tcp_ses_list) {
57680 @@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
57681 tcon = list_entry(tmp3,
57682 struct cifs_tcon,
57683 tcon_list);
57684 - atomic_set(&tcon->num_smbs_sent, 0);
57685 + atomic_set_unchecked(&tcon->num_smbs_sent, 0);
57686 if (server->ops->clear_stats)
57687 server->ops->clear_stats(tcon);
57688 }
57689 @@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
57690 smBufAllocCount.counter, cifs_min_small);
57691 #ifdef CONFIG_CIFS_STATS2
57692 seq_printf(m, "Total Large %d Small %d Allocations\n",
57693 - atomic_read(&totBufAllocCount),
57694 - atomic_read(&totSmBufAllocCount));
57695 + atomic_read_unchecked(&totBufAllocCount),
57696 + atomic_read_unchecked(&totSmBufAllocCount));
57697 #endif /* CONFIG_CIFS_STATS2 */
57698
57699 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
57700 @@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
57701 if (tcon->need_reconnect)
57702 seq_puts(m, "\tDISCONNECTED ");
57703 seq_printf(m, "\nSMBs: %d",
57704 - atomic_read(&tcon->num_smbs_sent));
57705 + atomic_read_unchecked(&tcon->num_smbs_sent));
57706 if (server->ops->print_stats)
57707 server->ops->print_stats(m, tcon);
57708 }
57709 diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
57710 index 5be1f997..fa1015a1 100644
57711 --- a/fs/cifs/cifsfs.c
57712 +++ b/fs/cifs/cifsfs.c
57713 @@ -1068,7 +1068,7 @@ cifs_init_request_bufs(void)
57714 */
57715 cifs_req_cachep = kmem_cache_create("cifs_request",
57716 CIFSMaxBufSize + max_hdr_size, 0,
57717 - SLAB_HWCACHE_ALIGN, NULL);
57718 + SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
57719 if (cifs_req_cachep == NULL)
57720 return -ENOMEM;
57721
57722 @@ -1095,7 +1095,7 @@ cifs_init_request_bufs(void)
57723 efficient to alloc 1 per page off the slab compared to 17K (5page)
57724 alloc of large cifs buffers even when page debugging is on */
57725 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
57726 - MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
57727 + MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
57728 NULL);
57729 if (cifs_sm_req_cachep == NULL) {
57730 mempool_destroy(cifs_req_poolp);
57731 @@ -1180,8 +1180,8 @@ init_cifs(void)
57732 atomic_set(&bufAllocCount, 0);
57733 atomic_set(&smBufAllocCount, 0);
57734 #ifdef CONFIG_CIFS_STATS2
57735 - atomic_set(&totBufAllocCount, 0);
57736 - atomic_set(&totSmBufAllocCount, 0);
57737 + atomic_set_unchecked(&totBufAllocCount, 0);
57738 + atomic_set_unchecked(&totSmBufAllocCount, 0);
57739 #endif /* CONFIG_CIFS_STATS2 */
57740
57741 atomic_set(&midCount, 0);
57742 diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
57743 index 30f6e92..e915ba5 100644
57744 --- a/fs/cifs/cifsglob.h
57745 +++ b/fs/cifs/cifsglob.h
57746 @@ -806,35 +806,35 @@ struct cifs_tcon {
57747 __u16 Flags; /* optional support bits */
57748 enum statusEnum tidStatus;
57749 #ifdef CONFIG_CIFS_STATS
57750 - atomic_t num_smbs_sent;
57751 + atomic_unchecked_t num_smbs_sent;
57752 union {
57753 struct {
57754 - atomic_t num_writes;
57755 - atomic_t num_reads;
57756 - atomic_t num_flushes;
57757 - atomic_t num_oplock_brks;
57758 - atomic_t num_opens;
57759 - atomic_t num_closes;
57760 - atomic_t num_deletes;
57761 - atomic_t num_mkdirs;
57762 - atomic_t num_posixopens;
57763 - atomic_t num_posixmkdirs;
57764 - atomic_t num_rmdirs;
57765 - atomic_t num_renames;
57766 - atomic_t num_t2renames;
57767 - atomic_t num_ffirst;
57768 - atomic_t num_fnext;
57769 - atomic_t num_fclose;
57770 - atomic_t num_hardlinks;
57771 - atomic_t num_symlinks;
57772 - atomic_t num_locks;
57773 - atomic_t num_acl_get;
57774 - atomic_t num_acl_set;
57775 + atomic_unchecked_t num_writes;
57776 + atomic_unchecked_t num_reads;
57777 + atomic_unchecked_t num_flushes;
57778 + atomic_unchecked_t num_oplock_brks;
57779 + atomic_unchecked_t num_opens;
57780 + atomic_unchecked_t num_closes;
57781 + atomic_unchecked_t num_deletes;
57782 + atomic_unchecked_t num_mkdirs;
57783 + atomic_unchecked_t num_posixopens;
57784 + atomic_unchecked_t num_posixmkdirs;
57785 + atomic_unchecked_t num_rmdirs;
57786 + atomic_unchecked_t num_renames;
57787 + atomic_unchecked_t num_t2renames;
57788 + atomic_unchecked_t num_ffirst;
57789 + atomic_unchecked_t num_fnext;
57790 + atomic_unchecked_t num_fclose;
57791 + atomic_unchecked_t num_hardlinks;
57792 + atomic_unchecked_t num_symlinks;
57793 + atomic_unchecked_t num_locks;
57794 + atomic_unchecked_t num_acl_get;
57795 + atomic_unchecked_t num_acl_set;
57796 } cifs_stats;
57797 #ifdef CONFIG_CIFS_SMB2
57798 struct {
57799 - atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
57800 - atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
57801 + atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
57802 + atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
57803 } smb2_stats;
57804 #endif /* CONFIG_CIFS_SMB2 */
57805 } stats;
57806 @@ -1170,7 +1170,7 @@ convert_delimiter(char *path, char delim)
57807 }
57808
57809 #ifdef CONFIG_CIFS_STATS
57810 -#define cifs_stats_inc atomic_inc
57811 +#define cifs_stats_inc atomic_inc_unchecked
57812
57813 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
57814 unsigned int bytes)
57815 @@ -1536,8 +1536,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
57816 /* Various Debug counters */
57817 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
57818 #ifdef CONFIG_CIFS_STATS2
57819 -GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
57820 -GLOBAL_EXTERN atomic_t totSmBufAllocCount;
57821 +GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
57822 +GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
57823 #endif
57824 GLOBAL_EXTERN atomic_t smBufAllocCount;
57825 GLOBAL_EXTERN atomic_t midCount;
57826 diff --git a/fs/cifs/file.c b/fs/cifs/file.c
57827 index 5ed03e0..e9a3a6c 100644
57828 --- a/fs/cifs/file.c
57829 +++ b/fs/cifs/file.c
57830 @@ -1900,10 +1900,14 @@ static int cifs_writepages(struct address_space *mapping,
57831 index = mapping->writeback_index; /* Start from prev offset */
57832 end = -1;
57833 } else {
57834 - index = wbc->range_start >> PAGE_CACHE_SHIFT;
57835 - end = wbc->range_end >> PAGE_CACHE_SHIFT;
57836 - if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
57837 + if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
57838 range_whole = true;
57839 + index = 0;
57840 + end = ULONG_MAX;
57841 + } else {
57842 + index = wbc->range_start >> PAGE_CACHE_SHIFT;
57843 + end = wbc->range_end >> PAGE_CACHE_SHIFT;
57844 + }
57845 scanned = true;
57846 }
57847 retry:
57848 diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
57849 index 3b0c62e..f7d090c 100644
57850 --- a/fs/cifs/misc.c
57851 +++ b/fs/cifs/misc.c
57852 @@ -170,7 +170,7 @@ cifs_buf_get(void)
57853 memset(ret_buf, 0, buf_size + 3);
57854 atomic_inc(&bufAllocCount);
57855 #ifdef CONFIG_CIFS_STATS2
57856 - atomic_inc(&totBufAllocCount);
57857 + atomic_inc_unchecked(&totBufAllocCount);
57858 #endif /* CONFIG_CIFS_STATS2 */
57859 }
57860
57861 @@ -205,7 +205,7 @@ cifs_small_buf_get(void)
57862 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
57863 atomic_inc(&smBufAllocCount);
57864 #ifdef CONFIG_CIFS_STATS2
57865 - atomic_inc(&totSmBufAllocCount);
57866 + atomic_inc_unchecked(&totSmBufAllocCount);
57867 #endif /* CONFIG_CIFS_STATS2 */
57868
57869 }
57870 diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
57871 index d1fdfa8..94558f8 100644
57872 --- a/fs/cifs/smb1ops.c
57873 +++ b/fs/cifs/smb1ops.c
57874 @@ -626,27 +626,27 @@ static void
57875 cifs_clear_stats(struct cifs_tcon *tcon)
57876 {
57877 #ifdef CONFIG_CIFS_STATS
57878 - atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
57879 - atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
57880 - atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
57881 - atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
57882 - atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
57883 - atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
57884 - atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
57885 - atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
57886 - atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
57887 - atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
57888 - atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
57889 - atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
57890 - atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
57891 - atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
57892 - atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
57893 - atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
57894 - atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
57895 - atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
57896 - atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
57897 - atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
57898 - atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
57899 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
57900 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
57901 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
57902 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
57903 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
57904 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
57905 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
57906 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
57907 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
57908 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
57909 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
57910 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
57911 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
57912 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
57913 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
57914 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
57915 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
57916 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
57917 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
57918 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
57919 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
57920 #endif
57921 }
57922
57923 @@ -655,36 +655,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
57924 {
57925 #ifdef CONFIG_CIFS_STATS
57926 seq_printf(m, " Oplocks breaks: %d",
57927 - atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
57928 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
57929 seq_printf(m, "\nReads: %d Bytes: %llu",
57930 - atomic_read(&tcon->stats.cifs_stats.num_reads),
57931 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
57932 (long long)(tcon->bytes_read));
57933 seq_printf(m, "\nWrites: %d Bytes: %llu",
57934 - atomic_read(&tcon->stats.cifs_stats.num_writes),
57935 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
57936 (long long)(tcon->bytes_written));
57937 seq_printf(m, "\nFlushes: %d",
57938 - atomic_read(&tcon->stats.cifs_stats.num_flushes));
57939 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
57940 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
57941 - atomic_read(&tcon->stats.cifs_stats.num_locks),
57942 - atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
57943 - atomic_read(&tcon->stats.cifs_stats.num_symlinks));
57944 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
57945 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
57946 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
57947 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
57948 - atomic_read(&tcon->stats.cifs_stats.num_opens),
57949 - atomic_read(&tcon->stats.cifs_stats.num_closes),
57950 - atomic_read(&tcon->stats.cifs_stats.num_deletes));
57951 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
57952 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
57953 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
57954 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
57955 - atomic_read(&tcon->stats.cifs_stats.num_posixopens),
57956 - atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
57957 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
57958 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
57959 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
57960 - atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
57961 - atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
57962 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
57963 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
57964 seq_printf(m, "\nRenames: %d T2 Renames %d",
57965 - atomic_read(&tcon->stats.cifs_stats.num_renames),
57966 - atomic_read(&tcon->stats.cifs_stats.num_t2renames));
57967 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
57968 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
57969 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
57970 - atomic_read(&tcon->stats.cifs_stats.num_ffirst),
57971 - atomic_read(&tcon->stats.cifs_stats.num_fnext),
57972 - atomic_read(&tcon->stats.cifs_stats.num_fclose));
57973 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
57974 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
57975 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
57976 #endif
57977 }
57978
57979 diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
57980 index 35ddc3e..563e809 100644
57981 --- a/fs/cifs/smb2ops.c
57982 +++ b/fs/cifs/smb2ops.c
57983 @@ -364,8 +364,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
57984 #ifdef CONFIG_CIFS_STATS
57985 int i;
57986 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
57987 - atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
57988 - atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
57989 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
57990 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
57991 }
57992 #endif
57993 }
57994 @@ -405,65 +405,65 @@ static void
57995 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
57996 {
57997 #ifdef CONFIG_CIFS_STATS
57998 - atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
57999 - atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
58000 + atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
58001 + atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
58002 seq_printf(m, "\nNegotiates: %d sent %d failed",
58003 - atomic_read(&sent[SMB2_NEGOTIATE_HE]),
58004 - atomic_read(&failed[SMB2_NEGOTIATE_HE]));
58005 + atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
58006 + atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
58007 seq_printf(m, "\nSessionSetups: %d sent %d failed",
58008 - atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
58009 - atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
58010 + atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
58011 + atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
58012 seq_printf(m, "\nLogoffs: %d sent %d failed",
58013 - atomic_read(&sent[SMB2_LOGOFF_HE]),
58014 - atomic_read(&failed[SMB2_LOGOFF_HE]));
58015 + atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
58016 + atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
58017 seq_printf(m, "\nTreeConnects: %d sent %d failed",
58018 - atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
58019 - atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
58020 + atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
58021 + atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
58022 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
58023 - atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
58024 - atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
58025 + atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
58026 + atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
58027 seq_printf(m, "\nCreates: %d sent %d failed",
58028 - atomic_read(&sent[SMB2_CREATE_HE]),
58029 - atomic_read(&failed[SMB2_CREATE_HE]));
58030 + atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
58031 + atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
58032 seq_printf(m, "\nCloses: %d sent %d failed",
58033 - atomic_read(&sent[SMB2_CLOSE_HE]),
58034 - atomic_read(&failed[SMB2_CLOSE_HE]));
58035 + atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
58036 + atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
58037 seq_printf(m, "\nFlushes: %d sent %d failed",
58038 - atomic_read(&sent[SMB2_FLUSH_HE]),
58039 - atomic_read(&failed[SMB2_FLUSH_HE]));
58040 + atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
58041 + atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
58042 seq_printf(m, "\nReads: %d sent %d failed",
58043 - atomic_read(&sent[SMB2_READ_HE]),
58044 - atomic_read(&failed[SMB2_READ_HE]));
58045 + atomic_read_unchecked(&sent[SMB2_READ_HE]),
58046 + atomic_read_unchecked(&failed[SMB2_READ_HE]));
58047 seq_printf(m, "\nWrites: %d sent %d failed",
58048 - atomic_read(&sent[SMB2_WRITE_HE]),
58049 - atomic_read(&failed[SMB2_WRITE_HE]));
58050 + atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
58051 + atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
58052 seq_printf(m, "\nLocks: %d sent %d failed",
58053 - atomic_read(&sent[SMB2_LOCK_HE]),
58054 - atomic_read(&failed[SMB2_LOCK_HE]));
58055 + atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
58056 + atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
58057 seq_printf(m, "\nIOCTLs: %d sent %d failed",
58058 - atomic_read(&sent[SMB2_IOCTL_HE]),
58059 - atomic_read(&failed[SMB2_IOCTL_HE]));
58060 + atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
58061 + atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
58062 seq_printf(m, "\nCancels: %d sent %d failed",
58063 - atomic_read(&sent[SMB2_CANCEL_HE]),
58064 - atomic_read(&failed[SMB2_CANCEL_HE]));
58065 + atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
58066 + atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
58067 seq_printf(m, "\nEchos: %d sent %d failed",
58068 - atomic_read(&sent[SMB2_ECHO_HE]),
58069 - atomic_read(&failed[SMB2_ECHO_HE]));
58070 + atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
58071 + atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
58072 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
58073 - atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
58074 - atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
58075 + atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
58076 + atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
58077 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
58078 - atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
58079 - atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
58080 + atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
58081 + atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
58082 seq_printf(m, "\nQueryInfos: %d sent %d failed",
58083 - atomic_read(&sent[SMB2_QUERY_INFO_HE]),
58084 - atomic_read(&failed[SMB2_QUERY_INFO_HE]));
58085 + atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
58086 + atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
58087 seq_printf(m, "\nSetInfos: %d sent %d failed",
58088 - atomic_read(&sent[SMB2_SET_INFO_HE]),
58089 - atomic_read(&failed[SMB2_SET_INFO_HE]));
58090 + atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
58091 + atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
58092 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
58093 - atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
58094 - atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
58095 + atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
58096 + atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
58097 #endif
58098 }
58099
58100 diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
58101 index 1fb6ad2..758e171 100644
58102 --- a/fs/cifs/smb2pdu.c
58103 +++ b/fs/cifs/smb2pdu.c
58104 @@ -2097,8 +2097,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
58105 default:
58106 cifs_dbg(VFS, "info level %u isn't supported\n",
58107 srch_inf->info_level);
58108 - rc = -EINVAL;
58109 - goto qdir_exit;
58110 + return -EINVAL;
58111 }
58112
58113 req->FileIndex = cpu_to_le32(index);
58114 diff --git a/fs/coda/cache.c b/fs/coda/cache.c
58115 index 1da168c..8bc7ff6 100644
58116 --- a/fs/coda/cache.c
58117 +++ b/fs/coda/cache.c
58118 @@ -24,7 +24,7 @@
58119 #include "coda_linux.h"
58120 #include "coda_cache.h"
58121
58122 -static atomic_t permission_epoch = ATOMIC_INIT(0);
58123 +static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
58124
58125 /* replace or extend an acl cache hit */
58126 void coda_cache_enter(struct inode *inode, int mask)
58127 @@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
58128 struct coda_inode_info *cii = ITOC(inode);
58129
58130 spin_lock(&cii->c_lock);
58131 - cii->c_cached_epoch = atomic_read(&permission_epoch);
58132 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
58133 if (!uid_eq(cii->c_uid, current_fsuid())) {
58134 cii->c_uid = current_fsuid();
58135 cii->c_cached_perm = mask;
58136 @@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
58137 {
58138 struct coda_inode_info *cii = ITOC(inode);
58139 spin_lock(&cii->c_lock);
58140 - cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
58141 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
58142 spin_unlock(&cii->c_lock);
58143 }
58144
58145 /* remove all acl caches */
58146 void coda_cache_clear_all(struct super_block *sb)
58147 {
58148 - atomic_inc(&permission_epoch);
58149 + atomic_inc_unchecked(&permission_epoch);
58150 }
58151
58152
58153 @@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
58154 spin_lock(&cii->c_lock);
58155 hit = (mask & cii->c_cached_perm) == mask &&
58156 uid_eq(cii->c_uid, current_fsuid()) &&
58157 - cii->c_cached_epoch == atomic_read(&permission_epoch);
58158 + cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
58159 spin_unlock(&cii->c_lock);
58160
58161 return hit;
58162 diff --git a/fs/compat.c b/fs/compat.c
58163 index 66d3d3c..9c10175 100644
58164 --- a/fs/compat.c
58165 +++ b/fs/compat.c
58166 @@ -54,7 +54,7 @@
58167 #include <asm/ioctls.h>
58168 #include "internal.h"
58169
58170 -int compat_log = 1;
58171 +int compat_log = 0;
58172
58173 int compat_printk(const char *fmt, ...)
58174 {
58175 @@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
58176
58177 set_fs(KERNEL_DS);
58178 /* The __user pointer cast is valid because of the set_fs() */
58179 - ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
58180 + ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
58181 set_fs(oldfs);
58182 /* truncating is ok because it's a user address */
58183 if (!ret)
58184 @@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
58185 goto out;
58186
58187 ret = -EINVAL;
58188 - if (nr_segs > UIO_MAXIOV || nr_segs < 0)
58189 + if (nr_segs > UIO_MAXIOV)
58190 goto out;
58191 if (nr_segs > fast_segs) {
58192 ret = -ENOMEM;
58193 @@ -850,6 +850,7 @@ struct compat_old_linux_dirent {
58194 struct compat_readdir_callback {
58195 struct dir_context ctx;
58196 struct compat_old_linux_dirent __user *dirent;
58197 + struct file * file;
58198 int result;
58199 };
58200
58201 @@ -867,6 +868,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
58202 buf->result = -EOVERFLOW;
58203 return -EOVERFLOW;
58204 }
58205 +
58206 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
58207 + return 0;
58208 +
58209 buf->result++;
58210 dirent = buf->dirent;
58211 if (!access_ok(VERIFY_WRITE, dirent,
58212 @@ -898,6 +903,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
58213 if (!f.file)
58214 return -EBADF;
58215
58216 + buf.file = f.file;
58217 error = iterate_dir(f.file, &buf.ctx);
58218 if (buf.result)
58219 error = buf.result;
58220 @@ -917,6 +923,7 @@ struct compat_getdents_callback {
58221 struct dir_context ctx;
58222 struct compat_linux_dirent __user *current_dir;
58223 struct compat_linux_dirent __user *previous;
58224 + struct file * file;
58225 int count;
58226 int error;
58227 };
58228 @@ -938,6 +945,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
58229 buf->error = -EOVERFLOW;
58230 return -EOVERFLOW;
58231 }
58232 +
58233 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
58234 + return 0;
58235 +
58236 dirent = buf->previous;
58237 if (dirent) {
58238 if (__put_user(offset, &dirent->d_off))
58239 @@ -983,6 +994,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
58240 if (!f.file)
58241 return -EBADF;
58242
58243 + buf.file = f.file;
58244 error = iterate_dir(f.file, &buf.ctx);
58245 if (error >= 0)
58246 error = buf.error;
58247 @@ -1003,6 +1015,7 @@ struct compat_getdents_callback64 {
58248 struct dir_context ctx;
58249 struct linux_dirent64 __user *current_dir;
58250 struct linux_dirent64 __user *previous;
58251 + struct file * file;
58252 int count;
58253 int error;
58254 };
58255 @@ -1019,6 +1032,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
58256 buf->error = -EINVAL; /* only used if we fail.. */
58257 if (reclen > buf->count)
58258 return -EINVAL;
58259 +
58260 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
58261 + return 0;
58262 +
58263 dirent = buf->previous;
58264
58265 if (dirent) {
58266 @@ -1068,6 +1085,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
58267 if (!f.file)
58268 return -EBADF;
58269
58270 + buf.file = f.file;
58271 error = iterate_dir(f.file, &buf.ctx);
58272 if (error >= 0)
58273 error = buf.error;
58274 diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
58275 index 4d24d17..4f8c09e 100644
58276 --- a/fs/compat_binfmt_elf.c
58277 +++ b/fs/compat_binfmt_elf.c
58278 @@ -30,11 +30,13 @@
58279 #undef elf_phdr
58280 #undef elf_shdr
58281 #undef elf_note
58282 +#undef elf_dyn
58283 #undef elf_addr_t
58284 #define elfhdr elf32_hdr
58285 #define elf_phdr elf32_phdr
58286 #define elf_shdr elf32_shdr
58287 #define elf_note elf32_note
58288 +#define elf_dyn Elf32_Dyn
58289 #define elf_addr_t Elf32_Addr
58290
58291 /*
58292 diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
58293 index e822890..59374d5 100644
58294 --- a/fs/compat_ioctl.c
58295 +++ b/fs/compat_ioctl.c
58296 @@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
58297 return -EFAULT;
58298 if (__get_user(udata, &ss32->iomem_base))
58299 return -EFAULT;
58300 - ss.iomem_base = compat_ptr(udata);
58301 + ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
58302 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
58303 __get_user(ss.port_high, &ss32->port_high))
58304 return -EFAULT;
58305 @@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
58306 for (i = 0; i < nmsgs; i++) {
58307 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
58308 return -EFAULT;
58309 - if (get_user(datap, &umsgs[i].buf) ||
58310 - put_user(compat_ptr(datap), &tmsgs[i].buf))
58311 + if (get_user(datap, (u8 __user * __user *)&umsgs[i].buf) ||
58312 + put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
58313 return -EFAULT;
58314 }
58315 return sys_ioctl(fd, cmd, (unsigned long)tdata);
58316 @@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
58317 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
58318 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
58319 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
58320 - copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
58321 + copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
58322 return -EFAULT;
58323
58324 return ioctl_preallocate(file, p);
58325 @@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
58326 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
58327 {
58328 unsigned int a, b;
58329 - a = *(unsigned int *)p;
58330 - b = *(unsigned int *)q;
58331 + a = *(const unsigned int *)p;
58332 + b = *(const unsigned int *)q;
58333 if (a > b)
58334 return 1;
58335 if (a < b)
58336 diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
58337 index e081acb..911df21 100644
58338 --- a/fs/configfs/dir.c
58339 +++ b/fs/configfs/dir.c
58340 @@ -1548,7 +1548,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
58341 }
58342 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
58343 struct configfs_dirent *next;
58344 - const char *name;
58345 + const unsigned char * name;
58346 + char d_name[sizeof(next->s_dentry->d_iname)];
58347 int len;
58348 struct inode *inode = NULL;
58349
58350 @@ -1557,7 +1558,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
58351 continue;
58352
58353 name = configfs_get_name(next);
58354 - len = strlen(name);
58355 + if (next->s_dentry && name == next->s_dentry->d_iname) {
58356 + len = next->s_dentry->d_name.len;
58357 + memcpy(d_name, name, len);
58358 + name = d_name;
58359 + } else
58360 + len = strlen(name);
58361
58362 /*
58363 * We'll have a dentry and an inode for
58364 diff --git a/fs/coredump.c b/fs/coredump.c
58365 index 0b2528f..836c55f 100644
58366 --- a/fs/coredump.c
58367 +++ b/fs/coredump.c
58368 @@ -442,8 +442,8 @@ static void wait_for_dump_helpers(struct file *file)
58369 struct pipe_inode_info *pipe = file->private_data;
58370
58371 pipe_lock(pipe);
58372 - pipe->readers++;
58373 - pipe->writers--;
58374 + atomic_inc(&pipe->readers);
58375 + atomic_dec(&pipe->writers);
58376 wake_up_interruptible_sync(&pipe->wait);
58377 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
58378 pipe_unlock(pipe);
58379 @@ -452,11 +452,11 @@ static void wait_for_dump_helpers(struct file *file)
58380 * We actually want wait_event_freezable() but then we need
58381 * to clear TIF_SIGPENDING and improve dump_interrupted().
58382 */
58383 - wait_event_interruptible(pipe->wait, pipe->readers == 1);
58384 + wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
58385
58386 pipe_lock(pipe);
58387 - pipe->readers--;
58388 - pipe->writers++;
58389 + atomic_dec(&pipe->readers);
58390 + atomic_inc(&pipe->writers);
58391 pipe_unlock(pipe);
58392 }
58393
58394 @@ -503,7 +503,9 @@ void do_coredump(const siginfo_t *siginfo)
58395 struct files_struct *displaced;
58396 bool need_nonrelative = false;
58397 bool core_dumped = false;
58398 - static atomic_t core_dump_count = ATOMIC_INIT(0);
58399 + static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
58400 + long signr = siginfo->si_signo;
58401 + int dumpable;
58402 struct coredump_params cprm = {
58403 .siginfo = siginfo,
58404 .regs = signal_pt_regs(),
58405 @@ -516,12 +518,17 @@ void do_coredump(const siginfo_t *siginfo)
58406 .mm_flags = mm->flags,
58407 };
58408
58409 - audit_core_dumps(siginfo->si_signo);
58410 + audit_core_dumps(signr);
58411 +
58412 + dumpable = __get_dumpable(cprm.mm_flags);
58413 +
58414 + if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
58415 + gr_handle_brute_attach(dumpable);
58416
58417 binfmt = mm->binfmt;
58418 if (!binfmt || !binfmt->core_dump)
58419 goto fail;
58420 - if (!__get_dumpable(cprm.mm_flags))
58421 + if (!dumpable)
58422 goto fail;
58423
58424 cred = prepare_creds();
58425 @@ -540,7 +547,7 @@ void do_coredump(const siginfo_t *siginfo)
58426 need_nonrelative = true;
58427 }
58428
58429 - retval = coredump_wait(siginfo->si_signo, &core_state);
58430 + retval = coredump_wait(signr, &core_state);
58431 if (retval < 0)
58432 goto fail_creds;
58433
58434 @@ -583,7 +590,7 @@ void do_coredump(const siginfo_t *siginfo)
58435 }
58436 cprm.limit = RLIM_INFINITY;
58437
58438 - dump_count = atomic_inc_return(&core_dump_count);
58439 + dump_count = atomic_inc_return_unchecked(&core_dump_count);
58440 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
58441 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
58442 task_tgid_vnr(current), current->comm);
58443 @@ -615,6 +622,8 @@ void do_coredump(const siginfo_t *siginfo)
58444 } else {
58445 struct inode *inode;
58446
58447 + gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
58448 +
58449 if (cprm.limit < binfmt->min_coredump)
58450 goto fail_unlock;
58451
58452 @@ -673,7 +682,7 @@ close_fail:
58453 filp_close(cprm.file, NULL);
58454 fail_dropcount:
58455 if (ispipe)
58456 - atomic_dec(&core_dump_count);
58457 + atomic_dec_unchecked(&core_dump_count);
58458 fail_unlock:
58459 kfree(cn.corename);
58460 coredump_finish(mm, core_dumped);
58461 @@ -694,6 +703,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
58462 struct file *file = cprm->file;
58463 loff_t pos = file->f_pos;
58464 ssize_t n;
58465 +
58466 + gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
58467 if (cprm->written + nr > cprm->limit)
58468 return 0;
58469 while (nr) {
58470 diff --git a/fs/dcache.c b/fs/dcache.c
58471 index e99c6f5..2838bf58 100644
58472 --- a/fs/dcache.c
58473 +++ b/fs/dcache.c
58474 @@ -1445,7 +1445,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
58475 */
58476 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
58477 if (name->len > DNAME_INLINE_LEN-1) {
58478 - dname = kmalloc(name->len + 1, GFP_KERNEL);
58479 + dname = kmalloc(round_up(name->len + 1, sizeof(unsigned long)), GFP_KERNEL);
58480 if (!dname) {
58481 kmem_cache_free(dentry_cache, dentry);
58482 return NULL;
58483 @@ -3413,7 +3413,8 @@ void __init vfs_caches_init(unsigned long mempages)
58484 mempages -= reserve;
58485
58486 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
58487 - SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
58488 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
58489 + SLAB_NO_SANITIZE, NULL);
58490
58491 dcache_init();
58492 inode_init();
58493 diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
58494 index 8c41b52..145b1b9 100644
58495 --- a/fs/debugfs/inode.c
58496 +++ b/fs/debugfs/inode.c
58497 @@ -416,7 +416,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
58498 */
58499 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
58500 {
58501 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
58502 + return __create_file(name, S_IFDIR | S_IRWXU,
58503 +#else
58504 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
58505 +#endif
58506 parent, NULL, NULL);
58507 }
58508 EXPORT_SYMBOL_GPL(debugfs_create_dir);
58509 diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
58510 index d4a9431..77f9b2e 100644
58511 --- a/fs/ecryptfs/inode.c
58512 +++ b/fs/ecryptfs/inode.c
58513 @@ -673,7 +673,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
58514 old_fs = get_fs();
58515 set_fs(get_ds());
58516 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
58517 - (char __user *)lower_buf,
58518 + (char __force_user *)lower_buf,
58519 PATH_MAX);
58520 set_fs(old_fs);
58521 if (rc < 0)
58522 diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
58523 index e4141f2..d8263e8 100644
58524 --- a/fs/ecryptfs/miscdev.c
58525 +++ b/fs/ecryptfs/miscdev.c
58526 @@ -304,7 +304,7 @@ check_list:
58527 goto out_unlock_msg_ctx;
58528 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
58529 if (msg_ctx->msg) {
58530 - if (copy_to_user(&buf[i], packet_length, packet_length_size))
58531 + if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
58532 goto out_unlock_msg_ctx;
58533 i += packet_length_size;
58534 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
58535 diff --git a/fs/exec.c b/fs/exec.c
58536 index 238b7aa..a421d91 100644
58537 --- a/fs/exec.c
58538 +++ b/fs/exec.c
58539 @@ -56,8 +56,20 @@
58540 #include <linux/pipe_fs_i.h>
58541 #include <linux/oom.h>
58542 #include <linux/compat.h>
58543 +#include <linux/random.h>
58544 +#include <linux/seq_file.h>
58545 +#include <linux/coredump.h>
58546 +#include <linux/mman.h>
58547 +
58548 +#ifdef CONFIG_PAX_REFCOUNT
58549 +#include <linux/kallsyms.h>
58550 +#include <linux/kdebug.h>
58551 +#endif
58552 +
58553 +#include <trace/events/fs.h>
58554
58555 #include <asm/uaccess.h>
58556 +#include <asm/sections.h>
58557 #include <asm/mmu_context.h>
58558 #include <asm/tlb.h>
58559
58560 @@ -66,19 +78,34 @@
58561
58562 #include <trace/events/sched.h>
58563
58564 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
58565 +void __weak pax_set_initial_flags(struct linux_binprm *bprm)
58566 +{
58567 + 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");
58568 +}
58569 +#endif
58570 +
58571 +#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
58572 +void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
58573 +EXPORT_SYMBOL(pax_set_initial_flags_func);
58574 +#endif
58575 +
58576 int suid_dumpable = 0;
58577
58578 static LIST_HEAD(formats);
58579 static DEFINE_RWLOCK(binfmt_lock);
58580
58581 +extern int gr_process_kernel_exec_ban(void);
58582 +extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
58583 +
58584 void __register_binfmt(struct linux_binfmt * fmt, int insert)
58585 {
58586 BUG_ON(!fmt);
58587 if (WARN_ON(!fmt->load_binary))
58588 return;
58589 write_lock(&binfmt_lock);
58590 - insert ? list_add(&fmt->lh, &formats) :
58591 - list_add_tail(&fmt->lh, &formats);
58592 + insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
58593 + pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
58594 write_unlock(&binfmt_lock);
58595 }
58596
58597 @@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
58598 void unregister_binfmt(struct linux_binfmt * fmt)
58599 {
58600 write_lock(&binfmt_lock);
58601 - list_del(&fmt->lh);
58602 + pax_list_del((struct list_head *)&fmt->lh);
58603 write_unlock(&binfmt_lock);
58604 }
58605
58606 @@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
58607 int write)
58608 {
58609 struct page *page;
58610 - int ret;
58611
58612 -#ifdef CONFIG_STACK_GROWSUP
58613 - if (write) {
58614 - ret = expand_downwards(bprm->vma, pos);
58615 - if (ret < 0)
58616 - return NULL;
58617 - }
58618 -#endif
58619 - ret = get_user_pages(current, bprm->mm, pos,
58620 - 1, write, 1, &page, NULL);
58621 - if (ret <= 0)
58622 + if (0 > expand_downwards(bprm->vma, pos))
58623 + return NULL;
58624 + if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
58625 return NULL;
58626
58627 if (write) {
58628 @@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
58629 if (size <= ARG_MAX)
58630 return page;
58631
58632 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58633 + // only allow 512KB for argv+env on suid/sgid binaries
58634 + // to prevent easy ASLR exhaustion
58635 + if (((!uid_eq(bprm->cred->euid, current_euid())) ||
58636 + (!gid_eq(bprm->cred->egid, current_egid()))) &&
58637 + (size > (512 * 1024))) {
58638 + put_page(page);
58639 + return NULL;
58640 + }
58641 +#endif
58642 +
58643 /*
58644 * Limit to 1/4-th the stack size for the argv+env strings.
58645 * This ensures that:
58646 @@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
58647 vma->vm_end = STACK_TOP_MAX;
58648 vma->vm_start = vma->vm_end - PAGE_SIZE;
58649 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
58650 +
58651 +#ifdef CONFIG_PAX_SEGMEXEC
58652 + vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
58653 +#endif
58654 +
58655 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
58656 INIT_LIST_HEAD(&vma->anon_vma_chain);
58657
58658 @@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
58659 mm->stack_vm = mm->total_vm = 1;
58660 up_write(&mm->mmap_sem);
58661 bprm->p = vma->vm_end - sizeof(void *);
58662 +
58663 +#ifdef CONFIG_PAX_RANDUSTACK
58664 + if (randomize_va_space)
58665 + bprm->p ^= prandom_u32() & ~PAGE_MASK;
58666 +#endif
58667 +
58668 return 0;
58669 err:
58670 up_write(&mm->mmap_sem);
58671 @@ -399,7 +440,7 @@ struct user_arg_ptr {
58672 } ptr;
58673 };
58674
58675 -static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
58676 +const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
58677 {
58678 const char __user *native;
58679
58680 @@ -408,14 +449,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
58681 compat_uptr_t compat;
58682
58683 if (get_user(compat, argv.ptr.compat + nr))
58684 - return ERR_PTR(-EFAULT);
58685 + return (const char __force_user *)ERR_PTR(-EFAULT);
58686
58687 return compat_ptr(compat);
58688 }
58689 #endif
58690
58691 if (get_user(native, argv.ptr.native + nr))
58692 - return ERR_PTR(-EFAULT);
58693 + return (const char __force_user *)ERR_PTR(-EFAULT);
58694
58695 return native;
58696 }
58697 @@ -434,7 +475,7 @@ static int count(struct user_arg_ptr argv, int max)
58698 if (!p)
58699 break;
58700
58701 - if (IS_ERR(p))
58702 + if (IS_ERR((const char __force_kernel *)p))
58703 return -EFAULT;
58704
58705 if (i >= max)
58706 @@ -469,7 +510,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
58707
58708 ret = -EFAULT;
58709 str = get_user_arg_ptr(argv, argc);
58710 - if (IS_ERR(str))
58711 + if (IS_ERR((const char __force_kernel *)str))
58712 goto out;
58713
58714 len = strnlen_user(str, MAX_ARG_STRLEN);
58715 @@ -551,7 +592,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
58716 int r;
58717 mm_segment_t oldfs = get_fs();
58718 struct user_arg_ptr argv = {
58719 - .ptr.native = (const char __user *const __user *)__argv,
58720 + .ptr.native = (const char __user * const __force_user *)__argv,
58721 };
58722
58723 set_fs(KERNEL_DS);
58724 @@ -586,7 +627,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
58725 unsigned long new_end = old_end - shift;
58726 struct mmu_gather tlb;
58727
58728 - BUG_ON(new_start > new_end);
58729 + if (new_start >= new_end || new_start < mmap_min_addr)
58730 + return -ENOMEM;
58731
58732 /*
58733 * ensure there are no vmas between where we want to go
58734 @@ -595,6 +637,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
58735 if (vma != find_vma(mm, new_start))
58736 return -EFAULT;
58737
58738 +#ifdef CONFIG_PAX_SEGMEXEC
58739 + BUG_ON(pax_find_mirror_vma(vma));
58740 +#endif
58741 +
58742 /*
58743 * cover the whole range: [new_start, old_end)
58744 */
58745 @@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
58746 stack_top = arch_align_stack(stack_top);
58747 stack_top = PAGE_ALIGN(stack_top);
58748
58749 - if (unlikely(stack_top < mmap_min_addr) ||
58750 - unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
58751 - return -ENOMEM;
58752 -
58753 stack_shift = vma->vm_end - stack_top;
58754
58755 bprm->p -= stack_shift;
58756 @@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
58757 bprm->exec -= stack_shift;
58758
58759 down_write(&mm->mmap_sem);
58760 +
58761 + /* Move stack pages down in memory. */
58762 + if (stack_shift) {
58763 + ret = shift_arg_pages(vma, stack_shift);
58764 + if (ret)
58765 + goto out_unlock;
58766 + }
58767 +
58768 vm_flags = VM_STACK_FLAGS;
58769
58770 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
58771 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58772 + vm_flags &= ~VM_EXEC;
58773 +
58774 +#ifdef CONFIG_PAX_MPROTECT
58775 + if (mm->pax_flags & MF_PAX_MPROTECT)
58776 + vm_flags &= ~VM_MAYEXEC;
58777 +#endif
58778 +
58779 + }
58780 +#endif
58781 +
58782 /*
58783 * Adjust stack execute permissions; explicitly enable for
58784 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
58785 @@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
58786 goto out_unlock;
58787 BUG_ON(prev != vma);
58788
58789 - /* Move stack pages down in memory. */
58790 - if (stack_shift) {
58791 - ret = shift_arg_pages(vma, stack_shift);
58792 - if (ret)
58793 - goto out_unlock;
58794 - }
58795 -
58796 /* mprotect_fixup is overkill to remove the temporary stack flags */
58797 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
58798
58799 @@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
58800 #endif
58801 current->mm->start_stack = bprm->p;
58802 ret = expand_stack(vma, stack_base);
58803 +
58804 +#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
58805 + if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
58806 + unsigned long size;
58807 + vm_flags_t vm_flags;
58808 +
58809 + size = STACK_TOP - vma->vm_end;
58810 + vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
58811 +
58812 + ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
58813 +
58814 +#ifdef CONFIG_X86
58815 + if (!ret) {
58816 + size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
58817 + ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
58818 + }
58819 +#endif
58820 +
58821 + }
58822 +#endif
58823 +
58824 if (ret)
58825 ret = -EFAULT;
58826
58827 @@ -775,6 +851,8 @@ static struct file *do_open_exec(struct filename *name)
58828
58829 fsnotify_open(file);
58830
58831 + trace_open_exec(name->name);
58832 +
58833 err = deny_write_access(file);
58834 if (err)
58835 goto exit;
58836 @@ -804,7 +882,7 @@ int kernel_read(struct file *file, loff_t offset,
58837 old_fs = get_fs();
58838 set_fs(get_ds());
58839 /* The cast to a user pointer is valid due to the set_fs() */
58840 - result = vfs_read(file, (void __user *)addr, count, &pos);
58841 + result = vfs_read(file, (void __force_user *)addr, count, &pos);
58842 set_fs(old_fs);
58843 return result;
58844 }
58845 @@ -849,6 +927,7 @@ static int exec_mmap(struct mm_struct *mm)
58846 tsk->mm = mm;
58847 tsk->active_mm = mm;
58848 activate_mm(active_mm, mm);
58849 + populate_stack();
58850 tsk->mm->vmacache_seqnum = 0;
58851 vmacache_flush(tsk);
58852 task_unlock(tsk);
58853 @@ -1246,7 +1325,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
58854 }
58855 rcu_read_unlock();
58856
58857 - if (p->fs->users > n_fs)
58858 + if (atomic_read(&p->fs->users) > n_fs)
58859 bprm->unsafe |= LSM_UNSAFE_SHARE;
58860 else
58861 p->fs->in_exec = 1;
58862 @@ -1422,6 +1501,31 @@ static int exec_binprm(struct linux_binprm *bprm)
58863 return ret;
58864 }
58865
58866 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58867 +static DEFINE_PER_CPU(u64, exec_counter);
58868 +static int __init init_exec_counters(void)
58869 +{
58870 + unsigned int cpu;
58871 +
58872 + for_each_possible_cpu(cpu) {
58873 + per_cpu(exec_counter, cpu) = (u64)cpu;
58874 + }
58875 +
58876 + return 0;
58877 +}
58878 +early_initcall(init_exec_counters);
58879 +static inline void increment_exec_counter(void)
58880 +{
58881 + BUILD_BUG_ON(NR_CPUS > (1 << 16));
58882 + current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
58883 +}
58884 +#else
58885 +static inline void increment_exec_counter(void) {}
58886 +#endif
58887 +
58888 +extern void gr_handle_exec_args(struct linux_binprm *bprm,
58889 + struct user_arg_ptr argv);
58890 +
58891 /*
58892 * sys_execve() executes a new program.
58893 */
58894 @@ -1429,6 +1533,11 @@ static int do_execve_common(struct filename *filename,
58895 struct user_arg_ptr argv,
58896 struct user_arg_ptr envp)
58897 {
58898 +#ifdef CONFIG_GRKERNSEC
58899 + struct file *old_exec_file;
58900 + struct acl_subject_label *old_acl;
58901 + struct rlimit old_rlim[RLIM_NLIMITS];
58902 +#endif
58903 struct linux_binprm *bprm;
58904 struct file *file;
58905 struct files_struct *displaced;
58906 @@ -1437,6 +1546,8 @@ static int do_execve_common(struct filename *filename,
58907 if (IS_ERR(filename))
58908 return PTR_ERR(filename);
58909
58910 + gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
58911 +
58912 /*
58913 * We move the actual failure in case of RLIMIT_NPROC excess from
58914 * set*uid() to execve() because too many poorly written programs
58915 @@ -1474,11 +1585,21 @@ static int do_execve_common(struct filename *filename,
58916 if (IS_ERR(file))
58917 goto out_unmark;
58918
58919 + if (gr_ptrace_readexec(file, bprm->unsafe)) {
58920 + retval = -EPERM;
58921 + goto out_unmark;
58922 + }
58923 +
58924 sched_exec();
58925
58926 bprm->file = file;
58927 bprm->filename = bprm->interp = filename->name;
58928
58929 + if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
58930 + retval = -EACCES;
58931 + goto out_unmark;
58932 + }
58933 +
58934 retval = bprm_mm_init(bprm);
58935 if (retval)
58936 goto out_unmark;
58937 @@ -1495,24 +1616,70 @@ static int do_execve_common(struct filename *filename,
58938 if (retval < 0)
58939 goto out;
58940
58941 +#ifdef CONFIG_GRKERNSEC
58942 + old_acl = current->acl;
58943 + memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
58944 + old_exec_file = current->exec_file;
58945 + get_file(file);
58946 + current->exec_file = file;
58947 +#endif
58948 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58949 + /* limit suid stack to 8MB
58950 + * we saved the old limits above and will restore them if this exec fails
58951 + */
58952 + if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
58953 + (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
58954 + current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
58955 +#endif
58956 +
58957 + if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
58958 + retval = -EPERM;
58959 + goto out_fail;
58960 + }
58961 +
58962 + if (!gr_tpe_allow(file)) {
58963 + retval = -EACCES;
58964 + goto out_fail;
58965 + }
58966 +
58967 + if (gr_check_crash_exec(file)) {
58968 + retval = -EACCES;
58969 + goto out_fail;
58970 + }
58971 +
58972 + retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
58973 + bprm->unsafe);
58974 + if (retval < 0)
58975 + goto out_fail;
58976 +
58977 retval = copy_strings_kernel(1, &bprm->filename, bprm);
58978 if (retval < 0)
58979 - goto out;
58980 + goto out_fail;
58981
58982 bprm->exec = bprm->p;
58983 retval = copy_strings(bprm->envc, envp, bprm);
58984 if (retval < 0)
58985 - goto out;
58986 + goto out_fail;
58987
58988 retval = copy_strings(bprm->argc, argv, bprm);
58989 if (retval < 0)
58990 - goto out;
58991 + goto out_fail;
58992 +
58993 + gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
58994 +
58995 + gr_handle_exec_args(bprm, argv);
58996
58997 retval = exec_binprm(bprm);
58998 if (retval < 0)
58999 - goto out;
59000 + goto out_fail;
59001 +#ifdef CONFIG_GRKERNSEC
59002 + if (old_exec_file)
59003 + fput(old_exec_file);
59004 +#endif
59005
59006 /* execve succeeded */
59007 +
59008 + increment_exec_counter();
59009 current->fs->in_exec = 0;
59010 current->in_execve = 0;
59011 acct_update_integrals(current);
59012 @@ -1523,6 +1690,14 @@ static int do_execve_common(struct filename *filename,
59013 put_files_struct(displaced);
59014 return retval;
59015
59016 +out_fail:
59017 +#ifdef CONFIG_GRKERNSEC
59018 + current->acl = old_acl;
59019 + memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
59020 + fput(current->exec_file);
59021 + current->exec_file = old_exec_file;
59022 +#endif
59023 +
59024 out:
59025 if (bprm->mm) {
59026 acct_arg_size(bprm, 0);
59027 @@ -1614,3 +1789,312 @@ COMPAT_SYSCALL_DEFINE3(execve, const char __user *, filename,
59028 return compat_do_execve(getname(filename), argv, envp);
59029 }
59030 #endif
59031 +
59032 +int pax_check_flags(unsigned long *flags)
59033 +{
59034 + int retval = 0;
59035 +
59036 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
59037 + if (*flags & MF_PAX_SEGMEXEC)
59038 + {
59039 + *flags &= ~MF_PAX_SEGMEXEC;
59040 + retval = -EINVAL;
59041 + }
59042 +#endif
59043 +
59044 + if ((*flags & MF_PAX_PAGEEXEC)
59045 +
59046 +#ifdef CONFIG_PAX_PAGEEXEC
59047 + && (*flags & MF_PAX_SEGMEXEC)
59048 +#endif
59049 +
59050 + )
59051 + {
59052 + *flags &= ~MF_PAX_PAGEEXEC;
59053 + retval = -EINVAL;
59054 + }
59055 +
59056 + if ((*flags & MF_PAX_MPROTECT)
59057 +
59058 +#ifdef CONFIG_PAX_MPROTECT
59059 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
59060 +#endif
59061 +
59062 + )
59063 + {
59064 + *flags &= ~MF_PAX_MPROTECT;
59065 + retval = -EINVAL;
59066 + }
59067 +
59068 + if ((*flags & MF_PAX_EMUTRAMP)
59069 +
59070 +#ifdef CONFIG_PAX_EMUTRAMP
59071 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
59072 +#endif
59073 +
59074 + )
59075 + {
59076 + *flags &= ~MF_PAX_EMUTRAMP;
59077 + retval = -EINVAL;
59078 + }
59079 +
59080 + return retval;
59081 +}
59082 +
59083 +EXPORT_SYMBOL(pax_check_flags);
59084 +
59085 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
59086 +char *pax_get_path(const struct path *path, char *buf, int buflen)
59087 +{
59088 + char *pathname = d_path(path, buf, buflen);
59089 +
59090 + if (IS_ERR(pathname))
59091 + goto toolong;
59092 +
59093 + pathname = mangle_path(buf, pathname, "\t\n\\");
59094 + if (!pathname)
59095 + goto toolong;
59096 +
59097 + *pathname = 0;
59098 + return buf;
59099 +
59100 +toolong:
59101 + return "<path too long>";
59102 +}
59103 +EXPORT_SYMBOL(pax_get_path);
59104 +
59105 +void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
59106 +{
59107 + struct task_struct *tsk = current;
59108 + struct mm_struct *mm = current->mm;
59109 + char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
59110 + char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
59111 + char *path_exec = NULL;
59112 + char *path_fault = NULL;
59113 + unsigned long start = 0UL, end = 0UL, offset = 0UL;
59114 + siginfo_t info = { };
59115 +
59116 + if (buffer_exec && buffer_fault) {
59117 + struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
59118 +
59119 + down_read(&mm->mmap_sem);
59120 + vma = mm->mmap;
59121 + while (vma && (!vma_exec || !vma_fault)) {
59122 + if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
59123 + vma_exec = vma;
59124 + if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
59125 + vma_fault = vma;
59126 + vma = vma->vm_next;
59127 + }
59128 + if (vma_exec)
59129 + path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
59130 + if (vma_fault) {
59131 + start = vma_fault->vm_start;
59132 + end = vma_fault->vm_end;
59133 + offset = vma_fault->vm_pgoff << PAGE_SHIFT;
59134 + if (vma_fault->vm_file)
59135 + path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
59136 + else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
59137 + path_fault = "<heap>";
59138 + else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
59139 + path_fault = "<stack>";
59140 + else
59141 + path_fault = "<anonymous mapping>";
59142 + }
59143 + up_read(&mm->mmap_sem);
59144 + }
59145 + if (tsk->signal->curr_ip)
59146 + printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
59147 + else
59148 + printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
59149 + 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),
59150 + from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
59151 + free_page((unsigned long)buffer_exec);
59152 + free_page((unsigned long)buffer_fault);
59153 + pax_report_insns(regs, pc, sp);
59154 + info.si_signo = SIGKILL;
59155 + info.si_errno = 0;
59156 + info.si_code = SI_KERNEL;
59157 + info.si_pid = 0;
59158 + info.si_uid = 0;
59159 + do_coredump(&info);
59160 +}
59161 +#endif
59162 +
59163 +#ifdef CONFIG_PAX_REFCOUNT
59164 +void pax_report_refcount_overflow(struct pt_regs *regs)
59165 +{
59166 + if (current->signal->curr_ip)
59167 + printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
59168 + &current->signal->curr_ip, current->comm, task_pid_nr(current),
59169 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
59170 + else
59171 + printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
59172 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
59173 + print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
59174 + preempt_disable();
59175 + show_regs(regs);
59176 + preempt_enable();
59177 + force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
59178 +}
59179 +#endif
59180 +
59181 +#ifdef CONFIG_PAX_USERCOPY
59182 +/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
59183 +static noinline int check_stack_object(const void *obj, unsigned long len)
59184 +{
59185 + const void * const stack = task_stack_page(current);
59186 + const void * const stackend = stack + THREAD_SIZE;
59187 +
59188 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
59189 + const void *frame = NULL;
59190 + const void *oldframe;
59191 +#endif
59192 +
59193 + if (obj + len < obj)
59194 + return -1;
59195 +
59196 + if (obj + len <= stack || stackend <= obj)
59197 + return 0;
59198 +
59199 + if (obj < stack || stackend < obj + len)
59200 + return -1;
59201 +
59202 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
59203 + oldframe = __builtin_frame_address(1);
59204 + if (oldframe)
59205 + frame = __builtin_frame_address(2);
59206 + /*
59207 + low ----------------------------------------------> high
59208 + [saved bp][saved ip][args][local vars][saved bp][saved ip]
59209 + ^----------------^
59210 + allow copies only within here
59211 + */
59212 + while (stack <= frame && frame < stackend) {
59213 + /* if obj + len extends past the last frame, this
59214 + check won't pass and the next frame will be 0,
59215 + causing us to bail out and correctly report
59216 + the copy as invalid
59217 + */
59218 + if (obj + len <= frame)
59219 + return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
59220 + oldframe = frame;
59221 + frame = *(const void * const *)frame;
59222 + }
59223 + return -1;
59224 +#else
59225 + return 1;
59226 +#endif
59227 +}
59228 +
59229 +static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
59230 +{
59231 + if (current->signal->curr_ip)
59232 + printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
59233 + &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
59234 + else
59235 + printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
59236 + to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
59237 + dump_stack();
59238 + gr_handle_kernel_exploit();
59239 + do_group_exit(SIGKILL);
59240 +}
59241 +#endif
59242 +
59243 +#ifdef CONFIG_PAX_USERCOPY
59244 +
59245 +static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
59246 +{
59247 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
59248 + unsigned long textlow = ktla_ktva((unsigned long)_stext);
59249 +#ifdef CONFIG_MODULES
59250 + unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
59251 +#else
59252 + unsigned long texthigh = ktla_ktva((unsigned long)_etext);
59253 +#endif
59254 +
59255 +#else
59256 + unsigned long textlow = (unsigned long)_stext;
59257 + unsigned long texthigh = (unsigned long)_etext;
59258 +
59259 +#ifdef CONFIG_X86_64
59260 + /* check against linear mapping as well */
59261 + if (high > (unsigned long)__va(__pa(textlow)) &&
59262 + low < (unsigned long)__va(__pa(texthigh)))
59263 + return true;
59264 +#endif
59265 +
59266 +#endif
59267 +
59268 + if (high <= textlow || low >= texthigh)
59269 + return false;
59270 + else
59271 + return true;
59272 +}
59273 +#endif
59274 +
59275 +void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
59276 +{
59277 +#ifdef CONFIG_PAX_USERCOPY
59278 + const char *type;
59279 +#endif
59280 +
59281 +#ifndef CONFIG_STACK_GROWSUP
59282 + unsigned long stackstart = (unsigned long)task_stack_page(current);
59283 + unsigned long currentsp = (unsigned long)&stackstart;
59284 + if (unlikely((currentsp < stackstart + 512 ||
59285 + currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
59286 + BUG();
59287 +#endif
59288 +
59289 +#ifndef CONFIG_PAX_USERCOPY_DEBUG
59290 + if (const_size)
59291 + return;
59292 +#endif
59293 +
59294 +#ifdef CONFIG_PAX_USERCOPY
59295 + if (!n)
59296 + return;
59297 +
59298 + type = check_heap_object(ptr, n);
59299 + if (!type) {
59300 + int ret = check_stack_object(ptr, n);
59301 + if (ret == 1 || ret == 2)
59302 + return;
59303 + if (ret == 0) {
59304 + if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
59305 + type = "<kernel text>";
59306 + else
59307 + return;
59308 + } else
59309 + type = "<process stack>";
59310 + }
59311 +
59312 + pax_report_usercopy(ptr, n, to_user, type);
59313 +#endif
59314 +
59315 +}
59316 +EXPORT_SYMBOL(__check_object_size);
59317 +
59318 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
59319 +void pax_track_stack(void)
59320 +{
59321 + unsigned long sp = (unsigned long)&sp;
59322 + if (sp < current_thread_info()->lowest_stack &&
59323 + sp > (unsigned long)task_stack_page(current))
59324 + current_thread_info()->lowest_stack = sp;
59325 + if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
59326 + BUG();
59327 +}
59328 +EXPORT_SYMBOL(pax_track_stack);
59329 +#endif
59330 +
59331 +#ifdef CONFIG_PAX_SIZE_OVERFLOW
59332 +void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
59333 +{
59334 + printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
59335 + dump_stack();
59336 + do_group_exit(SIGKILL);
59337 +}
59338 +EXPORT_SYMBOL(report_size_overflow);
59339 +#endif
59340 diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
59341 index 9f9992b..8b59411 100644
59342 --- a/fs/ext2/balloc.c
59343 +++ b/fs/ext2/balloc.c
59344 @@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
59345
59346 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
59347 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
59348 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
59349 + if (free_blocks < root_blocks + 1 &&
59350 !uid_eq(sbi->s_resuid, current_fsuid()) &&
59351 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
59352 - !in_group_p (sbi->s_resgid))) {
59353 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
59354 return 0;
59355 }
59356 return 1;
59357 diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
59358 index 9142614..97484fa 100644
59359 --- a/fs/ext2/xattr.c
59360 +++ b/fs/ext2/xattr.c
59361 @@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
59362 struct buffer_head *bh = NULL;
59363 struct ext2_xattr_entry *entry;
59364 char *end;
59365 - size_t rest = buffer_size;
59366 + size_t rest = buffer_size, total_size = 0;
59367 int error;
59368
59369 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
59370 @@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
59371 buffer += size;
59372 }
59373 rest -= size;
59374 + total_size += size;
59375 }
59376 }
59377 - error = buffer_size - rest; /* total size */
59378 + error = total_size;
59379
59380 cleanup:
59381 brelse(bh);
59382 diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
59383 index 158b5d4..2432610 100644
59384 --- a/fs/ext3/balloc.c
59385 +++ b/fs/ext3/balloc.c
59386 @@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
59387
59388 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
59389 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
59390 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
59391 + if (free_blocks < root_blocks + 1 &&
59392 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
59393 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
59394 - !in_group_p (sbi->s_resgid))) {
59395 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
59396 return 0;
59397 }
59398 return 1;
59399 diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
59400 index c6874be..f8a6ae8 100644
59401 --- a/fs/ext3/xattr.c
59402 +++ b/fs/ext3/xattr.c
59403 @@ -330,7 +330,7 @@ static int
59404 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
59405 char *buffer, size_t buffer_size)
59406 {
59407 - size_t rest = buffer_size;
59408 + size_t rest = buffer_size, total_size = 0;
59409
59410 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
59411 const struct xattr_handler *handler =
59412 @@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
59413 buffer += size;
59414 }
59415 rest -= size;
59416 + total_size += size;
59417 }
59418 }
59419 - return buffer_size - rest;
59420 + return total_size;
59421 }
59422
59423 static int
59424 diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
59425 index 5c56785..77698a2 100644
59426 --- a/fs/ext4/balloc.c
59427 +++ b/fs/ext4/balloc.c
59428 @@ -534,8 +534,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
59429 /* Hm, nope. Are (enough) root reserved clusters available? */
59430 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
59431 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
59432 - capable(CAP_SYS_RESOURCE) ||
59433 - (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
59434 + (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
59435 + capable_nolog(CAP_SYS_RESOURCE)) {
59436
59437 if (free_clusters >= (nclusters + dirty_clusters +
59438 resv_clusters))
59439 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
59440 index f542e48..c0275f5 100644
59441 --- a/fs/ext4/ext4.h
59442 +++ b/fs/ext4/ext4.h
59443 @@ -1274,19 +1274,19 @@ struct ext4_sb_info {
59444 unsigned long s_mb_last_start;
59445
59446 /* stats for buddy allocator */
59447 - atomic_t s_bal_reqs; /* number of reqs with len > 1 */
59448 - atomic_t s_bal_success; /* we found long enough chunks */
59449 - atomic_t s_bal_allocated; /* in blocks */
59450 - atomic_t s_bal_ex_scanned; /* total extents scanned */
59451 - atomic_t s_bal_goals; /* goal hits */
59452 - atomic_t s_bal_breaks; /* too long searches */
59453 - atomic_t s_bal_2orders; /* 2^order hits */
59454 + atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
59455 + atomic_unchecked_t s_bal_success; /* we found long enough chunks */
59456 + atomic_unchecked_t s_bal_allocated; /* in blocks */
59457 + atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
59458 + atomic_unchecked_t s_bal_goals; /* goal hits */
59459 + atomic_unchecked_t s_bal_breaks; /* too long searches */
59460 + atomic_unchecked_t s_bal_2orders; /* 2^order hits */
59461 spinlock_t s_bal_lock;
59462 unsigned long s_mb_buddies_generated;
59463 unsigned long long s_mb_generation_time;
59464 - atomic_t s_mb_lost_chunks;
59465 - atomic_t s_mb_preallocated;
59466 - atomic_t s_mb_discarded;
59467 + atomic_unchecked_t s_mb_lost_chunks;
59468 + atomic_unchecked_t s_mb_preallocated;
59469 + atomic_unchecked_t s_mb_discarded;
59470 atomic_t s_lock_busy;
59471
59472 /* locality groups */
59473 diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
59474 index e6574d7..c30cbe2 100644
59475 --- a/fs/ext4/indirect.c
59476 +++ b/fs/ext4/indirect.c
59477 @@ -1345,8 +1345,8 @@ static int free_hole_blocks(handle_t *handle, struct inode *inode,
59478 if (level == 0 ||
59479 (bh && all_zeroes((__le32 *)bh->b_data,
59480 (__le32 *)bh->b_data + addr_per_block))) {
59481 - ext4_free_data(handle, inode, parent_bh, &blk, &blk+1);
59482 - *i_data = 0;
59483 + ext4_free_data(handle, inode, parent_bh,
59484 + i_data, i_data + 1);
59485 }
59486 brelse(bh);
59487 bh = NULL;
59488 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
59489 index fe4e668..f983538 100644
59490 --- a/fs/ext4/mballoc.c
59491 +++ b/fs/ext4/mballoc.c
59492 @@ -1889,7 +1889,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
59493 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
59494
59495 if (EXT4_SB(sb)->s_mb_stats)
59496 - atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
59497 + atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
59498
59499 break;
59500 }
59501 @@ -2199,7 +2199,7 @@ repeat:
59502 ac->ac_status = AC_STATUS_CONTINUE;
59503 ac->ac_flags |= EXT4_MB_HINT_FIRST;
59504 cr = 3;
59505 - atomic_inc(&sbi->s_mb_lost_chunks);
59506 + atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
59507 goto repeat;
59508 }
59509 }
59510 @@ -2707,25 +2707,25 @@ int ext4_mb_release(struct super_block *sb)
59511 if (sbi->s_mb_stats) {
59512 ext4_msg(sb, KERN_INFO,
59513 "mballoc: %u blocks %u reqs (%u success)",
59514 - atomic_read(&sbi->s_bal_allocated),
59515 - atomic_read(&sbi->s_bal_reqs),
59516 - atomic_read(&sbi->s_bal_success));
59517 + atomic_read_unchecked(&sbi->s_bal_allocated),
59518 + atomic_read_unchecked(&sbi->s_bal_reqs),
59519 + atomic_read_unchecked(&sbi->s_bal_success));
59520 ext4_msg(sb, KERN_INFO,
59521 "mballoc: %u extents scanned, %u goal hits, "
59522 "%u 2^N hits, %u breaks, %u lost",
59523 - atomic_read(&sbi->s_bal_ex_scanned),
59524 - atomic_read(&sbi->s_bal_goals),
59525 - atomic_read(&sbi->s_bal_2orders),
59526 - atomic_read(&sbi->s_bal_breaks),
59527 - atomic_read(&sbi->s_mb_lost_chunks));
59528 + atomic_read_unchecked(&sbi->s_bal_ex_scanned),
59529 + atomic_read_unchecked(&sbi->s_bal_goals),
59530 + atomic_read_unchecked(&sbi->s_bal_2orders),
59531 + atomic_read_unchecked(&sbi->s_bal_breaks),
59532 + atomic_read_unchecked(&sbi->s_mb_lost_chunks));
59533 ext4_msg(sb, KERN_INFO,
59534 "mballoc: %lu generated and it took %Lu",
59535 sbi->s_mb_buddies_generated,
59536 sbi->s_mb_generation_time);
59537 ext4_msg(sb, KERN_INFO,
59538 "mballoc: %u preallocated, %u discarded",
59539 - atomic_read(&sbi->s_mb_preallocated),
59540 - atomic_read(&sbi->s_mb_discarded));
59541 + atomic_read_unchecked(&sbi->s_mb_preallocated),
59542 + atomic_read_unchecked(&sbi->s_mb_discarded));
59543 }
59544
59545 free_percpu(sbi->s_locality_groups);
59546 @@ -3179,16 +3179,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
59547 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
59548
59549 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
59550 - atomic_inc(&sbi->s_bal_reqs);
59551 - atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
59552 + atomic_inc_unchecked(&sbi->s_bal_reqs);
59553 + atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
59554 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
59555 - atomic_inc(&sbi->s_bal_success);
59556 - atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
59557 + atomic_inc_unchecked(&sbi->s_bal_success);
59558 + atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
59559 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
59560 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
59561 - atomic_inc(&sbi->s_bal_goals);
59562 + atomic_inc_unchecked(&sbi->s_bal_goals);
59563 if (ac->ac_found > sbi->s_mb_max_to_scan)
59564 - atomic_inc(&sbi->s_bal_breaks);
59565 + atomic_inc_unchecked(&sbi->s_bal_breaks);
59566 }
59567
59568 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
59569 @@ -3593,7 +3593,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
59570 trace_ext4_mb_new_inode_pa(ac, pa);
59571
59572 ext4_mb_use_inode_pa(ac, pa);
59573 - atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
59574 + atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
59575
59576 ei = EXT4_I(ac->ac_inode);
59577 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
59578 @@ -3653,7 +3653,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
59579 trace_ext4_mb_new_group_pa(ac, pa);
59580
59581 ext4_mb_use_group_pa(ac, pa);
59582 - atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
59583 + atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
59584
59585 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
59586 lg = ac->ac_lg;
59587 @@ -3742,7 +3742,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
59588 * from the bitmap and continue.
59589 */
59590 }
59591 - atomic_add(free, &sbi->s_mb_discarded);
59592 + atomic_add_unchecked(free, &sbi->s_mb_discarded);
59593
59594 return err;
59595 }
59596 @@ -3760,7 +3760,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
59597 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
59598 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
59599 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
59600 - atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
59601 + atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
59602 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
59603
59604 return 0;
59605 diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
59606 index 04434ad..6404663 100644
59607 --- a/fs/ext4/mmp.c
59608 +++ b/fs/ext4/mmp.c
59609 @@ -113,7 +113,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
59610 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
59611 const char *function, unsigned int line, const char *msg)
59612 {
59613 - __ext4_warning(sb, function, line, msg);
59614 + __ext4_warning(sb, function, line, "%s", msg);
59615 __ext4_warning(sb, function, line,
59616 "MMP failure info: last update time: %llu, last update "
59617 "node: %s, last update device: %s\n",
59618 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
59619 index 6f9e6fa..d0ebdb7 100644
59620 --- a/fs/ext4/super.c
59621 +++ b/fs/ext4/super.c
59622 @@ -1275,7 +1275,7 @@ static ext4_fsblk_t get_sb_block(void **data)
59623 }
59624
59625 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
59626 -static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
59627 +static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
59628 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
59629
59630 #ifdef CONFIG_QUOTA
59631 @@ -2455,7 +2455,7 @@ struct ext4_attr {
59632 int offset;
59633 int deprecated_val;
59634 } u;
59635 -};
59636 +} __do_const;
59637
59638 static int parse_strtoull(const char *buf,
59639 unsigned long long max, unsigned long long *value)
59640 @@ -3869,38 +3869,19 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
59641 goto failed_mount2;
59642 }
59643 }
59644 -
59645 - /*
59646 - * set up enough so that it can read an inode,
59647 - * and create new inode for buddy allocator
59648 - */
59649 - sbi->s_gdb_count = db_count;
59650 - if (!test_opt(sb, NOLOAD) &&
59651 - EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_HAS_JOURNAL))
59652 - sb->s_op = &ext4_sops;
59653 - else
59654 - sb->s_op = &ext4_nojournal_sops;
59655 -
59656 - ext4_ext_init(sb);
59657 - err = ext4_mb_init(sb);
59658 - if (err) {
59659 - ext4_msg(sb, KERN_ERR, "failed to initialize mballoc (%d)",
59660 - err);
59661 - goto failed_mount2;
59662 - }
59663 -
59664 if (!ext4_check_descriptors(sb, &first_not_zeroed)) {
59665 ext4_msg(sb, KERN_ERR, "group descriptors corrupted!");
59666 - goto failed_mount2a;
59667 + goto failed_mount2;
59668 }
59669 if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG))
59670 if (!ext4_fill_flex_info(sb)) {
59671 ext4_msg(sb, KERN_ERR,
59672 "unable to initialize "
59673 "flex_bg meta info!");
59674 - goto failed_mount2a;
59675 + goto failed_mount2;
59676 }
59677
59678 + sbi->s_gdb_count = db_count;
59679 get_random_bytes(&sbi->s_next_generation, sizeof(u32));
59680 spin_lock_init(&sbi->s_next_gen_lock);
59681
59682 @@ -3935,6 +3916,14 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
59683 sbi->s_stripe = ext4_get_stripe_size(sbi);
59684 sbi->s_extent_max_zeroout_kb = 32;
59685
59686 + /*
59687 + * set up enough so that it can read an inode
59688 + */
59689 + if (!test_opt(sb, NOLOAD) &&
59690 + EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_HAS_JOURNAL))
59691 + sb->s_op = &ext4_sops;
59692 + else
59693 + sb->s_op = &ext4_nojournal_sops;
59694 sb->s_export_op = &ext4_export_ops;
59695 sb->s_xattr = ext4_xattr_handlers;
59696 #ifdef CONFIG_QUOTA
59697 @@ -4124,13 +4113,21 @@ no_journal:
59698 if (err) {
59699 ext4_msg(sb, KERN_ERR, "failed to reserve %llu clusters for "
59700 "reserved pool", ext4_calculate_resv_clusters(sb));
59701 - goto failed_mount5;
59702 + goto failed_mount4a;
59703 }
59704
59705 err = ext4_setup_system_zone(sb);
59706 if (err) {
59707 ext4_msg(sb, KERN_ERR, "failed to initialize system "
59708 "zone (%d)", err);
59709 + goto failed_mount4a;
59710 + }
59711 +
59712 + ext4_ext_init(sb);
59713 + err = ext4_mb_init(sb);
59714 + if (err) {
59715 + ext4_msg(sb, KERN_ERR, "failed to initialize mballoc (%d)",
59716 + err);
59717 goto failed_mount5;
59718 }
59719
59720 @@ -4207,8 +4204,11 @@ failed_mount8:
59721 failed_mount7:
59722 ext4_unregister_li_request(sb);
59723 failed_mount6:
59724 - ext4_release_system_zone(sb);
59725 + ext4_mb_release(sb);
59726 failed_mount5:
59727 + ext4_ext_release(sb);
59728 + ext4_release_system_zone(sb);
59729 +failed_mount4a:
59730 dput(sb->s_root);
59731 sb->s_root = NULL;
59732 failed_mount4:
59733 @@ -4232,14 +4232,11 @@ failed_mount3:
59734 percpu_counter_destroy(&sbi->s_extent_cache_cnt);
59735 if (sbi->s_mmp_tsk)
59736 kthread_stop(sbi->s_mmp_tsk);
59737 -failed_mount2a:
59738 - ext4_mb_release(sb);
59739 failed_mount2:
59740 for (i = 0; i < db_count; i++)
59741 brelse(sbi->s_group_desc[i]);
59742 ext4_kvfree(sbi->s_group_desc);
59743 failed_mount:
59744 - ext4_ext_release(sb);
59745 if (sbi->s_chksum_driver)
59746 crypto_free_shash(sbi->s_chksum_driver);
59747 if (sbi->s_proc) {
59748 diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
59749 index 4eec399..1d9444c 100644
59750 --- a/fs/ext4/xattr.c
59751 +++ b/fs/ext4/xattr.c
59752 @@ -383,7 +383,7 @@ static int
59753 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
59754 char *buffer, size_t buffer_size)
59755 {
59756 - size_t rest = buffer_size;
59757 + size_t rest = buffer_size, total_size = 0;
59758
59759 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
59760 const struct xattr_handler *handler =
59761 @@ -400,9 +400,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
59762 buffer += size;
59763 }
59764 rest -= size;
59765 + total_size += size;
59766 }
59767 }
59768 - return buffer_size - rest;
59769 + return total_size;
59770 }
59771
59772 static int
59773 diff --git a/fs/fcntl.c b/fs/fcntl.c
59774 index 72c82f6..a18b263 100644
59775 --- a/fs/fcntl.c
59776 +++ b/fs/fcntl.c
59777 @@ -106,6 +106,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
59778 if (err)
59779 return err;
59780
59781 + if (gr_handle_chroot_fowner(pid, type))
59782 + return -ENOENT;
59783 + if (gr_check_protected_task_fowner(pid, type))
59784 + return -EACCES;
59785 +
59786 f_modown(filp, pid, type, force);
59787 return 0;
59788 }
59789 diff --git a/fs/fhandle.c b/fs/fhandle.c
59790 index 999ff5c..ac037c9 100644
59791 --- a/fs/fhandle.c
59792 +++ b/fs/fhandle.c
59793 @@ -8,6 +8,7 @@
59794 #include <linux/fs_struct.h>
59795 #include <linux/fsnotify.h>
59796 #include <linux/personality.h>
59797 +#include <linux/grsecurity.h>
59798 #include <asm/uaccess.h>
59799 #include "internal.h"
59800 #include "mount.h"
59801 @@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
59802 } else
59803 retval = 0;
59804 /* copy the mount id */
59805 - if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
59806 - sizeof(*mnt_id)) ||
59807 + if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
59808 copy_to_user(ufh, handle,
59809 sizeof(struct file_handle) + handle_bytes))
59810 retval = -EFAULT;
59811 @@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
59812 * the directory. Ideally we would like CAP_DAC_SEARCH.
59813 * But we don't have that
59814 */
59815 - if (!capable(CAP_DAC_READ_SEARCH)) {
59816 + if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
59817 retval = -EPERM;
59818 goto out_err;
59819 }
59820 diff --git a/fs/file.c b/fs/file.c
59821 index 8f294cf..d0f3872 100644
59822 --- a/fs/file.c
59823 +++ b/fs/file.c
59824 @@ -16,6 +16,7 @@
59825 #include <linux/slab.h>
59826 #include <linux/vmalloc.h>
59827 #include <linux/file.h>
59828 +#include <linux/security.h>
59829 #include <linux/fdtable.h>
59830 #include <linux/bitops.h>
59831 #include <linux/interrupt.h>
59832 @@ -144,7 +145,7 @@ out:
59833 * Return <0 error code on error; 1 on successful completion.
59834 * The files->file_lock should be held on entry, and will be held on exit.
59835 */
59836 -static int expand_fdtable(struct files_struct *files, int nr)
59837 +static int expand_fdtable(struct files_struct *files, unsigned int nr)
59838 __releases(files->file_lock)
59839 __acquires(files->file_lock)
59840 {
59841 @@ -189,7 +190,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
59842 * expanded and execution may have blocked.
59843 * The files->file_lock should be held on entry, and will be held on exit.
59844 */
59845 -static int expand_files(struct files_struct *files, int nr)
59846 +static int expand_files(struct files_struct *files, unsigned int nr)
59847 {
59848 struct fdtable *fdt;
59849
59850 @@ -804,6 +805,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
59851 if (!file)
59852 return __close_fd(files, fd);
59853
59854 + gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
59855 if (fd >= rlimit(RLIMIT_NOFILE))
59856 return -EBADF;
59857
59858 @@ -830,6 +832,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
59859 if (unlikely(oldfd == newfd))
59860 return -EINVAL;
59861
59862 + gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
59863 if (newfd >= rlimit(RLIMIT_NOFILE))
59864 return -EBADF;
59865
59866 @@ -885,6 +888,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
59867 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
59868 {
59869 int err;
59870 + gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
59871 if (from >= rlimit(RLIMIT_NOFILE))
59872 return -EINVAL;
59873 err = alloc_fd(from, flags);
59874 diff --git a/fs/filesystems.c b/fs/filesystems.c
59875 index 5797d45..7d7d79a 100644
59876 --- a/fs/filesystems.c
59877 +++ b/fs/filesystems.c
59878 @@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
59879 int len = dot ? dot - name : strlen(name);
59880
59881 fs = __get_fs_type(name, len);
59882 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
59883 + if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
59884 +#else
59885 if (!fs && (request_module("fs-%.*s", len, name) == 0))
59886 +#endif
59887 fs = __get_fs_type(name, len);
59888
59889 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
59890 diff --git a/fs/fs_struct.c b/fs/fs_struct.c
59891 index 7dca743..543d620 100644
59892 --- a/fs/fs_struct.c
59893 +++ b/fs/fs_struct.c
59894 @@ -4,6 +4,7 @@
59895 #include <linux/path.h>
59896 #include <linux/slab.h>
59897 #include <linux/fs_struct.h>
59898 +#include <linux/grsecurity.h>
59899 #include "internal.h"
59900
59901 /*
59902 @@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
59903 write_seqcount_begin(&fs->seq);
59904 old_root = fs->root;
59905 fs->root = *path;
59906 + gr_set_chroot_entries(current, path);
59907 write_seqcount_end(&fs->seq);
59908 spin_unlock(&fs->lock);
59909 if (old_root.dentry)
59910 @@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
59911 int hits = 0;
59912 spin_lock(&fs->lock);
59913 write_seqcount_begin(&fs->seq);
59914 + /* this root replacement is only done by pivot_root,
59915 + leave grsec's chroot tagging alone for this task
59916 + so that a pivoted root isn't treated as a chroot
59917 + */
59918 hits += replace_path(&fs->root, old_root, new_root);
59919 hits += replace_path(&fs->pwd, old_root, new_root);
59920 write_seqcount_end(&fs->seq);
59921 @@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
59922 task_lock(tsk);
59923 spin_lock(&fs->lock);
59924 tsk->fs = NULL;
59925 - kill = !--fs->users;
59926 + gr_clear_chroot_entries(tsk);
59927 + kill = !atomic_dec_return(&fs->users);
59928 spin_unlock(&fs->lock);
59929 task_unlock(tsk);
59930 if (kill)
59931 @@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
59932 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
59933 /* We don't need to lock fs - think why ;-) */
59934 if (fs) {
59935 - fs->users = 1;
59936 + atomic_set(&fs->users, 1);
59937 fs->in_exec = 0;
59938 spin_lock_init(&fs->lock);
59939 seqcount_init(&fs->seq);
59940 @@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
59941 spin_lock(&old->lock);
59942 fs->root = old->root;
59943 path_get(&fs->root);
59944 + /* instead of calling gr_set_chroot_entries here,
59945 + we call it from every caller of this function
59946 + */
59947 fs->pwd = old->pwd;
59948 path_get(&fs->pwd);
59949 spin_unlock(&old->lock);
59950 @@ -139,8 +149,9 @@ int unshare_fs_struct(void)
59951
59952 task_lock(current);
59953 spin_lock(&fs->lock);
59954 - kill = !--fs->users;
59955 + kill = !atomic_dec_return(&fs->users);
59956 current->fs = new_fs;
59957 + gr_set_chroot_entries(current, &new_fs->root);
59958 spin_unlock(&fs->lock);
59959 task_unlock(current);
59960
59961 @@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
59962
59963 int current_umask(void)
59964 {
59965 - return current->fs->umask;
59966 + return current->fs->umask | gr_acl_umask();
59967 }
59968 EXPORT_SYMBOL(current_umask);
59969
59970 /* to be mentioned only in INIT_TASK */
59971 struct fs_struct init_fs = {
59972 - .users = 1,
59973 + .users = ATOMIC_INIT(1),
59974 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
59975 .seq = SEQCNT_ZERO(init_fs.seq),
59976 .umask = 0022,
59977 diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
59978 index 29d7feb..303644d 100644
59979 --- a/fs/fscache/cookie.c
59980 +++ b/fs/fscache/cookie.c
59981 @@ -19,7 +19,7 @@
59982
59983 struct kmem_cache *fscache_cookie_jar;
59984
59985 -static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
59986 +static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
59987
59988 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
59989 static int fscache_alloc_object(struct fscache_cache *cache,
59990 @@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
59991 parent ? (char *) parent->def->name : "<no-parent>",
59992 def->name, netfs_data, enable);
59993
59994 - fscache_stat(&fscache_n_acquires);
59995 + fscache_stat_unchecked(&fscache_n_acquires);
59996
59997 /* if there's no parent cookie, then we don't create one here either */
59998 if (!parent) {
59999 - fscache_stat(&fscache_n_acquires_null);
60000 + fscache_stat_unchecked(&fscache_n_acquires_null);
60001 _leave(" [no parent]");
60002 return NULL;
60003 }
60004 @@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
60005 /* allocate and initialise a cookie */
60006 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
60007 if (!cookie) {
60008 - fscache_stat(&fscache_n_acquires_oom);
60009 + fscache_stat_unchecked(&fscache_n_acquires_oom);
60010 _leave(" [ENOMEM]");
60011 return NULL;
60012 }
60013 @@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
60014
60015 switch (cookie->def->type) {
60016 case FSCACHE_COOKIE_TYPE_INDEX:
60017 - fscache_stat(&fscache_n_cookie_index);
60018 + fscache_stat_unchecked(&fscache_n_cookie_index);
60019 break;
60020 case FSCACHE_COOKIE_TYPE_DATAFILE:
60021 - fscache_stat(&fscache_n_cookie_data);
60022 + fscache_stat_unchecked(&fscache_n_cookie_data);
60023 break;
60024 default:
60025 - fscache_stat(&fscache_n_cookie_special);
60026 + fscache_stat_unchecked(&fscache_n_cookie_special);
60027 break;
60028 }
60029
60030 @@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
60031 } else {
60032 atomic_dec(&parent->n_children);
60033 __fscache_cookie_put(cookie);
60034 - fscache_stat(&fscache_n_acquires_nobufs);
60035 + fscache_stat_unchecked(&fscache_n_acquires_nobufs);
60036 _leave(" = NULL");
60037 return NULL;
60038 }
60039 @@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
60040 }
60041 }
60042
60043 - fscache_stat(&fscache_n_acquires_ok);
60044 + fscache_stat_unchecked(&fscache_n_acquires_ok);
60045 _leave(" = %p", cookie);
60046 return cookie;
60047 }
60048 @@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
60049 cache = fscache_select_cache_for_object(cookie->parent);
60050 if (!cache) {
60051 up_read(&fscache_addremove_sem);
60052 - fscache_stat(&fscache_n_acquires_no_cache);
60053 + fscache_stat_unchecked(&fscache_n_acquires_no_cache);
60054 _leave(" = -ENOMEDIUM [no cache]");
60055 return -ENOMEDIUM;
60056 }
60057 @@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
60058 object = cache->ops->alloc_object(cache, cookie);
60059 fscache_stat_d(&fscache_n_cop_alloc_object);
60060 if (IS_ERR(object)) {
60061 - fscache_stat(&fscache_n_object_no_alloc);
60062 + fscache_stat_unchecked(&fscache_n_object_no_alloc);
60063 ret = PTR_ERR(object);
60064 goto error;
60065 }
60066
60067 - fscache_stat(&fscache_n_object_alloc);
60068 + fscache_stat_unchecked(&fscache_n_object_alloc);
60069
60070 - object->debug_id = atomic_inc_return(&fscache_object_debug_id);
60071 + object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
60072
60073 _debug("ALLOC OBJ%x: %s {%lx}",
60074 object->debug_id, cookie->def->name, object->events);
60075 @@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
60076
60077 _enter("{%s}", cookie->def->name);
60078
60079 - fscache_stat(&fscache_n_invalidates);
60080 + fscache_stat_unchecked(&fscache_n_invalidates);
60081
60082 /* Only permit invalidation of data files. Invalidating an index will
60083 * require the caller to release all its attachments to the tree rooted
60084 @@ -477,10 +477,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
60085 {
60086 struct fscache_object *object;
60087
60088 - fscache_stat(&fscache_n_updates);
60089 + fscache_stat_unchecked(&fscache_n_updates);
60090
60091 if (!cookie) {
60092 - fscache_stat(&fscache_n_updates_null);
60093 + fscache_stat_unchecked(&fscache_n_updates_null);
60094 _leave(" [no cookie]");
60095 return;
60096 }
60097 @@ -581,12 +581,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
60098 */
60099 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
60100 {
60101 - fscache_stat(&fscache_n_relinquishes);
60102 + fscache_stat_unchecked(&fscache_n_relinquishes);
60103 if (retire)
60104 - fscache_stat(&fscache_n_relinquishes_retire);
60105 + fscache_stat_unchecked(&fscache_n_relinquishes_retire);
60106
60107 if (!cookie) {
60108 - fscache_stat(&fscache_n_relinquishes_null);
60109 + fscache_stat_unchecked(&fscache_n_relinquishes_null);
60110 _leave(" [no cookie]");
60111 return;
60112 }
60113 @@ -687,7 +687,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
60114 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
60115 goto inconsistent;
60116
60117 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
60118 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
60119
60120 __fscache_use_cookie(cookie);
60121 if (fscache_submit_op(object, op) < 0)
60122 diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
60123 index 4226f66..0fb3f45 100644
60124 --- a/fs/fscache/internal.h
60125 +++ b/fs/fscache/internal.h
60126 @@ -133,8 +133,8 @@ extern void fscache_operation_gc(struct work_struct *);
60127 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
60128 extern int fscache_wait_for_operation_activation(struct fscache_object *,
60129 struct fscache_operation *,
60130 - atomic_t *,
60131 - atomic_t *,
60132 + atomic_unchecked_t *,
60133 + atomic_unchecked_t *,
60134 void (*)(struct fscache_operation *));
60135 extern void fscache_invalidate_writes(struct fscache_cookie *);
60136
60137 @@ -153,101 +153,101 @@ extern void fscache_proc_cleanup(void);
60138 * stats.c
60139 */
60140 #ifdef CONFIG_FSCACHE_STATS
60141 -extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
60142 -extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
60143 +extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
60144 +extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
60145
60146 -extern atomic_t fscache_n_op_pend;
60147 -extern atomic_t fscache_n_op_run;
60148 -extern atomic_t fscache_n_op_enqueue;
60149 -extern atomic_t fscache_n_op_deferred_release;
60150 -extern atomic_t fscache_n_op_release;
60151 -extern atomic_t fscache_n_op_gc;
60152 -extern atomic_t fscache_n_op_cancelled;
60153 -extern atomic_t fscache_n_op_rejected;
60154 +extern atomic_unchecked_t fscache_n_op_pend;
60155 +extern atomic_unchecked_t fscache_n_op_run;
60156 +extern atomic_unchecked_t fscache_n_op_enqueue;
60157 +extern atomic_unchecked_t fscache_n_op_deferred_release;
60158 +extern atomic_unchecked_t fscache_n_op_release;
60159 +extern atomic_unchecked_t fscache_n_op_gc;
60160 +extern atomic_unchecked_t fscache_n_op_cancelled;
60161 +extern atomic_unchecked_t fscache_n_op_rejected;
60162
60163 -extern atomic_t fscache_n_attr_changed;
60164 -extern atomic_t fscache_n_attr_changed_ok;
60165 -extern atomic_t fscache_n_attr_changed_nobufs;
60166 -extern atomic_t fscache_n_attr_changed_nomem;
60167 -extern atomic_t fscache_n_attr_changed_calls;
60168 +extern atomic_unchecked_t fscache_n_attr_changed;
60169 +extern atomic_unchecked_t fscache_n_attr_changed_ok;
60170 +extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
60171 +extern atomic_unchecked_t fscache_n_attr_changed_nomem;
60172 +extern atomic_unchecked_t fscache_n_attr_changed_calls;
60173
60174 -extern atomic_t fscache_n_allocs;
60175 -extern atomic_t fscache_n_allocs_ok;
60176 -extern atomic_t fscache_n_allocs_wait;
60177 -extern atomic_t fscache_n_allocs_nobufs;
60178 -extern atomic_t fscache_n_allocs_intr;
60179 -extern atomic_t fscache_n_allocs_object_dead;
60180 -extern atomic_t fscache_n_alloc_ops;
60181 -extern atomic_t fscache_n_alloc_op_waits;
60182 +extern atomic_unchecked_t fscache_n_allocs;
60183 +extern atomic_unchecked_t fscache_n_allocs_ok;
60184 +extern atomic_unchecked_t fscache_n_allocs_wait;
60185 +extern atomic_unchecked_t fscache_n_allocs_nobufs;
60186 +extern atomic_unchecked_t fscache_n_allocs_intr;
60187 +extern atomic_unchecked_t fscache_n_allocs_object_dead;
60188 +extern atomic_unchecked_t fscache_n_alloc_ops;
60189 +extern atomic_unchecked_t fscache_n_alloc_op_waits;
60190
60191 -extern atomic_t fscache_n_retrievals;
60192 -extern atomic_t fscache_n_retrievals_ok;
60193 -extern atomic_t fscache_n_retrievals_wait;
60194 -extern atomic_t fscache_n_retrievals_nodata;
60195 -extern atomic_t fscache_n_retrievals_nobufs;
60196 -extern atomic_t fscache_n_retrievals_intr;
60197 -extern atomic_t fscache_n_retrievals_nomem;
60198 -extern atomic_t fscache_n_retrievals_object_dead;
60199 -extern atomic_t fscache_n_retrieval_ops;
60200 -extern atomic_t fscache_n_retrieval_op_waits;
60201 +extern atomic_unchecked_t fscache_n_retrievals;
60202 +extern atomic_unchecked_t fscache_n_retrievals_ok;
60203 +extern atomic_unchecked_t fscache_n_retrievals_wait;
60204 +extern atomic_unchecked_t fscache_n_retrievals_nodata;
60205 +extern atomic_unchecked_t fscache_n_retrievals_nobufs;
60206 +extern atomic_unchecked_t fscache_n_retrievals_intr;
60207 +extern atomic_unchecked_t fscache_n_retrievals_nomem;
60208 +extern atomic_unchecked_t fscache_n_retrievals_object_dead;
60209 +extern atomic_unchecked_t fscache_n_retrieval_ops;
60210 +extern atomic_unchecked_t fscache_n_retrieval_op_waits;
60211
60212 -extern atomic_t fscache_n_stores;
60213 -extern atomic_t fscache_n_stores_ok;
60214 -extern atomic_t fscache_n_stores_again;
60215 -extern atomic_t fscache_n_stores_nobufs;
60216 -extern atomic_t fscache_n_stores_oom;
60217 -extern atomic_t fscache_n_store_ops;
60218 -extern atomic_t fscache_n_store_calls;
60219 -extern atomic_t fscache_n_store_pages;
60220 -extern atomic_t fscache_n_store_radix_deletes;
60221 -extern atomic_t fscache_n_store_pages_over_limit;
60222 +extern atomic_unchecked_t fscache_n_stores;
60223 +extern atomic_unchecked_t fscache_n_stores_ok;
60224 +extern atomic_unchecked_t fscache_n_stores_again;
60225 +extern atomic_unchecked_t fscache_n_stores_nobufs;
60226 +extern atomic_unchecked_t fscache_n_stores_oom;
60227 +extern atomic_unchecked_t fscache_n_store_ops;
60228 +extern atomic_unchecked_t fscache_n_store_calls;
60229 +extern atomic_unchecked_t fscache_n_store_pages;
60230 +extern atomic_unchecked_t fscache_n_store_radix_deletes;
60231 +extern atomic_unchecked_t fscache_n_store_pages_over_limit;
60232
60233 -extern atomic_t fscache_n_store_vmscan_not_storing;
60234 -extern atomic_t fscache_n_store_vmscan_gone;
60235 -extern atomic_t fscache_n_store_vmscan_busy;
60236 -extern atomic_t fscache_n_store_vmscan_cancelled;
60237 -extern atomic_t fscache_n_store_vmscan_wait;
60238 +extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
60239 +extern atomic_unchecked_t fscache_n_store_vmscan_gone;
60240 +extern atomic_unchecked_t fscache_n_store_vmscan_busy;
60241 +extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
60242 +extern atomic_unchecked_t fscache_n_store_vmscan_wait;
60243
60244 -extern atomic_t fscache_n_marks;
60245 -extern atomic_t fscache_n_uncaches;
60246 +extern atomic_unchecked_t fscache_n_marks;
60247 +extern atomic_unchecked_t fscache_n_uncaches;
60248
60249 -extern atomic_t fscache_n_acquires;
60250 -extern atomic_t fscache_n_acquires_null;
60251 -extern atomic_t fscache_n_acquires_no_cache;
60252 -extern atomic_t fscache_n_acquires_ok;
60253 -extern atomic_t fscache_n_acquires_nobufs;
60254 -extern atomic_t fscache_n_acquires_oom;
60255 +extern atomic_unchecked_t fscache_n_acquires;
60256 +extern atomic_unchecked_t fscache_n_acquires_null;
60257 +extern atomic_unchecked_t fscache_n_acquires_no_cache;
60258 +extern atomic_unchecked_t fscache_n_acquires_ok;
60259 +extern atomic_unchecked_t fscache_n_acquires_nobufs;
60260 +extern atomic_unchecked_t fscache_n_acquires_oom;
60261
60262 -extern atomic_t fscache_n_invalidates;
60263 -extern atomic_t fscache_n_invalidates_run;
60264 +extern atomic_unchecked_t fscache_n_invalidates;
60265 +extern atomic_unchecked_t fscache_n_invalidates_run;
60266
60267 -extern atomic_t fscache_n_updates;
60268 -extern atomic_t fscache_n_updates_null;
60269 -extern atomic_t fscache_n_updates_run;
60270 +extern atomic_unchecked_t fscache_n_updates;
60271 +extern atomic_unchecked_t fscache_n_updates_null;
60272 +extern atomic_unchecked_t fscache_n_updates_run;
60273
60274 -extern atomic_t fscache_n_relinquishes;
60275 -extern atomic_t fscache_n_relinquishes_null;
60276 -extern atomic_t fscache_n_relinquishes_waitcrt;
60277 -extern atomic_t fscache_n_relinquishes_retire;
60278 +extern atomic_unchecked_t fscache_n_relinquishes;
60279 +extern atomic_unchecked_t fscache_n_relinquishes_null;
60280 +extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
60281 +extern atomic_unchecked_t fscache_n_relinquishes_retire;
60282
60283 -extern atomic_t fscache_n_cookie_index;
60284 -extern atomic_t fscache_n_cookie_data;
60285 -extern atomic_t fscache_n_cookie_special;
60286 +extern atomic_unchecked_t fscache_n_cookie_index;
60287 +extern atomic_unchecked_t fscache_n_cookie_data;
60288 +extern atomic_unchecked_t fscache_n_cookie_special;
60289
60290 -extern atomic_t fscache_n_object_alloc;
60291 -extern atomic_t fscache_n_object_no_alloc;
60292 -extern atomic_t fscache_n_object_lookups;
60293 -extern atomic_t fscache_n_object_lookups_negative;
60294 -extern atomic_t fscache_n_object_lookups_positive;
60295 -extern atomic_t fscache_n_object_lookups_timed_out;
60296 -extern atomic_t fscache_n_object_created;
60297 -extern atomic_t fscache_n_object_avail;
60298 -extern atomic_t fscache_n_object_dead;
60299 +extern atomic_unchecked_t fscache_n_object_alloc;
60300 +extern atomic_unchecked_t fscache_n_object_no_alloc;
60301 +extern atomic_unchecked_t fscache_n_object_lookups;
60302 +extern atomic_unchecked_t fscache_n_object_lookups_negative;
60303 +extern atomic_unchecked_t fscache_n_object_lookups_positive;
60304 +extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
60305 +extern atomic_unchecked_t fscache_n_object_created;
60306 +extern atomic_unchecked_t fscache_n_object_avail;
60307 +extern atomic_unchecked_t fscache_n_object_dead;
60308
60309 -extern atomic_t fscache_n_checkaux_none;
60310 -extern atomic_t fscache_n_checkaux_okay;
60311 -extern atomic_t fscache_n_checkaux_update;
60312 -extern atomic_t fscache_n_checkaux_obsolete;
60313 +extern atomic_unchecked_t fscache_n_checkaux_none;
60314 +extern atomic_unchecked_t fscache_n_checkaux_okay;
60315 +extern atomic_unchecked_t fscache_n_checkaux_update;
60316 +extern atomic_unchecked_t fscache_n_checkaux_obsolete;
60317
60318 extern atomic_t fscache_n_cop_alloc_object;
60319 extern atomic_t fscache_n_cop_lookup_object;
60320 @@ -272,6 +272,11 @@ static inline void fscache_stat(atomic_t *stat)
60321 atomic_inc(stat);
60322 }
60323
60324 +static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
60325 +{
60326 + atomic_inc_unchecked(stat);
60327 +}
60328 +
60329 static inline void fscache_stat_d(atomic_t *stat)
60330 {
60331 atomic_dec(stat);
60332 @@ -284,6 +289,7 @@ extern const struct file_operations fscache_stats_fops;
60333
60334 #define __fscache_stat(stat) (NULL)
60335 #define fscache_stat(stat) do {} while (0)
60336 +#define fscache_stat_unchecked(stat) do {} while (0)
60337 #define fscache_stat_d(stat) do {} while (0)
60338 #endif
60339
60340 diff --git a/fs/fscache/object.c b/fs/fscache/object.c
60341 index d3b4539..ed0c659 100644
60342 --- a/fs/fscache/object.c
60343 +++ b/fs/fscache/object.c
60344 @@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
60345 _debug("LOOKUP \"%s\" in \"%s\"",
60346 cookie->def->name, object->cache->tag->name);
60347
60348 - fscache_stat(&fscache_n_object_lookups);
60349 + fscache_stat_unchecked(&fscache_n_object_lookups);
60350 fscache_stat(&fscache_n_cop_lookup_object);
60351 ret = object->cache->ops->lookup_object(object);
60352 fscache_stat_d(&fscache_n_cop_lookup_object);
60353 @@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
60354 if (ret == -ETIMEDOUT) {
60355 /* probably stuck behind another object, so move this one to
60356 * the back of the queue */
60357 - fscache_stat(&fscache_n_object_lookups_timed_out);
60358 + fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
60359 _leave(" [timeout]");
60360 return NO_TRANSIT;
60361 }
60362 @@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
60363 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
60364
60365 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
60366 - fscache_stat(&fscache_n_object_lookups_negative);
60367 + fscache_stat_unchecked(&fscache_n_object_lookups_negative);
60368
60369 /* Allow write requests to begin stacking up and read requests to begin
60370 * returning ENODATA.
60371 @@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
60372 /* if we were still looking up, then we must have a positive lookup
60373 * result, in which case there may be data available */
60374 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
60375 - fscache_stat(&fscache_n_object_lookups_positive);
60376 + fscache_stat_unchecked(&fscache_n_object_lookups_positive);
60377
60378 /* We do (presumably) have data */
60379 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
60380 @@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
60381 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
60382 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
60383 } else {
60384 - fscache_stat(&fscache_n_object_created);
60385 + fscache_stat_unchecked(&fscache_n_object_created);
60386 }
60387
60388 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
60389 @@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
60390 fscache_stat_d(&fscache_n_cop_lookup_complete);
60391
60392 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
60393 - fscache_stat(&fscache_n_object_avail);
60394 + fscache_stat_unchecked(&fscache_n_object_avail);
60395
60396 _leave("");
60397 return transit_to(JUMPSTART_DEPS);
60398 @@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
60399
60400 /* this just shifts the object release to the work processor */
60401 fscache_put_object(object);
60402 - fscache_stat(&fscache_n_object_dead);
60403 + fscache_stat_unchecked(&fscache_n_object_dead);
60404
60405 _leave("");
60406 return transit_to(OBJECT_DEAD);
60407 @@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
60408 enum fscache_checkaux result;
60409
60410 if (!object->cookie->def->check_aux) {
60411 - fscache_stat(&fscache_n_checkaux_none);
60412 + fscache_stat_unchecked(&fscache_n_checkaux_none);
60413 return FSCACHE_CHECKAUX_OKAY;
60414 }
60415
60416 @@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
60417 switch (result) {
60418 /* entry okay as is */
60419 case FSCACHE_CHECKAUX_OKAY:
60420 - fscache_stat(&fscache_n_checkaux_okay);
60421 + fscache_stat_unchecked(&fscache_n_checkaux_okay);
60422 break;
60423
60424 /* entry requires update */
60425 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
60426 - fscache_stat(&fscache_n_checkaux_update);
60427 + fscache_stat_unchecked(&fscache_n_checkaux_update);
60428 break;
60429
60430 /* entry requires deletion */
60431 case FSCACHE_CHECKAUX_OBSOLETE:
60432 - fscache_stat(&fscache_n_checkaux_obsolete);
60433 + fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
60434 break;
60435
60436 default:
60437 @@ -992,7 +992,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
60438 {
60439 const struct fscache_state *s;
60440
60441 - fscache_stat(&fscache_n_invalidates_run);
60442 + fscache_stat_unchecked(&fscache_n_invalidates_run);
60443 fscache_stat(&fscache_n_cop_invalidate_object);
60444 s = _fscache_invalidate_object(object, event);
60445 fscache_stat_d(&fscache_n_cop_invalidate_object);
60446 @@ -1007,7 +1007,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
60447 {
60448 _enter("{OBJ%x},%d", object->debug_id, event);
60449
60450 - fscache_stat(&fscache_n_updates_run);
60451 + fscache_stat_unchecked(&fscache_n_updates_run);
60452 fscache_stat(&fscache_n_cop_update_object);
60453 object->cache->ops->update_object(object);
60454 fscache_stat_d(&fscache_n_cop_update_object);
60455 diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
60456 index 318071a..379938b 100644
60457 --- a/fs/fscache/operation.c
60458 +++ b/fs/fscache/operation.c
60459 @@ -17,7 +17,7 @@
60460 #include <linux/slab.h>
60461 #include "internal.h"
60462
60463 -atomic_t fscache_op_debug_id;
60464 +atomic_unchecked_t fscache_op_debug_id;
60465 EXPORT_SYMBOL(fscache_op_debug_id);
60466
60467 /**
60468 @@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
60469 ASSERTCMP(atomic_read(&op->usage), >, 0);
60470 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
60471
60472 - fscache_stat(&fscache_n_op_enqueue);
60473 + fscache_stat_unchecked(&fscache_n_op_enqueue);
60474 switch (op->flags & FSCACHE_OP_TYPE) {
60475 case FSCACHE_OP_ASYNC:
60476 _debug("queue async");
60477 @@ -73,7 +73,7 @@ static void fscache_run_op(struct fscache_object *object,
60478 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
60479 if (op->processor)
60480 fscache_enqueue_operation(op);
60481 - fscache_stat(&fscache_n_op_run);
60482 + fscache_stat_unchecked(&fscache_n_op_run);
60483 }
60484
60485 /*
60486 @@ -105,11 +105,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
60487 if (object->n_in_progress > 0) {
60488 atomic_inc(&op->usage);
60489 list_add_tail(&op->pend_link, &object->pending_ops);
60490 - fscache_stat(&fscache_n_op_pend);
60491 + fscache_stat_unchecked(&fscache_n_op_pend);
60492 } else if (!list_empty(&object->pending_ops)) {
60493 atomic_inc(&op->usage);
60494 list_add_tail(&op->pend_link, &object->pending_ops);
60495 - fscache_stat(&fscache_n_op_pend);
60496 + fscache_stat_unchecked(&fscache_n_op_pend);
60497 fscache_start_operations(object);
60498 } else {
60499 ASSERTCMP(object->n_in_progress, ==, 0);
60500 @@ -125,7 +125,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
60501 object->n_exclusive++; /* reads and writes must wait */
60502 atomic_inc(&op->usage);
60503 list_add_tail(&op->pend_link, &object->pending_ops);
60504 - fscache_stat(&fscache_n_op_pend);
60505 + fscache_stat_unchecked(&fscache_n_op_pend);
60506 ret = 0;
60507 } else {
60508 /* If we're in any other state, there must have been an I/O
60509 @@ -212,11 +212,11 @@ int fscache_submit_op(struct fscache_object *object,
60510 if (object->n_exclusive > 0) {
60511 atomic_inc(&op->usage);
60512 list_add_tail(&op->pend_link, &object->pending_ops);
60513 - fscache_stat(&fscache_n_op_pend);
60514 + fscache_stat_unchecked(&fscache_n_op_pend);
60515 } else if (!list_empty(&object->pending_ops)) {
60516 atomic_inc(&op->usage);
60517 list_add_tail(&op->pend_link, &object->pending_ops);
60518 - fscache_stat(&fscache_n_op_pend);
60519 + fscache_stat_unchecked(&fscache_n_op_pend);
60520 fscache_start_operations(object);
60521 } else {
60522 ASSERTCMP(object->n_exclusive, ==, 0);
60523 @@ -228,10 +228,10 @@ int fscache_submit_op(struct fscache_object *object,
60524 object->n_ops++;
60525 atomic_inc(&op->usage);
60526 list_add_tail(&op->pend_link, &object->pending_ops);
60527 - fscache_stat(&fscache_n_op_pend);
60528 + fscache_stat_unchecked(&fscache_n_op_pend);
60529 ret = 0;
60530 } else if (fscache_object_is_dying(object)) {
60531 - fscache_stat(&fscache_n_op_rejected);
60532 + fscache_stat_unchecked(&fscache_n_op_rejected);
60533 op->state = FSCACHE_OP_ST_CANCELLED;
60534 ret = -ENOBUFS;
60535 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
60536 @@ -310,7 +310,7 @@ int fscache_cancel_op(struct fscache_operation *op,
60537 ret = -EBUSY;
60538 if (op->state == FSCACHE_OP_ST_PENDING) {
60539 ASSERT(!list_empty(&op->pend_link));
60540 - fscache_stat(&fscache_n_op_cancelled);
60541 + fscache_stat_unchecked(&fscache_n_op_cancelled);
60542 list_del_init(&op->pend_link);
60543 if (do_cancel)
60544 do_cancel(op);
60545 @@ -342,7 +342,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
60546 while (!list_empty(&object->pending_ops)) {
60547 op = list_entry(object->pending_ops.next,
60548 struct fscache_operation, pend_link);
60549 - fscache_stat(&fscache_n_op_cancelled);
60550 + fscache_stat_unchecked(&fscache_n_op_cancelled);
60551 list_del_init(&op->pend_link);
60552
60553 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
60554 @@ -414,7 +414,7 @@ void fscache_put_operation(struct fscache_operation *op)
60555 op->state, ==, FSCACHE_OP_ST_CANCELLED);
60556 op->state = FSCACHE_OP_ST_DEAD;
60557
60558 - fscache_stat(&fscache_n_op_release);
60559 + fscache_stat_unchecked(&fscache_n_op_release);
60560
60561 if (op->release) {
60562 op->release(op);
60563 @@ -433,7 +433,7 @@ void fscache_put_operation(struct fscache_operation *op)
60564 * lock, and defer it otherwise */
60565 if (!spin_trylock(&object->lock)) {
60566 _debug("defer put");
60567 - fscache_stat(&fscache_n_op_deferred_release);
60568 + fscache_stat_unchecked(&fscache_n_op_deferred_release);
60569
60570 cache = object->cache;
60571 spin_lock(&cache->op_gc_list_lock);
60572 @@ -486,7 +486,7 @@ void fscache_operation_gc(struct work_struct *work)
60573
60574 _debug("GC DEFERRED REL OBJ%x OP%x",
60575 object->debug_id, op->debug_id);
60576 - fscache_stat(&fscache_n_op_gc);
60577 + fscache_stat_unchecked(&fscache_n_op_gc);
60578
60579 ASSERTCMP(atomic_read(&op->usage), ==, 0);
60580 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
60581 diff --git a/fs/fscache/page.c b/fs/fscache/page.c
60582 index 7f5c658..6c1e164 100644
60583 --- a/fs/fscache/page.c
60584 +++ b/fs/fscache/page.c
60585 @@ -61,7 +61,7 @@ try_again:
60586 val = radix_tree_lookup(&cookie->stores, page->index);
60587 if (!val) {
60588 rcu_read_unlock();
60589 - fscache_stat(&fscache_n_store_vmscan_not_storing);
60590 + fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
60591 __fscache_uncache_page(cookie, page);
60592 return true;
60593 }
60594 @@ -91,11 +91,11 @@ try_again:
60595 spin_unlock(&cookie->stores_lock);
60596
60597 if (xpage) {
60598 - fscache_stat(&fscache_n_store_vmscan_cancelled);
60599 - fscache_stat(&fscache_n_store_radix_deletes);
60600 + fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
60601 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
60602 ASSERTCMP(xpage, ==, page);
60603 } else {
60604 - fscache_stat(&fscache_n_store_vmscan_gone);
60605 + fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
60606 }
60607
60608 wake_up_bit(&cookie->flags, 0);
60609 @@ -110,11 +110,11 @@ page_busy:
60610 * sleeping on memory allocation, so we may need to impose a timeout
60611 * too. */
60612 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
60613 - fscache_stat(&fscache_n_store_vmscan_busy);
60614 + fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
60615 return false;
60616 }
60617
60618 - fscache_stat(&fscache_n_store_vmscan_wait);
60619 + fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
60620 __fscache_wait_on_page_write(cookie, page);
60621 gfp &= ~__GFP_WAIT;
60622 goto try_again;
60623 @@ -140,7 +140,7 @@ static void fscache_end_page_write(struct fscache_object *object,
60624 FSCACHE_COOKIE_STORING_TAG);
60625 if (!radix_tree_tag_get(&cookie->stores, page->index,
60626 FSCACHE_COOKIE_PENDING_TAG)) {
60627 - fscache_stat(&fscache_n_store_radix_deletes);
60628 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
60629 xpage = radix_tree_delete(&cookie->stores, page->index);
60630 }
60631 spin_unlock(&cookie->stores_lock);
60632 @@ -161,7 +161,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
60633
60634 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
60635
60636 - fscache_stat(&fscache_n_attr_changed_calls);
60637 + fscache_stat_unchecked(&fscache_n_attr_changed_calls);
60638
60639 if (fscache_object_is_active(object)) {
60640 fscache_stat(&fscache_n_cop_attr_changed);
60641 @@ -188,11 +188,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
60642
60643 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
60644
60645 - fscache_stat(&fscache_n_attr_changed);
60646 + fscache_stat_unchecked(&fscache_n_attr_changed);
60647
60648 op = kzalloc(sizeof(*op), GFP_KERNEL);
60649 if (!op) {
60650 - fscache_stat(&fscache_n_attr_changed_nomem);
60651 + fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
60652 _leave(" = -ENOMEM");
60653 return -ENOMEM;
60654 }
60655 @@ -214,7 +214,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
60656 if (fscache_submit_exclusive_op(object, op) < 0)
60657 goto nobufs;
60658 spin_unlock(&cookie->lock);
60659 - fscache_stat(&fscache_n_attr_changed_ok);
60660 + fscache_stat_unchecked(&fscache_n_attr_changed_ok);
60661 fscache_put_operation(op);
60662 _leave(" = 0");
60663 return 0;
60664 @@ -225,7 +225,7 @@ nobufs:
60665 kfree(op);
60666 if (wake_cookie)
60667 __fscache_wake_unused_cookie(cookie);
60668 - fscache_stat(&fscache_n_attr_changed_nobufs);
60669 + fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
60670 _leave(" = %d", -ENOBUFS);
60671 return -ENOBUFS;
60672 }
60673 @@ -264,7 +264,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
60674 /* allocate a retrieval operation and attempt to submit it */
60675 op = kzalloc(sizeof(*op), GFP_NOIO);
60676 if (!op) {
60677 - fscache_stat(&fscache_n_retrievals_nomem);
60678 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
60679 return NULL;
60680 }
60681
60682 @@ -294,13 +294,13 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
60683 return 0;
60684 }
60685
60686 - fscache_stat(&fscache_n_retrievals_wait);
60687 + fscache_stat_unchecked(&fscache_n_retrievals_wait);
60688
60689 jif = jiffies;
60690 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
60691 fscache_wait_bit_interruptible,
60692 TASK_INTERRUPTIBLE) != 0) {
60693 - fscache_stat(&fscache_n_retrievals_intr);
60694 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
60695 _leave(" = -ERESTARTSYS");
60696 return -ERESTARTSYS;
60697 }
60698 @@ -329,8 +329,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
60699 */
60700 int fscache_wait_for_operation_activation(struct fscache_object *object,
60701 struct fscache_operation *op,
60702 - atomic_t *stat_op_waits,
60703 - atomic_t *stat_object_dead,
60704 + atomic_unchecked_t *stat_op_waits,
60705 + atomic_unchecked_t *stat_object_dead,
60706 void (*do_cancel)(struct fscache_operation *))
60707 {
60708 int ret;
60709 @@ -340,7 +340,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
60710
60711 _debug(">>> WT");
60712 if (stat_op_waits)
60713 - fscache_stat(stat_op_waits);
60714 + fscache_stat_unchecked(stat_op_waits);
60715 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
60716 fscache_wait_bit_interruptible,
60717 TASK_INTERRUPTIBLE) != 0) {
60718 @@ -358,7 +358,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
60719 check_if_dead:
60720 if (op->state == FSCACHE_OP_ST_CANCELLED) {
60721 if (stat_object_dead)
60722 - fscache_stat(stat_object_dead);
60723 + fscache_stat_unchecked(stat_object_dead);
60724 _leave(" = -ENOBUFS [cancelled]");
60725 return -ENOBUFS;
60726 }
60727 @@ -366,7 +366,7 @@ check_if_dead:
60728 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
60729 fscache_cancel_op(op, do_cancel);
60730 if (stat_object_dead)
60731 - fscache_stat(stat_object_dead);
60732 + fscache_stat_unchecked(stat_object_dead);
60733 return -ENOBUFS;
60734 }
60735 return 0;
60736 @@ -394,7 +394,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
60737
60738 _enter("%p,%p,,,", cookie, page);
60739
60740 - fscache_stat(&fscache_n_retrievals);
60741 + fscache_stat_unchecked(&fscache_n_retrievals);
60742
60743 if (hlist_empty(&cookie->backing_objects))
60744 goto nobufs;
60745 @@ -436,7 +436,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
60746 goto nobufs_unlock_dec;
60747 spin_unlock(&cookie->lock);
60748
60749 - fscache_stat(&fscache_n_retrieval_ops);
60750 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
60751
60752 /* pin the netfs read context in case we need to do the actual netfs
60753 * read because we've encountered a cache read failure */
60754 @@ -467,15 +467,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
60755
60756 error:
60757 if (ret == -ENOMEM)
60758 - fscache_stat(&fscache_n_retrievals_nomem);
60759 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
60760 else if (ret == -ERESTARTSYS)
60761 - fscache_stat(&fscache_n_retrievals_intr);
60762 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
60763 else if (ret == -ENODATA)
60764 - fscache_stat(&fscache_n_retrievals_nodata);
60765 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
60766 else if (ret < 0)
60767 - fscache_stat(&fscache_n_retrievals_nobufs);
60768 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
60769 else
60770 - fscache_stat(&fscache_n_retrievals_ok);
60771 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
60772
60773 fscache_put_retrieval(op);
60774 _leave(" = %d", ret);
60775 @@ -490,7 +490,7 @@ nobufs_unlock:
60776 __fscache_wake_unused_cookie(cookie);
60777 kfree(op);
60778 nobufs:
60779 - fscache_stat(&fscache_n_retrievals_nobufs);
60780 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
60781 _leave(" = -ENOBUFS");
60782 return -ENOBUFS;
60783 }
60784 @@ -529,7 +529,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
60785
60786 _enter("%p,,%d,,,", cookie, *nr_pages);
60787
60788 - fscache_stat(&fscache_n_retrievals);
60789 + fscache_stat_unchecked(&fscache_n_retrievals);
60790
60791 if (hlist_empty(&cookie->backing_objects))
60792 goto nobufs;
60793 @@ -567,7 +567,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
60794 goto nobufs_unlock_dec;
60795 spin_unlock(&cookie->lock);
60796
60797 - fscache_stat(&fscache_n_retrieval_ops);
60798 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
60799
60800 /* pin the netfs read context in case we need to do the actual netfs
60801 * read because we've encountered a cache read failure */
60802 @@ -598,15 +598,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
60803
60804 error:
60805 if (ret == -ENOMEM)
60806 - fscache_stat(&fscache_n_retrievals_nomem);
60807 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
60808 else if (ret == -ERESTARTSYS)
60809 - fscache_stat(&fscache_n_retrievals_intr);
60810 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
60811 else if (ret == -ENODATA)
60812 - fscache_stat(&fscache_n_retrievals_nodata);
60813 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
60814 else if (ret < 0)
60815 - fscache_stat(&fscache_n_retrievals_nobufs);
60816 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
60817 else
60818 - fscache_stat(&fscache_n_retrievals_ok);
60819 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
60820
60821 fscache_put_retrieval(op);
60822 _leave(" = %d", ret);
60823 @@ -621,7 +621,7 @@ nobufs_unlock:
60824 if (wake_cookie)
60825 __fscache_wake_unused_cookie(cookie);
60826 nobufs:
60827 - fscache_stat(&fscache_n_retrievals_nobufs);
60828 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
60829 _leave(" = -ENOBUFS");
60830 return -ENOBUFS;
60831 }
60832 @@ -646,7 +646,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
60833
60834 _enter("%p,%p,,,", cookie, page);
60835
60836 - fscache_stat(&fscache_n_allocs);
60837 + fscache_stat_unchecked(&fscache_n_allocs);
60838
60839 if (hlist_empty(&cookie->backing_objects))
60840 goto nobufs;
60841 @@ -680,7 +680,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
60842 goto nobufs_unlock_dec;
60843 spin_unlock(&cookie->lock);
60844
60845 - fscache_stat(&fscache_n_alloc_ops);
60846 + fscache_stat_unchecked(&fscache_n_alloc_ops);
60847
60848 ret = fscache_wait_for_operation_activation(
60849 object, &op->op,
60850 @@ -697,11 +697,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
60851
60852 error:
60853 if (ret == -ERESTARTSYS)
60854 - fscache_stat(&fscache_n_allocs_intr);
60855 + fscache_stat_unchecked(&fscache_n_allocs_intr);
60856 else if (ret < 0)
60857 - fscache_stat(&fscache_n_allocs_nobufs);
60858 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
60859 else
60860 - fscache_stat(&fscache_n_allocs_ok);
60861 + fscache_stat_unchecked(&fscache_n_allocs_ok);
60862
60863 fscache_put_retrieval(op);
60864 _leave(" = %d", ret);
60865 @@ -715,7 +715,7 @@ nobufs_unlock:
60866 if (wake_cookie)
60867 __fscache_wake_unused_cookie(cookie);
60868 nobufs:
60869 - fscache_stat(&fscache_n_allocs_nobufs);
60870 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
60871 _leave(" = -ENOBUFS");
60872 return -ENOBUFS;
60873 }
60874 @@ -791,7 +791,7 @@ static void fscache_write_op(struct fscache_operation *_op)
60875
60876 spin_lock(&cookie->stores_lock);
60877
60878 - fscache_stat(&fscache_n_store_calls);
60879 + fscache_stat_unchecked(&fscache_n_store_calls);
60880
60881 /* find a page to store */
60882 page = NULL;
60883 @@ -802,7 +802,7 @@ static void fscache_write_op(struct fscache_operation *_op)
60884 page = results[0];
60885 _debug("gang %d [%lx]", n, page->index);
60886 if (page->index > op->store_limit) {
60887 - fscache_stat(&fscache_n_store_pages_over_limit);
60888 + fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
60889 goto superseded;
60890 }
60891
60892 @@ -814,7 +814,7 @@ static void fscache_write_op(struct fscache_operation *_op)
60893 spin_unlock(&cookie->stores_lock);
60894 spin_unlock(&object->lock);
60895
60896 - fscache_stat(&fscache_n_store_pages);
60897 + fscache_stat_unchecked(&fscache_n_store_pages);
60898 fscache_stat(&fscache_n_cop_write_page);
60899 ret = object->cache->ops->write_page(op, page);
60900 fscache_stat_d(&fscache_n_cop_write_page);
60901 @@ -918,7 +918,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
60902 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
60903 ASSERT(PageFsCache(page));
60904
60905 - fscache_stat(&fscache_n_stores);
60906 + fscache_stat_unchecked(&fscache_n_stores);
60907
60908 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
60909 _leave(" = -ENOBUFS [invalidating]");
60910 @@ -977,7 +977,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
60911 spin_unlock(&cookie->stores_lock);
60912 spin_unlock(&object->lock);
60913
60914 - op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
60915 + op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
60916 op->store_limit = object->store_limit;
60917
60918 __fscache_use_cookie(cookie);
60919 @@ -986,8 +986,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
60920
60921 spin_unlock(&cookie->lock);
60922 radix_tree_preload_end();
60923 - fscache_stat(&fscache_n_store_ops);
60924 - fscache_stat(&fscache_n_stores_ok);
60925 + fscache_stat_unchecked(&fscache_n_store_ops);
60926 + fscache_stat_unchecked(&fscache_n_stores_ok);
60927
60928 /* the work queue now carries its own ref on the object */
60929 fscache_put_operation(&op->op);
60930 @@ -995,14 +995,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
60931 return 0;
60932
60933 already_queued:
60934 - fscache_stat(&fscache_n_stores_again);
60935 + fscache_stat_unchecked(&fscache_n_stores_again);
60936 already_pending:
60937 spin_unlock(&cookie->stores_lock);
60938 spin_unlock(&object->lock);
60939 spin_unlock(&cookie->lock);
60940 radix_tree_preload_end();
60941 kfree(op);
60942 - fscache_stat(&fscache_n_stores_ok);
60943 + fscache_stat_unchecked(&fscache_n_stores_ok);
60944 _leave(" = 0");
60945 return 0;
60946
60947 @@ -1024,14 +1024,14 @@ nobufs:
60948 kfree(op);
60949 if (wake_cookie)
60950 __fscache_wake_unused_cookie(cookie);
60951 - fscache_stat(&fscache_n_stores_nobufs);
60952 + fscache_stat_unchecked(&fscache_n_stores_nobufs);
60953 _leave(" = -ENOBUFS");
60954 return -ENOBUFS;
60955
60956 nomem_free:
60957 kfree(op);
60958 nomem:
60959 - fscache_stat(&fscache_n_stores_oom);
60960 + fscache_stat_unchecked(&fscache_n_stores_oom);
60961 _leave(" = -ENOMEM");
60962 return -ENOMEM;
60963 }
60964 @@ -1049,7 +1049,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
60965 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
60966 ASSERTCMP(page, !=, NULL);
60967
60968 - fscache_stat(&fscache_n_uncaches);
60969 + fscache_stat_unchecked(&fscache_n_uncaches);
60970
60971 /* cache withdrawal may beat us to it */
60972 if (!PageFsCache(page))
60973 @@ -1100,7 +1100,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
60974 struct fscache_cookie *cookie = op->op.object->cookie;
60975
60976 #ifdef CONFIG_FSCACHE_STATS
60977 - atomic_inc(&fscache_n_marks);
60978 + atomic_inc_unchecked(&fscache_n_marks);
60979 #endif
60980
60981 _debug("- mark %p{%lx}", page, page->index);
60982 diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
60983 index 40d13c7..ddf52b9 100644
60984 --- a/fs/fscache/stats.c
60985 +++ b/fs/fscache/stats.c
60986 @@ -18,99 +18,99 @@
60987 /*
60988 * operation counters
60989 */
60990 -atomic_t fscache_n_op_pend;
60991 -atomic_t fscache_n_op_run;
60992 -atomic_t fscache_n_op_enqueue;
60993 -atomic_t fscache_n_op_requeue;
60994 -atomic_t fscache_n_op_deferred_release;
60995 -atomic_t fscache_n_op_release;
60996 -atomic_t fscache_n_op_gc;
60997 -atomic_t fscache_n_op_cancelled;
60998 -atomic_t fscache_n_op_rejected;
60999 +atomic_unchecked_t fscache_n_op_pend;
61000 +atomic_unchecked_t fscache_n_op_run;
61001 +atomic_unchecked_t fscache_n_op_enqueue;
61002 +atomic_unchecked_t fscache_n_op_requeue;
61003 +atomic_unchecked_t fscache_n_op_deferred_release;
61004 +atomic_unchecked_t fscache_n_op_release;
61005 +atomic_unchecked_t fscache_n_op_gc;
61006 +atomic_unchecked_t fscache_n_op_cancelled;
61007 +atomic_unchecked_t fscache_n_op_rejected;
61008
61009 -atomic_t fscache_n_attr_changed;
61010 -atomic_t fscache_n_attr_changed_ok;
61011 -atomic_t fscache_n_attr_changed_nobufs;
61012 -atomic_t fscache_n_attr_changed_nomem;
61013 -atomic_t fscache_n_attr_changed_calls;
61014 +atomic_unchecked_t fscache_n_attr_changed;
61015 +atomic_unchecked_t fscache_n_attr_changed_ok;
61016 +atomic_unchecked_t fscache_n_attr_changed_nobufs;
61017 +atomic_unchecked_t fscache_n_attr_changed_nomem;
61018 +atomic_unchecked_t fscache_n_attr_changed_calls;
61019
61020 -atomic_t fscache_n_allocs;
61021 -atomic_t fscache_n_allocs_ok;
61022 -atomic_t fscache_n_allocs_wait;
61023 -atomic_t fscache_n_allocs_nobufs;
61024 -atomic_t fscache_n_allocs_intr;
61025 -atomic_t fscache_n_allocs_object_dead;
61026 -atomic_t fscache_n_alloc_ops;
61027 -atomic_t fscache_n_alloc_op_waits;
61028 +atomic_unchecked_t fscache_n_allocs;
61029 +atomic_unchecked_t fscache_n_allocs_ok;
61030 +atomic_unchecked_t fscache_n_allocs_wait;
61031 +atomic_unchecked_t fscache_n_allocs_nobufs;
61032 +atomic_unchecked_t fscache_n_allocs_intr;
61033 +atomic_unchecked_t fscache_n_allocs_object_dead;
61034 +atomic_unchecked_t fscache_n_alloc_ops;
61035 +atomic_unchecked_t fscache_n_alloc_op_waits;
61036
61037 -atomic_t fscache_n_retrievals;
61038 -atomic_t fscache_n_retrievals_ok;
61039 -atomic_t fscache_n_retrievals_wait;
61040 -atomic_t fscache_n_retrievals_nodata;
61041 -atomic_t fscache_n_retrievals_nobufs;
61042 -atomic_t fscache_n_retrievals_intr;
61043 -atomic_t fscache_n_retrievals_nomem;
61044 -atomic_t fscache_n_retrievals_object_dead;
61045 -atomic_t fscache_n_retrieval_ops;
61046 -atomic_t fscache_n_retrieval_op_waits;
61047 +atomic_unchecked_t fscache_n_retrievals;
61048 +atomic_unchecked_t fscache_n_retrievals_ok;
61049 +atomic_unchecked_t fscache_n_retrievals_wait;
61050 +atomic_unchecked_t fscache_n_retrievals_nodata;
61051 +atomic_unchecked_t fscache_n_retrievals_nobufs;
61052 +atomic_unchecked_t fscache_n_retrievals_intr;
61053 +atomic_unchecked_t fscache_n_retrievals_nomem;
61054 +atomic_unchecked_t fscache_n_retrievals_object_dead;
61055 +atomic_unchecked_t fscache_n_retrieval_ops;
61056 +atomic_unchecked_t fscache_n_retrieval_op_waits;
61057
61058 -atomic_t fscache_n_stores;
61059 -atomic_t fscache_n_stores_ok;
61060 -atomic_t fscache_n_stores_again;
61061 -atomic_t fscache_n_stores_nobufs;
61062 -atomic_t fscache_n_stores_oom;
61063 -atomic_t fscache_n_store_ops;
61064 -atomic_t fscache_n_store_calls;
61065 -atomic_t fscache_n_store_pages;
61066 -atomic_t fscache_n_store_radix_deletes;
61067 -atomic_t fscache_n_store_pages_over_limit;
61068 +atomic_unchecked_t fscache_n_stores;
61069 +atomic_unchecked_t fscache_n_stores_ok;
61070 +atomic_unchecked_t fscache_n_stores_again;
61071 +atomic_unchecked_t fscache_n_stores_nobufs;
61072 +atomic_unchecked_t fscache_n_stores_oom;
61073 +atomic_unchecked_t fscache_n_store_ops;
61074 +atomic_unchecked_t fscache_n_store_calls;
61075 +atomic_unchecked_t fscache_n_store_pages;
61076 +atomic_unchecked_t fscache_n_store_radix_deletes;
61077 +atomic_unchecked_t fscache_n_store_pages_over_limit;
61078
61079 -atomic_t fscache_n_store_vmscan_not_storing;
61080 -atomic_t fscache_n_store_vmscan_gone;
61081 -atomic_t fscache_n_store_vmscan_busy;
61082 -atomic_t fscache_n_store_vmscan_cancelled;
61083 -atomic_t fscache_n_store_vmscan_wait;
61084 +atomic_unchecked_t fscache_n_store_vmscan_not_storing;
61085 +atomic_unchecked_t fscache_n_store_vmscan_gone;
61086 +atomic_unchecked_t fscache_n_store_vmscan_busy;
61087 +atomic_unchecked_t fscache_n_store_vmscan_cancelled;
61088 +atomic_unchecked_t fscache_n_store_vmscan_wait;
61089
61090 -atomic_t fscache_n_marks;
61091 -atomic_t fscache_n_uncaches;
61092 +atomic_unchecked_t fscache_n_marks;
61093 +atomic_unchecked_t fscache_n_uncaches;
61094
61095 -atomic_t fscache_n_acquires;
61096 -atomic_t fscache_n_acquires_null;
61097 -atomic_t fscache_n_acquires_no_cache;
61098 -atomic_t fscache_n_acquires_ok;
61099 -atomic_t fscache_n_acquires_nobufs;
61100 -atomic_t fscache_n_acquires_oom;
61101 +atomic_unchecked_t fscache_n_acquires;
61102 +atomic_unchecked_t fscache_n_acquires_null;
61103 +atomic_unchecked_t fscache_n_acquires_no_cache;
61104 +atomic_unchecked_t fscache_n_acquires_ok;
61105 +atomic_unchecked_t fscache_n_acquires_nobufs;
61106 +atomic_unchecked_t fscache_n_acquires_oom;
61107
61108 -atomic_t fscache_n_invalidates;
61109 -atomic_t fscache_n_invalidates_run;
61110 +atomic_unchecked_t fscache_n_invalidates;
61111 +atomic_unchecked_t fscache_n_invalidates_run;
61112
61113 -atomic_t fscache_n_updates;
61114 -atomic_t fscache_n_updates_null;
61115 -atomic_t fscache_n_updates_run;
61116 +atomic_unchecked_t fscache_n_updates;
61117 +atomic_unchecked_t fscache_n_updates_null;
61118 +atomic_unchecked_t fscache_n_updates_run;
61119
61120 -atomic_t fscache_n_relinquishes;
61121 -atomic_t fscache_n_relinquishes_null;
61122 -atomic_t fscache_n_relinquishes_waitcrt;
61123 -atomic_t fscache_n_relinquishes_retire;
61124 +atomic_unchecked_t fscache_n_relinquishes;
61125 +atomic_unchecked_t fscache_n_relinquishes_null;
61126 +atomic_unchecked_t fscache_n_relinquishes_waitcrt;
61127 +atomic_unchecked_t fscache_n_relinquishes_retire;
61128
61129 -atomic_t fscache_n_cookie_index;
61130 -atomic_t fscache_n_cookie_data;
61131 -atomic_t fscache_n_cookie_special;
61132 +atomic_unchecked_t fscache_n_cookie_index;
61133 +atomic_unchecked_t fscache_n_cookie_data;
61134 +atomic_unchecked_t fscache_n_cookie_special;
61135
61136 -atomic_t fscache_n_object_alloc;
61137 -atomic_t fscache_n_object_no_alloc;
61138 -atomic_t fscache_n_object_lookups;
61139 -atomic_t fscache_n_object_lookups_negative;
61140 -atomic_t fscache_n_object_lookups_positive;
61141 -atomic_t fscache_n_object_lookups_timed_out;
61142 -atomic_t fscache_n_object_created;
61143 -atomic_t fscache_n_object_avail;
61144 -atomic_t fscache_n_object_dead;
61145 +atomic_unchecked_t fscache_n_object_alloc;
61146 +atomic_unchecked_t fscache_n_object_no_alloc;
61147 +atomic_unchecked_t fscache_n_object_lookups;
61148 +atomic_unchecked_t fscache_n_object_lookups_negative;
61149 +atomic_unchecked_t fscache_n_object_lookups_positive;
61150 +atomic_unchecked_t fscache_n_object_lookups_timed_out;
61151 +atomic_unchecked_t fscache_n_object_created;
61152 +atomic_unchecked_t fscache_n_object_avail;
61153 +atomic_unchecked_t fscache_n_object_dead;
61154
61155 -atomic_t fscache_n_checkaux_none;
61156 -atomic_t fscache_n_checkaux_okay;
61157 -atomic_t fscache_n_checkaux_update;
61158 -atomic_t fscache_n_checkaux_obsolete;
61159 +atomic_unchecked_t fscache_n_checkaux_none;
61160 +atomic_unchecked_t fscache_n_checkaux_okay;
61161 +atomic_unchecked_t fscache_n_checkaux_update;
61162 +atomic_unchecked_t fscache_n_checkaux_obsolete;
61163
61164 atomic_t fscache_n_cop_alloc_object;
61165 atomic_t fscache_n_cop_lookup_object;
61166 @@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
61167 seq_puts(m, "FS-Cache statistics\n");
61168
61169 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
61170 - atomic_read(&fscache_n_cookie_index),
61171 - atomic_read(&fscache_n_cookie_data),
61172 - atomic_read(&fscache_n_cookie_special));
61173 + atomic_read_unchecked(&fscache_n_cookie_index),
61174 + atomic_read_unchecked(&fscache_n_cookie_data),
61175 + atomic_read_unchecked(&fscache_n_cookie_special));
61176
61177 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
61178 - atomic_read(&fscache_n_object_alloc),
61179 - atomic_read(&fscache_n_object_no_alloc),
61180 - atomic_read(&fscache_n_object_avail),
61181 - atomic_read(&fscache_n_object_dead));
61182 + atomic_read_unchecked(&fscache_n_object_alloc),
61183 + atomic_read_unchecked(&fscache_n_object_no_alloc),
61184 + atomic_read_unchecked(&fscache_n_object_avail),
61185 + atomic_read_unchecked(&fscache_n_object_dead));
61186 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
61187 - atomic_read(&fscache_n_checkaux_none),
61188 - atomic_read(&fscache_n_checkaux_okay),
61189 - atomic_read(&fscache_n_checkaux_update),
61190 - atomic_read(&fscache_n_checkaux_obsolete));
61191 + atomic_read_unchecked(&fscache_n_checkaux_none),
61192 + atomic_read_unchecked(&fscache_n_checkaux_okay),
61193 + atomic_read_unchecked(&fscache_n_checkaux_update),
61194 + atomic_read_unchecked(&fscache_n_checkaux_obsolete));
61195
61196 seq_printf(m, "Pages : mrk=%u unc=%u\n",
61197 - atomic_read(&fscache_n_marks),
61198 - atomic_read(&fscache_n_uncaches));
61199 + atomic_read_unchecked(&fscache_n_marks),
61200 + atomic_read_unchecked(&fscache_n_uncaches));
61201
61202 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
61203 " oom=%u\n",
61204 - atomic_read(&fscache_n_acquires),
61205 - atomic_read(&fscache_n_acquires_null),
61206 - atomic_read(&fscache_n_acquires_no_cache),
61207 - atomic_read(&fscache_n_acquires_ok),
61208 - atomic_read(&fscache_n_acquires_nobufs),
61209 - atomic_read(&fscache_n_acquires_oom));
61210 + atomic_read_unchecked(&fscache_n_acquires),
61211 + atomic_read_unchecked(&fscache_n_acquires_null),
61212 + atomic_read_unchecked(&fscache_n_acquires_no_cache),
61213 + atomic_read_unchecked(&fscache_n_acquires_ok),
61214 + atomic_read_unchecked(&fscache_n_acquires_nobufs),
61215 + atomic_read_unchecked(&fscache_n_acquires_oom));
61216
61217 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
61218 - atomic_read(&fscache_n_object_lookups),
61219 - atomic_read(&fscache_n_object_lookups_negative),
61220 - atomic_read(&fscache_n_object_lookups_positive),
61221 - atomic_read(&fscache_n_object_created),
61222 - atomic_read(&fscache_n_object_lookups_timed_out));
61223 + atomic_read_unchecked(&fscache_n_object_lookups),
61224 + atomic_read_unchecked(&fscache_n_object_lookups_negative),
61225 + atomic_read_unchecked(&fscache_n_object_lookups_positive),
61226 + atomic_read_unchecked(&fscache_n_object_created),
61227 + atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
61228
61229 seq_printf(m, "Invals : n=%u run=%u\n",
61230 - atomic_read(&fscache_n_invalidates),
61231 - atomic_read(&fscache_n_invalidates_run));
61232 + atomic_read_unchecked(&fscache_n_invalidates),
61233 + atomic_read_unchecked(&fscache_n_invalidates_run));
61234
61235 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
61236 - atomic_read(&fscache_n_updates),
61237 - atomic_read(&fscache_n_updates_null),
61238 - atomic_read(&fscache_n_updates_run));
61239 + atomic_read_unchecked(&fscache_n_updates),
61240 + atomic_read_unchecked(&fscache_n_updates_null),
61241 + atomic_read_unchecked(&fscache_n_updates_run));
61242
61243 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
61244 - atomic_read(&fscache_n_relinquishes),
61245 - atomic_read(&fscache_n_relinquishes_null),
61246 - atomic_read(&fscache_n_relinquishes_waitcrt),
61247 - atomic_read(&fscache_n_relinquishes_retire));
61248 + atomic_read_unchecked(&fscache_n_relinquishes),
61249 + atomic_read_unchecked(&fscache_n_relinquishes_null),
61250 + atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
61251 + atomic_read_unchecked(&fscache_n_relinquishes_retire));
61252
61253 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
61254 - atomic_read(&fscache_n_attr_changed),
61255 - atomic_read(&fscache_n_attr_changed_ok),
61256 - atomic_read(&fscache_n_attr_changed_nobufs),
61257 - atomic_read(&fscache_n_attr_changed_nomem),
61258 - atomic_read(&fscache_n_attr_changed_calls));
61259 + atomic_read_unchecked(&fscache_n_attr_changed),
61260 + atomic_read_unchecked(&fscache_n_attr_changed_ok),
61261 + atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
61262 + atomic_read_unchecked(&fscache_n_attr_changed_nomem),
61263 + atomic_read_unchecked(&fscache_n_attr_changed_calls));
61264
61265 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
61266 - atomic_read(&fscache_n_allocs),
61267 - atomic_read(&fscache_n_allocs_ok),
61268 - atomic_read(&fscache_n_allocs_wait),
61269 - atomic_read(&fscache_n_allocs_nobufs),
61270 - atomic_read(&fscache_n_allocs_intr));
61271 + atomic_read_unchecked(&fscache_n_allocs),
61272 + atomic_read_unchecked(&fscache_n_allocs_ok),
61273 + atomic_read_unchecked(&fscache_n_allocs_wait),
61274 + atomic_read_unchecked(&fscache_n_allocs_nobufs),
61275 + atomic_read_unchecked(&fscache_n_allocs_intr));
61276 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
61277 - atomic_read(&fscache_n_alloc_ops),
61278 - atomic_read(&fscache_n_alloc_op_waits),
61279 - atomic_read(&fscache_n_allocs_object_dead));
61280 + atomic_read_unchecked(&fscache_n_alloc_ops),
61281 + atomic_read_unchecked(&fscache_n_alloc_op_waits),
61282 + atomic_read_unchecked(&fscache_n_allocs_object_dead));
61283
61284 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
61285 " int=%u oom=%u\n",
61286 - atomic_read(&fscache_n_retrievals),
61287 - atomic_read(&fscache_n_retrievals_ok),
61288 - atomic_read(&fscache_n_retrievals_wait),
61289 - atomic_read(&fscache_n_retrievals_nodata),
61290 - atomic_read(&fscache_n_retrievals_nobufs),
61291 - atomic_read(&fscache_n_retrievals_intr),
61292 - atomic_read(&fscache_n_retrievals_nomem));
61293 + atomic_read_unchecked(&fscache_n_retrievals),
61294 + atomic_read_unchecked(&fscache_n_retrievals_ok),
61295 + atomic_read_unchecked(&fscache_n_retrievals_wait),
61296 + atomic_read_unchecked(&fscache_n_retrievals_nodata),
61297 + atomic_read_unchecked(&fscache_n_retrievals_nobufs),
61298 + atomic_read_unchecked(&fscache_n_retrievals_intr),
61299 + atomic_read_unchecked(&fscache_n_retrievals_nomem));
61300 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
61301 - atomic_read(&fscache_n_retrieval_ops),
61302 - atomic_read(&fscache_n_retrieval_op_waits),
61303 - atomic_read(&fscache_n_retrievals_object_dead));
61304 + atomic_read_unchecked(&fscache_n_retrieval_ops),
61305 + atomic_read_unchecked(&fscache_n_retrieval_op_waits),
61306 + atomic_read_unchecked(&fscache_n_retrievals_object_dead));
61307
61308 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
61309 - atomic_read(&fscache_n_stores),
61310 - atomic_read(&fscache_n_stores_ok),
61311 - atomic_read(&fscache_n_stores_again),
61312 - atomic_read(&fscache_n_stores_nobufs),
61313 - atomic_read(&fscache_n_stores_oom));
61314 + atomic_read_unchecked(&fscache_n_stores),
61315 + atomic_read_unchecked(&fscache_n_stores_ok),
61316 + atomic_read_unchecked(&fscache_n_stores_again),
61317 + atomic_read_unchecked(&fscache_n_stores_nobufs),
61318 + atomic_read_unchecked(&fscache_n_stores_oom));
61319 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
61320 - atomic_read(&fscache_n_store_ops),
61321 - atomic_read(&fscache_n_store_calls),
61322 - atomic_read(&fscache_n_store_pages),
61323 - atomic_read(&fscache_n_store_radix_deletes),
61324 - atomic_read(&fscache_n_store_pages_over_limit));
61325 + atomic_read_unchecked(&fscache_n_store_ops),
61326 + atomic_read_unchecked(&fscache_n_store_calls),
61327 + atomic_read_unchecked(&fscache_n_store_pages),
61328 + atomic_read_unchecked(&fscache_n_store_radix_deletes),
61329 + atomic_read_unchecked(&fscache_n_store_pages_over_limit));
61330
61331 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
61332 - atomic_read(&fscache_n_store_vmscan_not_storing),
61333 - atomic_read(&fscache_n_store_vmscan_gone),
61334 - atomic_read(&fscache_n_store_vmscan_busy),
61335 - atomic_read(&fscache_n_store_vmscan_cancelled),
61336 - atomic_read(&fscache_n_store_vmscan_wait));
61337 + atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
61338 + atomic_read_unchecked(&fscache_n_store_vmscan_gone),
61339 + atomic_read_unchecked(&fscache_n_store_vmscan_busy),
61340 + atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
61341 + atomic_read_unchecked(&fscache_n_store_vmscan_wait));
61342
61343 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
61344 - atomic_read(&fscache_n_op_pend),
61345 - atomic_read(&fscache_n_op_run),
61346 - atomic_read(&fscache_n_op_enqueue),
61347 - atomic_read(&fscache_n_op_cancelled),
61348 - atomic_read(&fscache_n_op_rejected));
61349 + atomic_read_unchecked(&fscache_n_op_pend),
61350 + atomic_read_unchecked(&fscache_n_op_run),
61351 + atomic_read_unchecked(&fscache_n_op_enqueue),
61352 + atomic_read_unchecked(&fscache_n_op_cancelled),
61353 + atomic_read_unchecked(&fscache_n_op_rejected));
61354 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
61355 - atomic_read(&fscache_n_op_deferred_release),
61356 - atomic_read(&fscache_n_op_release),
61357 - atomic_read(&fscache_n_op_gc));
61358 + atomic_read_unchecked(&fscache_n_op_deferred_release),
61359 + atomic_read_unchecked(&fscache_n_op_release),
61360 + atomic_read_unchecked(&fscache_n_op_gc));
61361
61362 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
61363 atomic_read(&fscache_n_cop_alloc_object),
61364 diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
61365 index 13b691a..1ffca5ae 100644
61366 --- a/fs/fuse/cuse.c
61367 +++ b/fs/fuse/cuse.c
61368 @@ -607,10 +607,12 @@ static int __init cuse_init(void)
61369 INIT_LIST_HEAD(&cuse_conntbl[i]);
61370
61371 /* inherit and extend fuse_dev_operations */
61372 - cuse_channel_fops = fuse_dev_operations;
61373 - cuse_channel_fops.owner = THIS_MODULE;
61374 - cuse_channel_fops.open = cuse_channel_open;
61375 - cuse_channel_fops.release = cuse_channel_release;
61376 + pax_open_kernel();
61377 + memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
61378 + *(void **)&cuse_channel_fops.owner = THIS_MODULE;
61379 + *(void **)&cuse_channel_fops.open = cuse_channel_open;
61380 + *(void **)&cuse_channel_fops.release = cuse_channel_release;
61381 + pax_close_kernel();
61382
61383 cuse_class = class_create(THIS_MODULE, "cuse");
61384 if (IS_ERR(cuse_class))
61385 diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
61386 index aac71ce..fcd6a1b 100644
61387 --- a/fs/fuse/dev.c
61388 +++ b/fs/fuse/dev.c
61389 @@ -1323,7 +1323,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
61390 ret = 0;
61391 pipe_lock(pipe);
61392
61393 - if (!pipe->readers) {
61394 + if (!atomic_read(&pipe->readers)) {
61395 send_sig(SIGPIPE, current, 0);
61396 if (!ret)
61397 ret = -EPIPE;
61398 @@ -1352,7 +1352,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
61399 page_nr++;
61400 ret += buf->len;
61401
61402 - if (pipe->files)
61403 + if (atomic_read(&pipe->files))
61404 do_wakeup = 1;
61405 }
61406
61407 diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
61408 index 4219835..3473b7e 100644
61409 --- a/fs/fuse/dir.c
61410 +++ b/fs/fuse/dir.c
61411 @@ -1478,7 +1478,7 @@ static char *read_link(struct dentry *dentry)
61412 return link;
61413 }
61414
61415 -static void free_link(char *link)
61416 +static void free_link(const char *link)
61417 {
61418 if (!IS_ERR(link))
61419 free_page((unsigned long) link);
61420 diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
61421 index 9c470fd..aae410e 100644
61422 --- a/fs/hostfs/hostfs_kern.c
61423 +++ b/fs/hostfs/hostfs_kern.c
61424 @@ -898,7 +898,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
61425
61426 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
61427 {
61428 - char *s = nd_get_link(nd);
61429 + const char *s = nd_get_link(nd);
61430 if (!IS_ERR(s))
61431 __putname(s);
61432 }
61433 diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
61434 index e19d4c0..8a357a9 100644
61435 --- a/fs/hugetlbfs/inode.c
61436 +++ b/fs/hugetlbfs/inode.c
61437 @@ -152,6 +152,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
61438 struct mm_struct *mm = current->mm;
61439 struct vm_area_struct *vma;
61440 struct hstate *h = hstate_file(file);
61441 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
61442 struct vm_unmapped_area_info info;
61443
61444 if (len & ~huge_page_mask(h))
61445 @@ -165,17 +166,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
61446 return addr;
61447 }
61448
61449 +#ifdef CONFIG_PAX_RANDMMAP
61450 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
61451 +#endif
61452 +
61453 if (addr) {
61454 addr = ALIGN(addr, huge_page_size(h));
61455 vma = find_vma(mm, addr);
61456 - if (TASK_SIZE - len >= addr &&
61457 - (!vma || addr + len <= vma->vm_start))
61458 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
61459 return addr;
61460 }
61461
61462 info.flags = 0;
61463 info.length = len;
61464 info.low_limit = TASK_UNMAPPED_BASE;
61465 +
61466 +#ifdef CONFIG_PAX_RANDMMAP
61467 + if (mm->pax_flags & MF_PAX_RANDMMAP)
61468 + info.low_limit += mm->delta_mmap;
61469 +#endif
61470 +
61471 info.high_limit = TASK_SIZE;
61472 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
61473 info.align_offset = 0;
61474 @@ -921,7 +931,7 @@ static struct file_system_type hugetlbfs_fs_type = {
61475 };
61476 MODULE_ALIAS_FS("hugetlbfs");
61477
61478 -static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
61479 +struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
61480
61481 static int can_do_hugetlb_shm(void)
61482 {
61483 diff --git a/fs/inode.c b/fs/inode.c
61484 index d2fb2f2..a6444b0 100644
61485 --- a/fs/inode.c
61486 +++ b/fs/inode.c
61487 @@ -839,16 +839,20 @@ unsigned int get_next_ino(void)
61488 unsigned int *p = &get_cpu_var(last_ino);
61489 unsigned int res = *p;
61490
61491 +start:
61492 +
61493 #ifdef CONFIG_SMP
61494 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
61495 - static atomic_t shared_last_ino;
61496 - int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
61497 + static atomic_unchecked_t shared_last_ino;
61498 + int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
61499
61500 res = next - LAST_INO_BATCH;
61501 }
61502 #endif
61503
61504 - *p = ++res;
61505 + if (unlikely(!++res))
61506 + goto start; /* never zero */
61507 + *p = res;
61508 put_cpu_var(last_ino);
61509 return res;
61510 }
61511 diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
61512 index 4a6cf28..d3a29d3 100644
61513 --- a/fs/jffs2/erase.c
61514 +++ b/fs/jffs2/erase.c
61515 @@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
61516 struct jffs2_unknown_node marker = {
61517 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
61518 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
61519 - .totlen = cpu_to_je32(c->cleanmarker_size)
61520 + .totlen = cpu_to_je32(c->cleanmarker_size),
61521 + .hdr_crc = cpu_to_je32(0)
61522 };
61523
61524 jffs2_prealloc_raw_node_refs(c, jeb, 1);
61525 diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
61526 index a6597d6..41b30ec 100644
61527 --- a/fs/jffs2/wbuf.c
61528 +++ b/fs/jffs2/wbuf.c
61529 @@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
61530 {
61531 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
61532 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
61533 - .totlen = constant_cpu_to_je32(8)
61534 + .totlen = constant_cpu_to_je32(8),
61535 + .hdr_crc = constant_cpu_to_je32(0)
61536 };
61537
61538 /*
61539 diff --git a/fs/jfs/super.c b/fs/jfs/super.c
61540 index 97f7fda..09bd33d 100644
61541 --- a/fs/jfs/super.c
61542 +++ b/fs/jfs/super.c
61543 @@ -885,7 +885,7 @@ static int __init init_jfs_fs(void)
61544
61545 jfs_inode_cachep =
61546 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
61547 - SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
61548 + SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
61549 init_once);
61550 if (jfs_inode_cachep == NULL)
61551 return -ENOMEM;
61552 diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
61553 index ac127cd..d8079db 100644
61554 --- a/fs/kernfs/dir.c
61555 +++ b/fs/kernfs/dir.c
61556 @@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
61557 *
61558 * Returns 31 bit hash of ns + name (so it fits in an off_t )
61559 */
61560 -static unsigned int kernfs_name_hash(const char *name, const void *ns)
61561 +static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
61562 {
61563 unsigned long hash = init_name_hash();
61564 unsigned int len = strlen(name);
61565 diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
61566 index 5e9a80c..3853a24 100644
61567 --- a/fs/kernfs/file.c
61568 +++ b/fs/kernfs/file.c
61569 @@ -33,7 +33,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
61570
61571 struct kernfs_open_node {
61572 atomic_t refcnt;
61573 - atomic_t event;
61574 + atomic_unchecked_t event;
61575 wait_queue_head_t poll;
61576 struct list_head files; /* goes through kernfs_open_file.list */
61577 };
61578 @@ -149,7 +149,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
61579 {
61580 struct kernfs_open_file *of = sf->private;
61581
61582 - of->event = atomic_read(&of->kn->attr.open->event);
61583 + of->event = atomic_read_unchecked(&of->kn->attr.open->event);
61584
61585 return of->kn->attr.ops->seq_show(sf, v);
61586 }
61587 @@ -361,12 +361,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
61588 return ret;
61589 }
61590
61591 -static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
61592 - void *buf, int len, int write)
61593 +static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
61594 + void *buf, size_t len, int write)
61595 {
61596 struct file *file = vma->vm_file;
61597 struct kernfs_open_file *of = kernfs_of(file);
61598 - int ret;
61599 + ssize_t ret;
61600
61601 if (!of->vm_ops)
61602 return -EINVAL;
61603 @@ -567,7 +567,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
61604 return -ENOMEM;
61605
61606 atomic_set(&new_on->refcnt, 0);
61607 - atomic_set(&new_on->event, 1);
61608 + atomic_set_unchecked(&new_on->event, 1);
61609 init_waitqueue_head(&new_on->poll);
61610 INIT_LIST_HEAD(&new_on->files);
61611 goto retry;
61612 @@ -773,7 +773,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
61613
61614 kernfs_put_active(kn);
61615
61616 - if (of->event != atomic_read(&on->event))
61617 + if (of->event != atomic_read_unchecked(&on->event))
61618 goto trigger;
61619
61620 return DEFAULT_POLLMASK;
61621 @@ -798,7 +798,7 @@ void kernfs_notify(struct kernfs_node *kn)
61622 if (!WARN_ON(kernfs_type(kn) != KERNFS_FILE)) {
61623 on = kn->attr.open;
61624 if (on) {
61625 - atomic_inc(&on->event);
61626 + atomic_inc_unchecked(&on->event);
61627 wake_up_interruptible(&on->poll);
61628 }
61629 }
61630 diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
61631 index 8a19889..4c3069a 100644
61632 --- a/fs/kernfs/symlink.c
61633 +++ b/fs/kernfs/symlink.c
61634 @@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
61635 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
61636 void *cookie)
61637 {
61638 - char *page = nd_get_link(nd);
61639 + const char *page = nd_get_link(nd);
61640 if (!IS_ERR(page))
61641 free_page((unsigned long)page);
61642 }
61643 diff --git a/fs/libfs.c b/fs/libfs.c
61644 index a184424..944ddce 100644
61645 --- a/fs/libfs.c
61646 +++ b/fs/libfs.c
61647 @@ -159,6 +159,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
61648
61649 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
61650 struct dentry *next = list_entry(p, struct dentry, d_u.d_child);
61651 + char d_name[sizeof(next->d_iname)];
61652 + const unsigned char *name;
61653 +
61654 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
61655 if (!simple_positive(next)) {
61656 spin_unlock(&next->d_lock);
61657 @@ -167,7 +170,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
61658
61659 spin_unlock(&next->d_lock);
61660 spin_unlock(&dentry->d_lock);
61661 - if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
61662 + name = next->d_name.name;
61663 + if (name == next->d_iname) {
61664 + memcpy(d_name, name, next->d_name.len);
61665 + name = d_name;
61666 + }
61667 + if (!dir_emit(ctx, name, next->d_name.len,
61668 next->d_inode->i_ino, dt_type(next->d_inode)))
61669 return 0;
61670 spin_lock(&dentry->d_lock);
61671 @@ -999,7 +1007,7 @@ EXPORT_SYMBOL(noop_fsync);
61672 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
61673 void *cookie)
61674 {
61675 - char *s = nd_get_link(nd);
61676 + const char *s = nd_get_link(nd);
61677 if (!IS_ERR(s))
61678 kfree(s);
61679 }
61680 diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
61681 index acd3947..1f896e2 100644
61682 --- a/fs/lockd/clntproc.c
61683 +++ b/fs/lockd/clntproc.c
61684 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
61685 /*
61686 * Cookie counter for NLM requests
61687 */
61688 -static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
61689 +static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
61690
61691 void nlmclnt_next_cookie(struct nlm_cookie *c)
61692 {
61693 - u32 cookie = atomic_inc_return(&nlm_cookie);
61694 + u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
61695
61696 memcpy(c->data, &cookie, 4);
61697 c->len=4;
61698 diff --git a/fs/locks.c b/fs/locks.c
61699 index e390bd9..c79870e 100644
61700 --- a/fs/locks.c
61701 +++ b/fs/locks.c
61702 @@ -2315,16 +2315,16 @@ void locks_remove_file(struct file *filp)
61703 locks_remove_posix(filp, (fl_owner_t)filp);
61704
61705 if (filp->f_op->flock) {
61706 - struct file_lock fl = {
61707 + struct file_lock flock = {
61708 .fl_pid = current->tgid,
61709 .fl_file = filp,
61710 .fl_flags = FL_FLOCK,
61711 .fl_type = F_UNLCK,
61712 .fl_end = OFFSET_MAX,
61713 };
61714 - filp->f_op->flock(filp, F_SETLKW, &fl);
61715 - if (fl.fl_ops && fl.fl_ops->fl_release_private)
61716 - fl.fl_ops->fl_release_private(&fl);
61717 + filp->f_op->flock(filp, F_SETLKW, &flock);
61718 + if (flock.fl_ops && flock.fl_ops->fl_release_private)
61719 + flock.fl_ops->fl_release_private(&flock);
61720 }
61721
61722 spin_lock(&inode->i_lock);
61723 diff --git a/fs/mount.h b/fs/mount.h
61724 index d55297f..f5b28c5 100644
61725 --- a/fs/mount.h
61726 +++ b/fs/mount.h
61727 @@ -11,7 +11,7 @@ struct mnt_namespace {
61728 u64 seq; /* Sequence number to prevent loops */
61729 wait_queue_head_t poll;
61730 u64 event;
61731 -};
61732 +} __randomize_layout;
61733
61734 struct mnt_pcp {
61735 int mnt_count;
61736 @@ -57,7 +57,7 @@ struct mount {
61737 int mnt_expiry_mark; /* true if marked for expiry */
61738 int mnt_pinned;
61739 struct path mnt_ex_mountpoint;
61740 -};
61741 +} __randomize_layout;
61742
61743 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
61744
61745 diff --git a/fs/namei.c b/fs/namei.c
61746 index 985c6f3..f67a0f8 100644
61747 --- a/fs/namei.c
61748 +++ b/fs/namei.c
61749 @@ -330,17 +330,32 @@ int generic_permission(struct inode *inode, int mask)
61750 if (ret != -EACCES)
61751 return ret;
61752
61753 +#ifdef CONFIG_GRKERNSEC
61754 + /* we'll block if we have to log due to a denied capability use */
61755 + if (mask & MAY_NOT_BLOCK)
61756 + return -ECHILD;
61757 +#endif
61758 +
61759 if (S_ISDIR(inode->i_mode)) {
61760 /* DACs are overridable for directories */
61761 - if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
61762 - return 0;
61763 if (!(mask & MAY_WRITE))
61764 - if (capable_wrt_inode_uidgid(inode,
61765 - CAP_DAC_READ_SEARCH))
61766 + if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
61767 + capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
61768 return 0;
61769 + if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
61770 + return 0;
61771 return -EACCES;
61772 }
61773 /*
61774 + * Searching includes executable on directories, else just read.
61775 + */
61776 + mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
61777 + if (mask == MAY_READ)
61778 + if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
61779 + capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
61780 + return 0;
61781 +
61782 + /*
61783 * Read/write DACs are always overridable.
61784 * Executable DACs are overridable when there is
61785 * at least one exec bit set.
61786 @@ -349,14 +364,6 @@ int generic_permission(struct inode *inode, int mask)
61787 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
61788 return 0;
61789
61790 - /*
61791 - * Searching includes executable on directories, else just read.
61792 - */
61793 - mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
61794 - if (mask == MAY_READ)
61795 - if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
61796 - return 0;
61797 -
61798 return -EACCES;
61799 }
61800 EXPORT_SYMBOL(generic_permission);
61801 @@ -824,7 +831,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
61802 {
61803 struct dentry *dentry = link->dentry;
61804 int error;
61805 - char *s;
61806 + const char *s;
61807
61808 BUG_ON(nd->flags & LOOKUP_RCU);
61809
61810 @@ -845,6 +852,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
61811 if (error)
61812 goto out_put_nd_path;
61813
61814 + if (gr_handle_follow_link(dentry->d_parent->d_inode,
61815 + dentry->d_inode, dentry, nd->path.mnt)) {
61816 + error = -EACCES;
61817 + goto out_put_nd_path;
61818 + }
61819 +
61820 nd->last_type = LAST_BIND;
61821 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
61822 error = PTR_ERR(*p);
61823 @@ -1596,6 +1609,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
61824 if (res)
61825 break;
61826 res = walk_component(nd, path, LOOKUP_FOLLOW);
61827 + if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
61828 + res = -EACCES;
61829 put_link(nd, &link, cookie);
61830 } while (res > 0);
61831
61832 @@ -1669,7 +1684,7 @@ EXPORT_SYMBOL(full_name_hash);
61833 static inline unsigned long hash_name(const char *name, unsigned int *hashp)
61834 {
61835 unsigned long a, b, adata, bdata, mask, hash, len;
61836 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
61837 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
61838
61839 hash = a = 0;
61840 len = -sizeof(unsigned long);
61841 @@ -1953,6 +1968,8 @@ static int path_lookupat(int dfd, const char *name,
61842 if (err)
61843 break;
61844 err = lookup_last(nd, &path);
61845 + if (!err && gr_handle_symlink_owner(&link, nd->inode))
61846 + err = -EACCES;
61847 put_link(nd, &link, cookie);
61848 }
61849 }
61850 @@ -1960,6 +1977,13 @@ static int path_lookupat(int dfd, const char *name,
61851 if (!err)
61852 err = complete_walk(nd);
61853
61854 + if (!err && !(nd->flags & LOOKUP_PARENT)) {
61855 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
61856 + path_put(&nd->path);
61857 + err = -ENOENT;
61858 + }
61859 + }
61860 +
61861 if (!err && nd->flags & LOOKUP_DIRECTORY) {
61862 if (!d_can_lookup(nd->path.dentry)) {
61863 path_put(&nd->path);
61864 @@ -1987,8 +2011,15 @@ static int filename_lookup(int dfd, struct filename *name,
61865 retval = path_lookupat(dfd, name->name,
61866 flags | LOOKUP_REVAL, nd);
61867
61868 - if (likely(!retval))
61869 + if (likely(!retval)) {
61870 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
61871 + if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
61872 + if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
61873 + path_put(&nd->path);
61874 + return -ENOENT;
61875 + }
61876 + }
61877 + }
61878 return retval;
61879 }
61880
61881 @@ -2569,6 +2600,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
61882 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
61883 return -EPERM;
61884
61885 + if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
61886 + return -EPERM;
61887 + if (gr_handle_rawio(inode))
61888 + return -EPERM;
61889 + if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
61890 + return -EACCES;
61891 +
61892 return 0;
61893 }
61894
61895 @@ -2800,7 +2838,7 @@ looked_up:
61896 * cleared otherwise prior to returning.
61897 */
61898 static int lookup_open(struct nameidata *nd, struct path *path,
61899 - struct file *file,
61900 + struct path *link, struct file *file,
61901 const struct open_flags *op,
61902 bool got_write, int *opened)
61903 {
61904 @@ -2835,6 +2873,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
61905 /* Negative dentry, just create the file */
61906 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
61907 umode_t mode = op->mode;
61908 +
61909 + if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
61910 + error = -EACCES;
61911 + goto out_dput;
61912 + }
61913 +
61914 + if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
61915 + error = -EACCES;
61916 + goto out_dput;
61917 + }
61918 +
61919 if (!IS_POSIXACL(dir->d_inode))
61920 mode &= ~current_umask();
61921 /*
61922 @@ -2856,6 +2905,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
61923 nd->flags & LOOKUP_EXCL);
61924 if (error)
61925 goto out_dput;
61926 + else
61927 + gr_handle_create(dentry, nd->path.mnt);
61928 }
61929 out_no_open:
61930 path->dentry = dentry;
61931 @@ -2870,7 +2921,7 @@ out_dput:
61932 /*
61933 * Handle the last step of open()
61934 */
61935 -static int do_last(struct nameidata *nd, struct path *path,
61936 +static int do_last(struct nameidata *nd, struct path *path, struct path *link,
61937 struct file *file, const struct open_flags *op,
61938 int *opened, struct filename *name)
61939 {
61940 @@ -2920,6 +2971,15 @@ static int do_last(struct nameidata *nd, struct path *path,
61941 if (error)
61942 return error;
61943
61944 + if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
61945 + error = -ENOENT;
61946 + goto out;
61947 + }
61948 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
61949 + error = -EACCES;
61950 + goto out;
61951 + }
61952 +
61953 audit_inode(name, dir, LOOKUP_PARENT);
61954 error = -EISDIR;
61955 /* trailing slashes? */
61956 @@ -2939,7 +2999,7 @@ retry_lookup:
61957 */
61958 }
61959 mutex_lock(&dir->d_inode->i_mutex);
61960 - error = lookup_open(nd, path, file, op, got_write, opened);
61961 + error = lookup_open(nd, path, link, file, op, got_write, opened);
61962 mutex_unlock(&dir->d_inode->i_mutex);
61963
61964 if (error <= 0) {
61965 @@ -2963,11 +3023,28 @@ retry_lookup:
61966 goto finish_open_created;
61967 }
61968
61969 + if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
61970 + error = -ENOENT;
61971 + goto exit_dput;
61972 + }
61973 + if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
61974 + error = -EACCES;
61975 + goto exit_dput;
61976 + }
61977 +
61978 /*
61979 * create/update audit record if it already exists.
61980 */
61981 - if (d_is_positive(path->dentry))
61982 + if (d_is_positive(path->dentry)) {
61983 + /* only check if O_CREAT is specified, all other checks need to go
61984 + into may_open */
61985 + if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
61986 + error = -EACCES;
61987 + goto exit_dput;
61988 + }
61989 +
61990 audit_inode(name, path->dentry, 0);
61991 + }
61992
61993 /*
61994 * If atomic_open() acquired write access it is dropped now due to
61995 @@ -3008,6 +3085,11 @@ finish_lookup:
61996 }
61997 }
61998 BUG_ON(inode != path->dentry->d_inode);
61999 + /* if we're resolving a symlink to another symlink */
62000 + if (link && gr_handle_symlink_owner(link, inode)) {
62001 + error = -EACCES;
62002 + goto out;
62003 + }
62004 return 1;
62005 }
62006
62007 @@ -3017,7 +3099,6 @@ finish_lookup:
62008 save_parent.dentry = nd->path.dentry;
62009 save_parent.mnt = mntget(path->mnt);
62010 nd->path.dentry = path->dentry;
62011 -
62012 }
62013 nd->inode = inode;
62014 /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
62015 @@ -3027,7 +3108,18 @@ finish_open:
62016 path_put(&save_parent);
62017 return error;
62018 }
62019 +
62020 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
62021 + error = -ENOENT;
62022 + goto out;
62023 + }
62024 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
62025 + error = -EACCES;
62026 + goto out;
62027 + }
62028 +
62029 audit_inode(name, nd->path.dentry, 0);
62030 +
62031 error = -EISDIR;
62032 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
62033 goto out;
62034 @@ -3190,7 +3282,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
62035 if (unlikely(error))
62036 goto out;
62037
62038 - error = do_last(nd, &path, file, op, &opened, pathname);
62039 + error = do_last(nd, &path, NULL, file, op, &opened, pathname);
62040 while (unlikely(error > 0)) { /* trailing symlink */
62041 struct path link = path;
62042 void *cookie;
62043 @@ -3208,7 +3300,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
62044 error = follow_link(&link, nd, &cookie);
62045 if (unlikely(error))
62046 break;
62047 - error = do_last(nd, &path, file, op, &opened, pathname);
62048 + error = do_last(nd, &path, &link, file, op, &opened, pathname);
62049 put_link(nd, &link, cookie);
62050 }
62051 out:
62052 @@ -3308,9 +3400,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
62053 goto unlock;
62054
62055 error = -EEXIST;
62056 - if (d_is_positive(dentry))
62057 + if (d_is_positive(dentry)) {
62058 + if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
62059 + error = -ENOENT;
62060 goto fail;
62061 -
62062 + }
62063 /*
62064 * Special case - lookup gave negative, but... we had foo/bar/
62065 * From the vfs_mknod() POV we just have a negative dentry -
62066 @@ -3362,6 +3456,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
62067 }
62068 EXPORT_SYMBOL(user_path_create);
62069
62070 +static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
62071 +{
62072 + struct filename *tmp = getname(pathname);
62073 + struct dentry *res;
62074 + if (IS_ERR(tmp))
62075 + return ERR_CAST(tmp);
62076 + res = kern_path_create(dfd, tmp->name, path, lookup_flags);
62077 + if (IS_ERR(res))
62078 + putname(tmp);
62079 + else
62080 + *to = tmp;
62081 + return res;
62082 +}
62083 +
62084 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
62085 {
62086 int error = may_create(dir, dentry);
62087 @@ -3425,6 +3533,17 @@ retry:
62088
62089 if (!IS_POSIXACL(path.dentry->d_inode))
62090 mode &= ~current_umask();
62091 +
62092 + if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
62093 + error = -EPERM;
62094 + goto out;
62095 + }
62096 +
62097 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
62098 + error = -EACCES;
62099 + goto out;
62100 + }
62101 +
62102 error = security_path_mknod(&path, dentry, mode, dev);
62103 if (error)
62104 goto out;
62105 @@ -3441,6 +3560,8 @@ retry:
62106 break;
62107 }
62108 out:
62109 + if (!error)
62110 + gr_handle_create(dentry, path.mnt);
62111 done_path_create(&path, dentry);
62112 if (retry_estale(error, lookup_flags)) {
62113 lookup_flags |= LOOKUP_REVAL;
62114 @@ -3494,9 +3615,16 @@ retry:
62115
62116 if (!IS_POSIXACL(path.dentry->d_inode))
62117 mode &= ~current_umask();
62118 + if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
62119 + error = -EACCES;
62120 + goto out;
62121 + }
62122 error = security_path_mkdir(&path, dentry, mode);
62123 if (!error)
62124 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
62125 + if (!error)
62126 + gr_handle_create(dentry, path.mnt);
62127 +out:
62128 done_path_create(&path, dentry);
62129 if (retry_estale(error, lookup_flags)) {
62130 lookup_flags |= LOOKUP_REVAL;
62131 @@ -3579,6 +3707,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
62132 struct filename *name;
62133 struct dentry *dentry;
62134 struct nameidata nd;
62135 + ino_t saved_ino = 0;
62136 + dev_t saved_dev = 0;
62137 unsigned int lookup_flags = 0;
62138 retry:
62139 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
62140 @@ -3611,10 +3741,21 @@ retry:
62141 error = -ENOENT;
62142 goto exit3;
62143 }
62144 +
62145 + saved_ino = dentry->d_inode->i_ino;
62146 + saved_dev = gr_get_dev_from_dentry(dentry);
62147 +
62148 + if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
62149 + error = -EACCES;
62150 + goto exit3;
62151 + }
62152 +
62153 error = security_path_rmdir(&nd.path, dentry);
62154 if (error)
62155 goto exit3;
62156 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
62157 + if (!error && (saved_dev || saved_ino))
62158 + gr_handle_delete(saved_ino, saved_dev);
62159 exit3:
62160 dput(dentry);
62161 exit2:
62162 @@ -3705,6 +3846,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
62163 struct nameidata nd;
62164 struct inode *inode = NULL;
62165 struct inode *delegated_inode = NULL;
62166 + ino_t saved_ino = 0;
62167 + dev_t saved_dev = 0;
62168 unsigned int lookup_flags = 0;
62169 retry:
62170 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
62171 @@ -3731,10 +3874,22 @@ retry_deleg:
62172 if (d_is_negative(dentry))
62173 goto slashes;
62174 ihold(inode);
62175 +
62176 + if (inode->i_nlink <= 1) {
62177 + saved_ino = inode->i_ino;
62178 + saved_dev = gr_get_dev_from_dentry(dentry);
62179 + }
62180 + if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
62181 + error = -EACCES;
62182 + goto exit2;
62183 + }
62184 +
62185 error = security_path_unlink(&nd.path, dentry);
62186 if (error)
62187 goto exit2;
62188 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
62189 + if (!error && (saved_ino || saved_dev))
62190 + gr_handle_delete(saved_ino, saved_dev);
62191 exit2:
62192 dput(dentry);
62193 }
62194 @@ -3823,9 +3978,17 @@ retry:
62195 if (IS_ERR(dentry))
62196 goto out_putname;
62197
62198 + if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
62199 + error = -EACCES;
62200 + goto out;
62201 + }
62202 +
62203 error = security_path_symlink(&path, dentry, from->name);
62204 if (!error)
62205 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
62206 + if (!error)
62207 + gr_handle_create(dentry, path.mnt);
62208 +out:
62209 done_path_create(&path, dentry);
62210 if (retry_estale(error, lookup_flags)) {
62211 lookup_flags |= LOOKUP_REVAL;
62212 @@ -3929,6 +4092,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
62213 struct dentry *new_dentry;
62214 struct path old_path, new_path;
62215 struct inode *delegated_inode = NULL;
62216 + struct filename *to = NULL;
62217 int how = 0;
62218 int error;
62219
62220 @@ -3952,7 +4116,7 @@ retry:
62221 if (error)
62222 return error;
62223
62224 - new_dentry = user_path_create(newdfd, newname, &new_path,
62225 + new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
62226 (how & LOOKUP_REVAL));
62227 error = PTR_ERR(new_dentry);
62228 if (IS_ERR(new_dentry))
62229 @@ -3964,11 +4128,28 @@ retry:
62230 error = may_linkat(&old_path);
62231 if (unlikely(error))
62232 goto out_dput;
62233 +
62234 + if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
62235 + old_path.dentry->d_inode,
62236 + old_path.dentry->d_inode->i_mode, to)) {
62237 + error = -EACCES;
62238 + goto out_dput;
62239 + }
62240 +
62241 + if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
62242 + old_path.dentry, old_path.mnt, to)) {
62243 + error = -EACCES;
62244 + goto out_dput;
62245 + }
62246 +
62247 error = security_path_link(old_path.dentry, &new_path, new_dentry);
62248 if (error)
62249 goto out_dput;
62250 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
62251 + if (!error)
62252 + gr_handle_create(new_dentry, new_path.mnt);
62253 out_dput:
62254 + putname(to);
62255 done_path_create(&new_path, new_dentry);
62256 if (delegated_inode) {
62257 error = break_deleg_wait(&delegated_inode);
62258 @@ -4278,6 +4459,12 @@ retry_deleg:
62259 if (new_dentry == trap)
62260 goto exit5;
62261
62262 + error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
62263 + old_dentry, old_dir->d_inode, oldnd.path.mnt,
62264 + to, flags);
62265 + if (error)
62266 + goto exit5;
62267 +
62268 error = security_path_rename(&oldnd.path, old_dentry,
62269 &newnd.path, new_dentry, flags);
62270 if (error)
62271 @@ -4285,6 +4472,9 @@ retry_deleg:
62272 error = vfs_rename(old_dir->d_inode, old_dentry,
62273 new_dir->d_inode, new_dentry,
62274 &delegated_inode, flags);
62275 + if (!error)
62276 + gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
62277 + new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
62278 exit5:
62279 dput(new_dentry);
62280 exit4:
62281 @@ -4327,14 +4517,24 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
62282
62283 int readlink_copy(char __user *buffer, int buflen, const char *link)
62284 {
62285 + char tmpbuf[64];
62286 + const char *newlink;
62287 int len = PTR_ERR(link);
62288 +
62289 if (IS_ERR(link))
62290 goto out;
62291
62292 len = strlen(link);
62293 if (len > (unsigned) buflen)
62294 len = buflen;
62295 - if (copy_to_user(buffer, link, len))
62296 +
62297 + if (len < sizeof(tmpbuf)) {
62298 + memcpy(tmpbuf, link, len);
62299 + newlink = tmpbuf;
62300 + } else
62301 + newlink = link;
62302 +
62303 + if (copy_to_user(buffer, newlink, len))
62304 len = -EFAULT;
62305 out:
62306 return len;
62307 diff --git a/fs/namespace.c b/fs/namespace.c
62308 index 182bc41..72e3cf1 100644
62309 --- a/fs/namespace.c
62310 +++ b/fs/namespace.c
62311 @@ -1348,6 +1348,9 @@ static int do_umount(struct mount *mnt, int flags)
62312 if (!(sb->s_flags & MS_RDONLY))
62313 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
62314 up_write(&sb->s_umount);
62315 +
62316 + gr_log_remount(mnt->mnt_devname, retval);
62317 +
62318 return retval;
62319 }
62320
62321 @@ -1370,6 +1373,9 @@ static int do_umount(struct mount *mnt, int flags)
62322 }
62323 unlock_mount_hash();
62324 namespace_unlock();
62325 +
62326 + gr_log_unmount(mnt->mnt_devname, retval);
62327 +
62328 return retval;
62329 }
62330
62331 @@ -1389,7 +1395,7 @@ static inline bool may_mount(void)
62332 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
62333 */
62334
62335 -SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
62336 +SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
62337 {
62338 struct path path;
62339 struct mount *mnt;
62340 @@ -1431,7 +1437,7 @@ out:
62341 /*
62342 * The 2.0 compatible umount. No flags.
62343 */
62344 -SYSCALL_DEFINE1(oldumount, char __user *, name)
62345 +SYSCALL_DEFINE1(oldumount, const char __user *, name)
62346 {
62347 return sys_umount(name, 0);
62348 }
62349 @@ -2440,6 +2446,16 @@ long do_mount(const char *dev_name, const char *dir_name,
62350 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
62351 MS_STRICTATIME);
62352
62353 + if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
62354 + retval = -EPERM;
62355 + goto dput_out;
62356 + }
62357 +
62358 + if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
62359 + retval = -EPERM;
62360 + goto dput_out;
62361 + }
62362 +
62363 if (flags & MS_REMOUNT)
62364 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
62365 data_page);
62366 @@ -2454,6 +2470,9 @@ long do_mount(const char *dev_name, const char *dir_name,
62367 dev_name, data_page);
62368 dput_out:
62369 path_put(&path);
62370 +
62371 + gr_log_mount(dev_name, dir_name, retval);
62372 +
62373 return retval;
62374 }
62375
62376 @@ -2471,7 +2490,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
62377 * number incrementing at 10Ghz will take 12,427 years to wrap which
62378 * is effectively never, so we can ignore the possibility.
62379 */
62380 -static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
62381 +static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
62382
62383 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
62384 {
62385 @@ -2486,7 +2505,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
62386 kfree(new_ns);
62387 return ERR_PTR(ret);
62388 }
62389 - new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
62390 + new_ns->seq = atomic64_inc_return_unchecked(&mnt_ns_seq);
62391 atomic_set(&new_ns->count, 1);
62392 new_ns->root = NULL;
62393 INIT_LIST_HEAD(&new_ns->list);
62394 @@ -2496,7 +2515,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
62395 return new_ns;
62396 }
62397
62398 -struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
62399 +__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
62400 struct user_namespace *user_ns, struct fs_struct *new_fs)
62401 {
62402 struct mnt_namespace *new_ns;
62403 @@ -2617,8 +2636,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
62404 }
62405 EXPORT_SYMBOL(mount_subtree);
62406
62407 -SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
62408 - char __user *, type, unsigned long, flags, void __user *, data)
62409 +SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
62410 + const char __user *, type, unsigned long, flags, void __user *, data)
62411 {
62412 int ret;
62413 char *kernel_type;
62414 @@ -2731,6 +2750,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
62415 if (error)
62416 goto out2;
62417
62418 + if (gr_handle_chroot_pivot()) {
62419 + error = -EPERM;
62420 + goto out2;
62421 + }
62422 +
62423 get_fs_root(current->fs, &root);
62424 old_mp = lock_mount(&old);
62425 error = PTR_ERR(old_mp);
62426 @@ -2999,7 +3023,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
62427 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
62428 return -EPERM;
62429
62430 - if (fs->users != 1)
62431 + if (atomic_read(&fs->users) != 1)
62432 return -EINVAL;
62433
62434 get_mnt_ns(mnt_ns);
62435 diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
62436 index f4ccfe6..a5cf064 100644
62437 --- a/fs/nfs/callback_xdr.c
62438 +++ b/fs/nfs/callback_xdr.c
62439 @@ -51,7 +51,7 @@ struct callback_op {
62440 callback_decode_arg_t decode_args;
62441 callback_encode_res_t encode_res;
62442 long res_maxsize;
62443 -};
62444 +} __do_const;
62445
62446 static struct callback_op callback_ops[];
62447
62448 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
62449 index c79f3e7..d61d671 100644
62450 --- a/fs/nfs/inode.c
62451 +++ b/fs/nfs/inode.c
62452 @@ -1209,16 +1209,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
62453 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
62454 }
62455
62456 -static atomic_long_t nfs_attr_generation_counter;
62457 +static atomic_long_unchecked_t nfs_attr_generation_counter;
62458
62459 static unsigned long nfs_read_attr_generation_counter(void)
62460 {
62461 - return atomic_long_read(&nfs_attr_generation_counter);
62462 + return atomic_long_read_unchecked(&nfs_attr_generation_counter);
62463 }
62464
62465 unsigned long nfs_inc_attr_generation_counter(void)
62466 {
62467 - return atomic_long_inc_return(&nfs_attr_generation_counter);
62468 + return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
62469 }
62470
62471 void nfs_fattr_init(struct nfs_fattr *fattr)
62472 diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
62473 index 95e3720..46c23fa 100644
62474 --- a/fs/nfsd/nfs4proc.c
62475 +++ b/fs/nfsd/nfs4proc.c
62476 @@ -1169,7 +1169,7 @@ struct nfsd4_operation {
62477 nfsd4op_rsize op_rsize_bop;
62478 stateid_getter op_get_currentstateid;
62479 stateid_setter op_set_currentstateid;
62480 -};
62481 +} __do_const;
62482
62483 static struct nfsd4_operation nfsd4_ops[];
62484
62485 diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
62486 index 3297158..7bb8436 100644
62487 --- a/fs/nfsd/nfs4xdr.c
62488 +++ b/fs/nfsd/nfs4xdr.c
62489 @@ -1541,7 +1541,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
62490
62491 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
62492
62493 -static nfsd4_dec nfsd4_dec_ops[] = {
62494 +static const nfsd4_dec nfsd4_dec_ops[] = {
62495 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
62496 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
62497 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
62498 diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
62499 index f8f060f..c4ba09a 100644
62500 --- a/fs/nfsd/nfscache.c
62501 +++ b/fs/nfsd/nfscache.c
62502 @@ -519,14 +519,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
62503 {
62504 struct svc_cacherep *rp = rqstp->rq_cacherep;
62505 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
62506 - int len;
62507 + long len;
62508 size_t bufsize = 0;
62509
62510 if (!rp)
62511 return;
62512
62513 - len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
62514 - len >>= 2;
62515 + if (statp) {
62516 + len = (char*)statp - (char*)resv->iov_base;
62517 + len = resv->iov_len - len;
62518 + len >>= 2;
62519 + }
62520
62521 /* Don't cache excessive amounts of data and XDR failures */
62522 if (!statp || len > (256 >> 2)) {
62523 diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
62524 index 16f0673..1c2c30ab 100644
62525 --- a/fs/nfsd/vfs.c
62526 +++ b/fs/nfsd/vfs.c
62527 @@ -843,7 +843,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
62528 } else {
62529 oldfs = get_fs();
62530 set_fs(KERNEL_DS);
62531 - host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
62532 + host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
62533 set_fs(oldfs);
62534 }
62535
62536 @@ -934,7 +934,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
62537
62538 /* Write the data. */
62539 oldfs = get_fs(); set_fs(KERNEL_DS);
62540 - host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
62541 + host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
62542 set_fs(oldfs);
62543 if (host_err < 0)
62544 goto out_nfserr;
62545 @@ -1479,7 +1479,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
62546 */
62547
62548 oldfs = get_fs(); set_fs(KERNEL_DS);
62549 - host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
62550 + host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
62551 set_fs(oldfs);
62552
62553 if (host_err < 0)
62554 diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
62555 index 52ccd34..43a53b1 100644
62556 --- a/fs/nls/nls_base.c
62557 +++ b/fs/nls/nls_base.c
62558 @@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
62559
62560 int __register_nls(struct nls_table *nls, struct module *owner)
62561 {
62562 - struct nls_table ** tmp = &tables;
62563 + struct nls_table *tmp = tables;
62564
62565 if (nls->next)
62566 return -EBUSY;
62567
62568 - nls->owner = owner;
62569 + pax_open_kernel();
62570 + *(void **)&nls->owner = owner;
62571 + pax_close_kernel();
62572 spin_lock(&nls_lock);
62573 - while (*tmp) {
62574 - if (nls == *tmp) {
62575 + while (tmp) {
62576 + if (nls == tmp) {
62577 spin_unlock(&nls_lock);
62578 return -EBUSY;
62579 }
62580 - tmp = &(*tmp)->next;
62581 + tmp = tmp->next;
62582 }
62583 - nls->next = tables;
62584 + pax_open_kernel();
62585 + *(struct nls_table **)&nls->next = tables;
62586 + pax_close_kernel();
62587 tables = nls;
62588 spin_unlock(&nls_lock);
62589 return 0;
62590 @@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
62591
62592 int unregister_nls(struct nls_table * nls)
62593 {
62594 - struct nls_table ** tmp = &tables;
62595 + struct nls_table * const * tmp = &tables;
62596
62597 spin_lock(&nls_lock);
62598 while (*tmp) {
62599 if (nls == *tmp) {
62600 - *tmp = nls->next;
62601 + pax_open_kernel();
62602 + *(struct nls_table **)tmp = nls->next;
62603 + pax_close_kernel();
62604 spin_unlock(&nls_lock);
62605 return 0;
62606 }
62607 diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
62608 index 162b3f1..6076a7c 100644
62609 --- a/fs/nls/nls_euc-jp.c
62610 +++ b/fs/nls/nls_euc-jp.c
62611 @@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
62612 p_nls = load_nls("cp932");
62613
62614 if (p_nls) {
62615 - table.charset2upper = p_nls->charset2upper;
62616 - table.charset2lower = p_nls->charset2lower;
62617 + pax_open_kernel();
62618 + *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
62619 + *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
62620 + pax_close_kernel();
62621 return register_nls(&table);
62622 }
62623
62624 diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
62625 index a80a741..7b96e1b 100644
62626 --- a/fs/nls/nls_koi8-ru.c
62627 +++ b/fs/nls/nls_koi8-ru.c
62628 @@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
62629 p_nls = load_nls("koi8-u");
62630
62631 if (p_nls) {
62632 - table.charset2upper = p_nls->charset2upper;
62633 - table.charset2lower = p_nls->charset2lower;
62634 + pax_open_kernel();
62635 + *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
62636 + *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
62637 + pax_close_kernel();
62638 return register_nls(&table);
62639 }
62640
62641 diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
62642 index 732648b..d3b017f 100644
62643 --- a/fs/notify/fanotify/fanotify_user.c
62644 +++ b/fs/notify/fanotify/fanotify_user.c
62645 @@ -203,8 +203,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
62646
62647 fd = fanotify_event_metadata.fd;
62648 ret = -EFAULT;
62649 - if (copy_to_user(buf, &fanotify_event_metadata,
62650 - fanotify_event_metadata.event_len))
62651 + if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
62652 + copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
62653 goto out_close_fd;
62654
62655 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
62656 diff --git a/fs/notify/notification.c b/fs/notify/notification.c
62657 index 1e58402..bb2d6f4 100644
62658 --- a/fs/notify/notification.c
62659 +++ b/fs/notify/notification.c
62660 @@ -48,7 +48,7 @@
62661 #include <linux/fsnotify_backend.h>
62662 #include "fsnotify.h"
62663
62664 -static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
62665 +static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
62666
62667 /**
62668 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
62669 @@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
62670 */
62671 u32 fsnotify_get_cookie(void)
62672 {
62673 - return atomic_inc_return(&fsnotify_sync_cookie);
62674 + return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
62675 }
62676 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
62677
62678 diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
62679 index 9e38daf..5727cae 100644
62680 --- a/fs/ntfs/dir.c
62681 +++ b/fs/ntfs/dir.c
62682 @@ -1310,7 +1310,7 @@ find_next_index_buffer:
62683 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
62684 ~(s64)(ndir->itype.index.block_size - 1)));
62685 /* Bounds checks. */
62686 - if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
62687 + if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
62688 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
62689 "inode 0x%lx or driver bug.", vdir->i_ino);
62690 goto err_out;
62691 diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
62692 index db9bd8a..8338fb6 100644
62693 --- a/fs/ntfs/file.c
62694 +++ b/fs/ntfs/file.c
62695 @@ -1282,7 +1282,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
62696 char *addr;
62697 size_t total = 0;
62698 unsigned len;
62699 - int left;
62700 + unsigned left;
62701
62702 do {
62703 len = PAGE_CACHE_SIZE - ofs;
62704 diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
62705 index 9de2491..3306095 100644
62706 --- a/fs/ntfs/super.c
62707 +++ b/fs/ntfs/super.c
62708 @@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
62709 if (!silent)
62710 ntfs_error(sb, "Primary boot sector is invalid.");
62711 } else if (!silent)
62712 - ntfs_error(sb, read_err_str, "primary");
62713 + ntfs_error(sb, read_err_str, "%s", "primary");
62714 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
62715 if (bh_primary)
62716 brelse(bh_primary);
62717 @@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
62718 goto hotfix_primary_boot_sector;
62719 brelse(bh_backup);
62720 } else if (!silent)
62721 - ntfs_error(sb, read_err_str, "backup");
62722 + ntfs_error(sb, read_err_str, "%s", "backup");
62723 /* Try to read NT3.51- backup boot sector. */
62724 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
62725 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
62726 @@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
62727 "sector.");
62728 brelse(bh_backup);
62729 } else if (!silent)
62730 - ntfs_error(sb, read_err_str, "backup");
62731 + ntfs_error(sb, read_err_str, "%s", "backup");
62732 /* We failed. Cleanup and return. */
62733 if (bh_primary)
62734 brelse(bh_primary);
62735 diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
62736 index 0440134..d52c93a 100644
62737 --- a/fs/ocfs2/localalloc.c
62738 +++ b/fs/ocfs2/localalloc.c
62739 @@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
62740 goto bail;
62741 }
62742
62743 - atomic_inc(&osb->alloc_stats.moves);
62744 + atomic_inc_unchecked(&osb->alloc_stats.moves);
62745
62746 bail:
62747 if (handle)
62748 diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
62749 index 8d64a97..c37665d 100644
62750 --- a/fs/ocfs2/ocfs2.h
62751 +++ b/fs/ocfs2/ocfs2.h
62752 @@ -236,11 +236,11 @@ enum ocfs2_vol_state
62753
62754 struct ocfs2_alloc_stats
62755 {
62756 - atomic_t moves;
62757 - atomic_t local_data;
62758 - atomic_t bitmap_data;
62759 - atomic_t bg_allocs;
62760 - atomic_t bg_extends;
62761 + atomic_unchecked_t moves;
62762 + atomic_unchecked_t local_data;
62763 + atomic_unchecked_t bitmap_data;
62764 + atomic_unchecked_t bg_allocs;
62765 + atomic_unchecked_t bg_extends;
62766 };
62767
62768 enum ocfs2_local_alloc_state
62769 diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
62770 index 0cb889a..6a26b24 100644
62771 --- a/fs/ocfs2/suballoc.c
62772 +++ b/fs/ocfs2/suballoc.c
62773 @@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
62774 mlog_errno(status);
62775 goto bail;
62776 }
62777 - atomic_inc(&osb->alloc_stats.bg_extends);
62778 + atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
62779
62780 /* You should never ask for this much metadata */
62781 BUG_ON(bits_wanted >
62782 @@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
62783 mlog_errno(status);
62784 goto bail;
62785 }
62786 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62787 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62788
62789 *suballoc_loc = res.sr_bg_blkno;
62790 *suballoc_bit_start = res.sr_bit_offset;
62791 @@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
62792 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
62793 res->sr_bits);
62794
62795 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62796 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62797
62798 BUG_ON(res->sr_bits != 1);
62799
62800 @@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
62801 mlog_errno(status);
62802 goto bail;
62803 }
62804 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62805 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62806
62807 BUG_ON(res.sr_bits != 1);
62808
62809 @@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
62810 cluster_start,
62811 num_clusters);
62812 if (!status)
62813 - atomic_inc(&osb->alloc_stats.local_data);
62814 + atomic_inc_unchecked(&osb->alloc_stats.local_data);
62815 } else {
62816 if (min_clusters > (osb->bitmap_cpg - 1)) {
62817 /* The only paths asking for contiguousness
62818 @@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
62819 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
62820 res.sr_bg_blkno,
62821 res.sr_bit_offset);
62822 - atomic_inc(&osb->alloc_stats.bitmap_data);
62823 + atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
62824 *num_clusters = res.sr_bits;
62825 }
62826 }
62827 diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
62828 index a7cdd56..c583144 100644
62829 --- a/fs/ocfs2/super.c
62830 +++ b/fs/ocfs2/super.c
62831 @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
62832 "%10s => GlobalAllocs: %d LocalAllocs: %d "
62833 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
62834 "Stats",
62835 - atomic_read(&osb->alloc_stats.bitmap_data),
62836 - atomic_read(&osb->alloc_stats.local_data),
62837 - atomic_read(&osb->alloc_stats.bg_allocs),
62838 - atomic_read(&osb->alloc_stats.moves),
62839 - atomic_read(&osb->alloc_stats.bg_extends));
62840 + atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
62841 + atomic_read_unchecked(&osb->alloc_stats.local_data),
62842 + atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
62843 + atomic_read_unchecked(&osb->alloc_stats.moves),
62844 + atomic_read_unchecked(&osb->alloc_stats.bg_extends));
62845
62846 out += snprintf(buf + out, len - out,
62847 "%10s => State: %u Descriptor: %llu Size: %u bits "
62848 @@ -2104,11 +2104,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
62849
62850 mutex_init(&osb->system_file_mutex);
62851
62852 - atomic_set(&osb->alloc_stats.moves, 0);
62853 - atomic_set(&osb->alloc_stats.local_data, 0);
62854 - atomic_set(&osb->alloc_stats.bitmap_data, 0);
62855 - atomic_set(&osb->alloc_stats.bg_allocs, 0);
62856 - atomic_set(&osb->alloc_stats.bg_extends, 0);
62857 + atomic_set_unchecked(&osb->alloc_stats.moves, 0);
62858 + atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
62859 + atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
62860 + atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
62861 + atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
62862
62863 /* Copy the blockcheck stats from the superblock probe */
62864 osb->osb_ecc_stats = *stats;
62865 diff --git a/fs/open.c b/fs/open.c
62866 index 9d64679..75f925c 100644
62867 --- a/fs/open.c
62868 +++ b/fs/open.c
62869 @@ -32,6 +32,8 @@
62870 #include <linux/dnotify.h>
62871 #include <linux/compat.h>
62872
62873 +#define CREATE_TRACE_POINTS
62874 +#include <trace/events/fs.h>
62875 #include "internal.h"
62876
62877 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
62878 @@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
62879 error = locks_verify_truncate(inode, NULL, length);
62880 if (!error)
62881 error = security_path_truncate(path);
62882 + if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
62883 + error = -EACCES;
62884 if (!error)
62885 error = do_truncate(path->dentry, length, 0, NULL);
62886
62887 @@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
62888 error = locks_verify_truncate(inode, f.file, length);
62889 if (!error)
62890 error = security_path_truncate(&f.file->f_path);
62891 + if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
62892 + error = -EACCES;
62893 if (!error)
62894 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
62895 sb_end_write(inode->i_sb);
62896 @@ -381,6 +387,9 @@ retry:
62897 if (__mnt_is_readonly(path.mnt))
62898 res = -EROFS;
62899
62900 + if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
62901 + res = -EACCES;
62902 +
62903 out_path_release:
62904 path_put(&path);
62905 if (retry_estale(res, lookup_flags)) {
62906 @@ -412,6 +421,8 @@ retry:
62907 if (error)
62908 goto dput_and_out;
62909
62910 + gr_log_chdir(path.dentry, path.mnt);
62911 +
62912 set_fs_pwd(current->fs, &path);
62913
62914 dput_and_out:
62915 @@ -441,6 +452,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
62916 goto out_putf;
62917
62918 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
62919 +
62920 + if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
62921 + error = -EPERM;
62922 +
62923 + if (!error)
62924 + gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
62925 +
62926 if (!error)
62927 set_fs_pwd(current->fs, &f.file->f_path);
62928 out_putf:
62929 @@ -470,7 +488,13 @@ retry:
62930 if (error)
62931 goto dput_and_out;
62932
62933 + if (gr_handle_chroot_chroot(path.dentry, path.mnt))
62934 + goto dput_and_out;
62935 +
62936 set_fs_root(current->fs, &path);
62937 +
62938 + gr_handle_chroot_chdir(&path);
62939 +
62940 error = 0;
62941 dput_and_out:
62942 path_put(&path);
62943 @@ -494,6 +518,16 @@ static int chmod_common(struct path *path, umode_t mode)
62944 return error;
62945 retry_deleg:
62946 mutex_lock(&inode->i_mutex);
62947 +
62948 + if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
62949 + error = -EACCES;
62950 + goto out_unlock;
62951 + }
62952 + if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
62953 + error = -EACCES;
62954 + goto out_unlock;
62955 + }
62956 +
62957 error = security_path_chmod(path, mode);
62958 if (error)
62959 goto out_unlock;
62960 @@ -559,6 +593,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
62961 uid = make_kuid(current_user_ns(), user);
62962 gid = make_kgid(current_user_ns(), group);
62963
62964 + if (!gr_acl_handle_chown(path->dentry, path->mnt))
62965 + return -EACCES;
62966 +
62967 newattrs.ia_valid = ATTR_CTIME;
62968 if (user != (uid_t) -1) {
62969 if (!uid_valid(uid))
62970 @@ -978,6 +1015,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
62971 } else {
62972 fsnotify_open(f);
62973 fd_install(fd, f);
62974 + trace_do_sys_open(tmp->name, flags, mode);
62975 }
62976 }
62977 putname(tmp);
62978 diff --git a/fs/pipe.c b/fs/pipe.c
62979 index 034bffa..6c6b522 100644
62980 --- a/fs/pipe.c
62981 +++ b/fs/pipe.c
62982 @@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
62983
62984 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
62985 {
62986 - if (pipe->files)
62987 + if (atomic_read(&pipe->files))
62988 mutex_lock_nested(&pipe->mutex, subclass);
62989 }
62990
62991 @@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
62992
62993 void pipe_unlock(struct pipe_inode_info *pipe)
62994 {
62995 - if (pipe->files)
62996 + if (atomic_read(&pipe->files))
62997 mutex_unlock(&pipe->mutex);
62998 }
62999 EXPORT_SYMBOL(pipe_unlock);
63000 @@ -342,9 +342,9 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov,
63001 }
63002 if (bufs) /* More to do? */
63003 continue;
63004 - if (!pipe->writers)
63005 + if (!atomic_read(&pipe->writers))
63006 break;
63007 - if (!pipe->waiting_writers) {
63008 + if (!atomic_read(&pipe->waiting_writers)) {
63009 /* syscall merging: Usually we must not sleep
63010 * if O_NONBLOCK is set, or if we got some data.
63011 * But if a writer sleeps in kernel space, then
63012 @@ -406,7 +406,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
63013 ret = 0;
63014 __pipe_lock(pipe);
63015
63016 - if (!pipe->readers) {
63017 + if (!atomic_read(&pipe->readers)) {
63018 send_sig(SIGPIPE, current, 0);
63019 ret = -EPIPE;
63020 goto out;
63021 @@ -461,7 +461,7 @@ redo1:
63022 for (;;) {
63023 int bufs;
63024
63025 - if (!pipe->readers) {
63026 + if (!atomic_read(&pipe->readers)) {
63027 send_sig(SIGPIPE, current, 0);
63028 if (!ret)
63029 ret = -EPIPE;
63030 @@ -552,9 +552,9 @@ redo2:
63031 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
63032 do_wakeup = 0;
63033 }
63034 - pipe->waiting_writers++;
63035 + atomic_inc(&pipe->waiting_writers);
63036 pipe_wait(pipe);
63037 - pipe->waiting_writers--;
63038 + atomic_dec(&pipe->waiting_writers);
63039 }
63040 out:
63041 __pipe_unlock(pipe);
63042 @@ -609,7 +609,7 @@ pipe_poll(struct file *filp, poll_table *wait)
63043 mask = 0;
63044 if (filp->f_mode & FMODE_READ) {
63045 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
63046 - if (!pipe->writers && filp->f_version != pipe->w_counter)
63047 + if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
63048 mask |= POLLHUP;
63049 }
63050
63051 @@ -619,7 +619,7 @@ pipe_poll(struct file *filp, poll_table *wait)
63052 * Most Unices do not set POLLERR for FIFOs but on Linux they
63053 * behave exactly like pipes for poll().
63054 */
63055 - if (!pipe->readers)
63056 + if (!atomic_read(&pipe->readers))
63057 mask |= POLLERR;
63058 }
63059
63060 @@ -631,7 +631,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
63061 int kill = 0;
63062
63063 spin_lock(&inode->i_lock);
63064 - if (!--pipe->files) {
63065 + if (atomic_dec_and_test(&pipe->files)) {
63066 inode->i_pipe = NULL;
63067 kill = 1;
63068 }
63069 @@ -648,11 +648,11 @@ pipe_release(struct inode *inode, struct file *file)
63070
63071 __pipe_lock(pipe);
63072 if (file->f_mode & FMODE_READ)
63073 - pipe->readers--;
63074 + atomic_dec(&pipe->readers);
63075 if (file->f_mode & FMODE_WRITE)
63076 - pipe->writers--;
63077 + atomic_dec(&pipe->writers);
63078
63079 - if (pipe->readers || pipe->writers) {
63080 + if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
63081 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
63082 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
63083 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
63084 @@ -717,7 +717,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
63085 kfree(pipe);
63086 }
63087
63088 -static struct vfsmount *pipe_mnt __read_mostly;
63089 +struct vfsmount *pipe_mnt __read_mostly;
63090
63091 /*
63092 * pipefs_dname() is called from d_path().
63093 @@ -747,8 +747,9 @@ static struct inode * get_pipe_inode(void)
63094 goto fail_iput;
63095
63096 inode->i_pipe = pipe;
63097 - pipe->files = 2;
63098 - pipe->readers = pipe->writers = 1;
63099 + atomic_set(&pipe->files, 2);
63100 + atomic_set(&pipe->readers, 1);
63101 + atomic_set(&pipe->writers, 1);
63102 inode->i_fop = &pipefifo_fops;
63103
63104 /*
63105 @@ -927,17 +928,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
63106 spin_lock(&inode->i_lock);
63107 if (inode->i_pipe) {
63108 pipe = inode->i_pipe;
63109 - pipe->files++;
63110 + atomic_inc(&pipe->files);
63111 spin_unlock(&inode->i_lock);
63112 } else {
63113 spin_unlock(&inode->i_lock);
63114 pipe = alloc_pipe_info();
63115 if (!pipe)
63116 return -ENOMEM;
63117 - pipe->files = 1;
63118 + atomic_set(&pipe->files, 1);
63119 spin_lock(&inode->i_lock);
63120 if (unlikely(inode->i_pipe)) {
63121 - inode->i_pipe->files++;
63122 + atomic_inc(&inode->i_pipe->files);
63123 spin_unlock(&inode->i_lock);
63124 free_pipe_info(pipe);
63125 pipe = inode->i_pipe;
63126 @@ -962,10 +963,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
63127 * opened, even when there is no process writing the FIFO.
63128 */
63129 pipe->r_counter++;
63130 - if (pipe->readers++ == 0)
63131 + if (atomic_inc_return(&pipe->readers) == 1)
63132 wake_up_partner(pipe);
63133
63134 - if (!is_pipe && !pipe->writers) {
63135 + if (!is_pipe && !atomic_read(&pipe->writers)) {
63136 if ((filp->f_flags & O_NONBLOCK)) {
63137 /* suppress POLLHUP until we have
63138 * seen a writer */
63139 @@ -984,14 +985,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
63140 * errno=ENXIO when there is no process reading the FIFO.
63141 */
63142 ret = -ENXIO;
63143 - if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
63144 + if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
63145 goto err;
63146
63147 pipe->w_counter++;
63148 - if (!pipe->writers++)
63149 + if (atomic_inc_return(&pipe->writers) == 1)
63150 wake_up_partner(pipe);
63151
63152 - if (!is_pipe && !pipe->readers) {
63153 + if (!is_pipe && !atomic_read(&pipe->readers)) {
63154 if (wait_for_partner(pipe, &pipe->r_counter))
63155 goto err_wr;
63156 }
63157 @@ -1005,11 +1006,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
63158 * the process can at least talk to itself.
63159 */
63160
63161 - pipe->readers++;
63162 - pipe->writers++;
63163 + atomic_inc(&pipe->readers);
63164 + atomic_inc(&pipe->writers);
63165 pipe->r_counter++;
63166 pipe->w_counter++;
63167 - if (pipe->readers == 1 || pipe->writers == 1)
63168 + if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
63169 wake_up_partner(pipe);
63170 break;
63171
63172 @@ -1023,13 +1024,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
63173 return 0;
63174
63175 err_rd:
63176 - if (!--pipe->readers)
63177 + if (atomic_dec_and_test(&pipe->readers))
63178 wake_up_interruptible(&pipe->wait);
63179 ret = -ERESTARTSYS;
63180 goto err;
63181
63182 err_wr:
63183 - if (!--pipe->writers)
63184 + if (atomic_dec_and_test(&pipe->writers))
63185 wake_up_interruptible(&pipe->wait);
63186 ret = -ERESTARTSYS;
63187 goto err;
63188 diff --git a/fs/posix_acl.c b/fs/posix_acl.c
63189 index 0855f77..6787d50 100644
63190 --- a/fs/posix_acl.c
63191 +++ b/fs/posix_acl.c
63192 @@ -20,6 +20,7 @@
63193 #include <linux/xattr.h>
63194 #include <linux/export.h>
63195 #include <linux/user_namespace.h>
63196 +#include <linux/grsecurity.h>
63197
63198 struct posix_acl **acl_by_type(struct inode *inode, int type)
63199 {
63200 @@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
63201 }
63202 }
63203 if (mode_p)
63204 - *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
63205 + *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
63206 return not_equiv;
63207 }
63208 EXPORT_SYMBOL(posix_acl_equiv_mode);
63209 @@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
63210 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
63211 }
63212
63213 - *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
63214 + *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
63215 return not_equiv;
63216 }
63217
63218 @@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
63219 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
63220 int err = -ENOMEM;
63221 if (clone) {
63222 + *mode_p &= ~gr_acl_umask();
63223 +
63224 err = posix_acl_create_masq(clone, mode_p);
63225 if (err < 0) {
63226 posix_acl_release(clone);
63227 @@ -659,11 +662,12 @@ struct posix_acl *
63228 posix_acl_from_xattr(struct user_namespace *user_ns,
63229 const void *value, size_t size)
63230 {
63231 - posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
63232 - posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
63233 + const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
63234 + const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
63235 int count;
63236 struct posix_acl *acl;
63237 struct posix_acl_entry *acl_e;
63238 + umode_t umask = gr_acl_umask();
63239
63240 if (!value)
63241 return NULL;
63242 @@ -689,12 +693,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
63243
63244 switch(acl_e->e_tag) {
63245 case ACL_USER_OBJ:
63246 + acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
63247 + break;
63248 case ACL_GROUP_OBJ:
63249 case ACL_MASK:
63250 + acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
63251 + break;
63252 case ACL_OTHER:
63253 + acl_e->e_perm &= ~(umask & S_IRWXO);
63254 break;
63255
63256 case ACL_USER:
63257 + acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
63258 acl_e->e_uid =
63259 make_kuid(user_ns,
63260 le32_to_cpu(entry->e_id));
63261 @@ -702,6 +712,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
63262 goto fail;
63263 break;
63264 case ACL_GROUP:
63265 + acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
63266 acl_e->e_gid =
63267 make_kgid(user_ns,
63268 le32_to_cpu(entry->e_id));
63269 diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
63270 index 2183fcf..3c32a98 100644
63271 --- a/fs/proc/Kconfig
63272 +++ b/fs/proc/Kconfig
63273 @@ -30,7 +30,7 @@ config PROC_FS
63274
63275 config PROC_KCORE
63276 bool "/proc/kcore support" if !ARM
63277 - depends on PROC_FS && MMU
63278 + depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
63279 help
63280 Provides a virtual ELF core file of the live kernel. This can
63281 be read with gdb and other ELF tools. No modifications can be
63282 @@ -38,8 +38,8 @@ config PROC_KCORE
63283
63284 config PROC_VMCORE
63285 bool "/proc/vmcore support"
63286 - depends on PROC_FS && CRASH_DUMP
63287 - default y
63288 + depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
63289 + default n
63290 help
63291 Exports the dump image of crashed kernel in ELF format.
63292
63293 @@ -63,8 +63,8 @@ config PROC_SYSCTL
63294 limited in memory.
63295
63296 config PROC_PAGE_MONITOR
63297 - default y
63298 - depends on PROC_FS && MMU
63299 + default n
63300 + depends on PROC_FS && MMU && !GRKERNSEC
63301 bool "Enable /proc page monitoring" if EXPERT
63302 help
63303 Various /proc files exist to monitor process memory utilization:
63304 diff --git a/fs/proc/array.c b/fs/proc/array.c
63305 index 64db2bc..a8185d6 100644
63306 --- a/fs/proc/array.c
63307 +++ b/fs/proc/array.c
63308 @@ -60,6 +60,7 @@
63309 #include <linux/tty.h>
63310 #include <linux/string.h>
63311 #include <linux/mman.h>
63312 +#include <linux/grsecurity.h>
63313 #include <linux/proc_fs.h>
63314 #include <linux/ioport.h>
63315 #include <linux/uaccess.h>
63316 @@ -356,6 +357,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
63317 seq_putc(m, '\n');
63318 }
63319
63320 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
63321 +static inline void task_pax(struct seq_file *m, struct task_struct *p)
63322 +{
63323 + if (p->mm)
63324 + seq_printf(m, "PaX:\t%c%c%c%c%c\n",
63325 + p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
63326 + p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
63327 + p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
63328 + p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
63329 + p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
63330 + else
63331 + seq_printf(m, "PaX:\t-----\n");
63332 +}
63333 +#endif
63334 +
63335 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
63336 struct pid *pid, struct task_struct *task)
63337 {
63338 @@ -374,9 +390,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
63339 task_cpus_allowed(m, task);
63340 cpuset_task_status_allowed(m, task);
63341 task_context_switch_counts(m, task);
63342 +
63343 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
63344 + task_pax(m, task);
63345 +#endif
63346 +
63347 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
63348 + task_grsec_rbac(m, task);
63349 +#endif
63350 +
63351 return 0;
63352 }
63353
63354 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63355 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
63356 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
63357 + _mm->pax_flags & MF_PAX_SEGMEXEC))
63358 +#endif
63359 +
63360 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
63361 struct pid *pid, struct task_struct *task, int whole)
63362 {
63363 @@ -398,6 +429,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
63364 char tcomm[sizeof(task->comm)];
63365 unsigned long flags;
63366
63367 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63368 + if (current->exec_id != m->exec_id) {
63369 + gr_log_badprocpid("stat");
63370 + return 0;
63371 + }
63372 +#endif
63373 +
63374 state = *get_task_state(task);
63375 vsize = eip = esp = 0;
63376 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
63377 @@ -468,6 +506,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
63378 gtime = task_gtime(task);
63379 }
63380
63381 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63382 + if (PAX_RAND_FLAGS(mm)) {
63383 + eip = 0;
63384 + esp = 0;
63385 + wchan = 0;
63386 + }
63387 +#endif
63388 +#ifdef CONFIG_GRKERNSEC_HIDESYM
63389 + wchan = 0;
63390 + eip =0;
63391 + esp =0;
63392 +#endif
63393 +
63394 /* scale priority and nice values from timeslices to -20..20 */
63395 /* to make it look like a "normal" Unix priority/nice value */
63396 priority = task_prio(task);
63397 @@ -504,9 +555,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
63398 seq_put_decimal_ull(m, ' ', vsize);
63399 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
63400 seq_put_decimal_ull(m, ' ', rsslim);
63401 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63402 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
63403 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
63404 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
63405 +#else
63406 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
63407 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
63408 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
63409 +#endif
63410 seq_put_decimal_ull(m, ' ', esp);
63411 seq_put_decimal_ull(m, ' ', eip);
63412 /* The signal information here is obsolete.
63413 @@ -528,7 +585,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
63414 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
63415 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
63416
63417 - if (mm && permitted) {
63418 + if (mm && permitted
63419 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63420 + && !PAX_RAND_FLAGS(mm)
63421 +#endif
63422 + ) {
63423 seq_put_decimal_ull(m, ' ', mm->start_data);
63424 seq_put_decimal_ull(m, ' ', mm->end_data);
63425 seq_put_decimal_ull(m, ' ', mm->start_brk);
63426 @@ -566,8 +627,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
63427 struct pid *pid, struct task_struct *task)
63428 {
63429 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
63430 - struct mm_struct *mm = get_task_mm(task);
63431 + struct mm_struct *mm;
63432
63433 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63434 + if (current->exec_id != m->exec_id) {
63435 + gr_log_badprocpid("statm");
63436 + return 0;
63437 + }
63438 +#endif
63439 + mm = get_task_mm(task);
63440 if (mm) {
63441 size = task_statm(mm, &shared, &text, &data, &resident);
63442 mmput(mm);
63443 @@ -590,6 +658,13 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
63444 return 0;
63445 }
63446
63447 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
63448 +int proc_pid_ipaddr(struct task_struct *task, char *buffer)
63449 +{
63450 + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
63451 +}
63452 +#endif
63453 +
63454 #ifdef CONFIG_CHECKPOINT_RESTORE
63455 static struct pid *
63456 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
63457 diff --git a/fs/proc/base.c b/fs/proc/base.c
63458 index 2d696b0..b9da447 100644
63459 --- a/fs/proc/base.c
63460 +++ b/fs/proc/base.c
63461 @@ -113,6 +113,14 @@ struct pid_entry {
63462 union proc_op op;
63463 };
63464
63465 +struct getdents_callback {
63466 + struct linux_dirent __user * current_dir;
63467 + struct linux_dirent __user * previous;
63468 + struct file * file;
63469 + int count;
63470 + int error;
63471 +};
63472 +
63473 #define NOD(NAME, MODE, IOP, FOP, OP) { \
63474 .name = (NAME), \
63475 .len = sizeof(NAME) - 1, \
63476 @@ -205,12 +213,28 @@ static int proc_pid_cmdline(struct task_struct *task, char *buffer)
63477 return get_cmdline(task, buffer, PAGE_SIZE);
63478 }
63479
63480 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63481 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
63482 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
63483 + _mm->pax_flags & MF_PAX_SEGMEXEC))
63484 +#endif
63485 +
63486 static int proc_pid_auxv(struct task_struct *task, char *buffer)
63487 {
63488 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
63489 int res = PTR_ERR(mm);
63490 if (mm && !IS_ERR(mm)) {
63491 unsigned int nwords = 0;
63492 +
63493 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63494 + /* allow if we're currently ptracing this task */
63495 + if (PAX_RAND_FLAGS(mm) &&
63496 + (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
63497 + mmput(mm);
63498 + return 0;
63499 + }
63500 +#endif
63501 +
63502 do {
63503 nwords += 2;
63504 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
63505 @@ -224,7 +248,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
63506 }
63507
63508
63509 -#ifdef CONFIG_KALLSYMS
63510 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63511 /*
63512 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
63513 * Returns the resolved symbol. If that fails, simply return the address.
63514 @@ -263,7 +287,7 @@ static void unlock_trace(struct task_struct *task)
63515 mutex_unlock(&task->signal->cred_guard_mutex);
63516 }
63517
63518 -#ifdef CONFIG_STACKTRACE
63519 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63520
63521 #define MAX_STACK_TRACE_DEPTH 64
63522
63523 @@ -486,7 +510,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
63524 return count;
63525 }
63526
63527 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
63528 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
63529 static int proc_pid_syscall(struct task_struct *task, char *buffer)
63530 {
63531 long nr;
63532 @@ -515,7 +539,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
63533 /************************************************************************/
63534
63535 /* permission checks */
63536 -static int proc_fd_access_allowed(struct inode *inode)
63537 +static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
63538 {
63539 struct task_struct *task;
63540 int allowed = 0;
63541 @@ -525,7 +549,10 @@ static int proc_fd_access_allowed(struct inode *inode)
63542 */
63543 task = get_proc_task(inode);
63544 if (task) {
63545 - allowed = ptrace_may_access(task, PTRACE_MODE_READ);
63546 + if (log)
63547 + allowed = ptrace_may_access(task, PTRACE_MODE_READ);
63548 + else
63549 + allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
63550 put_task_struct(task);
63551 }
63552 return allowed;
63553 @@ -556,10 +583,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
63554 struct task_struct *task,
63555 int hide_pid_min)
63556 {
63557 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
63558 + return false;
63559 +
63560 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63561 + rcu_read_lock();
63562 + {
63563 + const struct cred *tmpcred = current_cred();
63564 + const struct cred *cred = __task_cred(task);
63565 +
63566 + if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
63567 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63568 + || in_group_p(grsec_proc_gid)
63569 +#endif
63570 + ) {
63571 + rcu_read_unlock();
63572 + return true;
63573 + }
63574 + }
63575 + rcu_read_unlock();
63576 +
63577 + if (!pid->hide_pid)
63578 + return false;
63579 +#endif
63580 +
63581 if (pid->hide_pid < hide_pid_min)
63582 return true;
63583 if (in_group_p(pid->pid_gid))
63584 return true;
63585 +
63586 return ptrace_may_access(task, PTRACE_MODE_READ);
63587 }
63588
63589 @@ -577,7 +629,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
63590 put_task_struct(task);
63591
63592 if (!has_perms) {
63593 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63594 + {
63595 +#else
63596 if (pid->hide_pid == 2) {
63597 +#endif
63598 /*
63599 * Let's make getdents(), stat(), and open()
63600 * consistent with each other. If a process
63601 @@ -675,6 +731,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
63602 if (!task)
63603 return -ESRCH;
63604
63605 + if (gr_acl_handle_procpidmem(task)) {
63606 + put_task_struct(task);
63607 + return -EPERM;
63608 + }
63609 +
63610 mm = mm_access(task, mode);
63611 put_task_struct(task);
63612
63613 @@ -690,6 +751,10 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
63614
63615 file->private_data = mm;
63616
63617 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63618 + file->f_version = current->exec_id;
63619 +#endif
63620 +
63621 return 0;
63622 }
63623
63624 @@ -711,6 +776,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
63625 ssize_t copied;
63626 char *page;
63627
63628 +#ifdef CONFIG_GRKERNSEC
63629 + if (write)
63630 + return -EPERM;
63631 +#endif
63632 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63633 + if (file->f_version != current->exec_id) {
63634 + gr_log_badprocpid("mem");
63635 + return 0;
63636 + }
63637 +#endif
63638 +
63639 if (!mm)
63640 return 0;
63641
63642 @@ -723,7 +799,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
63643 goto free;
63644
63645 while (count > 0) {
63646 - int this_len = min_t(int, count, PAGE_SIZE);
63647 + ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
63648
63649 if (write && copy_from_user(page, buf, this_len)) {
63650 copied = -EFAULT;
63651 @@ -815,6 +891,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
63652 if (!mm)
63653 return 0;
63654
63655 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63656 + if (file->f_version != current->exec_id) {
63657 + gr_log_badprocpid("environ");
63658 + return 0;
63659 + }
63660 +#endif
63661 +
63662 page = (char *)__get_free_page(GFP_TEMPORARY);
63663 if (!page)
63664 return -ENOMEM;
63665 @@ -824,7 +907,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
63666 goto free;
63667 while (count > 0) {
63668 size_t this_len, max_len;
63669 - int retval;
63670 + ssize_t retval;
63671
63672 if (src >= (mm->env_end - mm->env_start))
63673 break;
63674 @@ -1438,7 +1521,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
63675 int error = -EACCES;
63676
63677 /* Are we allowed to snoop on the tasks file descriptors? */
63678 - if (!proc_fd_access_allowed(inode))
63679 + if (!proc_fd_access_allowed(inode, 0))
63680 goto out;
63681
63682 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
63683 @@ -1482,8 +1565,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
63684 struct path path;
63685
63686 /* Are we allowed to snoop on the tasks file descriptors? */
63687 - if (!proc_fd_access_allowed(inode))
63688 - goto out;
63689 + /* logging this is needed for learning on chromium to work properly,
63690 + but we don't want to flood the logs from 'ps' which does a readlink
63691 + on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
63692 + CAP_SYS_PTRACE as it's not necessary for its basic functionality
63693 + */
63694 + if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
63695 + if (!proc_fd_access_allowed(inode,0))
63696 + goto out;
63697 + } else {
63698 + if (!proc_fd_access_allowed(inode,1))
63699 + goto out;
63700 + }
63701
63702 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
63703 if (error)
63704 @@ -1533,7 +1626,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
63705 rcu_read_lock();
63706 cred = __task_cred(task);
63707 inode->i_uid = cred->euid;
63708 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63709 + inode->i_gid = grsec_proc_gid;
63710 +#else
63711 inode->i_gid = cred->egid;
63712 +#endif
63713 rcu_read_unlock();
63714 }
63715 security_task_to_inode(task, inode);
63716 @@ -1569,10 +1666,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
63717 return -ENOENT;
63718 }
63719 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
63720 +#ifdef CONFIG_GRKERNSEC_PROC_USER
63721 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
63722 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63723 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
63724 +#endif
63725 task_dumpable(task)) {
63726 cred = __task_cred(task);
63727 stat->uid = cred->euid;
63728 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63729 + stat->gid = grsec_proc_gid;
63730 +#else
63731 stat->gid = cred->egid;
63732 +#endif
63733 }
63734 }
63735 rcu_read_unlock();
63736 @@ -1610,11 +1716,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
63737
63738 if (task) {
63739 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
63740 +#ifdef CONFIG_GRKERNSEC_PROC_USER
63741 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
63742 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63743 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
63744 +#endif
63745 task_dumpable(task)) {
63746 rcu_read_lock();
63747 cred = __task_cred(task);
63748 inode->i_uid = cred->euid;
63749 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63750 + inode->i_gid = grsec_proc_gid;
63751 +#else
63752 inode->i_gid = cred->egid;
63753 +#endif
63754 rcu_read_unlock();
63755 } else {
63756 inode->i_uid = GLOBAL_ROOT_UID;
63757 @@ -2149,6 +2264,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
63758 if (!task)
63759 goto out_no_task;
63760
63761 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
63762 + goto out;
63763 +
63764 /*
63765 * Yes, it does not scale. And it should not. Don't add
63766 * new entries into /proc/<tgid>/ without very good reasons.
63767 @@ -2179,6 +2297,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
63768 if (!task)
63769 return -ENOENT;
63770
63771 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
63772 + goto out;
63773 +
63774 if (!dir_emit_dots(file, ctx))
63775 goto out;
63776
63777 @@ -2568,7 +2689,7 @@ static const struct pid_entry tgid_base_stuff[] = {
63778 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
63779 #endif
63780 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
63781 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
63782 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
63783 INF("syscall", S_IRUSR, proc_pid_syscall),
63784 #endif
63785 INF("cmdline", S_IRUGO, proc_pid_cmdline),
63786 @@ -2593,10 +2714,10 @@ static const struct pid_entry tgid_base_stuff[] = {
63787 #ifdef CONFIG_SECURITY
63788 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
63789 #endif
63790 -#ifdef CONFIG_KALLSYMS
63791 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63792 INF("wchan", S_IRUGO, proc_pid_wchan),
63793 #endif
63794 -#ifdef CONFIG_STACKTRACE
63795 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63796 ONE("stack", S_IRUSR, proc_pid_stack),
63797 #endif
63798 #ifdef CONFIG_SCHEDSTATS
63799 @@ -2630,6 +2751,9 @@ static const struct pid_entry tgid_base_stuff[] = {
63800 #ifdef CONFIG_HARDWALL
63801 INF("hardwall", S_IRUGO, proc_pid_hardwall),
63802 #endif
63803 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
63804 + INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
63805 +#endif
63806 #ifdef CONFIG_USER_NS
63807 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
63808 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
63809 @@ -2760,7 +2884,14 @@ static int proc_pid_instantiate(struct inode *dir,
63810 if (!inode)
63811 goto out;
63812
63813 +#ifdef CONFIG_GRKERNSEC_PROC_USER
63814 + inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
63815 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63816 + inode->i_gid = grsec_proc_gid;
63817 + inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
63818 +#else
63819 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
63820 +#endif
63821 inode->i_op = &proc_tgid_base_inode_operations;
63822 inode->i_fop = &proc_tgid_base_operations;
63823 inode->i_flags|=S_IMMUTABLE;
63824 @@ -2798,7 +2929,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
63825 if (!task)
63826 goto out;
63827
63828 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
63829 + goto out_put_task;
63830 +
63831 result = proc_pid_instantiate(dir, dentry, task, NULL);
63832 +out_put_task:
63833 put_task_struct(task);
63834 out:
63835 return ERR_PTR(result);
63836 @@ -2904,7 +3039,7 @@ static const struct pid_entry tid_base_stuff[] = {
63837 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
63838 #endif
63839 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
63840 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
63841 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
63842 INF("syscall", S_IRUSR, proc_pid_syscall),
63843 #endif
63844 INF("cmdline", S_IRUGO, proc_pid_cmdline),
63845 @@ -2931,10 +3066,10 @@ static const struct pid_entry tid_base_stuff[] = {
63846 #ifdef CONFIG_SECURITY
63847 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
63848 #endif
63849 -#ifdef CONFIG_KALLSYMS
63850 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63851 INF("wchan", S_IRUGO, proc_pid_wchan),
63852 #endif
63853 -#ifdef CONFIG_STACKTRACE
63854 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63855 ONE("stack", S_IRUSR, proc_pid_stack),
63856 #endif
63857 #ifdef CONFIG_SCHEDSTATS
63858 diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
63859 index cbd82df..c0407d2 100644
63860 --- a/fs/proc/cmdline.c
63861 +++ b/fs/proc/cmdline.c
63862 @@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
63863
63864 static int __init proc_cmdline_init(void)
63865 {
63866 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
63867 + proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
63868 +#else
63869 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
63870 +#endif
63871 return 0;
63872 }
63873 fs_initcall(proc_cmdline_init);
63874 diff --git a/fs/proc/devices.c b/fs/proc/devices.c
63875 index 50493ed..248166b 100644
63876 --- a/fs/proc/devices.c
63877 +++ b/fs/proc/devices.c
63878 @@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
63879
63880 static int __init proc_devices_init(void)
63881 {
63882 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
63883 + proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
63884 +#else
63885 proc_create("devices", 0, NULL, &proc_devinfo_operations);
63886 +#endif
63887 return 0;
63888 }
63889 fs_initcall(proc_devices_init);
63890 diff --git a/fs/proc/fd.c b/fs/proc/fd.c
63891 index 0788d09..9cc1385 100644
63892 --- a/fs/proc/fd.c
63893 +++ b/fs/proc/fd.c
63894 @@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
63895 if (!task)
63896 return -ENOENT;
63897
63898 - files = get_files_struct(task);
63899 + if (!gr_acl_handle_procpidmem(task))
63900 + files = get_files_struct(task);
63901 put_task_struct(task);
63902
63903 if (files) {
63904 @@ -285,11 +286,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
63905 */
63906 int proc_fd_permission(struct inode *inode, int mask)
63907 {
63908 + struct task_struct *task;
63909 int rv = generic_permission(inode, mask);
63910 - if (rv == 0)
63911 - return 0;
63912 +
63913 if (task_tgid(current) == proc_pid(inode))
63914 rv = 0;
63915 +
63916 + task = get_proc_task(inode);
63917 + if (task == NULL)
63918 + return rv;
63919 +
63920 + if (gr_acl_handle_procpidmem(task))
63921 + rv = -EACCES;
63922 +
63923 + put_task_struct(task);
63924 +
63925 return rv;
63926 }
63927
63928 diff --git a/fs/proc/generic.c b/fs/proc/generic.c
63929 index b7f268e..3bea6b7 100644
63930 --- a/fs/proc/generic.c
63931 +++ b/fs/proc/generic.c
63932 @@ -23,6 +23,7 @@
63933 #include <linux/bitops.h>
63934 #include <linux/spinlock.h>
63935 #include <linux/completion.h>
63936 +#include <linux/grsecurity.h>
63937 #include <asm/uaccess.h>
63938
63939 #include "internal.h"
63940 @@ -207,6 +208,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
63941 return proc_lookup_de(PDE(dir), dir, dentry);
63942 }
63943
63944 +struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
63945 + unsigned int flags)
63946 +{
63947 + if (gr_proc_is_restricted())
63948 + return ERR_PTR(-EACCES);
63949 +
63950 + return proc_lookup_de(PDE(dir), dir, dentry);
63951 +}
63952 +
63953 /*
63954 * This returns non-zero if at EOF, so that the /proc
63955 * root directory can use this and check if it should
63956 @@ -264,6 +274,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
63957 return proc_readdir_de(PDE(inode), file, ctx);
63958 }
63959
63960 +int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
63961 +{
63962 + struct inode *inode = file_inode(file);
63963 +
63964 + if (gr_proc_is_restricted())
63965 + return -EACCES;
63966 +
63967 + return proc_readdir_de(PDE(inode), file, ctx);
63968 +}
63969 +
63970 /*
63971 * These are the generic /proc directory operations. They
63972 * use the in-memory "struct proc_dir_entry" tree to parse
63973 @@ -275,6 +295,12 @@ static const struct file_operations proc_dir_operations = {
63974 .iterate = proc_readdir,
63975 };
63976
63977 +static const struct file_operations proc_dir_restricted_operations = {
63978 + .llseek = generic_file_llseek,
63979 + .read = generic_read_dir,
63980 + .iterate = proc_readdir_restrict,
63981 +};
63982 +
63983 /*
63984 * proc directories can do almost nothing..
63985 */
63986 @@ -284,6 +310,12 @@ static const struct inode_operations proc_dir_inode_operations = {
63987 .setattr = proc_notify_change,
63988 };
63989
63990 +static const struct inode_operations proc_dir_restricted_inode_operations = {
63991 + .lookup = proc_lookup_restrict,
63992 + .getattr = proc_getattr,
63993 + .setattr = proc_notify_change,
63994 +};
63995 +
63996 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
63997 {
63998 struct proc_dir_entry *tmp;
63999 @@ -294,8 +326,13 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
64000 return ret;
64001
64002 if (S_ISDIR(dp->mode)) {
64003 - dp->proc_fops = &proc_dir_operations;
64004 - dp->proc_iops = &proc_dir_inode_operations;
64005 + if (dp->restricted) {
64006 + dp->proc_fops = &proc_dir_restricted_operations;
64007 + dp->proc_iops = &proc_dir_restricted_inode_operations;
64008 + } else {
64009 + dp->proc_fops = &proc_dir_operations;
64010 + dp->proc_iops = &proc_dir_inode_operations;
64011 + }
64012 dir->nlink++;
64013 } else if (S_ISLNK(dp->mode)) {
64014 dp->proc_iops = &proc_link_inode_operations;
64015 @@ -407,6 +444,27 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
64016 }
64017 EXPORT_SYMBOL_GPL(proc_mkdir_data);
64018
64019 +struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
64020 + struct proc_dir_entry *parent, void *data)
64021 +{
64022 + struct proc_dir_entry *ent;
64023 +
64024 + if (mode == 0)
64025 + mode = S_IRUGO | S_IXUGO;
64026 +
64027 + ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
64028 + if (ent) {
64029 + ent->data = data;
64030 + ent->restricted = 1;
64031 + if (proc_register(parent, ent) < 0) {
64032 + kfree(ent);
64033 + ent = NULL;
64034 + }
64035 + }
64036 + return ent;
64037 +}
64038 +EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
64039 +
64040 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
64041 struct proc_dir_entry *parent)
64042 {
64043 @@ -421,6 +479,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
64044 }
64045 EXPORT_SYMBOL(proc_mkdir);
64046
64047 +struct proc_dir_entry *proc_mkdir_restrict(const char *name,
64048 + struct proc_dir_entry *parent)
64049 +{
64050 + return proc_mkdir_data_restrict(name, 0, parent, NULL);
64051 +}
64052 +EXPORT_SYMBOL(proc_mkdir_restrict);
64053 +
64054 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
64055 struct proc_dir_entry *parent,
64056 const struct file_operations *proc_fops,
64057 diff --git a/fs/proc/inode.c b/fs/proc/inode.c
64058 index 0adbc02..bee4d0b 100644
64059 --- a/fs/proc/inode.c
64060 +++ b/fs/proc/inode.c
64061 @@ -23,11 +23,17 @@
64062 #include <linux/slab.h>
64063 #include <linux/mount.h>
64064 #include <linux/magic.h>
64065 +#include <linux/grsecurity.h>
64066
64067 #include <asm/uaccess.h>
64068
64069 #include "internal.h"
64070
64071 +#ifdef CONFIG_PROC_SYSCTL
64072 +extern const struct inode_operations proc_sys_inode_operations;
64073 +extern const struct inode_operations proc_sys_dir_operations;
64074 +#endif
64075 +
64076 static void proc_evict_inode(struct inode *inode)
64077 {
64078 struct proc_dir_entry *de;
64079 @@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
64080 ns = PROC_I(inode)->ns.ns;
64081 if (ns_ops && ns)
64082 ns_ops->put(ns);
64083 +
64084 +#ifdef CONFIG_PROC_SYSCTL
64085 + if (inode->i_op == &proc_sys_inode_operations ||
64086 + inode->i_op == &proc_sys_dir_operations)
64087 + gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
64088 +#endif
64089 +
64090 }
64091
64092 static struct kmem_cache * proc_inode_cachep;
64093 @@ -413,7 +426,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
64094 if (de->mode) {
64095 inode->i_mode = de->mode;
64096 inode->i_uid = de->uid;
64097 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
64098 + inode->i_gid = grsec_proc_gid;
64099 +#else
64100 inode->i_gid = de->gid;
64101 +#endif
64102 }
64103 if (de->size)
64104 inode->i_size = de->size;
64105 diff --git a/fs/proc/internal.h b/fs/proc/internal.h
64106 index 3ab6d14..b26174e 100644
64107 --- a/fs/proc/internal.h
64108 +++ b/fs/proc/internal.h
64109 @@ -46,9 +46,10 @@ struct proc_dir_entry {
64110 struct completion *pde_unload_completion;
64111 struct list_head pde_openers; /* who did ->open, but not ->release */
64112 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
64113 + u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
64114 u8 namelen;
64115 char name[];
64116 -};
64117 +} __randomize_layout;
64118
64119 union proc_op {
64120 int (*proc_get_link)(struct dentry *, struct path *);
64121 @@ -67,7 +68,7 @@ struct proc_inode {
64122 struct ctl_table *sysctl_entry;
64123 struct proc_ns ns;
64124 struct inode vfs_inode;
64125 -};
64126 +} __randomize_layout;
64127
64128 /*
64129 * General functions
64130 @@ -155,6 +156,9 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
64131 struct pid *, struct task_struct *);
64132 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
64133 struct pid *, struct task_struct *);
64134 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
64135 +extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
64136 +#endif
64137
64138 /*
64139 * base.c
64140 @@ -181,9 +185,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
64141 extern spinlock_t proc_subdir_lock;
64142
64143 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
64144 +extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
64145 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
64146 struct dentry *);
64147 extern int proc_readdir(struct file *, struct dir_context *);
64148 +extern int proc_readdir_restrict(struct file *, struct dir_context *);
64149 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
64150
64151 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
64152 diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
64153 index a352d57..cb94a5c 100644
64154 --- a/fs/proc/interrupts.c
64155 +++ b/fs/proc/interrupts.c
64156 @@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
64157
64158 static int __init proc_interrupts_init(void)
64159 {
64160 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
64161 + proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
64162 +#else
64163 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
64164 +#endif
64165 return 0;
64166 }
64167 fs_initcall(proc_interrupts_init);
64168 diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
64169 index 39e6ef3..2f9cb5e 100644
64170 --- a/fs/proc/kcore.c
64171 +++ b/fs/proc/kcore.c
64172 @@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
64173 * the addresses in the elf_phdr on our list.
64174 */
64175 start = kc_offset_to_vaddr(*fpos - elf_buflen);
64176 - if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
64177 + tsz = PAGE_SIZE - (start & ~PAGE_MASK);
64178 + if (tsz > buflen)
64179 tsz = buflen;
64180 -
64181 +
64182 while (buflen) {
64183 struct kcore_list *m;
64184
64185 @@ -514,20 +515,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
64186 kfree(elf_buf);
64187 } else {
64188 if (kern_addr_valid(start)) {
64189 - unsigned long n;
64190 + char *elf_buf;
64191 + mm_segment_t oldfs;
64192
64193 - n = copy_to_user(buffer, (char *)start, tsz);
64194 - /*
64195 - * We cannot distinguish between fault on source
64196 - * and fault on destination. When this happens
64197 - * we clear too and hope it will trigger the
64198 - * EFAULT again.
64199 - */
64200 - if (n) {
64201 - if (clear_user(buffer + tsz - n,
64202 - n))
64203 + elf_buf = kmalloc(tsz, GFP_KERNEL);
64204 + if (!elf_buf)
64205 + return -ENOMEM;
64206 + oldfs = get_fs();
64207 + set_fs(KERNEL_DS);
64208 + if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
64209 + set_fs(oldfs);
64210 + if (copy_to_user(buffer, elf_buf, tsz)) {
64211 + kfree(elf_buf);
64212 return -EFAULT;
64213 + }
64214 }
64215 + set_fs(oldfs);
64216 + kfree(elf_buf);
64217 } else {
64218 if (clear_user(buffer, tsz))
64219 return -EFAULT;
64220 @@ -547,6 +551,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
64221
64222 static int open_kcore(struct inode *inode, struct file *filp)
64223 {
64224 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
64225 + return -EPERM;
64226 +#endif
64227 if (!capable(CAP_SYS_RAWIO))
64228 return -EPERM;
64229 if (kcore_need_update)
64230 diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
64231 index 7445af0..7c5113c 100644
64232 --- a/fs/proc/meminfo.c
64233 +++ b/fs/proc/meminfo.c
64234 @@ -187,7 +187,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
64235 vmi.used >> 10,
64236 vmi.largest_chunk >> 10
64237 #ifdef CONFIG_MEMORY_FAILURE
64238 - ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
64239 + ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
64240 #endif
64241 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
64242 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
64243 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
64244 index d4a3574..b421ce9 100644
64245 --- a/fs/proc/nommu.c
64246 +++ b/fs/proc/nommu.c
64247 @@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
64248
64249 if (file) {
64250 seq_pad(m, ' ');
64251 - seq_path(m, &file->f_path, "");
64252 + seq_path(m, &file->f_path, "\n\\");
64253 }
64254
64255 seq_putc(m, '\n');
64256 diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
64257 index 4677bb7..dad3045 100644
64258 --- a/fs/proc/proc_net.c
64259 +++ b/fs/proc/proc_net.c
64260 @@ -23,9 +23,27 @@
64261 #include <linux/nsproxy.h>
64262 #include <net/net_namespace.h>
64263 #include <linux/seq_file.h>
64264 +#include <linux/grsecurity.h>
64265
64266 #include "internal.h"
64267
64268 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
64269 +static struct seq_operations *ipv6_seq_ops_addr;
64270 +
64271 +void register_ipv6_seq_ops_addr(struct seq_operations *addr)
64272 +{
64273 + ipv6_seq_ops_addr = addr;
64274 +}
64275 +
64276 +void unregister_ipv6_seq_ops_addr(void)
64277 +{
64278 + ipv6_seq_ops_addr = NULL;
64279 +}
64280 +
64281 +EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
64282 +EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
64283 +#endif
64284 +
64285 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
64286 {
64287 return pde->parent->data;
64288 @@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
64289 return maybe_get_net(PDE_NET(PDE(inode)));
64290 }
64291
64292 +extern const struct seq_operations dev_seq_ops;
64293 +
64294 int seq_open_net(struct inode *ino, struct file *f,
64295 const struct seq_operations *ops, int size)
64296 {
64297 @@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
64298
64299 BUG_ON(size < sizeof(*p));
64300
64301 + /* only permit access to /proc/net/dev */
64302 + if (
64303 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
64304 + ops != ipv6_seq_ops_addr &&
64305 +#endif
64306 + ops != &dev_seq_ops && gr_proc_is_restricted())
64307 + return -EACCES;
64308 +
64309 net = get_proc_net(ino);
64310 if (net == NULL)
64311 return -ENXIO;
64312 @@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
64313 int err;
64314 struct net *net;
64315
64316 + if (gr_proc_is_restricted())
64317 + return -EACCES;
64318 +
64319 err = -ENXIO;
64320 net = get_proc_net(inode);
64321 if (net == NULL)
64322 diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
64323 index 7129046..6914844 100644
64324 --- a/fs/proc/proc_sysctl.c
64325 +++ b/fs/proc/proc_sysctl.c
64326 @@ -11,13 +11,21 @@
64327 #include <linux/namei.h>
64328 #include <linux/mm.h>
64329 #include <linux/module.h>
64330 +#include <linux/nsproxy.h>
64331 +#ifdef CONFIG_GRKERNSEC
64332 +#include <net/net_namespace.h>
64333 +#endif
64334 #include "internal.h"
64335
64336 +extern int gr_handle_chroot_sysctl(const int op);
64337 +extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
64338 + const int op);
64339 +
64340 static const struct dentry_operations proc_sys_dentry_operations;
64341 static const struct file_operations proc_sys_file_operations;
64342 -static const struct inode_operations proc_sys_inode_operations;
64343 +const struct inode_operations proc_sys_inode_operations;
64344 static const struct file_operations proc_sys_dir_file_operations;
64345 -static const struct inode_operations proc_sys_dir_operations;
64346 +const struct inode_operations proc_sys_dir_operations;
64347
64348 void proc_sys_poll_notify(struct ctl_table_poll *poll)
64349 {
64350 @@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
64351
64352 err = NULL;
64353 d_set_d_op(dentry, &proc_sys_dentry_operations);
64354 +
64355 + gr_handle_proc_create(dentry, inode);
64356 +
64357 d_add(dentry, inode);
64358
64359 out:
64360 @@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
64361 struct inode *inode = file_inode(filp);
64362 struct ctl_table_header *head = grab_header(inode);
64363 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
64364 + int op = write ? MAY_WRITE : MAY_READ;
64365 ssize_t error;
64366 size_t res;
64367
64368 @@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
64369 * and won't be until we finish.
64370 */
64371 error = -EPERM;
64372 - if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
64373 + if (sysctl_perm(head, table, op))
64374 goto out;
64375
64376 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
64377 @@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
64378 if (!table->proc_handler)
64379 goto out;
64380
64381 +#ifdef CONFIG_GRKERNSEC
64382 + error = -EPERM;
64383 + if (gr_handle_chroot_sysctl(op))
64384 + goto out;
64385 + dget(filp->f_path.dentry);
64386 + if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
64387 + dput(filp->f_path.dentry);
64388 + goto out;
64389 + }
64390 + dput(filp->f_path.dentry);
64391 + if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
64392 + goto out;
64393 + if (write) {
64394 + if (current->nsproxy->net_ns != table->extra2) {
64395 + if (!capable(CAP_SYS_ADMIN))
64396 + goto out;
64397 + } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
64398 + goto out;
64399 + }
64400 +#endif
64401 +
64402 /* careful: calling conventions are nasty here */
64403 res = count;
64404 error = table->proc_handler(table, write, buf, &res, ppos);
64405 @@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
64406 return false;
64407 } else {
64408 d_set_d_op(child, &proc_sys_dentry_operations);
64409 +
64410 + gr_handle_proc_create(child, inode);
64411 +
64412 d_add(child, inode);
64413 }
64414 } else {
64415 @@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
64416 if ((*pos)++ < ctx->pos)
64417 return true;
64418
64419 + if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
64420 + return 0;
64421 +
64422 if (unlikely(S_ISLNK(table->mode)))
64423 res = proc_sys_link_fill_cache(file, ctx, head, table);
64424 else
64425 @@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
64426 if (IS_ERR(head))
64427 return PTR_ERR(head);
64428
64429 + if (table && !gr_acl_handle_hidden_file(dentry, mnt))
64430 + return -ENOENT;
64431 +
64432 generic_fillattr(inode, stat);
64433 if (table)
64434 stat->mode = (stat->mode & S_IFMT) | table->mode;
64435 @@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
64436 .llseek = generic_file_llseek,
64437 };
64438
64439 -static const struct inode_operations proc_sys_inode_operations = {
64440 +const struct inode_operations proc_sys_inode_operations = {
64441 .permission = proc_sys_permission,
64442 .setattr = proc_sys_setattr,
64443 .getattr = proc_sys_getattr,
64444 };
64445
64446 -static const struct inode_operations proc_sys_dir_operations = {
64447 +const struct inode_operations proc_sys_dir_operations = {
64448 .lookup = proc_sys_lookup,
64449 .permission = proc_sys_permission,
64450 .setattr = proc_sys_setattr,
64451 @@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
64452 static struct ctl_dir *new_dir(struct ctl_table_set *set,
64453 const char *name, int namelen)
64454 {
64455 - struct ctl_table *table;
64456 + ctl_table_no_const *table;
64457 struct ctl_dir *new;
64458 struct ctl_node *node;
64459 char *new_name;
64460 @@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
64461 return NULL;
64462
64463 node = (struct ctl_node *)(new + 1);
64464 - table = (struct ctl_table *)(node + 1);
64465 + table = (ctl_table_no_const *)(node + 1);
64466 new_name = (char *)(table + 2);
64467 memcpy(new_name, name, namelen);
64468 new_name[namelen] = '\0';
64469 @@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
64470 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
64471 struct ctl_table_root *link_root)
64472 {
64473 - struct ctl_table *link_table, *entry, *link;
64474 + ctl_table_no_const *link_table, *link;
64475 + struct ctl_table *entry;
64476 struct ctl_table_header *links;
64477 struct ctl_node *node;
64478 char *link_name;
64479 @@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
64480 return NULL;
64481
64482 node = (struct ctl_node *)(links + 1);
64483 - link_table = (struct ctl_table *)(node + nr_entries);
64484 + link_table = (ctl_table_no_const *)(node + nr_entries);
64485 link_name = (char *)&link_table[nr_entries + 1];
64486
64487 for (link = link_table, entry = table; entry->procname; link++, entry++) {
64488 @@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
64489 struct ctl_table_header ***subheader, struct ctl_table_set *set,
64490 struct ctl_table *table)
64491 {
64492 - struct ctl_table *ctl_table_arg = NULL;
64493 - struct ctl_table *entry, *files;
64494 + ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
64495 + struct ctl_table *entry;
64496 int nr_files = 0;
64497 int nr_dirs = 0;
64498 int err = -ENOMEM;
64499 @@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
64500 nr_files++;
64501 }
64502
64503 - files = table;
64504 /* If there are mixed files and directories we need a new table */
64505 if (nr_dirs && nr_files) {
64506 - struct ctl_table *new;
64507 + ctl_table_no_const *new;
64508 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
64509 GFP_KERNEL);
64510 if (!files)
64511 @@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
64512 /* Register everything except a directory full of subdirectories */
64513 if (nr_files || !nr_dirs) {
64514 struct ctl_table_header *header;
64515 - header = __register_sysctl_table(set, path, files);
64516 + header = __register_sysctl_table(set, path, files ? files : table);
64517 if (!header) {
64518 kfree(ctl_table_arg);
64519 goto out;
64520 diff --git a/fs/proc/root.c b/fs/proc/root.c
64521 index 5dbadec..473af2f 100644
64522 --- a/fs/proc/root.c
64523 +++ b/fs/proc/root.c
64524 @@ -185,7 +185,15 @@ void __init proc_root_init(void)
64525 proc_mkdir("openprom", NULL);
64526 #endif
64527 proc_tty_init();
64528 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
64529 +#ifdef CONFIG_GRKERNSEC_PROC_USER
64530 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
64531 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
64532 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
64533 +#endif
64534 +#else
64535 proc_mkdir("bus", NULL);
64536 +#endif
64537 proc_sys_init();
64538 }
64539
64540 diff --git a/fs/proc/stat.c b/fs/proc/stat.c
64541 index 9d231e9..2e1b51a 100644
64542 --- a/fs/proc/stat.c
64543 +++ b/fs/proc/stat.c
64544 @@ -11,6 +11,7 @@
64545 #include <linux/irqnr.h>
64546 #include <linux/cputime.h>
64547 #include <linux/tick.h>
64548 +#include <linux/grsecurity.h>
64549
64550 #ifndef arch_irq_stat_cpu
64551 #define arch_irq_stat_cpu(cpu) 0
64552 @@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
64553 u64 sum_softirq = 0;
64554 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
64555 struct timespec boottime;
64556 + int unrestricted = 1;
64557 +
64558 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
64559 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
64560 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
64561 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
64562 + && !in_group_p(grsec_proc_gid)
64563 +#endif
64564 + )
64565 + unrestricted = 0;
64566 +#endif
64567 +#endif
64568
64569 user = nice = system = idle = iowait =
64570 irq = softirq = steal = 0;
64571 @@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
64572 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
64573 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
64574 idle += get_idle_time(i);
64575 - iowait += get_iowait_time(i);
64576 - irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
64577 - softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
64578 - steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
64579 - guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
64580 - guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
64581 - sum += kstat_cpu_irqs_sum(i);
64582 - sum += arch_irq_stat_cpu(i);
64583 + if (unrestricted) {
64584 + iowait += get_iowait_time(i);
64585 + irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
64586 + softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
64587 + steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
64588 + guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
64589 + guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
64590 + sum += kstat_cpu_irqs_sum(i);
64591 + sum += arch_irq_stat_cpu(i);
64592 + for (j = 0; j < NR_SOFTIRQS; j++) {
64593 + unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
64594
64595 - for (j = 0; j < NR_SOFTIRQS; j++) {
64596 - unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
64597 -
64598 - per_softirq_sums[j] += softirq_stat;
64599 - sum_softirq += softirq_stat;
64600 + per_softirq_sums[j] += softirq_stat;
64601 + sum_softirq += softirq_stat;
64602 + }
64603 }
64604 }
64605 - sum += arch_irq_stat();
64606 + if (unrestricted)
64607 + sum += arch_irq_stat();
64608
64609 seq_puts(p, "cpu ");
64610 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
64611 @@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
64612 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
64613 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
64614 idle = get_idle_time(i);
64615 - iowait = get_iowait_time(i);
64616 - irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
64617 - softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
64618 - steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
64619 - guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
64620 - guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
64621 + if (unrestricted) {
64622 + iowait = get_iowait_time(i);
64623 + irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
64624 + softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
64625 + steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
64626 + guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
64627 + guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
64628 + }
64629 seq_printf(p, "cpu%d", i);
64630 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
64631 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
64632 @@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
64633
64634 /* sum again ? it could be updated? */
64635 for_each_irq_nr(j)
64636 - seq_put_decimal_ull(p, ' ', kstat_irqs(j));
64637 + seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs(j) : 0ULL);
64638
64639 seq_printf(p,
64640 "\nctxt %llu\n"
64641 @@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
64642 "processes %lu\n"
64643 "procs_running %lu\n"
64644 "procs_blocked %lu\n",
64645 - nr_context_switches(),
64646 + unrestricted ? nr_context_switches() : 0ULL,
64647 (unsigned long)jif,
64648 - total_forks,
64649 - nr_running(),
64650 - nr_iowait());
64651 + unrestricted ? total_forks : 0UL,
64652 + unrestricted ? nr_running() : 0UL,
64653 + unrestricted ? nr_iowait() : 0UL);
64654
64655 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
64656
64657 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
64658 index c4b2646..84f0d7b 100644
64659 --- a/fs/proc/task_mmu.c
64660 +++ b/fs/proc/task_mmu.c
64661 @@ -13,12 +13,19 @@
64662 #include <linux/swap.h>
64663 #include <linux/swapops.h>
64664 #include <linux/mmu_notifier.h>
64665 +#include <linux/grsecurity.h>
64666
64667 #include <asm/elf.h>
64668 #include <asm/uaccess.h>
64669 #include <asm/tlbflush.h>
64670 #include "internal.h"
64671
64672 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64673 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
64674 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
64675 + _mm->pax_flags & MF_PAX_SEGMEXEC))
64676 +#endif
64677 +
64678 void task_mem(struct seq_file *m, struct mm_struct *mm)
64679 {
64680 unsigned long data, text, lib, swap;
64681 @@ -54,8 +61,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
64682 "VmExe:\t%8lu kB\n"
64683 "VmLib:\t%8lu kB\n"
64684 "VmPTE:\t%8lu kB\n"
64685 - "VmSwap:\t%8lu kB\n",
64686 - hiwater_vm << (PAGE_SHIFT-10),
64687 + "VmSwap:\t%8lu kB\n"
64688 +
64689 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
64690 + "CsBase:\t%8lx\nCsLim:\t%8lx\n"
64691 +#endif
64692 +
64693 + ,hiwater_vm << (PAGE_SHIFT-10),
64694 total_vm << (PAGE_SHIFT-10),
64695 mm->locked_vm << (PAGE_SHIFT-10),
64696 mm->pinned_vm << (PAGE_SHIFT-10),
64697 @@ -65,7 +77,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
64698 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
64699 (PTRS_PER_PTE * sizeof(pte_t) *
64700 atomic_long_read(&mm->nr_ptes)) >> 10,
64701 - swap << (PAGE_SHIFT-10));
64702 + swap << (PAGE_SHIFT-10)
64703 +
64704 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
64705 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64706 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
64707 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
64708 +#else
64709 + , mm->context.user_cs_base
64710 + , mm->context.user_cs_limit
64711 +#endif
64712 +#endif
64713 +
64714 + );
64715 }
64716
64717 unsigned long task_vsize(struct mm_struct *mm)
64718 @@ -271,13 +295,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
64719 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
64720 }
64721
64722 - /* We don't show the stack guard page in /proc/maps */
64723 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64724 + start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
64725 + end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
64726 +#else
64727 start = vma->vm_start;
64728 - if (stack_guard_page_start(vma, start))
64729 - start += PAGE_SIZE;
64730 end = vma->vm_end;
64731 - if (stack_guard_page_end(vma, end))
64732 - end -= PAGE_SIZE;
64733 +#endif
64734
64735 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
64736 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
64737 @@ -287,7 +311,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
64738 flags & VM_WRITE ? 'w' : '-',
64739 flags & VM_EXEC ? 'x' : '-',
64740 flags & VM_MAYSHARE ? 's' : 'p',
64741 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64742 + PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
64743 +#else
64744 pgoff,
64745 +#endif
64746 MAJOR(dev), MINOR(dev), ino);
64747
64748 /*
64749 @@ -296,7 +324,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
64750 */
64751 if (file) {
64752 seq_pad(m, ' ');
64753 - seq_path(m, &file->f_path, "\n");
64754 + seq_path(m, &file->f_path, "\n\\");
64755 goto done;
64756 }
64757
64758 @@ -322,8 +350,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
64759 * Thread stack in /proc/PID/task/TID/maps or
64760 * the main process stack.
64761 */
64762 - if (!is_pid || (vma->vm_start <= mm->start_stack &&
64763 - vma->vm_end >= mm->start_stack)) {
64764 + if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
64765 + (vma->vm_start <= mm->start_stack &&
64766 + vma->vm_end >= mm->start_stack)) {
64767 name = "[stack]";
64768 } else {
64769 /* Thread stack in /proc/PID/maps */
64770 @@ -347,6 +376,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
64771 struct proc_maps_private *priv = m->private;
64772 struct task_struct *task = priv->task;
64773
64774 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64775 + if (current->exec_id != m->exec_id) {
64776 + gr_log_badprocpid("maps");
64777 + return 0;
64778 + }
64779 +#endif
64780 +
64781 show_map_vma(m, vma, is_pid);
64782
64783 if (m->count < m->size) /* vma is copied successfully */
64784 @@ -587,12 +623,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
64785 .private = &mss,
64786 };
64787
64788 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64789 + if (current->exec_id != m->exec_id) {
64790 + gr_log_badprocpid("smaps");
64791 + return 0;
64792 + }
64793 +#endif
64794 memset(&mss, 0, sizeof mss);
64795 - mss.vma = vma;
64796 - /* mmap_sem is held in m_start */
64797 - if (vma->vm_mm && !is_vm_hugetlb_page(vma))
64798 - walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
64799 -
64800 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64801 + if (!PAX_RAND_FLAGS(vma->vm_mm)) {
64802 +#endif
64803 + mss.vma = vma;
64804 + /* mmap_sem is held in m_start */
64805 + if (vma->vm_mm && !is_vm_hugetlb_page(vma))
64806 + walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
64807 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64808 + }
64809 +#endif
64810 show_map_vma(m, vma, is_pid);
64811
64812 seq_printf(m,
64813 @@ -610,7 +657,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
64814 "KernelPageSize: %8lu kB\n"
64815 "MMUPageSize: %8lu kB\n"
64816 "Locked: %8lu kB\n",
64817 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64818 + PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
64819 +#else
64820 (vma->vm_end - vma->vm_start) >> 10,
64821 +#endif
64822 mss.resident >> 10,
64823 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
64824 mss.shared_clean >> 10,
64825 @@ -1388,6 +1439,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
64826 char buffer[64];
64827 int nid;
64828
64829 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64830 + if (current->exec_id != m->exec_id) {
64831 + gr_log_badprocpid("numa_maps");
64832 + return 0;
64833 + }
64834 +#endif
64835 +
64836 if (!mm)
64837 return 0;
64838
64839 @@ -1405,11 +1463,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
64840 mpol_to_str(buffer, sizeof(buffer), pol);
64841 mpol_cond_put(pol);
64842
64843 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64844 + seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
64845 +#else
64846 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
64847 +#endif
64848
64849 if (file) {
64850 seq_printf(m, " file=");
64851 - seq_path(m, &file->f_path, "\n\t= ");
64852 + seq_path(m, &file->f_path, "\n\t\\= ");
64853 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
64854 seq_printf(m, " heap");
64855 } else {
64856 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
64857 index 678455d..ebd3245 100644
64858 --- a/fs/proc/task_nommu.c
64859 +++ b/fs/proc/task_nommu.c
64860 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
64861 else
64862 bytes += kobjsize(mm);
64863
64864 - if (current->fs && current->fs->users > 1)
64865 + if (current->fs && atomic_read(&current->fs->users) > 1)
64866 sbytes += kobjsize(current->fs);
64867 else
64868 bytes += kobjsize(current->fs);
64869 @@ -161,7 +161,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
64870
64871 if (file) {
64872 seq_pad(m, ' ');
64873 - seq_path(m, &file->f_path, "");
64874 + seq_path(m, &file->f_path, "\n\\");
64875 } else if (mm) {
64876 pid_t tid = vm_is_stack(priv->task, vma, is_pid);
64877
64878 diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
64879 index 6a8e785..41f2a6c 100644
64880 --- a/fs/proc/vmcore.c
64881 +++ b/fs/proc/vmcore.c
64882 @@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
64883 nr_bytes = count;
64884
64885 /* If pfn is not ram, return zeros for sparse dump files */
64886 - if (pfn_is_ram(pfn) == 0)
64887 - memset(buf, 0, nr_bytes);
64888 - else {
64889 + if (pfn_is_ram(pfn) == 0) {
64890 + if (userbuf) {
64891 + if (clear_user((char __force_user *)buf, nr_bytes))
64892 + return -EFAULT;
64893 + } else
64894 + memset(buf, 0, nr_bytes);
64895 + } else {
64896 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
64897 offset, userbuf);
64898 if (tmp < 0)
64899 @@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
64900 static int copy_to(void *target, void *src, size_t size, int userbuf)
64901 {
64902 if (userbuf) {
64903 - if (copy_to_user((char __user *) target, src, size))
64904 + if (copy_to_user((char __force_user *) target, src, size))
64905 return -EFAULT;
64906 } else {
64907 memcpy(target, src, size);
64908 @@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
64909 if (*fpos < m->offset + m->size) {
64910 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
64911 start = m->paddr + *fpos - m->offset;
64912 - tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
64913 + tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
64914 if (tmp < 0)
64915 return tmp;
64916 buflen -= tsz;
64917 @@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
64918 static ssize_t read_vmcore(struct file *file, char __user *buffer,
64919 size_t buflen, loff_t *fpos)
64920 {
64921 - return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
64922 + return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
64923 }
64924
64925 /*
64926 diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
64927 index b00fcc9..e0c6381 100644
64928 --- a/fs/qnx6/qnx6.h
64929 +++ b/fs/qnx6/qnx6.h
64930 @@ -74,7 +74,7 @@ enum {
64931 BYTESEX_BE,
64932 };
64933
64934 -static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
64935 +static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
64936 {
64937 if (sbi->s_bytesex == BYTESEX_LE)
64938 return le64_to_cpu((__force __le64)n);
64939 @@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
64940 return (__force __fs64)cpu_to_be64(n);
64941 }
64942
64943 -static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
64944 +static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
64945 {
64946 if (sbi->s_bytesex == BYTESEX_LE)
64947 return le32_to_cpu((__force __le32)n);
64948 diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
64949 index 72d2917..c917c12 100644
64950 --- a/fs/quota/netlink.c
64951 +++ b/fs/quota/netlink.c
64952 @@ -45,7 +45,7 @@ static struct genl_family quota_genl_family = {
64953 void quota_send_warning(struct kqid qid, dev_t dev,
64954 const char warntype)
64955 {
64956 - static atomic_t seq;
64957 + static atomic_unchecked_t seq;
64958 struct sk_buff *skb;
64959 void *msg_head;
64960 int ret;
64961 @@ -61,7 +61,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
64962 "VFS: Not enough memory to send quota warning.\n");
64963 return;
64964 }
64965 - msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
64966 + msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
64967 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
64968 if (!msg_head) {
64969 printk(KERN_ERR
64970 diff --git a/fs/read_write.c b/fs/read_write.c
64971 index 31c6efa..a068805 100644
64972 --- a/fs/read_write.c
64973 +++ b/fs/read_write.c
64974 @@ -450,7 +450,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
64975
64976 old_fs = get_fs();
64977 set_fs(get_ds());
64978 - p = (__force const char __user *)buf;
64979 + p = (const char __force_user *)buf;
64980 if (count > MAX_RW_COUNT)
64981 count = MAX_RW_COUNT;
64982 if (file->f_op->write)
64983 diff --git a/fs/readdir.c b/fs/readdir.c
64984 index 5b53d99..a6c3049 100644
64985 --- a/fs/readdir.c
64986 +++ b/fs/readdir.c
64987 @@ -17,6 +17,7 @@
64988 #include <linux/security.h>
64989 #include <linux/syscalls.h>
64990 #include <linux/unistd.h>
64991 +#include <linux/namei.h>
64992
64993 #include <asm/uaccess.h>
64994
64995 @@ -69,6 +70,7 @@ struct old_linux_dirent {
64996 struct readdir_callback {
64997 struct dir_context ctx;
64998 struct old_linux_dirent __user * dirent;
64999 + struct file * file;
65000 int result;
65001 };
65002
65003 @@ -86,6 +88,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
65004 buf->result = -EOVERFLOW;
65005 return -EOVERFLOW;
65006 }
65007 +
65008 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
65009 + return 0;
65010 +
65011 buf->result++;
65012 dirent = buf->dirent;
65013 if (!access_ok(VERIFY_WRITE, dirent,
65014 @@ -117,6 +123,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
65015 if (!f.file)
65016 return -EBADF;
65017
65018 + buf.file = f.file;
65019 error = iterate_dir(f.file, &buf.ctx);
65020 if (buf.result)
65021 error = buf.result;
65022 @@ -142,6 +149,7 @@ struct getdents_callback {
65023 struct dir_context ctx;
65024 struct linux_dirent __user * current_dir;
65025 struct linux_dirent __user * previous;
65026 + struct file * file;
65027 int count;
65028 int error;
65029 };
65030 @@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
65031 buf->error = -EOVERFLOW;
65032 return -EOVERFLOW;
65033 }
65034 +
65035 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
65036 + return 0;
65037 +
65038 dirent = buf->previous;
65039 if (dirent) {
65040 if (__put_user(offset, &dirent->d_off))
65041 @@ -208,6 +220,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
65042 if (!f.file)
65043 return -EBADF;
65044
65045 + buf.file = f.file;
65046 error = iterate_dir(f.file, &buf.ctx);
65047 if (error >= 0)
65048 error = buf.error;
65049 @@ -226,6 +239,7 @@ struct getdents_callback64 {
65050 struct dir_context ctx;
65051 struct linux_dirent64 __user * current_dir;
65052 struct linux_dirent64 __user * previous;
65053 + struct file *file;
65054 int count;
65055 int error;
65056 };
65057 @@ -241,6 +255,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
65058 buf->error = -EINVAL; /* only used if we fail.. */
65059 if (reclen > buf->count)
65060 return -EINVAL;
65061 +
65062 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
65063 + return 0;
65064 +
65065 dirent = buf->previous;
65066 if (dirent) {
65067 if (__put_user(offset, &dirent->d_off))
65068 @@ -288,6 +306,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
65069 if (!f.file)
65070 return -EBADF;
65071
65072 + buf.file = f.file;
65073 error = iterate_dir(f.file, &buf.ctx);
65074 if (error >= 0)
65075 error = buf.error;
65076 diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
65077 index 9a3c68c..767933e 100644
65078 --- a/fs/reiserfs/do_balan.c
65079 +++ b/fs/reiserfs/do_balan.c
65080 @@ -1546,7 +1546,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
65081 return;
65082 }
65083
65084 - atomic_inc(&(fs_generation(tb->tb_sb)));
65085 + atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
65086 do_balance_starts(tb);
65087
65088 /* balance leaf returns 0 except if combining L R and S into
65089 diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
65090 index ee382ef..f4eb6eb5 100644
65091 --- a/fs/reiserfs/item_ops.c
65092 +++ b/fs/reiserfs/item_ops.c
65093 @@ -725,18 +725,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
65094 }
65095
65096 static struct item_operations errcatch_ops = {
65097 - errcatch_bytes_number,
65098 - errcatch_decrement_key,
65099 - errcatch_is_left_mergeable,
65100 - errcatch_print_item,
65101 - errcatch_check_item,
65102 + .bytes_number = errcatch_bytes_number,
65103 + .decrement_key = errcatch_decrement_key,
65104 + .is_left_mergeable = errcatch_is_left_mergeable,
65105 + .print_item = errcatch_print_item,
65106 + .check_item = errcatch_check_item,
65107
65108 - errcatch_create_vi,
65109 - errcatch_check_left,
65110 - errcatch_check_right,
65111 - errcatch_part_size,
65112 - errcatch_unit_num,
65113 - errcatch_print_vi
65114 + .create_vi = errcatch_create_vi,
65115 + .check_left = errcatch_check_left,
65116 + .check_right = errcatch_check_right,
65117 + .part_size = errcatch_part_size,
65118 + .unit_num = errcatch_unit_num,
65119 + .print_vi = errcatch_print_vi
65120 };
65121
65122 //////////////////////////////////////////////////////////////////////////////
65123 diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
65124 index 02b0b7d..c85018b 100644
65125 --- a/fs/reiserfs/procfs.c
65126 +++ b/fs/reiserfs/procfs.c
65127 @@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
65128 "SMALL_TAILS " : "NO_TAILS ",
65129 replay_only(sb) ? "REPLAY_ONLY " : "",
65130 convert_reiserfs(sb) ? "CONV " : "",
65131 - atomic_read(&r->s_generation_counter),
65132 + atomic_read_unchecked(&r->s_generation_counter),
65133 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
65134 SF(s_do_balance), SF(s_unneeded_left_neighbor),
65135 SF(s_good_search_by_key_reada), SF(s_bmaps),
65136 diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
65137 index 83d4eac..04e39a7 100644
65138 --- a/fs/reiserfs/reiserfs.h
65139 +++ b/fs/reiserfs/reiserfs.h
65140 @@ -453,7 +453,7 @@ struct reiserfs_sb_info {
65141 /* Comment? -Hans */
65142 wait_queue_head_t s_wait;
65143 /* To be obsoleted soon by per buffer seals.. -Hans */
65144 - atomic_t s_generation_counter; // increased by one every time the
65145 + atomic_unchecked_t s_generation_counter; // increased by one every time the
65146 // tree gets re-balanced
65147 unsigned long s_properties; /* File system properties. Currently holds
65148 on-disk FS format */
65149 @@ -1972,7 +1972,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
65150 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
65151
65152 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
65153 -#define get_generation(s) atomic_read (&fs_generation(s))
65154 +#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
65155 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
65156 #define __fs_changed(gen,s) (gen != get_generation (s))
65157 #define fs_changed(gen,s) \
65158 diff --git a/fs/select.c b/fs/select.c
65159 index 467bb1c..cf9d65a 100644
65160 --- a/fs/select.c
65161 +++ b/fs/select.c
65162 @@ -20,6 +20,7 @@
65163 #include <linux/export.h>
65164 #include <linux/slab.h>
65165 #include <linux/poll.h>
65166 +#include <linux/security.h>
65167 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
65168 #include <linux/file.h>
65169 #include <linux/fdtable.h>
65170 @@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
65171 struct poll_list *walk = head;
65172 unsigned long todo = nfds;
65173
65174 + gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
65175 if (nfds > rlimit(RLIMIT_NOFILE))
65176 return -EINVAL;
65177
65178 diff --git a/fs/seq_file.c b/fs/seq_file.c
65179 index 1d641bb..c2f4743 100644
65180 --- a/fs/seq_file.c
65181 +++ b/fs/seq_file.c
65182 @@ -10,6 +10,8 @@
65183 #include <linux/seq_file.h>
65184 #include <linux/slab.h>
65185 #include <linux/cred.h>
65186 +#include <linux/sched.h>
65187 +#include <linux/grsecurity.h>
65188
65189 #include <asm/uaccess.h>
65190 #include <asm/page.h>
65191 @@ -60,6 +62,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
65192 #ifdef CONFIG_USER_NS
65193 p->user_ns = file->f_cred->user_ns;
65194 #endif
65195 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65196 + p->exec_id = current->exec_id;
65197 +#endif
65198
65199 /*
65200 * Wrappers around seq_open(e.g. swaps_open) need to be
65201 @@ -82,6 +87,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
65202 }
65203 EXPORT_SYMBOL(seq_open);
65204
65205 +
65206 +int seq_open_restrict(struct file *file, const struct seq_operations *op)
65207 +{
65208 + if (gr_proc_is_restricted())
65209 + return -EACCES;
65210 +
65211 + return seq_open(file, op);
65212 +}
65213 +EXPORT_SYMBOL(seq_open_restrict);
65214 +
65215 static int traverse(struct seq_file *m, loff_t offset)
65216 {
65217 loff_t pos = 0, index;
65218 @@ -96,7 +111,7 @@ static int traverse(struct seq_file *m, loff_t offset)
65219 return 0;
65220 }
65221 if (!m->buf) {
65222 - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
65223 + m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
65224 if (!m->buf)
65225 return -ENOMEM;
65226 }
65227 @@ -137,7 +152,7 @@ Eoverflow:
65228 m->op->stop(m, p);
65229 kfree(m->buf);
65230 m->count = 0;
65231 - m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
65232 + m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
65233 return !m->buf ? -ENOMEM : -EAGAIN;
65234 }
65235
65236 @@ -153,7 +168,7 @@ Eoverflow:
65237 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
65238 {
65239 struct seq_file *m = file->private_data;
65240 - size_t copied = 0;
65241 + ssize_t copied = 0;
65242 loff_t pos;
65243 size_t n;
65244 void *p;
65245 @@ -192,7 +207,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
65246
65247 /* grab buffer if we didn't have one */
65248 if (!m->buf) {
65249 - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
65250 + m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
65251 if (!m->buf)
65252 goto Enomem;
65253 }
65254 @@ -234,7 +249,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
65255 m->op->stop(m, p);
65256 kfree(m->buf);
65257 m->count = 0;
65258 - m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
65259 + m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
65260 if (!m->buf)
65261 goto Enomem;
65262 m->version = 0;
65263 @@ -584,7 +599,7 @@ static void single_stop(struct seq_file *p, void *v)
65264 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
65265 void *data)
65266 {
65267 - struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
65268 + seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
65269 int res = -ENOMEM;
65270
65271 if (op) {
65272 @@ -620,6 +635,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
65273 }
65274 EXPORT_SYMBOL(single_open_size);
65275
65276 +int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
65277 + void *data)
65278 +{
65279 + if (gr_proc_is_restricted())
65280 + return -EACCES;
65281 +
65282 + return single_open(file, show, data);
65283 +}
65284 +EXPORT_SYMBOL(single_open_restrict);
65285 +
65286 +
65287 int single_release(struct inode *inode, struct file *file)
65288 {
65289 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
65290 diff --git a/fs/splice.c b/fs/splice.c
65291 index e246954..bd4f5b5 100644
65292 --- a/fs/splice.c
65293 +++ b/fs/splice.c
65294 @@ -192,7 +192,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
65295 pipe_lock(pipe);
65296
65297 for (;;) {
65298 - if (!pipe->readers) {
65299 + if (!atomic_read(&pipe->readers)) {
65300 send_sig(SIGPIPE, current, 0);
65301 if (!ret)
65302 ret = -EPIPE;
65303 @@ -215,7 +215,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
65304 page_nr++;
65305 ret += buf->len;
65306
65307 - if (pipe->files)
65308 + if (atomic_read(&pipe->files))
65309 do_wakeup = 1;
65310
65311 if (!--spd->nr_pages)
65312 @@ -246,9 +246,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
65313 do_wakeup = 0;
65314 }
65315
65316 - pipe->waiting_writers++;
65317 + atomic_inc(&pipe->waiting_writers);
65318 pipe_wait(pipe);
65319 - pipe->waiting_writers--;
65320 + atomic_dec(&pipe->waiting_writers);
65321 }
65322
65323 pipe_unlock(pipe);
65324 @@ -575,7 +575,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
65325 old_fs = get_fs();
65326 set_fs(get_ds());
65327 /* The cast to a user pointer is valid due to the set_fs() */
65328 - res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
65329 + res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
65330 set_fs(old_fs);
65331
65332 return res;
65333 @@ -590,7 +590,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
65334 old_fs = get_fs();
65335 set_fs(get_ds());
65336 /* The cast to a user pointer is valid due to the set_fs() */
65337 - res = vfs_write(file, (__force const char __user *)buf, count, &pos);
65338 + res = vfs_write(file, (const char __force_user *)buf, count, &pos);
65339 set_fs(old_fs);
65340
65341 return res;
65342 @@ -643,7 +643,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
65343 goto err;
65344
65345 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
65346 - vec[i].iov_base = (void __user *) page_address(page);
65347 + vec[i].iov_base = (void __force_user *) page_address(page);
65348 vec[i].iov_len = this_len;
65349 spd.pages[i] = page;
65350 spd.nr_pages++;
65351 @@ -839,7 +839,7 @@ int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_desc *sd,
65352 ops->release(pipe, buf);
65353 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
65354 pipe->nrbufs--;
65355 - if (pipe->files)
65356 + if (atomic_read(&pipe->files))
65357 sd->need_wakeup = true;
65358 }
65359
65360 @@ -864,10 +864,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
65361 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
65362 {
65363 while (!pipe->nrbufs) {
65364 - if (!pipe->writers)
65365 + if (!atomic_read(&pipe->writers))
65366 return 0;
65367
65368 - if (!pipe->waiting_writers && sd->num_spliced)
65369 + if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
65370 return 0;
65371
65372 if (sd->flags & SPLICE_F_NONBLOCK)
65373 @@ -1189,7 +1189,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
65374 * out of the pipe right after the splice_to_pipe(). So set
65375 * PIPE_READERS appropriately.
65376 */
65377 - pipe->readers = 1;
65378 + atomic_set(&pipe->readers, 1);
65379
65380 current->splice_pipe = pipe;
65381 }
65382 @@ -1485,6 +1485,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
65383
65384 partial[buffers].offset = off;
65385 partial[buffers].len = plen;
65386 + partial[buffers].private = 0;
65387
65388 off = 0;
65389 len -= plen;
65390 @@ -1721,9 +1722,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
65391 ret = -ERESTARTSYS;
65392 break;
65393 }
65394 - if (!pipe->writers)
65395 + if (!atomic_read(&pipe->writers))
65396 break;
65397 - if (!pipe->waiting_writers) {
65398 + if (!atomic_read(&pipe->waiting_writers)) {
65399 if (flags & SPLICE_F_NONBLOCK) {
65400 ret = -EAGAIN;
65401 break;
65402 @@ -1755,7 +1756,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
65403 pipe_lock(pipe);
65404
65405 while (pipe->nrbufs >= pipe->buffers) {
65406 - if (!pipe->readers) {
65407 + if (!atomic_read(&pipe->readers)) {
65408 send_sig(SIGPIPE, current, 0);
65409 ret = -EPIPE;
65410 break;
65411 @@ -1768,9 +1769,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
65412 ret = -ERESTARTSYS;
65413 break;
65414 }
65415 - pipe->waiting_writers++;
65416 + atomic_inc(&pipe->waiting_writers);
65417 pipe_wait(pipe);
65418 - pipe->waiting_writers--;
65419 + atomic_dec(&pipe->waiting_writers);
65420 }
65421
65422 pipe_unlock(pipe);
65423 @@ -1806,14 +1807,14 @@ retry:
65424 pipe_double_lock(ipipe, opipe);
65425
65426 do {
65427 - if (!opipe->readers) {
65428 + if (!atomic_read(&opipe->readers)) {
65429 send_sig(SIGPIPE, current, 0);
65430 if (!ret)
65431 ret = -EPIPE;
65432 break;
65433 }
65434
65435 - if (!ipipe->nrbufs && !ipipe->writers)
65436 + if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
65437 break;
65438
65439 /*
65440 @@ -1910,7 +1911,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
65441 pipe_double_lock(ipipe, opipe);
65442
65443 do {
65444 - if (!opipe->readers) {
65445 + if (!atomic_read(&opipe->readers)) {
65446 send_sig(SIGPIPE, current, 0);
65447 if (!ret)
65448 ret = -EPIPE;
65449 @@ -1955,7 +1956,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
65450 * return EAGAIN if we have the potential of some data in the
65451 * future, otherwise just return 0
65452 */
65453 - if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
65454 + if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
65455 ret = -EAGAIN;
65456
65457 pipe_unlock(ipipe);
65458 diff --git a/fs/stat.c b/fs/stat.c
65459 index ae0c3ce..9ee641c 100644
65460 --- a/fs/stat.c
65461 +++ b/fs/stat.c
65462 @@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
65463 stat->gid = inode->i_gid;
65464 stat->rdev = inode->i_rdev;
65465 stat->size = i_size_read(inode);
65466 - stat->atime = inode->i_atime;
65467 - stat->mtime = inode->i_mtime;
65468 + if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
65469 + stat->atime = inode->i_ctime;
65470 + stat->mtime = inode->i_ctime;
65471 + } else {
65472 + stat->atime = inode->i_atime;
65473 + stat->mtime = inode->i_mtime;
65474 + }
65475 stat->ctime = inode->i_ctime;
65476 stat->blksize = (1 << inode->i_blkbits);
65477 stat->blocks = inode->i_blocks;
65478 @@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
65479 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
65480 {
65481 struct inode *inode = path->dentry->d_inode;
65482 + int retval;
65483
65484 - if (inode->i_op->getattr)
65485 - return inode->i_op->getattr(path->mnt, path->dentry, stat);
65486 + if (inode->i_op->getattr) {
65487 + retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
65488 + if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
65489 + stat->atime = stat->ctime;
65490 + stat->mtime = stat->ctime;
65491 + }
65492 + return retval;
65493 + }
65494
65495 generic_fillattr(inode, stat);
65496 return 0;
65497 diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
65498 index 0b45ff4..847de5b 100644
65499 --- a/fs/sysfs/dir.c
65500 +++ b/fs/sysfs/dir.c
65501 @@ -41,9 +41,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
65502 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
65503 {
65504 struct kernfs_node *parent, *kn;
65505 + const char *name;
65506 + umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
65507 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
65508 + const char *parent_name;
65509 +#endif
65510
65511 BUG_ON(!kobj);
65512
65513 + name = kobject_name(kobj);
65514 +
65515 if (kobj->parent)
65516 parent = kobj->parent->sd;
65517 else
65518 @@ -52,11 +59,22 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
65519 if (!parent)
65520 return -ENOENT;
65521
65522 - kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
65523 - S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
65524 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
65525 + parent_name = parent->name;
65526 + mode = S_IRWXU;
65527 +
65528 + if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
65529 + (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
65530 + (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
65531 + (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
65532 + mode = S_IRWXU | S_IRUGO | S_IXUGO;
65533 +#endif
65534 +
65535 + kn = kernfs_create_dir_ns(parent, name,
65536 + mode, kobj, ns);
65537 if (IS_ERR(kn)) {
65538 if (PTR_ERR(kn) == -EEXIST)
65539 - sysfs_warn_dup(parent, kobject_name(kobj));
65540 + sysfs_warn_dup(parent, name);
65541 return PTR_ERR(kn);
65542 }
65543
65544 diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
65545 index 69d4889..a810bd4 100644
65546 --- a/fs/sysv/sysv.h
65547 +++ b/fs/sysv/sysv.h
65548 @@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
65549 #endif
65550 }
65551
65552 -static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
65553 +static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
65554 {
65555 if (sbi->s_bytesex == BYTESEX_PDP)
65556 return PDP_swab((__force __u32)n);
65557 diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
65558 index e18b988..f1d4ad0f 100644
65559 --- a/fs/ubifs/io.c
65560 +++ b/fs/ubifs/io.c
65561 @@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
65562 return err;
65563 }
65564
65565 -int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
65566 +int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
65567 {
65568 int err;
65569
65570 diff --git a/fs/udf/misc.c b/fs/udf/misc.c
65571 index c175b4d..8f36a16 100644
65572 --- a/fs/udf/misc.c
65573 +++ b/fs/udf/misc.c
65574 @@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
65575
65576 u8 udf_tag_checksum(const struct tag *t)
65577 {
65578 - u8 *data = (u8 *)t;
65579 + const u8 *data = (const u8 *)t;
65580 u8 checksum = 0;
65581 int i;
65582 for (i = 0; i < sizeof(struct tag); ++i)
65583 diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
65584 index 8d974c4..b82f6ec 100644
65585 --- a/fs/ufs/swab.h
65586 +++ b/fs/ufs/swab.h
65587 @@ -22,7 +22,7 @@ enum {
65588 BYTESEX_BE
65589 };
65590
65591 -static inline u64
65592 +static inline u64 __intentional_overflow(-1)
65593 fs64_to_cpu(struct super_block *sbp, __fs64 n)
65594 {
65595 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
65596 @@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
65597 return (__force __fs64)cpu_to_be64(n);
65598 }
65599
65600 -static inline u32
65601 +static inline u32 __intentional_overflow(-1)
65602 fs32_to_cpu(struct super_block *sbp, __fs32 n)
65603 {
65604 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
65605 diff --git a/fs/utimes.c b/fs/utimes.c
65606 index aa138d6..5f3a811 100644
65607 --- a/fs/utimes.c
65608 +++ b/fs/utimes.c
65609 @@ -1,6 +1,7 @@
65610 #include <linux/compiler.h>
65611 #include <linux/file.h>
65612 #include <linux/fs.h>
65613 +#include <linux/security.h>
65614 #include <linux/linkage.h>
65615 #include <linux/mount.h>
65616 #include <linux/namei.h>
65617 @@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
65618 }
65619 }
65620 retry_deleg:
65621 +
65622 + if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
65623 + error = -EACCES;
65624 + goto mnt_drop_write_and_out;
65625 + }
65626 +
65627 mutex_lock(&inode->i_mutex);
65628 error = notify_change(path->dentry, &newattrs, &delegated_inode);
65629 mutex_unlock(&inode->i_mutex);
65630 diff --git a/fs/xattr.c b/fs/xattr.c
65631 index 3377dff..f394815 100644
65632 --- a/fs/xattr.c
65633 +++ b/fs/xattr.c
65634 @@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
65635 return rc;
65636 }
65637
65638 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
65639 +ssize_t
65640 +pax_getxattr(struct dentry *dentry, void *value, size_t size)
65641 +{
65642 + struct inode *inode = dentry->d_inode;
65643 + ssize_t error;
65644 +
65645 + error = inode_permission(inode, MAY_EXEC);
65646 + if (error)
65647 + return error;
65648 +
65649 + if (inode->i_op->getxattr)
65650 + error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
65651 + else
65652 + error = -EOPNOTSUPP;
65653 +
65654 + return error;
65655 +}
65656 +EXPORT_SYMBOL(pax_getxattr);
65657 +#endif
65658 +
65659 ssize_t
65660 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
65661 {
65662 @@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
65663 * Extended attribute SET operations
65664 */
65665 static long
65666 -setxattr(struct dentry *d, const char __user *name, const void __user *value,
65667 +setxattr(struct path *path, const char __user *name, const void __user *value,
65668 size_t size, int flags)
65669 {
65670 int error;
65671 @@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
65672 posix_acl_fix_xattr_from_user(kvalue, size);
65673 }
65674
65675 - error = vfs_setxattr(d, kname, kvalue, size, flags);
65676 + if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
65677 + error = -EACCES;
65678 + goto out;
65679 + }
65680 +
65681 + error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
65682 out:
65683 if (vvalue)
65684 vfree(vvalue);
65685 @@ -377,7 +403,7 @@ retry:
65686 return error;
65687 error = mnt_want_write(path.mnt);
65688 if (!error) {
65689 - error = setxattr(path.dentry, name, value, size, flags);
65690 + error = setxattr(&path, name, value, size, flags);
65691 mnt_drop_write(path.mnt);
65692 }
65693 path_put(&path);
65694 @@ -401,7 +427,7 @@ retry:
65695 return error;
65696 error = mnt_want_write(path.mnt);
65697 if (!error) {
65698 - error = setxattr(path.dentry, name, value, size, flags);
65699 + error = setxattr(&path, name, value, size, flags);
65700 mnt_drop_write(path.mnt);
65701 }
65702 path_put(&path);
65703 @@ -416,16 +442,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
65704 const void __user *,value, size_t, size, int, flags)
65705 {
65706 struct fd f = fdget(fd);
65707 - struct dentry *dentry;
65708 int error = -EBADF;
65709
65710 if (!f.file)
65711 return error;
65712 - dentry = f.file->f_path.dentry;
65713 - audit_inode(NULL, dentry, 0);
65714 + audit_inode(NULL, f.file->f_path.dentry, 0);
65715 error = mnt_want_write_file(f.file);
65716 if (!error) {
65717 - error = setxattr(dentry, name, value, size, flags);
65718 + error = setxattr(&f.file->f_path, name, value, size, flags);
65719 mnt_drop_write_file(f.file);
65720 }
65721 fdput(f);
65722 @@ -626,7 +650,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
65723 * Extended attribute REMOVE operations
65724 */
65725 static long
65726 -removexattr(struct dentry *d, const char __user *name)
65727 +removexattr(struct path *path, const char __user *name)
65728 {
65729 int error;
65730 char kname[XATTR_NAME_MAX + 1];
65731 @@ -637,7 +661,10 @@ removexattr(struct dentry *d, const char __user *name)
65732 if (error < 0)
65733 return error;
65734
65735 - return vfs_removexattr(d, kname);
65736 + if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
65737 + return -EACCES;
65738 +
65739 + return vfs_removexattr(path->dentry, kname);
65740 }
65741
65742 SYSCALL_DEFINE2(removexattr, const char __user *, pathname,
65743 @@ -652,7 +679,7 @@ retry:
65744 return error;
65745 error = mnt_want_write(path.mnt);
65746 if (!error) {
65747 - error = removexattr(path.dentry, name);
65748 + error = removexattr(&path, name);
65749 mnt_drop_write(path.mnt);
65750 }
65751 path_put(&path);
65752 @@ -675,7 +702,7 @@ retry:
65753 return error;
65754 error = mnt_want_write(path.mnt);
65755 if (!error) {
65756 - error = removexattr(path.dentry, name);
65757 + error = removexattr(&path, name);
65758 mnt_drop_write(path.mnt);
65759 }
65760 path_put(&path);
65761 @@ -689,16 +716,16 @@ retry:
65762 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
65763 {
65764 struct fd f = fdget(fd);
65765 - struct dentry *dentry;
65766 + struct path *path;
65767 int error = -EBADF;
65768
65769 if (!f.file)
65770 return error;
65771 - dentry = f.file->f_path.dentry;
65772 - audit_inode(NULL, dentry, 0);
65773 + path = &f.file->f_path;
65774 + audit_inode(NULL, path->dentry, 0);
65775 error = mnt_want_write_file(f.file);
65776 if (!error) {
65777 - error = removexattr(dentry, name);
65778 + error = removexattr(path, name);
65779 mnt_drop_write_file(f.file);
65780 }
65781 fdput(f);
65782 diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
65783 index f0efc7e..ba72910 100644
65784 --- a/fs/xfs/xfs_bmap.c
65785 +++ b/fs/xfs/xfs_bmap.c
65786 @@ -584,7 +584,7 @@ xfs_bmap_validate_ret(
65787
65788 #else
65789 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
65790 -#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
65791 +#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
65792 #endif /* DEBUG */
65793
65794 /*
65795 diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
65796 index aead369..0dfecfd 100644
65797 --- a/fs/xfs/xfs_dir2_readdir.c
65798 +++ b/fs/xfs/xfs_dir2_readdir.c
65799 @@ -160,7 +160,12 @@ xfs_dir2_sf_getdents(
65800 ino = dp->d_ops->sf_get_ino(sfp, sfep);
65801 filetype = dp->d_ops->sf_get_ftype(sfep);
65802 ctx->pos = off & 0x7fffffff;
65803 - if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
65804 + if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
65805 + char name[sfep->namelen];
65806 + memcpy(name, sfep->name, sfep->namelen);
65807 + if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(mp, filetype)))
65808 + return 0;
65809 + } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
65810 xfs_dir3_get_dtype(mp, filetype)))
65811 return 0;
65812 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
65813 diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
65814 index 6152cbe..f0f9eaa 100644
65815 --- a/fs/xfs/xfs_ioctl.c
65816 +++ b/fs/xfs/xfs_ioctl.c
65817 @@ -122,7 +122,7 @@ xfs_find_handle(
65818 }
65819
65820 error = -EFAULT;
65821 - if (copy_to_user(hreq->ohandle, &handle, hsize) ||
65822 + if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
65823 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
65824 goto out_put;
65825
65826 diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
65827 new file mode 100644
65828 index 0000000..bfd482c
65829 --- /dev/null
65830 +++ b/grsecurity/Kconfig
65831 @@ -0,0 +1,1176 @@
65832 +#
65833 +# grecurity configuration
65834 +#
65835 +menu "Memory Protections"
65836 +depends on GRKERNSEC
65837 +
65838 +config GRKERNSEC_KMEM
65839 + bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
65840 + default y if GRKERNSEC_CONFIG_AUTO
65841 + select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
65842 + help
65843 + If you say Y here, /dev/kmem and /dev/mem won't be allowed to
65844 + be written to or read from to modify or leak the contents of the running
65845 + kernel. /dev/port will also not be allowed to be opened, writing to
65846 + /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
65847 + If you have module support disabled, enabling this will close up several
65848 + ways that are currently used to insert malicious code into the running
65849 + kernel.
65850 +
65851 + Even with this feature enabled, we still highly recommend that
65852 + you use the RBAC system, as it is still possible for an attacker to
65853 + modify the running kernel through other more obscure methods.
65854 +
65855 + It is highly recommended that you say Y here if you meet all the
65856 + conditions above.
65857 +
65858 +config GRKERNSEC_VM86
65859 + bool "Restrict VM86 mode"
65860 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
65861 + depends on X86_32
65862 +
65863 + help
65864 + If you say Y here, only processes with CAP_SYS_RAWIO will be able to
65865 + make use of a special execution mode on 32bit x86 processors called
65866 + Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
65867 + video cards and will still work with this option enabled. The purpose
65868 + of the option is to prevent exploitation of emulation errors in
65869 + virtualization of vm86 mode like the one discovered in VMWare in 2009.
65870 + Nearly all users should be able to enable this option.
65871 +
65872 +config GRKERNSEC_IO
65873 + bool "Disable privileged I/O"
65874 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
65875 + depends on X86
65876 + select RTC_CLASS
65877 + select RTC_INTF_DEV
65878 + select RTC_DRV_CMOS
65879 +
65880 + help
65881 + If you say Y here, all ioperm and iopl calls will return an error.
65882 + Ioperm and iopl can be used to modify the running kernel.
65883 + Unfortunately, some programs need this access to operate properly,
65884 + the most notable of which are XFree86 and hwclock. hwclock can be
65885 + remedied by having RTC support in the kernel, so real-time
65886 + clock support is enabled if this option is enabled, to ensure
65887 + that hwclock operates correctly. If hwclock still does not work,
65888 + either update udev or symlink /dev/rtc to /dev/rtc0.
65889 +
65890 + If you're using XFree86 or a version of Xorg from 2012 or earlier,
65891 + you may not be able to boot into a graphical environment with this
65892 + option enabled. In this case, you should use the RBAC system instead.
65893 +
65894 +config GRKERNSEC_JIT_HARDEN
65895 + bool "Harden BPF JIT against spray attacks"
65896 + default y if GRKERNSEC_CONFIG_AUTO
65897 + depends on BPF_JIT && X86
65898 + help
65899 + If you say Y here, the native code generated by the kernel's Berkeley
65900 + Packet Filter (BPF) JIT engine will be hardened against JIT-spraying
65901 + attacks that attempt to fit attacker-beneficial instructions in
65902 + 32bit immediate fields of JIT-generated native instructions. The
65903 + attacker will generally aim to cause an unintended instruction sequence
65904 + of JIT-generated native code to execute by jumping into the middle of
65905 + a generated instruction. This feature effectively randomizes the 32bit
65906 + immediate constants present in the generated code to thwart such attacks.
65907 +
65908 + If you're using KERNEXEC, it's recommended that you enable this option
65909 + to supplement the hardening of the kernel.
65910 +
65911 +config GRKERNSEC_PERF_HARDEN
65912 + bool "Disable unprivileged PERF_EVENTS usage by default"
65913 + default y if GRKERNSEC_CONFIG_AUTO
65914 + depends on PERF_EVENTS
65915 + help
65916 + If you say Y here, the range of acceptable values for the
65917 + /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
65918 + default to a new value: 3. When the sysctl is set to this value, no
65919 + unprivileged use of the PERF_EVENTS syscall interface will be permitted.
65920 +
65921 + Though PERF_EVENTS can be used legitimately for performance monitoring
65922 + and low-level application profiling, it is forced on regardless of
65923 + configuration, has been at fault for several vulnerabilities, and
65924 + creates new opportunities for side channels and other information leaks.
65925 +
65926 + This feature puts PERF_EVENTS into a secure default state and permits
65927 + the administrator to change out of it temporarily if unprivileged
65928 + application profiling is needed.
65929 +
65930 +config GRKERNSEC_RAND_THREADSTACK
65931 + bool "Insert random gaps between thread stacks"
65932 + default y if GRKERNSEC_CONFIG_AUTO
65933 + depends on PAX_RANDMMAP && !PPC
65934 + help
65935 + If you say Y here, a random-sized gap will be enforced between allocated
65936 + thread stacks. Glibc's NPTL and other threading libraries that
65937 + pass MAP_STACK to the kernel for thread stack allocation are supported.
65938 + The implementation currently provides 8 bits of entropy for the gap.
65939 +
65940 + Many distributions do not compile threaded remote services with the
65941 + -fstack-check argument to GCC, causing the variable-sized stack-based
65942 + allocator, alloca(), to not probe the stack on allocation. This
65943 + permits an unbounded alloca() to skip over any guard page and potentially
65944 + modify another thread's stack reliably. An enforced random gap
65945 + reduces the reliability of such an attack and increases the chance
65946 + that such a read/write to another thread's stack instead lands in
65947 + an unmapped area, causing a crash and triggering grsecurity's
65948 + anti-bruteforcing logic.
65949 +
65950 +config GRKERNSEC_PROC_MEMMAP
65951 + bool "Harden ASLR against information leaks and entropy reduction"
65952 + default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
65953 + depends on PAX_NOEXEC || PAX_ASLR
65954 + help
65955 + If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
65956 + give no information about the addresses of its mappings if
65957 + PaX features that rely on random addresses are enabled on the task.
65958 + In addition to sanitizing this information and disabling other
65959 + dangerous sources of information, this option causes reads of sensitive
65960 + /proc/<pid> entries where the file descriptor was opened in a different
65961 + task than the one performing the read. Such attempts are logged.
65962 + This option also limits argv/env strings for suid/sgid binaries
65963 + to 512KB to prevent a complete exhaustion of the stack entropy provided
65964 + by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
65965 + binaries to prevent alternative mmap layouts from being abused.
65966 +
65967 + If you use PaX it is essential that you say Y here as it closes up
65968 + several holes that make full ASLR useless locally.
65969 +
65970 +
65971 +config GRKERNSEC_KSTACKOVERFLOW
65972 + bool "Prevent kernel stack overflows"
65973 + default y if GRKERNSEC_CONFIG_AUTO
65974 + depends on !IA64 && 64BIT
65975 + help
65976 + If you say Y here, the kernel's process stacks will be allocated
65977 + with vmalloc instead of the kernel's default allocator. This
65978 + introduces guard pages that in combination with the alloca checking
65979 + of the STACKLEAK feature prevents all forms of kernel process stack
65980 + overflow abuse. Note that this is different from kernel stack
65981 + buffer overflows.
65982 +
65983 +config GRKERNSEC_BRUTE
65984 + bool "Deter exploit bruteforcing"
65985 + default y if GRKERNSEC_CONFIG_AUTO
65986 + help
65987 + If you say Y here, attempts to bruteforce exploits against forking
65988 + daemons such as apache or sshd, as well as against suid/sgid binaries
65989 + will be deterred. When a child of a forking daemon is killed by PaX
65990 + or crashes due to an illegal instruction or other suspicious signal,
65991 + the parent process will be delayed 30 seconds upon every subsequent
65992 + fork until the administrator is able to assess the situation and
65993 + restart the daemon.
65994 + In the suid/sgid case, the attempt is logged, the user has all their
65995 + existing instances of the suid/sgid binary terminated and will
65996 + be unable to execute any suid/sgid binaries for 15 minutes.
65997 +
65998 + It is recommended that you also enable signal logging in the auditing
65999 + section so that logs are generated when a process triggers a suspicious
66000 + signal.
66001 + If the sysctl option is enabled, a sysctl option with name
66002 + "deter_bruteforce" is created.
66003 +
66004 +config GRKERNSEC_MODHARDEN
66005 + bool "Harden module auto-loading"
66006 + default y if GRKERNSEC_CONFIG_AUTO
66007 + depends on MODULES
66008 + help
66009 + If you say Y here, module auto-loading in response to use of some
66010 + feature implemented by an unloaded module will be restricted to
66011 + root users. Enabling this option helps defend against attacks
66012 + by unprivileged users who abuse the auto-loading behavior to
66013 + cause a vulnerable module to load that is then exploited.
66014 +
66015 + If this option prevents a legitimate use of auto-loading for a
66016 + non-root user, the administrator can execute modprobe manually
66017 + with the exact name of the module mentioned in the alert log.
66018 + Alternatively, the administrator can add the module to the list
66019 + of modules loaded at boot by modifying init scripts.
66020 +
66021 + Modification of init scripts will most likely be needed on
66022 + Ubuntu servers with encrypted home directory support enabled,
66023 + as the first non-root user logging in will cause the ecb(aes),
66024 + ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
66025 +
66026 +config GRKERNSEC_HIDESYM
66027 + bool "Hide kernel symbols"
66028 + default y if GRKERNSEC_CONFIG_AUTO
66029 + select PAX_USERCOPY_SLABS
66030 + help
66031 + If you say Y here, getting information on loaded modules, and
66032 + displaying all kernel symbols through a syscall will be restricted
66033 + to users with CAP_SYS_MODULE. For software compatibility reasons,
66034 + /proc/kallsyms will be restricted to the root user. The RBAC
66035 + system can hide that entry even from root.
66036 +
66037 + This option also prevents leaking of kernel addresses through
66038 + several /proc entries.
66039 +
66040 + Note that this option is only effective provided the following
66041 + conditions are met:
66042 + 1) The kernel using grsecurity is not precompiled by some distribution
66043 + 2) You have also enabled GRKERNSEC_DMESG
66044 + 3) You are using the RBAC system and hiding other files such as your
66045 + kernel image and System.map. Alternatively, enabling this option
66046 + causes the permissions on /boot, /lib/modules, and the kernel
66047 + source directory to change at compile time to prevent
66048 + reading by non-root users.
66049 + If the above conditions are met, this option will aid in providing a
66050 + useful protection against local kernel exploitation of overflows
66051 + and arbitrary read/write vulnerabilities.
66052 +
66053 + It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
66054 + in addition to this feature.
66055 +
66056 +config GRKERNSEC_RANDSTRUCT
66057 + bool "Randomize layout of sensitive kernel structures"
66058 + default y if GRKERNSEC_CONFIG_AUTO
66059 + select GRKERNSEC_HIDESYM
66060 + select MODVERSIONS if MODULES
66061 + help
66062 + If you say Y here, the layouts of a number of sensitive kernel
66063 + structures (task, fs, cred, etc) and all structures composed entirely
66064 + of function pointers (aka "ops" structs) will be randomized at compile-time.
66065 + This can introduce the requirement of an additional infoleak
66066 + vulnerability for exploits targeting these structure types.
66067 +
66068 + Enabling this feature will introduce some performance impact, slightly
66069 + increase memory usage, and prevent the use of forensic tools like
66070 + Volatility against the system (unless the kernel source tree isn't
66071 + cleaned after kernel installation).
66072 +
66073 + The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
66074 + It remains after a make clean to allow for external modules to be compiled
66075 + with the existing seed and will be removed by a make mrproper or
66076 + make distclean.
66077 +
66078 + Note that the implementation requires gcc 4.6.4. or newer. You may need
66079 + to install the supporting headers explicitly in addition to the normal
66080 + gcc package.
66081 +
66082 +config GRKERNSEC_RANDSTRUCT_PERFORMANCE
66083 + bool "Use cacheline-aware structure randomization"
66084 + depends on GRKERNSEC_RANDSTRUCT
66085 + default y if GRKERNSEC_CONFIG_PRIORITY_PERF
66086 + help
66087 + If you say Y here, the RANDSTRUCT randomization will make a best effort
66088 + at restricting randomization to cacheline-sized groups of elements. It
66089 + will further not randomize bitfields in structures. This reduces the
66090 + performance hit of RANDSTRUCT at the cost of weakened randomization.
66091 +
66092 +config GRKERNSEC_KERN_LOCKOUT
66093 + bool "Active kernel exploit response"
66094 + default y if GRKERNSEC_CONFIG_AUTO
66095 + depends on X86 || ARM || PPC || SPARC
66096 + help
66097 + If you say Y here, when a PaX alert is triggered due to suspicious
66098 + activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
66099 + or an OOPS occurs due to bad memory accesses, instead of just
66100 + terminating the offending process (and potentially allowing
66101 + a subsequent exploit from the same user), we will take one of two
66102 + actions:
66103 + If the user was root, we will panic the system
66104 + If the user was non-root, we will log the attempt, terminate
66105 + all processes owned by the user, then prevent them from creating
66106 + any new processes until the system is restarted
66107 + This deters repeated kernel exploitation/bruteforcing attempts
66108 + and is useful for later forensics.
66109 +
66110 +config GRKERNSEC_OLD_ARM_USERLAND
66111 + bool "Old ARM userland compatibility"
66112 + depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
66113 + help
66114 + If you say Y here, stubs of executable code to perform such operations
66115 + as "compare-exchange" will be placed at fixed locations in the ARM vector
66116 + table. This is unfortunately needed for old ARM userland meant to run
66117 + across a wide range of processors. Without this option enabled,
66118 + the get_tls and data memory barrier stubs will be emulated by the kernel,
66119 + which is enough for Linaro userlands or other userlands designed for v6
66120 + and newer ARM CPUs. It's recommended that you try without this option enabled
66121 + first, and only enable it if your userland does not boot (it will likely fail
66122 + at init time).
66123 +
66124 +endmenu
66125 +menu "Role Based Access Control Options"
66126 +depends on GRKERNSEC
66127 +
66128 +config GRKERNSEC_RBAC_DEBUG
66129 + bool
66130 +
66131 +config GRKERNSEC_NO_RBAC
66132 + bool "Disable RBAC system"
66133 + help
66134 + If you say Y here, the /dev/grsec device will be removed from the kernel,
66135 + preventing the RBAC system from being enabled. You should only say Y
66136 + here if you have no intention of using the RBAC system, so as to prevent
66137 + an attacker with root access from misusing the RBAC system to hide files
66138 + and processes when loadable module support and /dev/[k]mem have been
66139 + locked down.
66140 +
66141 +config GRKERNSEC_ACL_HIDEKERN
66142 + bool "Hide kernel processes"
66143 + help
66144 + If you say Y here, all kernel threads will be hidden to all
66145 + processes but those whose subject has the "view hidden processes"
66146 + flag.
66147 +
66148 +config GRKERNSEC_ACL_MAXTRIES
66149 + int "Maximum tries before password lockout"
66150 + default 3
66151 + help
66152 + This option enforces the maximum number of times a user can attempt
66153 + to authorize themselves with the grsecurity RBAC system before being
66154 + denied the ability to attempt authorization again for a specified time.
66155 + The lower the number, the harder it will be to brute-force a password.
66156 +
66157 +config GRKERNSEC_ACL_TIMEOUT
66158 + int "Time to wait after max password tries, in seconds"
66159 + default 30
66160 + help
66161 + This option specifies the time the user must wait after attempting to
66162 + authorize to the RBAC system with the maximum number of invalid
66163 + passwords. The higher the number, the harder it will be to brute-force
66164 + a password.
66165 +
66166 +endmenu
66167 +menu "Filesystem Protections"
66168 +depends on GRKERNSEC
66169 +
66170 +config GRKERNSEC_PROC
66171 + bool "Proc restrictions"
66172 + default y if GRKERNSEC_CONFIG_AUTO
66173 + help
66174 + If you say Y here, the permissions of the /proc filesystem
66175 + will be altered to enhance system security and privacy. You MUST
66176 + choose either a user only restriction or a user and group restriction.
66177 + Depending upon the option you choose, you can either restrict users to
66178 + see only the processes they themselves run, or choose a group that can
66179 + view all processes and files normally restricted to root if you choose
66180 + the "restrict to user only" option. NOTE: If you're running identd or
66181 + ntpd as a non-root user, you will have to run it as the group you
66182 + specify here.
66183 +
66184 +config GRKERNSEC_PROC_USER
66185 + bool "Restrict /proc to user only"
66186 + depends on GRKERNSEC_PROC
66187 + help
66188 + If you say Y here, non-root users will only be able to view their own
66189 + processes, and restricts them from viewing network-related information,
66190 + and viewing kernel symbol and module information.
66191 +
66192 +config GRKERNSEC_PROC_USERGROUP
66193 + bool "Allow special group"
66194 + default y if GRKERNSEC_CONFIG_AUTO
66195 + depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
66196 + help
66197 + If you say Y here, you will be able to select a group that will be
66198 + able to view all processes and network-related information. If you've
66199 + enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
66200 + remain hidden. This option is useful if you want to run identd as
66201 + a non-root user. The group you select may also be chosen at boot time
66202 + via "grsec_proc_gid=" on the kernel commandline.
66203 +
66204 +config GRKERNSEC_PROC_GID
66205 + int "GID for special group"
66206 + depends on GRKERNSEC_PROC_USERGROUP
66207 + default 1001
66208 +
66209 +config GRKERNSEC_PROC_ADD
66210 + bool "Additional restrictions"
66211 + default y if GRKERNSEC_CONFIG_AUTO
66212 + depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
66213 + help
66214 + If you say Y here, additional restrictions will be placed on
66215 + /proc that keep normal users from viewing device information and
66216 + slabinfo information that could be useful for exploits.
66217 +
66218 +config GRKERNSEC_LINK
66219 + bool "Linking restrictions"
66220 + default y if GRKERNSEC_CONFIG_AUTO
66221 + help
66222 + If you say Y here, /tmp race exploits will be prevented, since users
66223 + will no longer be able to follow symlinks owned by other users in
66224 + world-writable +t directories (e.g. /tmp), unless the owner of the
66225 + symlink is the owner of the directory. users will also not be
66226 + able to hardlink to files they do not own. If the sysctl option is
66227 + enabled, a sysctl option with name "linking_restrictions" is created.
66228 +
66229 +config GRKERNSEC_SYMLINKOWN
66230 + bool "Kernel-enforced SymlinksIfOwnerMatch"
66231 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
66232 + help
66233 + Apache's SymlinksIfOwnerMatch option has an inherent race condition
66234 + that prevents it from being used as a security feature. As Apache
66235 + verifies the symlink by performing a stat() against the target of
66236 + the symlink before it is followed, an attacker can setup a symlink
66237 + to point to a same-owned file, then replace the symlink with one
66238 + that targets another user's file just after Apache "validates" the
66239 + symlink -- a classic TOCTOU race. If you say Y here, a complete,
66240 + race-free replacement for Apache's "SymlinksIfOwnerMatch" option
66241 + will be in place for the group you specify. If the sysctl option
66242 + is enabled, a sysctl option with name "enforce_symlinksifowner" is
66243 + created.
66244 +
66245 +config GRKERNSEC_SYMLINKOWN_GID
66246 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
66247 + depends on GRKERNSEC_SYMLINKOWN
66248 + default 1006
66249 + help
66250 + Setting this GID determines what group kernel-enforced
66251 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
66252 + is enabled, a sysctl option with name "symlinkown_gid" is created.
66253 +
66254 +config GRKERNSEC_FIFO
66255 + bool "FIFO restrictions"
66256 + default y if GRKERNSEC_CONFIG_AUTO
66257 + help
66258 + If you say Y here, users will not be able to write to FIFOs they don't
66259 + own in world-writable +t directories (e.g. /tmp), unless the owner of
66260 + the FIFO is the same owner of the directory it's held in. If the sysctl
66261 + option is enabled, a sysctl option with name "fifo_restrictions" is
66262 + created.
66263 +
66264 +config GRKERNSEC_SYSFS_RESTRICT
66265 + bool "Sysfs/debugfs restriction"
66266 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
66267 + depends on SYSFS
66268 + help
66269 + If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
66270 + any filesystem normally mounted under it (e.g. debugfs) will be
66271 + mostly accessible only by root. These filesystems generally provide access
66272 + to hardware and debug information that isn't appropriate for unprivileged
66273 + users of the system. Sysfs and debugfs have also become a large source
66274 + of new vulnerabilities, ranging from infoleaks to local compromise.
66275 + There has been very little oversight with an eye toward security involved
66276 + in adding new exporters of information to these filesystems, so their
66277 + use is discouraged.
66278 + For reasons of compatibility, a few directories have been whitelisted
66279 + for access by non-root users:
66280 + /sys/fs/selinux
66281 + /sys/fs/fuse
66282 + /sys/devices/system/cpu
66283 +
66284 +config GRKERNSEC_ROFS
66285 + bool "Runtime read-only mount protection"
66286 + depends on SYSCTL
66287 + help
66288 + If you say Y here, a sysctl option with name "romount_protect" will
66289 + be created. By setting this option to 1 at runtime, filesystems
66290 + will be protected in the following ways:
66291 + * No new writable mounts will be allowed
66292 + * Existing read-only mounts won't be able to be remounted read/write
66293 + * Write operations will be denied on all block devices
66294 + This option acts independently of grsec_lock: once it is set to 1,
66295 + it cannot be turned off. Therefore, please be mindful of the resulting
66296 + behavior if this option is enabled in an init script on a read-only
66297 + filesystem.
66298 + Also be aware that as with other root-focused features, GRKERNSEC_KMEM
66299 + and GRKERNSEC_IO should be enabled and module loading disabled via
66300 + config or at runtime.
66301 + This feature is mainly intended for secure embedded systems.
66302 +
66303 +
66304 +config GRKERNSEC_DEVICE_SIDECHANNEL
66305 + bool "Eliminate stat/notify-based device sidechannels"
66306 + default y if GRKERNSEC_CONFIG_AUTO
66307 + help
66308 + If you say Y here, timing analyses on block or character
66309 + devices like /dev/ptmx using stat or inotify/dnotify/fanotify
66310 + will be thwarted for unprivileged users. If a process without
66311 + CAP_MKNOD stats such a device, the last access and last modify times
66312 + will match the device's create time. No access or modify events
66313 + will be triggered through inotify/dnotify/fanotify for such devices.
66314 + This feature will prevent attacks that may at a minimum
66315 + allow an attacker to determine the administrator's password length.
66316 +
66317 +config GRKERNSEC_CHROOT
66318 + bool "Chroot jail restrictions"
66319 + default y if GRKERNSEC_CONFIG_AUTO
66320 + help
66321 + If you say Y here, you will be able to choose several options that will
66322 + make breaking out of a chrooted jail much more difficult. If you
66323 + encounter no software incompatibilities with the following options, it
66324 + is recommended that you enable each one.
66325 +
66326 + Note that the chroot restrictions are not intended to apply to "chroots"
66327 + to directories that are simple bind mounts of the global root filesystem.
66328 + For several other reasons, a user shouldn't expect any significant
66329 + security by performing such a chroot.
66330 +
66331 +config GRKERNSEC_CHROOT_MOUNT
66332 + bool "Deny mounts"
66333 + default y if GRKERNSEC_CONFIG_AUTO
66334 + depends on GRKERNSEC_CHROOT
66335 + help
66336 + If you say Y here, processes inside a chroot will not be able to
66337 + mount or remount filesystems. If the sysctl option is enabled, a
66338 + sysctl option with name "chroot_deny_mount" is created.
66339 +
66340 +config GRKERNSEC_CHROOT_DOUBLE
66341 + bool "Deny double-chroots"
66342 + default y if GRKERNSEC_CONFIG_AUTO
66343 + depends on GRKERNSEC_CHROOT
66344 + help
66345 + If you say Y here, processes inside a chroot will not be able to chroot
66346 + again outside the chroot. This is a widely used method of breaking
66347 + out of a chroot jail and should not be allowed. If the sysctl
66348 + option is enabled, a sysctl option with name
66349 + "chroot_deny_chroot" is created.
66350 +
66351 +config GRKERNSEC_CHROOT_PIVOT
66352 + bool "Deny pivot_root in chroot"
66353 + default y if GRKERNSEC_CONFIG_AUTO
66354 + depends on GRKERNSEC_CHROOT
66355 + help
66356 + If you say Y here, processes inside a chroot will not be able to use
66357 + a function called pivot_root() that was introduced in Linux 2.3.41. It
66358 + works similar to chroot in that it changes the root filesystem. This
66359 + function could be misused in a chrooted process to attempt to break out
66360 + of the chroot, and therefore should not be allowed. If the sysctl
66361 + option is enabled, a sysctl option with name "chroot_deny_pivot" is
66362 + created.
66363 +
66364 +config GRKERNSEC_CHROOT_CHDIR
66365 + bool "Enforce chdir(\"/\") on all chroots"
66366 + default y if GRKERNSEC_CONFIG_AUTO
66367 + depends on GRKERNSEC_CHROOT
66368 + help
66369 + If you say Y here, the current working directory of all newly-chrooted
66370 + applications will be set to the the root directory of the chroot.
66371 + The man page on chroot(2) states:
66372 + Note that this call does not change the current working
66373 + directory, so that `.' can be outside the tree rooted at
66374 + `/'. In particular, the super-user can escape from a
66375 + `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
66376 +
66377 + It is recommended that you say Y here, since it's not known to break
66378 + any software. If the sysctl option is enabled, a sysctl option with
66379 + name "chroot_enforce_chdir" is created.
66380 +
66381 +config GRKERNSEC_CHROOT_CHMOD
66382 + bool "Deny (f)chmod +s"
66383 + default y if GRKERNSEC_CONFIG_AUTO
66384 + depends on GRKERNSEC_CHROOT
66385 + help
66386 + If you say Y here, processes inside a chroot will not be able to chmod
66387 + or fchmod files to make them have suid or sgid bits. This protects
66388 + against another published method of breaking a chroot. If the sysctl
66389 + option is enabled, a sysctl option with name "chroot_deny_chmod" is
66390 + created.
66391 +
66392 +config GRKERNSEC_CHROOT_FCHDIR
66393 + bool "Deny fchdir and fhandle out of chroot"
66394 + default y if GRKERNSEC_CONFIG_AUTO
66395 + depends on GRKERNSEC_CHROOT
66396 + help
66397 + If you say Y here, a well-known method of breaking chroots by fchdir'ing
66398 + to a file descriptor of the chrooting process that points to a directory
66399 + outside the filesystem will be stopped. Additionally, this option prevents
66400 + use of the recently-created syscall for opening files by a guessable "file
66401 + handle" inside a chroot. If the sysctl option is enabled, a sysctl option
66402 + with name "chroot_deny_fchdir" is created.
66403 +
66404 +config GRKERNSEC_CHROOT_MKNOD
66405 + bool "Deny mknod"
66406 + default y if GRKERNSEC_CONFIG_AUTO
66407 + depends on GRKERNSEC_CHROOT
66408 + help
66409 + If you say Y here, processes inside a chroot will not be allowed to
66410 + mknod. The problem with using mknod inside a chroot is that it
66411 + would allow an attacker to create a device entry that is the same
66412 + as one on the physical root of your system, which could range from
66413 + anything from the console device to a device for your harddrive (which
66414 + they could then use to wipe the drive or steal data). It is recommended
66415 + that you say Y here, unless you run into software incompatibilities.
66416 + If the sysctl option is enabled, a sysctl option with name
66417 + "chroot_deny_mknod" is created.
66418 +
66419 +config GRKERNSEC_CHROOT_SHMAT
66420 + bool "Deny shmat() out of chroot"
66421 + default y if GRKERNSEC_CONFIG_AUTO
66422 + depends on GRKERNSEC_CHROOT
66423 + help
66424 + If you say Y here, processes inside a chroot will not be able to attach
66425 + to shared memory segments that were created outside of the chroot jail.
66426 + It is recommended that you say Y here. If the sysctl option is enabled,
66427 + a sysctl option with name "chroot_deny_shmat" is created.
66428 +
66429 +config GRKERNSEC_CHROOT_UNIX
66430 + bool "Deny access to abstract AF_UNIX sockets out of chroot"
66431 + default y if GRKERNSEC_CONFIG_AUTO
66432 + depends on GRKERNSEC_CHROOT
66433 + help
66434 + If you say Y here, processes inside a chroot will not be able to
66435 + connect to abstract (meaning not belonging to a filesystem) Unix
66436 + domain sockets that were bound outside of a chroot. It is recommended
66437 + that you say Y here. If the sysctl option is enabled, a sysctl option
66438 + with name "chroot_deny_unix" is created.
66439 +
66440 +config GRKERNSEC_CHROOT_FINDTASK
66441 + bool "Protect outside processes"
66442 + default y if GRKERNSEC_CONFIG_AUTO
66443 + depends on GRKERNSEC_CHROOT
66444 + help
66445 + If you say Y here, processes inside a chroot will not be able to
66446 + kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
66447 + getsid, or view any process outside of the chroot. If the sysctl
66448 + option is enabled, a sysctl option with name "chroot_findtask" is
66449 + created.
66450 +
66451 +config GRKERNSEC_CHROOT_NICE
66452 + bool "Restrict priority changes"
66453 + default y if GRKERNSEC_CONFIG_AUTO
66454 + depends on GRKERNSEC_CHROOT
66455 + help
66456 + If you say Y here, processes inside a chroot will not be able to raise
66457 + the priority of processes in the chroot, or alter the priority of
66458 + processes outside the chroot. This provides more security than simply
66459 + removing CAP_SYS_NICE from the process' capability set. If the
66460 + sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
66461 + is created.
66462 +
66463 +config GRKERNSEC_CHROOT_SYSCTL
66464 + bool "Deny sysctl writes"
66465 + default y if GRKERNSEC_CONFIG_AUTO
66466 + depends on GRKERNSEC_CHROOT
66467 + help
66468 + If you say Y here, an attacker in a chroot will not be able to
66469 + write to sysctl entries, either by sysctl(2) or through a /proc
66470 + interface. It is strongly recommended that you say Y here. If the
66471 + sysctl option is enabled, a sysctl option with name
66472 + "chroot_deny_sysctl" is created.
66473 +
66474 +config GRKERNSEC_CHROOT_CAPS
66475 + bool "Capability restrictions"
66476 + default y if GRKERNSEC_CONFIG_AUTO
66477 + depends on GRKERNSEC_CHROOT
66478 + help
66479 + If you say Y here, the capabilities on all processes within a
66480 + chroot jail will be lowered to stop module insertion, raw i/o,
66481 + system and net admin tasks, rebooting the system, modifying immutable
66482 + files, modifying IPC owned by another, and changing the system time.
66483 + This is left an option because it can break some apps. Disable this
66484 + if your chrooted apps are having problems performing those kinds of
66485 + tasks. If the sysctl option is enabled, a sysctl option with
66486 + name "chroot_caps" is created.
66487 +
66488 +config GRKERNSEC_CHROOT_INITRD
66489 + bool "Exempt initrd tasks from restrictions"
66490 + default y if GRKERNSEC_CONFIG_AUTO
66491 + depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
66492 + help
66493 + If you say Y here, tasks started prior to init will be exempted from
66494 + grsecurity's chroot restrictions. This option is mainly meant to
66495 + resolve Plymouth's performing privileged operations unnecessarily
66496 + in a chroot.
66497 +
66498 +endmenu
66499 +menu "Kernel Auditing"
66500 +depends on GRKERNSEC
66501 +
66502 +config GRKERNSEC_AUDIT_GROUP
66503 + bool "Single group for auditing"
66504 + help
66505 + If you say Y here, the exec and chdir logging features will only operate
66506 + on a group you specify. This option is recommended if you only want to
66507 + watch certain users instead of having a large amount of logs from the
66508 + entire system. If the sysctl option is enabled, a sysctl option with
66509 + name "audit_group" is created.
66510 +
66511 +config GRKERNSEC_AUDIT_GID
66512 + int "GID for auditing"
66513 + depends on GRKERNSEC_AUDIT_GROUP
66514 + default 1007
66515 +
66516 +config GRKERNSEC_EXECLOG
66517 + bool "Exec logging"
66518 + help
66519 + If you say Y here, all execve() calls will be logged (since the
66520 + other exec*() calls are frontends to execve(), all execution
66521 + will be logged). Useful for shell-servers that like to keep track
66522 + of their users. If the sysctl option is enabled, a sysctl option with
66523 + name "exec_logging" is created.
66524 + WARNING: This option when enabled will produce a LOT of logs, especially
66525 + on an active system.
66526 +
66527 +config GRKERNSEC_RESLOG
66528 + bool "Resource logging"
66529 + default y if GRKERNSEC_CONFIG_AUTO
66530 + help
66531 + If you say Y here, all attempts to overstep resource limits will
66532 + be logged with the resource name, the requested size, and the current
66533 + limit. It is highly recommended that you say Y here. If the sysctl
66534 + option is enabled, a sysctl option with name "resource_logging" is
66535 + created. If the RBAC system is enabled, the sysctl value is ignored.
66536 +
66537 +config GRKERNSEC_CHROOT_EXECLOG
66538 + bool "Log execs within chroot"
66539 + help
66540 + If you say Y here, all executions inside a chroot jail will be logged
66541 + to syslog. This can cause a large amount of logs if certain
66542 + applications (eg. djb's daemontools) are installed on the system, and
66543 + is therefore left as an option. If the sysctl option is enabled, a
66544 + sysctl option with name "chroot_execlog" is created.
66545 +
66546 +config GRKERNSEC_AUDIT_PTRACE
66547 + bool "Ptrace logging"
66548 + help
66549 + If you say Y here, all attempts to attach to a process via ptrace
66550 + will be logged. If the sysctl option is enabled, a sysctl option
66551 + with name "audit_ptrace" is created.
66552 +
66553 +config GRKERNSEC_AUDIT_CHDIR
66554 + bool "Chdir logging"
66555 + help
66556 + If you say Y here, all chdir() calls will be logged. If the sysctl
66557 + option is enabled, a sysctl option with name "audit_chdir" is created.
66558 +
66559 +config GRKERNSEC_AUDIT_MOUNT
66560 + bool "(Un)Mount logging"
66561 + help
66562 + If you say Y here, all mounts and unmounts will be logged. If the
66563 + sysctl option is enabled, a sysctl option with name "audit_mount" is
66564 + created.
66565 +
66566 +config GRKERNSEC_SIGNAL
66567 + bool "Signal logging"
66568 + default y if GRKERNSEC_CONFIG_AUTO
66569 + help
66570 + If you say Y here, certain important signals will be logged, such as
66571 + SIGSEGV, which will as a result inform you of when a error in a program
66572 + occurred, which in some cases could mean a possible exploit attempt.
66573 + If the sysctl option is enabled, a sysctl option with name
66574 + "signal_logging" is created.
66575 +
66576 +config GRKERNSEC_FORKFAIL
66577 + bool "Fork failure logging"
66578 + help
66579 + If you say Y here, all failed fork() attempts will be logged.
66580 + This could suggest a fork bomb, or someone attempting to overstep
66581 + their process limit. If the sysctl option is enabled, a sysctl option
66582 + with name "forkfail_logging" is created.
66583 +
66584 +config GRKERNSEC_TIME
66585 + bool "Time change logging"
66586 + default y if GRKERNSEC_CONFIG_AUTO
66587 + help
66588 + If you say Y here, any changes of the system clock will be logged.
66589 + If the sysctl option is enabled, a sysctl option with name
66590 + "timechange_logging" is created.
66591 +
66592 +config GRKERNSEC_PROC_IPADDR
66593 + bool "/proc/<pid>/ipaddr support"
66594 + default y if GRKERNSEC_CONFIG_AUTO
66595 + help
66596 + If you say Y here, a new entry will be added to each /proc/<pid>
66597 + directory that contains the IP address of the person using the task.
66598 + The IP is carried across local TCP and AF_UNIX stream sockets.
66599 + This information can be useful for IDS/IPSes to perform remote response
66600 + to a local attack. The entry is readable by only the owner of the
66601 + process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
66602 + the RBAC system), and thus does not create privacy concerns.
66603 +
66604 +config GRKERNSEC_RWXMAP_LOG
66605 + bool 'Denied RWX mmap/mprotect logging'
66606 + default y if GRKERNSEC_CONFIG_AUTO
66607 + depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
66608 + help
66609 + If you say Y here, calls to mmap() and mprotect() with explicit
66610 + usage of PROT_WRITE and PROT_EXEC together will be logged when
66611 + denied by the PAX_MPROTECT feature. This feature will also
66612 + log other problematic scenarios that can occur when PAX_MPROTECT
66613 + is enabled on a binary, like textrels and PT_GNU_STACK. If the
66614 + sysctl option is enabled, a sysctl option with name "rwxmap_logging"
66615 + is created.
66616 +
66617 +endmenu
66618 +
66619 +menu "Executable Protections"
66620 +depends on GRKERNSEC
66621 +
66622 +config GRKERNSEC_DMESG
66623 + bool "Dmesg(8) restriction"
66624 + default y if GRKERNSEC_CONFIG_AUTO
66625 + help
66626 + If you say Y here, non-root users will not be able to use dmesg(8)
66627 + to view the contents of the kernel's circular log buffer.
66628 + The kernel's log buffer often contains kernel addresses and other
66629 + identifying information useful to an attacker in fingerprinting a
66630 + system for a targeted exploit.
66631 + If the sysctl option is enabled, a sysctl option with name "dmesg" is
66632 + created.
66633 +
66634 +config GRKERNSEC_HARDEN_PTRACE
66635 + bool "Deter ptrace-based process snooping"
66636 + default y if GRKERNSEC_CONFIG_AUTO
66637 + help
66638 + If you say Y here, TTY sniffers and other malicious monitoring
66639 + programs implemented through ptrace will be defeated. If you
66640 + have been using the RBAC system, this option has already been
66641 + enabled for several years for all users, with the ability to make
66642 + fine-grained exceptions.
66643 +
66644 + This option only affects the ability of non-root users to ptrace
66645 + processes that are not a descendent of the ptracing process.
66646 + This means that strace ./binary and gdb ./binary will still work,
66647 + but attaching to arbitrary processes will not. If the sysctl
66648 + option is enabled, a sysctl option with name "harden_ptrace" is
66649 + created.
66650 +
66651 +config GRKERNSEC_PTRACE_READEXEC
66652 + bool "Require read access to ptrace sensitive binaries"
66653 + default y if GRKERNSEC_CONFIG_AUTO
66654 + help
66655 + If you say Y here, unprivileged users will not be able to ptrace unreadable
66656 + binaries. This option is useful in environments that
66657 + remove the read bits (e.g. file mode 4711) from suid binaries to
66658 + prevent infoleaking of their contents. This option adds
66659 + consistency to the use of that file mode, as the binary could normally
66660 + be read out when run without privileges while ptracing.
66661 +
66662 + If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
66663 + is created.
66664 +
66665 +config GRKERNSEC_SETXID
66666 + bool "Enforce consistent multithreaded privileges"
66667 + default y if GRKERNSEC_CONFIG_AUTO
66668 + depends on (X86 || SPARC64 || PPC || ARM || MIPS)
66669 + help
66670 + If you say Y here, a change from a root uid to a non-root uid
66671 + in a multithreaded application will cause the resulting uids,
66672 + gids, supplementary groups, and capabilities in that thread
66673 + to be propagated to the other threads of the process. In most
66674 + cases this is unnecessary, as glibc will emulate this behavior
66675 + on behalf of the application. Other libcs do not act in the
66676 + same way, allowing the other threads of the process to continue
66677 + running with root privileges. If the sysctl option is enabled,
66678 + a sysctl option with name "consistent_setxid" is created.
66679 +
66680 +config GRKERNSEC_HARDEN_IPC
66681 + bool "Disallow access to overly-permissive IPC objects"
66682 + default y if GRKERNSEC_CONFIG_AUTO
66683 + depends on SYSVIPC
66684 + help
66685 + If you say Y here, access to overly-permissive IPC objects (shared
66686 + memory, message queues, and semaphores) will be denied for processes
66687 + given the following criteria beyond normal permission checks:
66688 + 1) If the IPC object is world-accessible and the euid doesn't match
66689 + that of the creator or current uid for the IPC object
66690 + 2) If the IPC object is group-accessible and the egid doesn't
66691 + match that of the creator or current gid for the IPC object
66692 + It's a common error to grant too much permission to these objects,
66693 + with impact ranging from denial of service and information leaking to
66694 + privilege escalation. This feature was developed in response to
66695 + research by Tim Brown:
66696 + http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
66697 + who found hundreds of such insecure usages. Processes with
66698 + CAP_IPC_OWNER are still permitted to access these IPC objects.
66699 + If the sysctl option is enabled, a sysctl option with name
66700 + "harden_ipc" is created.
66701 +
66702 +config GRKERNSEC_TPE
66703 + bool "Trusted Path Execution (TPE)"
66704 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
66705 + help
66706 + If you say Y here, you will be able to choose a gid to add to the
66707 + supplementary groups of users you want to mark as "untrusted."
66708 + These users will not be able to execute any files that are not in
66709 + root-owned directories writable only by root. If the sysctl option
66710 + is enabled, a sysctl option with name "tpe" is created.
66711 +
66712 +config GRKERNSEC_TPE_ALL
66713 + bool "Partially restrict all non-root users"
66714 + depends on GRKERNSEC_TPE
66715 + help
66716 + If you say Y here, all non-root users will be covered under
66717 + a weaker TPE restriction. This is separate from, and in addition to,
66718 + the main TPE options that you have selected elsewhere. Thus, if a
66719 + "trusted" GID is chosen, this restriction applies to even that GID.
66720 + Under this restriction, all non-root users will only be allowed to
66721 + execute files in directories they own that are not group or
66722 + world-writable, or in directories owned by root and writable only by
66723 + root. If the sysctl option is enabled, a sysctl option with name
66724 + "tpe_restrict_all" is created.
66725 +
66726 +config GRKERNSEC_TPE_INVERT
66727 + bool "Invert GID option"
66728 + depends on GRKERNSEC_TPE
66729 + help
66730 + If you say Y here, the group you specify in the TPE configuration will
66731 + decide what group TPE restrictions will be *disabled* for. This
66732 + option is useful if you want TPE restrictions to be applied to most
66733 + users on the system. If the sysctl option is enabled, a sysctl option
66734 + with name "tpe_invert" is created. Unlike other sysctl options, this
66735 + entry will default to on for backward-compatibility.
66736 +
66737 +config GRKERNSEC_TPE_GID
66738 + int
66739 + default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
66740 + default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
66741 +
66742 +config GRKERNSEC_TPE_UNTRUSTED_GID
66743 + int "GID for TPE-untrusted users"
66744 + depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
66745 + default 1005
66746 + help
66747 + Setting this GID determines what group TPE restrictions will be
66748 + *enabled* for. If the sysctl option is enabled, a sysctl option
66749 + with name "tpe_gid" is created.
66750 +
66751 +config GRKERNSEC_TPE_TRUSTED_GID
66752 + int "GID for TPE-trusted users"
66753 + depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
66754 + default 1005
66755 + help
66756 + Setting this GID determines what group TPE restrictions will be
66757 + *disabled* for. If the sysctl option is enabled, a sysctl option
66758 + with name "tpe_gid" is created.
66759 +
66760 +endmenu
66761 +menu "Network Protections"
66762 +depends on GRKERNSEC
66763 +
66764 +config GRKERNSEC_RANDNET
66765 + bool "Larger entropy pools"
66766 + default y if GRKERNSEC_CONFIG_AUTO
66767 + help
66768 + If you say Y here, the entropy pools used for many features of Linux
66769 + and grsecurity will be doubled in size. Since several grsecurity
66770 + features use additional randomness, it is recommended that you say Y
66771 + here. Saying Y here has a similar effect as modifying
66772 + /proc/sys/kernel/random/poolsize.
66773 +
66774 +config GRKERNSEC_BLACKHOLE
66775 + bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
66776 + default y if GRKERNSEC_CONFIG_AUTO
66777 + depends on NET
66778 + help
66779 + If you say Y here, neither TCP resets nor ICMP
66780 + destination-unreachable packets will be sent in response to packets
66781 + sent to ports for which no associated listening process exists.
66782 + This feature supports both IPV4 and IPV6 and exempts the
66783 + loopback interface from blackholing. Enabling this feature
66784 + makes a host more resilient to DoS attacks and reduces network
66785 + visibility against scanners.
66786 +
66787 + The blackhole feature as-implemented is equivalent to the FreeBSD
66788 + blackhole feature, as it prevents RST responses to all packets, not
66789 + just SYNs. Under most application behavior this causes no
66790 + problems, but applications (like haproxy) may not close certain
66791 + connections in a way that cleanly terminates them on the remote
66792 + end, leaving the remote host in LAST_ACK state. Because of this
66793 + side-effect and to prevent intentional LAST_ACK DoSes, this
66794 + feature also adds automatic mitigation against such attacks.
66795 + The mitigation drastically reduces the amount of time a socket
66796 + can spend in LAST_ACK state. If you're using haproxy and not
66797 + all servers it connects to have this option enabled, consider
66798 + disabling this feature on the haproxy host.
66799 +
66800 + If the sysctl option is enabled, two sysctl options with names
66801 + "ip_blackhole" and "lastack_retries" will be created.
66802 + While "ip_blackhole" takes the standard zero/non-zero on/off
66803 + toggle, "lastack_retries" uses the same kinds of values as
66804 + "tcp_retries1" and "tcp_retries2". The default value of 4
66805 + prevents a socket from lasting more than 45 seconds in LAST_ACK
66806 + state.
66807 +
66808 +config GRKERNSEC_NO_SIMULT_CONNECT
66809 + bool "Disable TCP Simultaneous Connect"
66810 + default y if GRKERNSEC_CONFIG_AUTO
66811 + depends on NET
66812 + help
66813 + If you say Y here, a feature by Willy Tarreau will be enabled that
66814 + removes a weakness in Linux's strict implementation of TCP that
66815 + allows two clients to connect to each other without either entering
66816 + a listening state. The weakness allows an attacker to easily prevent
66817 + a client from connecting to a known server provided the source port
66818 + for the connection is guessed correctly.
66819 +
66820 + As the weakness could be used to prevent an antivirus or IPS from
66821 + fetching updates, or prevent an SSL gateway from fetching a CRL,
66822 + it should be eliminated by enabling this option. Though Linux is
66823 + one of few operating systems supporting simultaneous connect, it
66824 + has no legitimate use in practice and is rarely supported by firewalls.
66825 +
66826 +config GRKERNSEC_SOCKET
66827 + bool "Socket restrictions"
66828 + depends on NET
66829 + help
66830 + If you say Y here, you will be able to choose from several options.
66831 + If you assign a GID on your system and add it to the supplementary
66832 + groups of users you want to restrict socket access to, this patch
66833 + will perform up to three things, based on the option(s) you choose.
66834 +
66835 +config GRKERNSEC_SOCKET_ALL
66836 + bool "Deny any sockets to group"
66837 + depends on GRKERNSEC_SOCKET
66838 + help
66839 + If you say Y here, you will be able to choose a GID of whose users will
66840 + be unable to connect to other hosts from your machine or run server
66841 + applications from your machine. If the sysctl option is enabled, a
66842 + sysctl option with name "socket_all" is created.
66843 +
66844 +config GRKERNSEC_SOCKET_ALL_GID
66845 + int "GID to deny all sockets for"
66846 + depends on GRKERNSEC_SOCKET_ALL
66847 + default 1004
66848 + help
66849 + Here you can choose the GID to disable socket access for. Remember to
66850 + add the users you want socket access disabled for to the GID
66851 + specified here. If the sysctl option is enabled, a sysctl option
66852 + with name "socket_all_gid" is created.
66853 +
66854 +config GRKERNSEC_SOCKET_CLIENT
66855 + bool "Deny client sockets to group"
66856 + depends on GRKERNSEC_SOCKET
66857 + help
66858 + If you say Y here, you will be able to choose a GID of whose users will
66859 + be unable to connect to other hosts from your machine, but will be
66860 + able to run servers. If this option is enabled, all users in the group
66861 + you specify will have to use passive mode when initiating ftp transfers
66862 + from the shell on your machine. If the sysctl option is enabled, a
66863 + sysctl option with name "socket_client" is created.
66864 +
66865 +config GRKERNSEC_SOCKET_CLIENT_GID
66866 + int "GID to deny client sockets for"
66867 + depends on GRKERNSEC_SOCKET_CLIENT
66868 + default 1003
66869 + help
66870 + Here you can choose the GID to disable client socket access for.
66871 + Remember to add the users you want client socket access disabled for to
66872 + the GID specified here. If the sysctl option is enabled, a sysctl
66873 + option with name "socket_client_gid" is created.
66874 +
66875 +config GRKERNSEC_SOCKET_SERVER
66876 + bool "Deny server sockets to group"
66877 + depends on GRKERNSEC_SOCKET
66878 + help
66879 + If you say Y here, you will be able to choose a GID of whose users will
66880 + be unable to run server applications from your machine. If the sysctl
66881 + option is enabled, a sysctl option with name "socket_server" is created.
66882 +
66883 +config GRKERNSEC_SOCKET_SERVER_GID
66884 + int "GID to deny server sockets for"
66885 + depends on GRKERNSEC_SOCKET_SERVER
66886 + default 1002
66887 + help
66888 + Here you can choose the GID to disable server socket access for.
66889 + Remember to add the users you want server socket access disabled for to
66890 + the GID specified here. If the sysctl option is enabled, a sysctl
66891 + option with name "socket_server_gid" is created.
66892 +
66893 +endmenu
66894 +
66895 +menu "Physical Protections"
66896 +depends on GRKERNSEC
66897 +
66898 +config GRKERNSEC_DENYUSB
66899 + bool "Deny new USB connections after toggle"
66900 + default y if GRKERNSEC_CONFIG_AUTO
66901 + depends on SYSCTL && USB_SUPPORT
66902 + help
66903 + If you say Y here, a new sysctl option with name "deny_new_usb"
66904 + will be created. Setting its value to 1 will prevent any new
66905 + USB devices from being recognized by the OS. Any attempted USB
66906 + device insertion will be logged. This option is intended to be
66907 + used against custom USB devices designed to exploit vulnerabilities
66908 + in various USB device drivers.
66909 +
66910 + For greatest effectiveness, this sysctl should be set after any
66911 + relevant init scripts. This option is safe to enable in distros
66912 + as each user can choose whether or not to toggle the sysctl.
66913 +
66914 +config GRKERNSEC_DENYUSB_FORCE
66915 + bool "Reject all USB devices not connected at boot"
66916 + select USB
66917 + depends on GRKERNSEC_DENYUSB
66918 + help
66919 + If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
66920 + that doesn't involve a sysctl entry. This option should only be
66921 + enabled if you're sure you want to deny all new USB connections
66922 + at runtime and don't want to modify init scripts. This should not
66923 + be enabled by distros. It forces the core USB code to be built
66924 + into the kernel image so that all devices connected at boot time
66925 + can be recognized and new USB device connections can be prevented
66926 + prior to init running.
66927 +
66928 +endmenu
66929 +
66930 +menu "Sysctl Support"
66931 +depends on GRKERNSEC && SYSCTL
66932 +
66933 +config GRKERNSEC_SYSCTL
66934 + bool "Sysctl support"
66935 + default y if GRKERNSEC_CONFIG_AUTO
66936 + help
66937 + If you say Y here, you will be able to change the options that
66938 + grsecurity runs with at bootup, without having to recompile your
66939 + kernel. You can echo values to files in /proc/sys/kernel/grsecurity
66940 + to enable (1) or disable (0) various features. All the sysctl entries
66941 + are mutable until the "grsec_lock" entry is set to a non-zero value.
66942 + All features enabled in the kernel configuration are disabled at boot
66943 + if you do not say Y to the "Turn on features by default" option.
66944 + All options should be set at startup, and the grsec_lock entry should
66945 + be set to a non-zero value after all the options are set.
66946 + *THIS IS EXTREMELY IMPORTANT*
66947 +
66948 +config GRKERNSEC_SYSCTL_DISTRO
66949 + bool "Extra sysctl support for distro makers (READ HELP)"
66950 + depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
66951 + help
66952 + If you say Y here, additional sysctl options will be created
66953 + for features that affect processes running as root. Therefore,
66954 + it is critical when using this option that the grsec_lock entry be
66955 + enabled after boot. Only distros with prebuilt kernel packages
66956 + with this option enabled that can ensure grsec_lock is enabled
66957 + after boot should use this option.
66958 + *Failure to set grsec_lock after boot makes all grsec features
66959 + this option covers useless*
66960 +
66961 + Currently this option creates the following sysctl entries:
66962 + "Disable Privileged I/O": "disable_priv_io"
66963 +
66964 +config GRKERNSEC_SYSCTL_ON
66965 + bool "Turn on features by default"
66966 + default y if GRKERNSEC_CONFIG_AUTO
66967 + depends on GRKERNSEC_SYSCTL
66968 + help
66969 + If you say Y here, instead of having all features enabled in the
66970 + kernel configuration disabled at boot time, the features will be
66971 + enabled at boot time. It is recommended you say Y here unless
66972 + there is some reason you would want all sysctl-tunable features to
66973 + be disabled by default. As mentioned elsewhere, it is important
66974 + to enable the grsec_lock entry once you have finished modifying
66975 + the sysctl entries.
66976 +
66977 +endmenu
66978 +menu "Logging Options"
66979 +depends on GRKERNSEC
66980 +
66981 +config GRKERNSEC_FLOODTIME
66982 + int "Seconds in between log messages (minimum)"
66983 + default 10
66984 + help
66985 + This option allows you to enforce the number of seconds between
66986 + grsecurity log messages. The default should be suitable for most
66987 + people, however, if you choose to change it, choose a value small enough
66988 + to allow informative logs to be produced, but large enough to
66989 + prevent flooding.
66990 +
66991 + Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
66992 + any rate limiting on grsecurity log messages.
66993 +
66994 +config GRKERNSEC_FLOODBURST
66995 + int "Number of messages in a burst (maximum)"
66996 + default 6
66997 + help
66998 + This option allows you to choose the maximum number of messages allowed
66999 + within the flood time interval you chose in a separate option. The
67000 + default should be suitable for most people, however if you find that
67001 + many of your logs are being interpreted as flooding, you may want to
67002 + raise this value.
67003 +
67004 + Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
67005 + any rate limiting on grsecurity log messages.
67006 +
67007 +endmenu
67008 diff --git a/grsecurity/Makefile b/grsecurity/Makefile
67009 new file mode 100644
67010 index 0000000..30ababb
67011 --- /dev/null
67012 +++ b/grsecurity/Makefile
67013 @@ -0,0 +1,54 @@
67014 +# grsecurity – access control and security hardening for Linux
67015 +# All code in this directory and various hooks located throughout the Linux kernel are
67016 +# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
67017 +# http://www.grsecurity.net spender@grsecurity.net
67018 +#
67019 +# This program is free software; you can redistribute it and/or
67020 +# modify it under the terms of the GNU General Public License version 2
67021 +# as published by the Free Software Foundation.
67022 +#
67023 +# This program is distributed in the hope that it will be useful,
67024 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
67025 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
67026 +# GNU General Public License for more details.
67027 +#
67028 +# You should have received a copy of the GNU General Public License
67029 +# along with this program; if not, write to the Free Software
67030 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
67031 +
67032 +KBUILD_CFLAGS += -Werror
67033 +
67034 +obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
67035 + grsec_mount.o grsec_sig.o grsec_sysctl.o \
67036 + grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
67037 + grsec_usb.o grsec_ipc.o grsec_proc.o
67038 +
67039 +obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
67040 + gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
67041 + gracl_learn.o grsec_log.o gracl_policy.o
67042 +ifdef CONFIG_COMPAT
67043 +obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
67044 +endif
67045 +
67046 +obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
67047 +
67048 +ifdef CONFIG_NET
67049 +obj-y += grsec_sock.o
67050 +obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
67051 +endif
67052 +
67053 +ifndef CONFIG_GRKERNSEC
67054 +obj-y += grsec_disabled.o
67055 +endif
67056 +
67057 +ifdef CONFIG_GRKERNSEC_HIDESYM
67058 +extra-y := grsec_hidesym.o
67059 +$(obj)/grsec_hidesym.o:
67060 + @-chmod -f 500 /boot
67061 + @-chmod -f 500 /lib/modules
67062 + @-chmod -f 500 /lib64/modules
67063 + @-chmod -f 500 /lib32/modules
67064 + @-chmod -f 700 .
67065 + @-chmod -f 700 $(objtree)
67066 + @echo ' grsec: protected kernel image paths'
67067 +endif
67068 diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
67069 new file mode 100644
67070 index 0000000..58223f6
67071 --- /dev/null
67072 +++ b/grsecurity/gracl.c
67073 @@ -0,0 +1,2702 @@
67074 +#include <linux/kernel.h>
67075 +#include <linux/module.h>
67076 +#include <linux/sched.h>
67077 +#include <linux/mm.h>
67078 +#include <linux/file.h>
67079 +#include <linux/fs.h>
67080 +#include <linux/namei.h>
67081 +#include <linux/mount.h>
67082 +#include <linux/tty.h>
67083 +#include <linux/proc_fs.h>
67084 +#include <linux/lglock.h>
67085 +#include <linux/slab.h>
67086 +#include <linux/vmalloc.h>
67087 +#include <linux/types.h>
67088 +#include <linux/sysctl.h>
67089 +#include <linux/netdevice.h>
67090 +#include <linux/ptrace.h>
67091 +#include <linux/gracl.h>
67092 +#include <linux/gralloc.h>
67093 +#include <linux/security.h>
67094 +#include <linux/grinternal.h>
67095 +#include <linux/pid_namespace.h>
67096 +#include <linux/stop_machine.h>
67097 +#include <linux/fdtable.h>
67098 +#include <linux/percpu.h>
67099 +#include <linux/lglock.h>
67100 +#include <linux/hugetlb.h>
67101 +#include <linux/posix-timers.h>
67102 +#include <linux/prefetch.h>
67103 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
67104 +#include <linux/magic.h>
67105 +#include <linux/pagemap.h>
67106 +#include "../fs/btrfs/async-thread.h"
67107 +#include "../fs/btrfs/ctree.h"
67108 +#include "../fs/btrfs/btrfs_inode.h"
67109 +#endif
67110 +#include "../fs/mount.h"
67111 +
67112 +#include <asm/uaccess.h>
67113 +#include <asm/errno.h>
67114 +#include <asm/mman.h>
67115 +
67116 +#define FOR_EACH_ROLE_START(role) \
67117 + role = running_polstate.role_list; \
67118 + while (role) {
67119 +
67120 +#define FOR_EACH_ROLE_END(role) \
67121 + role = role->prev; \
67122 + }
67123 +
67124 +extern struct path gr_real_root;
67125 +
67126 +static struct gr_policy_state running_polstate;
67127 +struct gr_policy_state *polstate = &running_polstate;
67128 +extern struct gr_alloc_state *current_alloc_state;
67129 +
67130 +extern char *gr_shared_page[4];
67131 +DEFINE_RWLOCK(gr_inode_lock);
67132 +
67133 +static unsigned int gr_status __read_only = GR_STATUS_INIT;
67134 +
67135 +#ifdef CONFIG_NET
67136 +extern struct vfsmount *sock_mnt;
67137 +#endif
67138 +
67139 +extern struct vfsmount *pipe_mnt;
67140 +extern struct vfsmount *shm_mnt;
67141 +
67142 +#ifdef CONFIG_HUGETLBFS
67143 +extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
67144 +#endif
67145 +
67146 +extern u16 acl_sp_role_value;
67147 +extern struct acl_object_label *fakefs_obj_rw;
67148 +extern struct acl_object_label *fakefs_obj_rwx;
67149 +
67150 +int gr_acl_is_enabled(void)
67151 +{
67152 + return (gr_status & GR_READY);
67153 +}
67154 +
67155 +void gr_enable_rbac_system(void)
67156 +{
67157 + pax_open_kernel();
67158 + gr_status |= GR_READY;
67159 + pax_close_kernel();
67160 +}
67161 +
67162 +int gr_rbac_disable(void *unused)
67163 +{
67164 + pax_open_kernel();
67165 + gr_status &= ~GR_READY;
67166 + pax_close_kernel();
67167 +
67168 + return 0;
67169 +}
67170 +
67171 +static inline dev_t __get_dev(const struct dentry *dentry)
67172 +{
67173 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
67174 + if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
67175 + return BTRFS_I(dentry->d_inode)->root->anon_dev;
67176 + else
67177 +#endif
67178 + return dentry->d_sb->s_dev;
67179 +}
67180 +
67181 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
67182 +{
67183 + return __get_dev(dentry);
67184 +}
67185 +
67186 +static char gr_task_roletype_to_char(struct task_struct *task)
67187 +{
67188 + switch (task->role->roletype &
67189 + (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
67190 + GR_ROLE_SPECIAL)) {
67191 + case GR_ROLE_DEFAULT:
67192 + return 'D';
67193 + case GR_ROLE_USER:
67194 + return 'U';
67195 + case GR_ROLE_GROUP:
67196 + return 'G';
67197 + case GR_ROLE_SPECIAL:
67198 + return 'S';
67199 + }
67200 +
67201 + return 'X';
67202 +}
67203 +
67204 +char gr_roletype_to_char(void)
67205 +{
67206 + return gr_task_roletype_to_char(current);
67207 +}
67208 +
67209 +__inline__ int
67210 +gr_acl_tpe_check(void)
67211 +{
67212 + if (unlikely(!(gr_status & GR_READY)))
67213 + return 0;
67214 + if (current->role->roletype & GR_ROLE_TPE)
67215 + return 1;
67216 + else
67217 + return 0;
67218 +}
67219 +
67220 +int
67221 +gr_handle_rawio(const struct inode *inode)
67222 +{
67223 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
67224 + if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
67225 + grsec_enable_chroot_caps && proc_is_chrooted(current) &&
67226 + !capable(CAP_SYS_RAWIO))
67227 + return 1;
67228 +#endif
67229 + return 0;
67230 +}
67231 +
67232 +int
67233 +gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
67234 +{
67235 + if (likely(lena != lenb))
67236 + return 0;
67237 +
67238 + return !memcmp(a, b, lena);
67239 +}
67240 +
67241 +static int prepend(char **buffer, int *buflen, const char *str, int namelen)
67242 +{
67243 + *buflen -= namelen;
67244 + if (*buflen < 0)
67245 + return -ENAMETOOLONG;
67246 + *buffer -= namelen;
67247 + memcpy(*buffer, str, namelen);
67248 + return 0;
67249 +}
67250 +
67251 +static int prepend_name(char **buffer, int *buflen, struct qstr *name)
67252 +{
67253 + return prepend(buffer, buflen, name->name, name->len);
67254 +}
67255 +
67256 +static int prepend_path(const struct path *path, struct path *root,
67257 + char **buffer, int *buflen)
67258 +{
67259 + struct dentry *dentry = path->dentry;
67260 + struct vfsmount *vfsmnt = path->mnt;
67261 + struct mount *mnt = real_mount(vfsmnt);
67262 + bool slash = false;
67263 + int error = 0;
67264 +
67265 + while (dentry != root->dentry || vfsmnt != root->mnt) {
67266 + struct dentry * parent;
67267 +
67268 + if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
67269 + /* Global root? */
67270 + if (!mnt_has_parent(mnt)) {
67271 + goto out;
67272 + }
67273 + dentry = mnt->mnt_mountpoint;
67274 + mnt = mnt->mnt_parent;
67275 + vfsmnt = &mnt->mnt;
67276 + continue;
67277 + }
67278 + parent = dentry->d_parent;
67279 + prefetch(parent);
67280 + spin_lock(&dentry->d_lock);
67281 + error = prepend_name(buffer, buflen, &dentry->d_name);
67282 + spin_unlock(&dentry->d_lock);
67283 + if (!error)
67284 + error = prepend(buffer, buflen, "/", 1);
67285 + if (error)
67286 + break;
67287 +
67288 + slash = true;
67289 + dentry = parent;
67290 + }
67291 +
67292 +out:
67293 + if (!error && !slash)
67294 + error = prepend(buffer, buflen, "/", 1);
67295 +
67296 + return error;
67297 +}
67298 +
67299 +/* this must be called with mount_lock and rename_lock held */
67300 +
67301 +static char *__our_d_path(const struct path *path, struct path *root,
67302 + char *buf, int buflen)
67303 +{
67304 + char *res = buf + buflen;
67305 + int error;
67306 +
67307 + prepend(&res, &buflen, "\0", 1);
67308 + error = prepend_path(path, root, &res, &buflen);
67309 + if (error)
67310 + return ERR_PTR(error);
67311 +
67312 + return res;
67313 +}
67314 +
67315 +static char *
67316 +gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
67317 +{
67318 + char *retval;
67319 +
67320 + retval = __our_d_path(path, root, buf, buflen);
67321 + if (unlikely(IS_ERR(retval)))
67322 + retval = strcpy(buf, "<path too long>");
67323 + else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
67324 + retval[1] = '\0';
67325 +
67326 + return retval;
67327 +}
67328 +
67329 +static char *
67330 +__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
67331 + char *buf, int buflen)
67332 +{
67333 + struct path path;
67334 + char *res;
67335 +
67336 + path.dentry = (struct dentry *)dentry;
67337 + path.mnt = (struct vfsmount *)vfsmnt;
67338 +
67339 + /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
67340 + by the RBAC system */
67341 + res = gen_full_path(&path, &gr_real_root, buf, buflen);
67342 +
67343 + return res;
67344 +}
67345 +
67346 +static char *
67347 +d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
67348 + char *buf, int buflen)
67349 +{
67350 + char *res;
67351 + struct path path;
67352 + struct path root;
67353 + struct task_struct *reaper = init_pid_ns.child_reaper;
67354 +
67355 + path.dentry = (struct dentry *)dentry;
67356 + path.mnt = (struct vfsmount *)vfsmnt;
67357 +
67358 + /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
67359 + get_fs_root(reaper->fs, &root);
67360 +
67361 + read_seqlock_excl(&mount_lock);
67362 + write_seqlock(&rename_lock);
67363 + res = gen_full_path(&path, &root, buf, buflen);
67364 + write_sequnlock(&rename_lock);
67365 + read_sequnlock_excl(&mount_lock);
67366 +
67367 + path_put(&root);
67368 + return res;
67369 +}
67370 +
67371 +char *
67372 +gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
67373 +{
67374 + char *ret;
67375 + read_seqlock_excl(&mount_lock);
67376 + write_seqlock(&rename_lock);
67377 + ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
67378 + PAGE_SIZE);
67379 + write_sequnlock(&rename_lock);
67380 + read_sequnlock_excl(&mount_lock);
67381 + return ret;
67382 +}
67383 +
67384 +static char *
67385 +gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
67386 +{
67387 + char *ret;
67388 + char *buf;
67389 + int buflen;
67390 +
67391 + read_seqlock_excl(&mount_lock);
67392 + write_seqlock(&rename_lock);
67393 + buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
67394 + ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
67395 + buflen = (int)(ret - buf);
67396 + if (buflen >= 5)
67397 + prepend(&ret, &buflen, "/proc", 5);
67398 + else
67399 + ret = strcpy(buf, "<path too long>");
67400 + write_sequnlock(&rename_lock);
67401 + read_sequnlock_excl(&mount_lock);
67402 + return ret;
67403 +}
67404 +
67405 +char *
67406 +gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
67407 +{
67408 + return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
67409 + PAGE_SIZE);
67410 +}
67411 +
67412 +char *
67413 +gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
67414 +{
67415 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
67416 + PAGE_SIZE);
67417 +}
67418 +
67419 +char *
67420 +gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
67421 +{
67422 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
67423 + PAGE_SIZE);
67424 +}
67425 +
67426 +char *
67427 +gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
67428 +{
67429 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
67430 + PAGE_SIZE);
67431 +}
67432 +
67433 +char *
67434 +gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
67435 +{
67436 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
67437 + PAGE_SIZE);
67438 +}
67439 +
67440 +__inline__ __u32
67441 +to_gr_audit(const __u32 reqmode)
67442 +{
67443 + /* masks off auditable permission flags, then shifts them to create
67444 + auditing flags, and adds the special case of append auditing if
67445 + we're requesting write */
67446 + return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
67447 +}
67448 +
67449 +struct acl_role_label *
67450 +__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
67451 + const gid_t gid)
67452 +{
67453 + unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
67454 + struct acl_role_label *match;
67455 + struct role_allowed_ip *ipp;
67456 + unsigned int x;
67457 + u32 curr_ip = task->signal->saved_ip;
67458 +
67459 + match = state->acl_role_set.r_hash[index];
67460 +
67461 + while (match) {
67462 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
67463 + for (x = 0; x < match->domain_child_num; x++) {
67464 + if (match->domain_children[x] == uid)
67465 + goto found;
67466 + }
67467 + } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
67468 + break;
67469 + match = match->next;
67470 + }
67471 +found:
67472 + if (match == NULL) {
67473 + try_group:
67474 + index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
67475 + match = state->acl_role_set.r_hash[index];
67476 +
67477 + while (match) {
67478 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
67479 + for (x = 0; x < match->domain_child_num; x++) {
67480 + if (match->domain_children[x] == gid)
67481 + goto found2;
67482 + }
67483 + } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
67484 + break;
67485 + match = match->next;
67486 + }
67487 +found2:
67488 + if (match == NULL)
67489 + match = state->default_role;
67490 + if (match->allowed_ips == NULL)
67491 + return match;
67492 + else {
67493 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
67494 + if (likely
67495 + ((ntohl(curr_ip) & ipp->netmask) ==
67496 + (ntohl(ipp->addr) & ipp->netmask)))
67497 + return match;
67498 + }
67499 + match = state->default_role;
67500 + }
67501 + } else if (match->allowed_ips == NULL) {
67502 + return match;
67503 + } else {
67504 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
67505 + if (likely
67506 + ((ntohl(curr_ip) & ipp->netmask) ==
67507 + (ntohl(ipp->addr) & ipp->netmask)))
67508 + return match;
67509 + }
67510 + goto try_group;
67511 + }
67512 +
67513 + return match;
67514 +}
67515 +
67516 +static struct acl_role_label *
67517 +lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
67518 + const gid_t gid)
67519 +{
67520 + return __lookup_acl_role_label(&running_polstate, task, uid, gid);
67521 +}
67522 +
67523 +struct acl_subject_label *
67524 +lookup_acl_subj_label(const ino_t ino, const dev_t dev,
67525 + const struct acl_role_label *role)
67526 +{
67527 + unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
67528 + struct acl_subject_label *match;
67529 +
67530 + match = role->subj_hash[index];
67531 +
67532 + while (match && (match->inode != ino || match->device != dev ||
67533 + (match->mode & GR_DELETED))) {
67534 + match = match->next;
67535 + }
67536 +
67537 + if (match && !(match->mode & GR_DELETED))
67538 + return match;
67539 + else
67540 + return NULL;
67541 +}
67542 +
67543 +struct acl_subject_label *
67544 +lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
67545 + const struct acl_role_label *role)
67546 +{
67547 + unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
67548 + struct acl_subject_label *match;
67549 +
67550 + match = role->subj_hash[index];
67551 +
67552 + while (match && (match->inode != ino || match->device != dev ||
67553 + !(match->mode & GR_DELETED))) {
67554 + match = match->next;
67555 + }
67556 +
67557 + if (match && (match->mode & GR_DELETED))
67558 + return match;
67559 + else
67560 + return NULL;
67561 +}
67562 +
67563 +static struct acl_object_label *
67564 +lookup_acl_obj_label(const ino_t ino, const dev_t dev,
67565 + const struct acl_subject_label *subj)
67566 +{
67567 + unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
67568 + struct acl_object_label *match;
67569 +
67570 + match = subj->obj_hash[index];
67571 +
67572 + while (match && (match->inode != ino || match->device != dev ||
67573 + (match->mode & GR_DELETED))) {
67574 + match = match->next;
67575 + }
67576 +
67577 + if (match && !(match->mode & GR_DELETED))
67578 + return match;
67579 + else
67580 + return NULL;
67581 +}
67582 +
67583 +static struct acl_object_label *
67584 +lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
67585 + const struct acl_subject_label *subj)
67586 +{
67587 + unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
67588 + struct acl_object_label *match;
67589 +
67590 + match = subj->obj_hash[index];
67591 +
67592 + while (match && (match->inode != ino || match->device != dev ||
67593 + !(match->mode & GR_DELETED))) {
67594 + match = match->next;
67595 + }
67596 +
67597 + if (match && (match->mode & GR_DELETED))
67598 + return match;
67599 +
67600 + match = subj->obj_hash[index];
67601 +
67602 + while (match && (match->inode != ino || match->device != dev ||
67603 + (match->mode & GR_DELETED))) {
67604 + match = match->next;
67605 + }
67606 +
67607 + if (match && !(match->mode & GR_DELETED))
67608 + return match;
67609 + else
67610 + return NULL;
67611 +}
67612 +
67613 +struct name_entry *
67614 +__lookup_name_entry(const struct gr_policy_state *state, const char *name)
67615 +{
67616 + unsigned int len = strlen(name);
67617 + unsigned int key = full_name_hash(name, len);
67618 + unsigned int index = key % state->name_set.n_size;
67619 + struct name_entry *match;
67620 +
67621 + match = state->name_set.n_hash[index];
67622 +
67623 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
67624 + match = match->next;
67625 +
67626 + return match;
67627 +}
67628 +
67629 +static struct name_entry *
67630 +lookup_name_entry(const char *name)
67631 +{
67632 + return __lookup_name_entry(&running_polstate, name);
67633 +}
67634 +
67635 +static struct name_entry *
67636 +lookup_name_entry_create(const char *name)
67637 +{
67638 + unsigned int len = strlen(name);
67639 + unsigned int key = full_name_hash(name, len);
67640 + unsigned int index = key % running_polstate.name_set.n_size;
67641 + struct name_entry *match;
67642 +
67643 + match = running_polstate.name_set.n_hash[index];
67644 +
67645 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
67646 + !match->deleted))
67647 + match = match->next;
67648 +
67649 + if (match && match->deleted)
67650 + return match;
67651 +
67652 + match = running_polstate.name_set.n_hash[index];
67653 +
67654 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
67655 + match->deleted))
67656 + match = match->next;
67657 +
67658 + if (match && !match->deleted)
67659 + return match;
67660 + else
67661 + return NULL;
67662 +}
67663 +
67664 +static struct inodev_entry *
67665 +lookup_inodev_entry(const ino_t ino, const dev_t dev)
67666 +{
67667 + unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
67668 + struct inodev_entry *match;
67669 +
67670 + match = running_polstate.inodev_set.i_hash[index];
67671 +
67672 + while (match && (match->nentry->inode != ino || match->nentry->device != dev))
67673 + match = match->next;
67674 +
67675 + return match;
67676 +}
67677 +
67678 +void
67679 +__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
67680 +{
67681 + unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
67682 + state->inodev_set.i_size);
67683 + struct inodev_entry **curr;
67684 +
67685 + entry->prev = NULL;
67686 +
67687 + curr = &state->inodev_set.i_hash[index];
67688 + if (*curr != NULL)
67689 + (*curr)->prev = entry;
67690 +
67691 + entry->next = *curr;
67692 + *curr = entry;
67693 +
67694 + return;
67695 +}
67696 +
67697 +static void
67698 +insert_inodev_entry(struct inodev_entry *entry)
67699 +{
67700 + __insert_inodev_entry(&running_polstate, entry);
67701 +}
67702 +
67703 +void
67704 +insert_acl_obj_label(struct acl_object_label *obj,
67705 + struct acl_subject_label *subj)
67706 +{
67707 + unsigned int index =
67708 + gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
67709 + struct acl_object_label **curr;
67710 +
67711 + obj->prev = NULL;
67712 +
67713 + curr = &subj->obj_hash[index];
67714 + if (*curr != NULL)
67715 + (*curr)->prev = obj;
67716 +
67717 + obj->next = *curr;
67718 + *curr = obj;
67719 +
67720 + return;
67721 +}
67722 +
67723 +void
67724 +insert_acl_subj_label(struct acl_subject_label *obj,
67725 + struct acl_role_label *role)
67726 +{
67727 + unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
67728 + struct acl_subject_label **curr;
67729 +
67730 + obj->prev = NULL;
67731 +
67732 + curr = &role->subj_hash[index];
67733 + if (*curr != NULL)
67734 + (*curr)->prev = obj;
67735 +
67736 + obj->next = *curr;
67737 + *curr = obj;
67738 +
67739 + return;
67740 +}
67741 +
67742 +/* derived from glibc fnmatch() 0: match, 1: no match*/
67743 +
67744 +static int
67745 +glob_match(const char *p, const char *n)
67746 +{
67747 + char c;
67748 +
67749 + while ((c = *p++) != '\0') {
67750 + switch (c) {
67751 + case '?':
67752 + if (*n == '\0')
67753 + return 1;
67754 + else if (*n == '/')
67755 + return 1;
67756 + break;
67757 + case '\\':
67758 + if (*n != c)
67759 + return 1;
67760 + break;
67761 + case '*':
67762 + for (c = *p++; c == '?' || c == '*'; c = *p++) {
67763 + if (*n == '/')
67764 + return 1;
67765 + else if (c == '?') {
67766 + if (*n == '\0')
67767 + return 1;
67768 + else
67769 + ++n;
67770 + }
67771 + }
67772 + if (c == '\0') {
67773 + return 0;
67774 + } else {
67775 + const char *endp;
67776 +
67777 + if ((endp = strchr(n, '/')) == NULL)
67778 + endp = n + strlen(n);
67779 +
67780 + if (c == '[') {
67781 + for (--p; n < endp; ++n)
67782 + if (!glob_match(p, n))
67783 + return 0;
67784 + } else if (c == '/') {
67785 + while (*n != '\0' && *n != '/')
67786 + ++n;
67787 + if (*n == '/' && !glob_match(p, n + 1))
67788 + return 0;
67789 + } else {
67790 + for (--p; n < endp; ++n)
67791 + if (*n == c && !glob_match(p, n))
67792 + return 0;
67793 + }
67794 +
67795 + return 1;
67796 + }
67797 + case '[':
67798 + {
67799 + int not;
67800 + char cold;
67801 +
67802 + if (*n == '\0' || *n == '/')
67803 + return 1;
67804 +
67805 + not = (*p == '!' || *p == '^');
67806 + if (not)
67807 + ++p;
67808 +
67809 + c = *p++;
67810 + for (;;) {
67811 + unsigned char fn = (unsigned char)*n;
67812 +
67813 + if (c == '\0')
67814 + return 1;
67815 + else {
67816 + if (c == fn)
67817 + goto matched;
67818 + cold = c;
67819 + c = *p++;
67820 +
67821 + if (c == '-' && *p != ']') {
67822 + unsigned char cend = *p++;
67823 +
67824 + if (cend == '\0')
67825 + return 1;
67826 +
67827 + if (cold <= fn && fn <= cend)
67828 + goto matched;
67829 +
67830 + c = *p++;
67831 + }
67832 + }
67833 +
67834 + if (c == ']')
67835 + break;
67836 + }
67837 + if (!not)
67838 + return 1;
67839 + break;
67840 + matched:
67841 + while (c != ']') {
67842 + if (c == '\0')
67843 + return 1;
67844 +
67845 + c = *p++;
67846 + }
67847 + if (not)
67848 + return 1;
67849 + }
67850 + break;
67851 + default:
67852 + if (c != *n)
67853 + return 1;
67854 + }
67855 +
67856 + ++n;
67857 + }
67858 +
67859 + if (*n == '\0')
67860 + return 0;
67861 +
67862 + if (*n == '/')
67863 + return 0;
67864 +
67865 + return 1;
67866 +}
67867 +
67868 +static struct acl_object_label *
67869 +chk_glob_label(struct acl_object_label *globbed,
67870 + const struct dentry *dentry, const struct vfsmount *mnt, char **path)
67871 +{
67872 + struct acl_object_label *tmp;
67873 +
67874 + if (*path == NULL)
67875 + *path = gr_to_filename_nolock(dentry, mnt);
67876 +
67877 + tmp = globbed;
67878 +
67879 + while (tmp) {
67880 + if (!glob_match(tmp->filename, *path))
67881 + return tmp;
67882 + tmp = tmp->next;
67883 + }
67884 +
67885 + return NULL;
67886 +}
67887 +
67888 +static struct acl_object_label *
67889 +__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
67890 + const ino_t curr_ino, const dev_t curr_dev,
67891 + const struct acl_subject_label *subj, char **path, const int checkglob)
67892 +{
67893 + struct acl_subject_label *tmpsubj;
67894 + struct acl_object_label *retval;
67895 + struct acl_object_label *retval2;
67896 +
67897 + tmpsubj = (struct acl_subject_label *) subj;
67898 + read_lock(&gr_inode_lock);
67899 + do {
67900 + retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
67901 + if (retval) {
67902 + if (checkglob && retval->globbed) {
67903 + retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
67904 + if (retval2)
67905 + retval = retval2;
67906 + }
67907 + break;
67908 + }
67909 + } while ((tmpsubj = tmpsubj->parent_subject));
67910 + read_unlock(&gr_inode_lock);
67911 +
67912 + return retval;
67913 +}
67914 +
67915 +static __inline__ struct acl_object_label *
67916 +full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
67917 + struct dentry *curr_dentry,
67918 + const struct acl_subject_label *subj, char **path, const int checkglob)
67919 +{
67920 + int newglob = checkglob;
67921 + ino_t inode;
67922 + dev_t device;
67923 +
67924 + /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
67925 + as we don't want a / * rule to match instead of the / object
67926 + don't do this for create lookups that call this function though, since they're looking up
67927 + on the parent and thus need globbing checks on all paths
67928 + */
67929 + if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
67930 + newglob = GR_NO_GLOB;
67931 +
67932 + spin_lock(&curr_dentry->d_lock);
67933 + inode = curr_dentry->d_inode->i_ino;
67934 + device = __get_dev(curr_dentry);
67935 + spin_unlock(&curr_dentry->d_lock);
67936 +
67937 + return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
67938 +}
67939 +
67940 +#ifdef CONFIG_HUGETLBFS
67941 +static inline bool
67942 +is_hugetlbfs_mnt(const struct vfsmount *mnt)
67943 +{
67944 + int i;
67945 + for (i = 0; i < HUGE_MAX_HSTATE; i++) {
67946 + if (unlikely(hugetlbfs_vfsmount[i] == mnt))
67947 + return true;
67948 + }
67949 +
67950 + return false;
67951 +}
67952 +#endif
67953 +
67954 +static struct acl_object_label *
67955 +__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
67956 + const struct acl_subject_label *subj, char *path, const int checkglob)
67957 +{
67958 + struct dentry *dentry = (struct dentry *) l_dentry;
67959 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
67960 + struct mount *real_mnt = real_mount(mnt);
67961 + struct acl_object_label *retval;
67962 + struct dentry *parent;
67963 +
67964 + read_seqlock_excl(&mount_lock);
67965 + write_seqlock(&rename_lock);
67966 +
67967 + if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
67968 +#ifdef CONFIG_NET
67969 + mnt == sock_mnt ||
67970 +#endif
67971 +#ifdef CONFIG_HUGETLBFS
67972 + (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
67973 +#endif
67974 + /* ignore Eric Biederman */
67975 + IS_PRIVATE(l_dentry->d_inode))) {
67976 + retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
67977 + goto out;
67978 + }
67979 +
67980 + for (;;) {
67981 + if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
67982 + break;
67983 +
67984 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
67985 + if (!mnt_has_parent(real_mnt))
67986 + break;
67987 +
67988 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
67989 + if (retval != NULL)
67990 + goto out;
67991 +
67992 + dentry = real_mnt->mnt_mountpoint;
67993 + real_mnt = real_mnt->mnt_parent;
67994 + mnt = &real_mnt->mnt;
67995 + continue;
67996 + }
67997 +
67998 + parent = dentry->d_parent;
67999 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
68000 + if (retval != NULL)
68001 + goto out;
68002 +
68003 + dentry = parent;
68004 + }
68005 +
68006 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
68007 +
68008 + /* gr_real_root is pinned so we don't have to hold a reference */
68009 + if (retval == NULL)
68010 + retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
68011 +out:
68012 + write_sequnlock(&rename_lock);
68013 + read_sequnlock_excl(&mount_lock);
68014 +
68015 + BUG_ON(retval == NULL);
68016 +
68017 + return retval;
68018 +}
68019 +
68020 +static __inline__ struct acl_object_label *
68021 +chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
68022 + const struct acl_subject_label *subj)
68023 +{
68024 + char *path = NULL;
68025 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
68026 +}
68027 +
68028 +static __inline__ struct acl_object_label *
68029 +chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
68030 + const struct acl_subject_label *subj)
68031 +{
68032 + char *path = NULL;
68033 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
68034 +}
68035 +
68036 +static __inline__ struct acl_object_label *
68037 +chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
68038 + const struct acl_subject_label *subj, char *path)
68039 +{
68040 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
68041 +}
68042 +
68043 +struct acl_subject_label *
68044 +chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
68045 + const struct acl_role_label *role)
68046 +{
68047 + struct dentry *dentry = (struct dentry *) l_dentry;
68048 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
68049 + struct mount *real_mnt = real_mount(mnt);
68050 + struct acl_subject_label *retval;
68051 + struct dentry *parent;
68052 +
68053 + read_seqlock_excl(&mount_lock);
68054 + write_seqlock(&rename_lock);
68055 +
68056 + for (;;) {
68057 + if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
68058 + break;
68059 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
68060 + if (!mnt_has_parent(real_mnt))
68061 + break;
68062 +
68063 + spin_lock(&dentry->d_lock);
68064 + read_lock(&gr_inode_lock);
68065 + retval =
68066 + lookup_acl_subj_label(dentry->d_inode->i_ino,
68067 + __get_dev(dentry), role);
68068 + read_unlock(&gr_inode_lock);
68069 + spin_unlock(&dentry->d_lock);
68070 + if (retval != NULL)
68071 + goto out;
68072 +
68073 + dentry = real_mnt->mnt_mountpoint;
68074 + real_mnt = real_mnt->mnt_parent;
68075 + mnt = &real_mnt->mnt;
68076 + continue;
68077 + }
68078 +
68079 + spin_lock(&dentry->d_lock);
68080 + read_lock(&gr_inode_lock);
68081 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
68082 + __get_dev(dentry), role);
68083 + read_unlock(&gr_inode_lock);
68084 + parent = dentry->d_parent;
68085 + spin_unlock(&dentry->d_lock);
68086 +
68087 + if (retval != NULL)
68088 + goto out;
68089 +
68090 + dentry = parent;
68091 + }
68092 +
68093 + spin_lock(&dentry->d_lock);
68094 + read_lock(&gr_inode_lock);
68095 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
68096 + __get_dev(dentry), role);
68097 + read_unlock(&gr_inode_lock);
68098 + spin_unlock(&dentry->d_lock);
68099 +
68100 + if (unlikely(retval == NULL)) {
68101 + /* gr_real_root is pinned, we don't need to hold a reference */
68102 + read_lock(&gr_inode_lock);
68103 + retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino,
68104 + __get_dev(gr_real_root.dentry), role);
68105 + read_unlock(&gr_inode_lock);
68106 + }
68107 +out:
68108 + write_sequnlock(&rename_lock);
68109 + read_sequnlock_excl(&mount_lock);
68110 +
68111 + BUG_ON(retval == NULL);
68112 +
68113 + return retval;
68114 +}
68115 +
68116 +void
68117 +assign_special_role(const char *rolename)
68118 +{
68119 + struct acl_object_label *obj;
68120 + struct acl_role_label *r;
68121 + struct acl_role_label *assigned = NULL;
68122 + struct task_struct *tsk;
68123 + struct file *filp;
68124 +
68125 + FOR_EACH_ROLE_START(r)
68126 + if (!strcmp(rolename, r->rolename) &&
68127 + (r->roletype & GR_ROLE_SPECIAL)) {
68128 + assigned = r;
68129 + break;
68130 + }
68131 + FOR_EACH_ROLE_END(r)
68132 +
68133 + if (!assigned)
68134 + return;
68135 +
68136 + read_lock(&tasklist_lock);
68137 + read_lock(&grsec_exec_file_lock);
68138 +
68139 + tsk = current->real_parent;
68140 + if (tsk == NULL)
68141 + goto out_unlock;
68142 +
68143 + filp = tsk->exec_file;
68144 + if (filp == NULL)
68145 + goto out_unlock;
68146 +
68147 + tsk->is_writable = 0;
68148 + tsk->inherited = 0;
68149 +
68150 + tsk->acl_sp_role = 1;
68151 + tsk->acl_role_id = ++acl_sp_role_value;
68152 + tsk->role = assigned;
68153 + tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
68154 +
68155 + /* ignore additional mmap checks for processes that are writable
68156 + by the default ACL */
68157 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
68158 + if (unlikely(obj->mode & GR_WRITE))
68159 + tsk->is_writable = 1;
68160 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
68161 + if (unlikely(obj->mode & GR_WRITE))
68162 + tsk->is_writable = 1;
68163 +
68164 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68165 + printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
68166 + tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
68167 +#endif
68168 +
68169 +out_unlock:
68170 + read_unlock(&grsec_exec_file_lock);
68171 + read_unlock(&tasklist_lock);
68172 + return;
68173 +}
68174 +
68175 +
68176 +static void
68177 +gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
68178 +{
68179 + struct task_struct *task = current;
68180 + const struct cred *cred = current_cred();
68181 +
68182 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
68183 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
68184 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
68185 + 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
68186 +
68187 + return;
68188 +}
68189 +
68190 +static void
68191 +gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
68192 +{
68193 + struct task_struct *task = current;
68194 + const struct cred *cred = current_cred();
68195 +
68196 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
68197 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
68198 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
68199 + 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
68200 +
68201 + return;
68202 +}
68203 +
68204 +static void
68205 +gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
68206 +{
68207 + struct task_struct *task = current;
68208 + const struct cred *cred = current_cred();
68209 +
68210 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
68211 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
68212 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
68213 + 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
68214 +
68215 + return;
68216 +}
68217 +
68218 +static void
68219 +gr_set_proc_res(struct task_struct *task)
68220 +{
68221 + struct acl_subject_label *proc;
68222 + unsigned short i;
68223 +
68224 + proc = task->acl;
68225 +
68226 + if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
68227 + return;
68228 +
68229 + for (i = 0; i < RLIM_NLIMITS; i++) {
68230 + if (!(proc->resmask & (1U << i)))
68231 + continue;
68232 +
68233 + task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
68234 + task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
68235 +
68236 + if (i == RLIMIT_CPU)
68237 + update_rlimit_cpu(task, proc->res[i].rlim_cur);
68238 + }
68239 +
68240 + return;
68241 +}
68242 +
68243 +/* both of the below must be called with
68244 + rcu_read_lock();
68245 + read_lock(&tasklist_lock);
68246 + read_lock(&grsec_exec_file_lock);
68247 +*/
68248 +
68249 +struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
68250 +{
68251 + char *tmpname;
68252 + struct acl_subject_label *tmpsubj;
68253 + struct file *filp;
68254 + struct name_entry *nmatch;
68255 +
68256 + filp = task->exec_file;
68257 + if (filp == NULL)
68258 + return NULL;
68259 +
68260 + /* the following is to apply the correct subject
68261 + on binaries running when the RBAC system
68262 + is enabled, when the binaries have been
68263 + replaced or deleted since their execution
68264 + -----
68265 + when the RBAC system starts, the inode/dev
68266 + from exec_file will be one the RBAC system
68267 + is unaware of. It only knows the inode/dev
68268 + of the present file on disk, or the absence
68269 + of it.
68270 + */
68271 +
68272 + if (filename)
68273 + nmatch = __lookup_name_entry(state, filename);
68274 + else {
68275 + preempt_disable();
68276 + tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
68277 +
68278 + nmatch = __lookup_name_entry(state, tmpname);
68279 + preempt_enable();
68280 + }
68281 + tmpsubj = NULL;
68282 + if (nmatch) {
68283 + if (nmatch->deleted)
68284 + tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
68285 + else
68286 + tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
68287 + }
68288 + /* this also works for the reload case -- if we don't match a potentially inherited subject
68289 + then we fall back to a normal lookup based on the binary's ino/dev
68290 + */
68291 + if (tmpsubj == NULL)
68292 + tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
68293 +
68294 + return tmpsubj;
68295 +}
68296 +
68297 +static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
68298 +{
68299 + return __gr_get_subject_for_task(&running_polstate, task, filename);
68300 +}
68301 +
68302 +void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
68303 +{
68304 + struct acl_object_label *obj;
68305 + struct file *filp;
68306 +
68307 + filp = task->exec_file;
68308 +
68309 + task->acl = subj;
68310 + task->is_writable = 0;
68311 + /* ignore additional mmap checks for processes that are writable
68312 + by the default ACL */
68313 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
68314 + if (unlikely(obj->mode & GR_WRITE))
68315 + task->is_writable = 1;
68316 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
68317 + if (unlikely(obj->mode & GR_WRITE))
68318 + task->is_writable = 1;
68319 +
68320 + gr_set_proc_res(task);
68321 +
68322 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68323 + 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);
68324 +#endif
68325 +}
68326 +
68327 +static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
68328 +{
68329 + __gr_apply_subject_to_task(&running_polstate, task, subj);
68330 +}
68331 +
68332 +__u32
68333 +gr_search_file(const struct dentry * dentry, const __u32 mode,
68334 + const struct vfsmount * mnt)
68335 +{
68336 + __u32 retval = mode;
68337 + struct acl_subject_label *curracl;
68338 + struct acl_object_label *currobj;
68339 +
68340 + if (unlikely(!(gr_status & GR_READY)))
68341 + return (mode & ~GR_AUDITS);
68342 +
68343 + curracl = current->acl;
68344 +
68345 + currobj = chk_obj_label(dentry, mnt, curracl);
68346 + retval = currobj->mode & mode;
68347 +
68348 + /* if we're opening a specified transfer file for writing
68349 + (e.g. /dev/initctl), then transfer our role to init
68350 + */
68351 + if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
68352 + current->role->roletype & GR_ROLE_PERSIST)) {
68353 + struct task_struct *task = init_pid_ns.child_reaper;
68354 +
68355 + if (task->role != current->role) {
68356 + struct acl_subject_label *subj;
68357 +
68358 + task->acl_sp_role = 0;
68359 + task->acl_role_id = current->acl_role_id;
68360 + task->role = current->role;
68361 + rcu_read_lock();
68362 + read_lock(&grsec_exec_file_lock);
68363 + subj = gr_get_subject_for_task(task, NULL);
68364 + gr_apply_subject_to_task(task, subj);
68365 + read_unlock(&grsec_exec_file_lock);
68366 + rcu_read_unlock();
68367 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
68368 + }
68369 + }
68370 +
68371 + if (unlikely
68372 + ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
68373 + && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
68374 + __u32 new_mode = mode;
68375 +
68376 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
68377 +
68378 + retval = new_mode;
68379 +
68380 + if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
68381 + new_mode |= GR_INHERIT;
68382 +
68383 + if (!(mode & GR_NOLEARN))
68384 + gr_log_learn(dentry, mnt, new_mode);
68385 + }
68386 +
68387 + return retval;
68388 +}
68389 +
68390 +struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
68391 + const struct dentry *parent,
68392 + const struct vfsmount *mnt)
68393 +{
68394 + struct name_entry *match;
68395 + struct acl_object_label *matchpo;
68396 + struct acl_subject_label *curracl;
68397 + char *path;
68398 +
68399 + if (unlikely(!(gr_status & GR_READY)))
68400 + return NULL;
68401 +
68402 + preempt_disable();
68403 + path = gr_to_filename_rbac(new_dentry, mnt);
68404 + match = lookup_name_entry_create(path);
68405 +
68406 + curracl = current->acl;
68407 +
68408 + if (match) {
68409 + read_lock(&gr_inode_lock);
68410 + matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
68411 + read_unlock(&gr_inode_lock);
68412 +
68413 + if (matchpo) {
68414 + preempt_enable();
68415 + return matchpo;
68416 + }
68417 + }
68418 +
68419 + // lookup parent
68420 +
68421 + matchpo = chk_obj_create_label(parent, mnt, curracl, path);
68422 +
68423 + preempt_enable();
68424 + return matchpo;
68425 +}
68426 +
68427 +__u32
68428 +gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
68429 + const struct vfsmount * mnt, const __u32 mode)
68430 +{
68431 + struct acl_object_label *matchpo;
68432 + __u32 retval;
68433 +
68434 + if (unlikely(!(gr_status & GR_READY)))
68435 + return (mode & ~GR_AUDITS);
68436 +
68437 + matchpo = gr_get_create_object(new_dentry, parent, mnt);
68438 +
68439 + retval = matchpo->mode & mode;
68440 +
68441 + if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
68442 + && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
68443 + __u32 new_mode = mode;
68444 +
68445 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
68446 +
68447 + gr_log_learn(new_dentry, mnt, new_mode);
68448 + return new_mode;
68449 + }
68450 +
68451 + return retval;
68452 +}
68453 +
68454 +__u32
68455 +gr_check_link(const struct dentry * new_dentry,
68456 + const struct dentry * parent_dentry,
68457 + const struct vfsmount * parent_mnt,
68458 + const struct dentry * old_dentry, const struct vfsmount * old_mnt)
68459 +{
68460 + struct acl_object_label *obj;
68461 + __u32 oldmode, newmode;
68462 + __u32 needmode;
68463 + __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
68464 + GR_DELETE | GR_INHERIT;
68465 +
68466 + if (unlikely(!(gr_status & GR_READY)))
68467 + return (GR_CREATE | GR_LINK);
68468 +
68469 + obj = chk_obj_label(old_dentry, old_mnt, current->acl);
68470 + oldmode = obj->mode;
68471 +
68472 + obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
68473 + newmode = obj->mode;
68474 +
68475 + needmode = newmode & checkmodes;
68476 +
68477 + // old name for hardlink must have at least the permissions of the new name
68478 + if ((oldmode & needmode) != needmode)
68479 + goto bad;
68480 +
68481 + // if old name had restrictions/auditing, make sure the new name does as well
68482 + needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
68483 +
68484 + // don't allow hardlinking of suid/sgid/fcapped files without permission
68485 + if (is_privileged_binary(old_dentry))
68486 + needmode |= GR_SETID;
68487 +
68488 + if ((newmode & needmode) != needmode)
68489 + goto bad;
68490 +
68491 + // enforce minimum permissions
68492 + if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
68493 + return newmode;
68494 +bad:
68495 + needmode = oldmode;
68496 + if (is_privileged_binary(old_dentry))
68497 + needmode |= GR_SETID;
68498 +
68499 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
68500 + gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
68501 + return (GR_CREATE | GR_LINK);
68502 + } else if (newmode & GR_SUPPRESS)
68503 + return GR_SUPPRESS;
68504 + else
68505 + return 0;
68506 +}
68507 +
68508 +int
68509 +gr_check_hidden_task(const struct task_struct *task)
68510 +{
68511 + if (unlikely(!(gr_status & GR_READY)))
68512 + return 0;
68513 +
68514 + if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
68515 + return 1;
68516 +
68517 + return 0;
68518 +}
68519 +
68520 +int
68521 +gr_check_protected_task(const struct task_struct *task)
68522 +{
68523 + if (unlikely(!(gr_status & GR_READY) || !task))
68524 + return 0;
68525 +
68526 + if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
68527 + task->acl != current->acl)
68528 + return 1;
68529 +
68530 + return 0;
68531 +}
68532 +
68533 +int
68534 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
68535 +{
68536 + struct task_struct *p;
68537 + int ret = 0;
68538 +
68539 + if (unlikely(!(gr_status & GR_READY) || !pid))
68540 + return ret;
68541 +
68542 + read_lock(&tasklist_lock);
68543 + do_each_pid_task(pid, type, p) {
68544 + if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
68545 + p->acl != current->acl) {
68546 + ret = 1;
68547 + goto out;
68548 + }
68549 + } while_each_pid_task(pid, type, p);
68550 +out:
68551 + read_unlock(&tasklist_lock);
68552 +
68553 + return ret;
68554 +}
68555 +
68556 +void
68557 +gr_copy_label(struct task_struct *tsk)
68558 +{
68559 + struct task_struct *p = current;
68560 +
68561 + tsk->inherited = p->inherited;
68562 + tsk->acl_sp_role = 0;
68563 + tsk->acl_role_id = p->acl_role_id;
68564 + tsk->acl = p->acl;
68565 + tsk->role = p->role;
68566 + tsk->signal->used_accept = 0;
68567 + tsk->signal->curr_ip = p->signal->curr_ip;
68568 + tsk->signal->saved_ip = p->signal->saved_ip;
68569 + if (p->exec_file)
68570 + get_file(p->exec_file);
68571 + tsk->exec_file = p->exec_file;
68572 + tsk->is_writable = p->is_writable;
68573 + if (unlikely(p->signal->used_accept)) {
68574 + p->signal->curr_ip = 0;
68575 + p->signal->saved_ip = 0;
68576 + }
68577 +
68578 + return;
68579 +}
68580 +
68581 +extern int gr_process_kernel_setuid_ban(struct user_struct *user);
68582 +
68583 +int
68584 +gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
68585 +{
68586 + unsigned int i;
68587 + __u16 num;
68588 + uid_t *uidlist;
68589 + uid_t curuid;
68590 + int realok = 0;
68591 + int effectiveok = 0;
68592 + int fsok = 0;
68593 + uid_t globalreal, globaleffective, globalfs;
68594 +
68595 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
68596 + struct user_struct *user;
68597 +
68598 + if (!uid_valid(real))
68599 + goto skipit;
68600 +
68601 + /* find user based on global namespace */
68602 +
68603 + globalreal = GR_GLOBAL_UID(real);
68604 +
68605 + user = find_user(make_kuid(&init_user_ns, globalreal));
68606 + if (user == NULL)
68607 + goto skipit;
68608 +
68609 + if (gr_process_kernel_setuid_ban(user)) {
68610 + /* for find_user */
68611 + free_uid(user);
68612 + return 1;
68613 + }
68614 +
68615 + /* for find_user */
68616 + free_uid(user);
68617 +
68618 +skipit:
68619 +#endif
68620 +
68621 + if (unlikely(!(gr_status & GR_READY)))
68622 + return 0;
68623 +
68624 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
68625 + gr_log_learn_uid_change(real, effective, fs);
68626 +
68627 + num = current->acl->user_trans_num;
68628 + uidlist = current->acl->user_transitions;
68629 +
68630 + if (uidlist == NULL)
68631 + return 0;
68632 +
68633 + if (!uid_valid(real)) {
68634 + realok = 1;
68635 + globalreal = (uid_t)-1;
68636 + } else {
68637 + globalreal = GR_GLOBAL_UID(real);
68638 + }
68639 + if (!uid_valid(effective)) {
68640 + effectiveok = 1;
68641 + globaleffective = (uid_t)-1;
68642 + } else {
68643 + globaleffective = GR_GLOBAL_UID(effective);
68644 + }
68645 + if (!uid_valid(fs)) {
68646 + fsok = 1;
68647 + globalfs = (uid_t)-1;
68648 + } else {
68649 + globalfs = GR_GLOBAL_UID(fs);
68650 + }
68651 +
68652 + if (current->acl->user_trans_type & GR_ID_ALLOW) {
68653 + for (i = 0; i < num; i++) {
68654 + curuid = uidlist[i];
68655 + if (globalreal == curuid)
68656 + realok = 1;
68657 + if (globaleffective == curuid)
68658 + effectiveok = 1;
68659 + if (globalfs == curuid)
68660 + fsok = 1;
68661 + }
68662 + } else if (current->acl->user_trans_type & GR_ID_DENY) {
68663 + for (i = 0; i < num; i++) {
68664 + curuid = uidlist[i];
68665 + if (globalreal == curuid)
68666 + break;
68667 + if (globaleffective == curuid)
68668 + break;
68669 + if (globalfs == curuid)
68670 + break;
68671 + }
68672 + /* not in deny list */
68673 + if (i == num) {
68674 + realok = 1;
68675 + effectiveok = 1;
68676 + fsok = 1;
68677 + }
68678 + }
68679 +
68680 + if (realok && effectiveok && fsok)
68681 + return 0;
68682 + else {
68683 + gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
68684 + return 1;
68685 + }
68686 +}
68687 +
68688 +int
68689 +gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
68690 +{
68691 + unsigned int i;
68692 + __u16 num;
68693 + gid_t *gidlist;
68694 + gid_t curgid;
68695 + int realok = 0;
68696 + int effectiveok = 0;
68697 + int fsok = 0;
68698 + gid_t globalreal, globaleffective, globalfs;
68699 +
68700 + if (unlikely(!(gr_status & GR_READY)))
68701 + return 0;
68702 +
68703 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
68704 + gr_log_learn_gid_change(real, effective, fs);
68705 +
68706 + num = current->acl->group_trans_num;
68707 + gidlist = current->acl->group_transitions;
68708 +
68709 + if (gidlist == NULL)
68710 + return 0;
68711 +
68712 + if (!gid_valid(real)) {
68713 + realok = 1;
68714 + globalreal = (gid_t)-1;
68715 + } else {
68716 + globalreal = GR_GLOBAL_GID(real);
68717 + }
68718 + if (!gid_valid(effective)) {
68719 + effectiveok = 1;
68720 + globaleffective = (gid_t)-1;
68721 + } else {
68722 + globaleffective = GR_GLOBAL_GID(effective);
68723 + }
68724 + if (!gid_valid(fs)) {
68725 + fsok = 1;
68726 + globalfs = (gid_t)-1;
68727 + } else {
68728 + globalfs = GR_GLOBAL_GID(fs);
68729 + }
68730 +
68731 + if (current->acl->group_trans_type & GR_ID_ALLOW) {
68732 + for (i = 0; i < num; i++) {
68733 + curgid = gidlist[i];
68734 + if (globalreal == curgid)
68735 + realok = 1;
68736 + if (globaleffective == curgid)
68737 + effectiveok = 1;
68738 + if (globalfs == curgid)
68739 + fsok = 1;
68740 + }
68741 + } else if (current->acl->group_trans_type & GR_ID_DENY) {
68742 + for (i = 0; i < num; i++) {
68743 + curgid = gidlist[i];
68744 + if (globalreal == curgid)
68745 + break;
68746 + if (globaleffective == curgid)
68747 + break;
68748 + if (globalfs == curgid)
68749 + break;
68750 + }
68751 + /* not in deny list */
68752 + if (i == num) {
68753 + realok = 1;
68754 + effectiveok = 1;
68755 + fsok = 1;
68756 + }
68757 + }
68758 +
68759 + if (realok && effectiveok && fsok)
68760 + return 0;
68761 + else {
68762 + gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
68763 + return 1;
68764 + }
68765 +}
68766 +
68767 +extern int gr_acl_is_capable(const int cap);
68768 +
68769 +void
68770 +gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
68771 +{
68772 + struct acl_role_label *role = task->role;
68773 + struct acl_subject_label *subj = NULL;
68774 + struct acl_object_label *obj;
68775 + struct file *filp;
68776 + uid_t uid;
68777 + gid_t gid;
68778 +
68779 + if (unlikely(!(gr_status & GR_READY)))
68780 + return;
68781 +
68782 + uid = GR_GLOBAL_UID(kuid);
68783 + gid = GR_GLOBAL_GID(kgid);
68784 +
68785 + filp = task->exec_file;
68786 +
68787 + /* kernel process, we'll give them the kernel role */
68788 + if (unlikely(!filp)) {
68789 + task->role = running_polstate.kernel_role;
68790 + task->acl = running_polstate.kernel_role->root_label;
68791 + return;
68792 + } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
68793 + /* save the current ip at time of role lookup so that the proper
68794 + IP will be learned for role_allowed_ip */
68795 + task->signal->saved_ip = task->signal->curr_ip;
68796 + role = lookup_acl_role_label(task, uid, gid);
68797 + }
68798 +
68799 + /* don't change the role if we're not a privileged process */
68800 + if (role && task->role != role &&
68801 + (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
68802 + ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
68803 + return;
68804 +
68805 + /* perform subject lookup in possibly new role
68806 + we can use this result below in the case where role == task->role
68807 + */
68808 + subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
68809 +
68810 + /* if we changed uid/gid, but result in the same role
68811 + and are using inheritance, don't lose the inherited subject
68812 + if current subject is other than what normal lookup
68813 + would result in, we arrived via inheritance, don't
68814 + lose subject
68815 + */
68816 + if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
68817 + (subj == task->acl)))
68818 + task->acl = subj;
68819 +
68820 + /* leave task->inherited unaffected */
68821 +
68822 + task->role = role;
68823 +
68824 + task->is_writable = 0;
68825 +
68826 + /* ignore additional mmap checks for processes that are writable
68827 + by the default ACL */
68828 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
68829 + if (unlikely(obj->mode & GR_WRITE))
68830 + task->is_writable = 1;
68831 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
68832 + if (unlikely(obj->mode & GR_WRITE))
68833 + task->is_writable = 1;
68834 +
68835 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68836 + 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);
68837 +#endif
68838 +
68839 + gr_set_proc_res(task);
68840 +
68841 + return;
68842 +}
68843 +
68844 +int
68845 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
68846 + const int unsafe_flags)
68847 +{
68848 + struct task_struct *task = current;
68849 + struct acl_subject_label *newacl;
68850 + struct acl_object_label *obj;
68851 + __u32 retmode;
68852 +
68853 + if (unlikely(!(gr_status & GR_READY)))
68854 + return 0;
68855 +
68856 + newacl = chk_subj_label(dentry, mnt, task->role);
68857 +
68858 + /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
68859 + did an exec
68860 + */
68861 + rcu_read_lock();
68862 + read_lock(&tasklist_lock);
68863 + if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
68864 + (task->parent->acl->mode & GR_POVERRIDE))) {
68865 + read_unlock(&tasklist_lock);
68866 + rcu_read_unlock();
68867 + goto skip_check;
68868 + }
68869 + read_unlock(&tasklist_lock);
68870 + rcu_read_unlock();
68871 +
68872 + if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
68873 + !(task->role->roletype & GR_ROLE_GOD) &&
68874 + !gr_search_file(dentry, GR_PTRACERD, mnt) &&
68875 + !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
68876 + if (unsafe_flags & LSM_UNSAFE_SHARE)
68877 + gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
68878 + else
68879 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
68880 + return -EACCES;
68881 + }
68882 +
68883 +skip_check:
68884 +
68885 + obj = chk_obj_label(dentry, mnt, task->acl);
68886 + retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
68887 +
68888 + if (!(task->acl->mode & GR_INHERITLEARN) &&
68889 + ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
68890 + if (obj->nested)
68891 + task->acl = obj->nested;
68892 + else
68893 + task->acl = newacl;
68894 + task->inherited = 0;
68895 + } else {
68896 + task->inherited = 1;
68897 + if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
68898 + gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
68899 + }
68900 +
68901 + task->is_writable = 0;
68902 +
68903 + /* ignore additional mmap checks for processes that are writable
68904 + by the default ACL */
68905 + obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
68906 + if (unlikely(obj->mode & GR_WRITE))
68907 + task->is_writable = 1;
68908 + obj = chk_obj_label(dentry, mnt, task->role->root_label);
68909 + if (unlikely(obj->mode & GR_WRITE))
68910 + task->is_writable = 1;
68911 +
68912 + gr_set_proc_res(task);
68913 +
68914 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68915 + 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);
68916 +#endif
68917 + return 0;
68918 +}
68919 +
68920 +/* always called with valid inodev ptr */
68921 +static void
68922 +do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
68923 +{
68924 + struct acl_object_label *matchpo;
68925 + struct acl_subject_label *matchps;
68926 + struct acl_subject_label *subj;
68927 + struct acl_role_label *role;
68928 + unsigned int x;
68929 +
68930 + FOR_EACH_ROLE_START(role)
68931 + FOR_EACH_SUBJECT_START(role, subj, x)
68932 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
68933 + matchpo->mode |= GR_DELETED;
68934 + FOR_EACH_SUBJECT_END(subj,x)
68935 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
68936 + /* nested subjects aren't in the role's subj_hash table */
68937 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
68938 + matchpo->mode |= GR_DELETED;
68939 + FOR_EACH_NESTED_SUBJECT_END(subj)
68940 + if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
68941 + matchps->mode |= GR_DELETED;
68942 + FOR_EACH_ROLE_END(role)
68943 +
68944 + inodev->nentry->deleted = 1;
68945 +
68946 + return;
68947 +}
68948 +
68949 +void
68950 +gr_handle_delete(const ino_t ino, const dev_t dev)
68951 +{
68952 + struct inodev_entry *inodev;
68953 +
68954 + if (unlikely(!(gr_status & GR_READY)))
68955 + return;
68956 +
68957 + write_lock(&gr_inode_lock);
68958 + inodev = lookup_inodev_entry(ino, dev);
68959 + if (inodev != NULL)
68960 + do_handle_delete(inodev, ino, dev);
68961 + write_unlock(&gr_inode_lock);
68962 +
68963 + return;
68964 +}
68965 +
68966 +static void
68967 +update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
68968 + const ino_t newinode, const dev_t newdevice,
68969 + struct acl_subject_label *subj)
68970 +{
68971 + unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
68972 + struct acl_object_label *match;
68973 +
68974 + match = subj->obj_hash[index];
68975 +
68976 + while (match && (match->inode != oldinode ||
68977 + match->device != olddevice ||
68978 + !(match->mode & GR_DELETED)))
68979 + match = match->next;
68980 +
68981 + if (match && (match->inode == oldinode)
68982 + && (match->device == olddevice)
68983 + && (match->mode & GR_DELETED)) {
68984 + if (match->prev == NULL) {
68985 + subj->obj_hash[index] = match->next;
68986 + if (match->next != NULL)
68987 + match->next->prev = NULL;
68988 + } else {
68989 + match->prev->next = match->next;
68990 + if (match->next != NULL)
68991 + match->next->prev = match->prev;
68992 + }
68993 + match->prev = NULL;
68994 + match->next = NULL;
68995 + match->inode = newinode;
68996 + match->device = newdevice;
68997 + match->mode &= ~GR_DELETED;
68998 +
68999 + insert_acl_obj_label(match, subj);
69000 + }
69001 +
69002 + return;
69003 +}
69004 +
69005 +static void
69006 +update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
69007 + const ino_t newinode, const dev_t newdevice,
69008 + struct acl_role_label *role)
69009 +{
69010 + unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
69011 + struct acl_subject_label *match;
69012 +
69013 + match = role->subj_hash[index];
69014 +
69015 + while (match && (match->inode != oldinode ||
69016 + match->device != olddevice ||
69017 + !(match->mode & GR_DELETED)))
69018 + match = match->next;
69019 +
69020 + if (match && (match->inode == oldinode)
69021 + && (match->device == olddevice)
69022 + && (match->mode & GR_DELETED)) {
69023 + if (match->prev == NULL) {
69024 + role->subj_hash[index] = match->next;
69025 + if (match->next != NULL)
69026 + match->next->prev = NULL;
69027 + } else {
69028 + match->prev->next = match->next;
69029 + if (match->next != NULL)
69030 + match->next->prev = match->prev;
69031 + }
69032 + match->prev = NULL;
69033 + match->next = NULL;
69034 + match->inode = newinode;
69035 + match->device = newdevice;
69036 + match->mode &= ~GR_DELETED;
69037 +
69038 + insert_acl_subj_label(match, role);
69039 + }
69040 +
69041 + return;
69042 +}
69043 +
69044 +static void
69045 +update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
69046 + const ino_t newinode, const dev_t newdevice)
69047 +{
69048 + unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
69049 + struct inodev_entry *match;
69050 +
69051 + match = running_polstate.inodev_set.i_hash[index];
69052 +
69053 + while (match && (match->nentry->inode != oldinode ||
69054 + match->nentry->device != olddevice || !match->nentry->deleted))
69055 + match = match->next;
69056 +
69057 + if (match && (match->nentry->inode == oldinode)
69058 + && (match->nentry->device == olddevice) &&
69059 + match->nentry->deleted) {
69060 + if (match->prev == NULL) {
69061 + running_polstate.inodev_set.i_hash[index] = match->next;
69062 + if (match->next != NULL)
69063 + match->next->prev = NULL;
69064 + } else {
69065 + match->prev->next = match->next;
69066 + if (match->next != NULL)
69067 + match->next->prev = match->prev;
69068 + }
69069 + match->prev = NULL;
69070 + match->next = NULL;
69071 + match->nentry->inode = newinode;
69072 + match->nentry->device = newdevice;
69073 + match->nentry->deleted = 0;
69074 +
69075 + insert_inodev_entry(match);
69076 + }
69077 +
69078 + return;
69079 +}
69080 +
69081 +static void
69082 +__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
69083 +{
69084 + struct acl_subject_label *subj;
69085 + struct acl_role_label *role;
69086 + unsigned int x;
69087 +
69088 + FOR_EACH_ROLE_START(role)
69089 + update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
69090 +
69091 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
69092 + if ((subj->inode == ino) && (subj->device == dev)) {
69093 + subj->inode = ino;
69094 + subj->device = dev;
69095 + }
69096 + /* nested subjects aren't in the role's subj_hash table */
69097 + update_acl_obj_label(matchn->inode, matchn->device,
69098 + ino, dev, subj);
69099 + FOR_EACH_NESTED_SUBJECT_END(subj)
69100 + FOR_EACH_SUBJECT_START(role, subj, x)
69101 + update_acl_obj_label(matchn->inode, matchn->device,
69102 + ino, dev, subj);
69103 + FOR_EACH_SUBJECT_END(subj,x)
69104 + FOR_EACH_ROLE_END(role)
69105 +
69106 + update_inodev_entry(matchn->inode, matchn->device, ino, dev);
69107 +
69108 + return;
69109 +}
69110 +
69111 +static void
69112 +do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
69113 + const struct vfsmount *mnt)
69114 +{
69115 + ino_t ino = dentry->d_inode->i_ino;
69116 + dev_t dev = __get_dev(dentry);
69117 +
69118 + __do_handle_create(matchn, ino, dev);
69119 +
69120 + return;
69121 +}
69122 +
69123 +void
69124 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
69125 +{
69126 + struct name_entry *matchn;
69127 +
69128 + if (unlikely(!(gr_status & GR_READY)))
69129 + return;
69130 +
69131 + preempt_disable();
69132 + matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
69133 +
69134 + if (unlikely((unsigned long)matchn)) {
69135 + write_lock(&gr_inode_lock);
69136 + do_handle_create(matchn, dentry, mnt);
69137 + write_unlock(&gr_inode_lock);
69138 + }
69139 + preempt_enable();
69140 +
69141 + return;
69142 +}
69143 +
69144 +void
69145 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
69146 +{
69147 + struct name_entry *matchn;
69148 +
69149 + if (unlikely(!(gr_status & GR_READY)))
69150 + return;
69151 +
69152 + preempt_disable();
69153 + matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
69154 +
69155 + if (unlikely((unsigned long)matchn)) {
69156 + write_lock(&gr_inode_lock);
69157 + __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
69158 + write_unlock(&gr_inode_lock);
69159 + }
69160 + preempt_enable();
69161 +
69162 + return;
69163 +}
69164 +
69165 +void
69166 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
69167 + struct dentry *old_dentry,
69168 + struct dentry *new_dentry,
69169 + struct vfsmount *mnt, const __u8 replace, unsigned int flags)
69170 +{
69171 + struct name_entry *matchn;
69172 + struct name_entry *matchn2 = NULL;
69173 + struct inodev_entry *inodev;
69174 + struct inode *inode = new_dentry->d_inode;
69175 + ino_t old_ino = old_dentry->d_inode->i_ino;
69176 + dev_t old_dev = __get_dev(old_dentry);
69177 + unsigned int exchange = flags & RENAME_EXCHANGE;
69178 +
69179 + /* vfs_rename swaps the name and parent link for old_dentry and
69180 + new_dentry
69181 + at this point, old_dentry has the new name, parent link, and inode
69182 + for the renamed file
69183 + if a file is being replaced by a rename, new_dentry has the inode
69184 + and name for the replaced file
69185 + */
69186 +
69187 + if (unlikely(!(gr_status & GR_READY)))
69188 + return;
69189 +
69190 + preempt_disable();
69191 + matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
69192 +
69193 + /* exchange cases:
69194 + a filename exists for the source, but not dest
69195 + do a recreate on source
69196 + a filename exists for the dest, but not source
69197 + do a recreate on dest
69198 + a filename exists for both source and dest
69199 + delete source and dest, then create source and dest
69200 + a filename exists for neither source nor dest
69201 + no updates needed
69202 +
69203 + the name entry lookups get us the old inode/dev associated with
69204 + each name, so do the deletes first (if possible) so that when
69205 + we do the create, we pick up on the right entries
69206 + */
69207 +
69208 + if (exchange)
69209 + matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
69210 +
69211 + /* we wouldn't have to check d_inode if it weren't for
69212 + NFS silly-renaming
69213 + */
69214 +
69215 + write_lock(&gr_inode_lock);
69216 + if (unlikely((replace || exchange) && inode)) {
69217 + ino_t new_ino = inode->i_ino;
69218 + dev_t new_dev = __get_dev(new_dentry);
69219 +
69220 + inodev = lookup_inodev_entry(new_ino, new_dev);
69221 + if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
69222 + do_handle_delete(inodev, new_ino, new_dev);
69223 + }
69224 +
69225 + inodev = lookup_inodev_entry(old_ino, old_dev);
69226 + if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
69227 + do_handle_delete(inodev, old_ino, old_dev);
69228 +
69229 + if (unlikely(matchn != NULL))
69230 + do_handle_create(matchn, old_dentry, mnt);
69231 +
69232 + if (unlikely(matchn2 != NULL))
69233 + do_handle_create(matchn2, new_dentry, mnt);
69234 +
69235 + write_unlock(&gr_inode_lock);
69236 + preempt_enable();
69237 +
69238 + return;
69239 +}
69240 +
69241 +#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
69242 +static const unsigned long res_learn_bumps[GR_NLIMITS] = {
69243 + [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
69244 + [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
69245 + [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
69246 + [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
69247 + [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
69248 + [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
69249 + [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
69250 + [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
69251 + [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
69252 + [RLIMIT_AS] = GR_RLIM_AS_BUMP,
69253 + [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
69254 + [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
69255 + [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
69256 + [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
69257 + [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
69258 + [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
69259 +};
69260 +
69261 +void
69262 +gr_learn_resource(const struct task_struct *task,
69263 + const int res, const unsigned long wanted, const int gt)
69264 +{
69265 + struct acl_subject_label *acl;
69266 + const struct cred *cred;
69267 +
69268 + if (unlikely((gr_status & GR_READY) &&
69269 + task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
69270 + goto skip_reslog;
69271 +
69272 + gr_log_resource(task, res, wanted, gt);
69273 +skip_reslog:
69274 +
69275 + if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
69276 + return;
69277 +
69278 + acl = task->acl;
69279 +
69280 + if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
69281 + !(acl->resmask & (1U << (unsigned short) res))))
69282 + return;
69283 +
69284 + if (wanted >= acl->res[res].rlim_cur) {
69285 + unsigned long res_add;
69286 +
69287 + res_add = wanted + res_learn_bumps[res];
69288 +
69289 + acl->res[res].rlim_cur = res_add;
69290 +
69291 + if (wanted > acl->res[res].rlim_max)
69292 + acl->res[res].rlim_max = res_add;
69293 +
69294 + /* only log the subject filename, since resource logging is supported for
69295 + single-subject learning only */
69296 + rcu_read_lock();
69297 + cred = __task_cred(task);
69298 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
69299 + task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
69300 + acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
69301 + "", (unsigned long) res, &task->signal->saved_ip);
69302 + rcu_read_unlock();
69303 + }
69304 +
69305 + return;
69306 +}
69307 +EXPORT_SYMBOL_GPL(gr_learn_resource);
69308 +#endif
69309 +
69310 +#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
69311 +void
69312 +pax_set_initial_flags(struct linux_binprm *bprm)
69313 +{
69314 + struct task_struct *task = current;
69315 + struct acl_subject_label *proc;
69316 + unsigned long flags;
69317 +
69318 + if (unlikely(!(gr_status & GR_READY)))
69319 + return;
69320 +
69321 + flags = pax_get_flags(task);
69322 +
69323 + proc = task->acl;
69324 +
69325 + if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
69326 + flags &= ~MF_PAX_PAGEEXEC;
69327 + if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
69328 + flags &= ~MF_PAX_SEGMEXEC;
69329 + if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
69330 + flags &= ~MF_PAX_RANDMMAP;
69331 + if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
69332 + flags &= ~MF_PAX_EMUTRAMP;
69333 + if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
69334 + flags &= ~MF_PAX_MPROTECT;
69335 +
69336 + if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
69337 + flags |= MF_PAX_PAGEEXEC;
69338 + if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
69339 + flags |= MF_PAX_SEGMEXEC;
69340 + if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
69341 + flags |= MF_PAX_RANDMMAP;
69342 + if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
69343 + flags |= MF_PAX_EMUTRAMP;
69344 + if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
69345 + flags |= MF_PAX_MPROTECT;
69346 +
69347 + pax_set_flags(task, flags);
69348 +
69349 + return;
69350 +}
69351 +#endif
69352 +
69353 +int
69354 +gr_handle_proc_ptrace(struct task_struct *task)
69355 +{
69356 + struct file *filp;
69357 + struct task_struct *tmp = task;
69358 + struct task_struct *curtemp = current;
69359 + __u32 retmode;
69360 +
69361 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
69362 + if (unlikely(!(gr_status & GR_READY)))
69363 + return 0;
69364 +#endif
69365 +
69366 + read_lock(&tasklist_lock);
69367 + read_lock(&grsec_exec_file_lock);
69368 + filp = task->exec_file;
69369 +
69370 + while (task_pid_nr(tmp) > 0) {
69371 + if (tmp == curtemp)
69372 + break;
69373 + tmp = tmp->real_parent;
69374 + }
69375 +
69376 + if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
69377 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
69378 + read_unlock(&grsec_exec_file_lock);
69379 + read_unlock(&tasklist_lock);
69380 + return 1;
69381 + }
69382 +
69383 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
69384 + if (!(gr_status & GR_READY)) {
69385 + read_unlock(&grsec_exec_file_lock);
69386 + read_unlock(&tasklist_lock);
69387 + return 0;
69388 + }
69389 +#endif
69390 +
69391 + retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
69392 + read_unlock(&grsec_exec_file_lock);
69393 + read_unlock(&tasklist_lock);
69394 +
69395 + if (retmode & GR_NOPTRACE)
69396 + return 1;
69397 +
69398 + if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
69399 + && (current->acl != task->acl || (current->acl != current->role->root_label
69400 + && task_pid_nr(current) != task_pid_nr(task))))
69401 + return 1;
69402 +
69403 + return 0;
69404 +}
69405 +
69406 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
69407 +{
69408 + if (unlikely(!(gr_status & GR_READY)))
69409 + return;
69410 +
69411 + if (!(current->role->roletype & GR_ROLE_GOD))
69412 + return;
69413 +
69414 + seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
69415 + p->role->rolename, gr_task_roletype_to_char(p),
69416 + p->acl->filename);
69417 +}
69418 +
69419 +int
69420 +gr_handle_ptrace(struct task_struct *task, const long request)
69421 +{
69422 + struct task_struct *tmp = task;
69423 + struct task_struct *curtemp = current;
69424 + __u32 retmode;
69425 +
69426 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
69427 + if (unlikely(!(gr_status & GR_READY)))
69428 + return 0;
69429 +#endif
69430 + if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
69431 + read_lock(&tasklist_lock);
69432 + while (task_pid_nr(tmp) > 0) {
69433 + if (tmp == curtemp)
69434 + break;
69435 + tmp = tmp->real_parent;
69436 + }
69437 +
69438 + if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
69439 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
69440 + read_unlock(&tasklist_lock);
69441 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
69442 + return 1;
69443 + }
69444 + read_unlock(&tasklist_lock);
69445 + }
69446 +
69447 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
69448 + if (!(gr_status & GR_READY))
69449 + return 0;
69450 +#endif
69451 +
69452 + read_lock(&grsec_exec_file_lock);
69453 + if (unlikely(!task->exec_file)) {
69454 + read_unlock(&grsec_exec_file_lock);
69455 + return 0;
69456 + }
69457 +
69458 + retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
69459 + read_unlock(&grsec_exec_file_lock);
69460 +
69461 + if (retmode & GR_NOPTRACE) {
69462 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
69463 + return 1;
69464 + }
69465 +
69466 + if (retmode & GR_PTRACERD) {
69467 + switch (request) {
69468 + case PTRACE_SEIZE:
69469 + case PTRACE_POKETEXT:
69470 + case PTRACE_POKEDATA:
69471 + case PTRACE_POKEUSR:
69472 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
69473 + case PTRACE_SETREGS:
69474 + case PTRACE_SETFPREGS:
69475 +#endif
69476 +#ifdef CONFIG_X86
69477 + case PTRACE_SETFPXREGS:
69478 +#endif
69479 +#ifdef CONFIG_ALTIVEC
69480 + case PTRACE_SETVRREGS:
69481 +#endif
69482 + return 1;
69483 + default:
69484 + return 0;
69485 + }
69486 + } else if (!(current->acl->mode & GR_POVERRIDE) &&
69487 + !(current->role->roletype & GR_ROLE_GOD) &&
69488 + (current->acl != task->acl)) {
69489 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
69490 + return 1;
69491 + }
69492 +
69493 + return 0;
69494 +}
69495 +
69496 +static int is_writable_mmap(const struct file *filp)
69497 +{
69498 + struct task_struct *task = current;
69499 + struct acl_object_label *obj, *obj2;
69500 +
69501 + if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
69502 + !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))) {
69503 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
69504 + obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
69505 + task->role->root_label);
69506 + if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
69507 + gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
69508 + return 1;
69509 + }
69510 + }
69511 + return 0;
69512 +}
69513 +
69514 +int
69515 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
69516 +{
69517 + __u32 mode;
69518 +
69519 + if (unlikely(!file || !(prot & PROT_EXEC)))
69520 + return 1;
69521 +
69522 + if (is_writable_mmap(file))
69523 + return 0;
69524 +
69525 + mode =
69526 + gr_search_file(file->f_path.dentry,
69527 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
69528 + file->f_path.mnt);
69529 +
69530 + if (!gr_tpe_allow(file))
69531 + return 0;
69532 +
69533 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
69534 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
69535 + return 0;
69536 + } else if (unlikely(!(mode & GR_EXEC))) {
69537 + return 0;
69538 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
69539 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
69540 + return 1;
69541 + }
69542 +
69543 + return 1;
69544 +}
69545 +
69546 +int
69547 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
69548 +{
69549 + __u32 mode;
69550 +
69551 + if (unlikely(!file || !(prot & PROT_EXEC)))
69552 + return 1;
69553 +
69554 + if (is_writable_mmap(file))
69555 + return 0;
69556 +
69557 + mode =
69558 + gr_search_file(file->f_path.dentry,
69559 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
69560 + file->f_path.mnt);
69561 +
69562 + if (!gr_tpe_allow(file))
69563 + return 0;
69564 +
69565 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
69566 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
69567 + return 0;
69568 + } else if (unlikely(!(mode & GR_EXEC))) {
69569 + return 0;
69570 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
69571 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
69572 + return 1;
69573 + }
69574 +
69575 + return 1;
69576 +}
69577 +
69578 +void
69579 +gr_acl_handle_psacct(struct task_struct *task, const long code)
69580 +{
69581 + unsigned long runtime, cputime;
69582 + cputime_t utime, stime;
69583 + unsigned int wday, cday;
69584 + __u8 whr, chr;
69585 + __u8 wmin, cmin;
69586 + __u8 wsec, csec;
69587 + struct timespec timeval;
69588 +
69589 + if (unlikely(!(gr_status & GR_READY) || !task->acl ||
69590 + !(task->acl->mode & GR_PROCACCT)))
69591 + return;
69592 +
69593 + do_posix_clock_monotonic_gettime(&timeval);
69594 + runtime = timeval.tv_sec - task->start_time.tv_sec;
69595 + wday = runtime / (60 * 60 * 24);
69596 + runtime -= wday * (60 * 60 * 24);
69597 + whr = runtime / (60 * 60);
69598 + runtime -= whr * (60 * 60);
69599 + wmin = runtime / 60;
69600 + runtime -= wmin * 60;
69601 + wsec = runtime;
69602 +
69603 + task_cputime(task, &utime, &stime);
69604 + cputime = cputime_to_secs(utime + stime);
69605 + cday = cputime / (60 * 60 * 24);
69606 + cputime -= cday * (60 * 60 * 24);
69607 + chr = cputime / (60 * 60);
69608 + cputime -= chr * (60 * 60);
69609 + cmin = cputime / 60;
69610 + cputime -= cmin * 60;
69611 + csec = cputime;
69612 +
69613 + gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
69614 +
69615 + return;
69616 +}
69617 +
69618 +#ifdef CONFIG_TASKSTATS
69619 +int gr_is_taskstats_denied(int pid)
69620 +{
69621 + struct task_struct *task;
69622 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
69623 + const struct cred *cred;
69624 +#endif
69625 + int ret = 0;
69626 +
69627 + /* restrict taskstats viewing to un-chrooted root users
69628 + who have the 'view' subject flag if the RBAC system is enabled
69629 + */
69630 +
69631 + rcu_read_lock();
69632 + read_lock(&tasklist_lock);
69633 + task = find_task_by_vpid(pid);
69634 + if (task) {
69635 +#ifdef CONFIG_GRKERNSEC_CHROOT
69636 + if (proc_is_chrooted(task))
69637 + ret = -EACCES;
69638 +#endif
69639 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
69640 + cred = __task_cred(task);
69641 +#ifdef CONFIG_GRKERNSEC_PROC_USER
69642 + if (gr_is_global_nonroot(cred->uid))
69643 + ret = -EACCES;
69644 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
69645 + if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
69646 + ret = -EACCES;
69647 +#endif
69648 +#endif
69649 + if (gr_status & GR_READY) {
69650 + if (!(task->acl->mode & GR_VIEW))
69651 + ret = -EACCES;
69652 + }
69653 + } else
69654 + ret = -ENOENT;
69655 +
69656 + read_unlock(&tasklist_lock);
69657 + rcu_read_unlock();
69658 +
69659 + return ret;
69660 +}
69661 +#endif
69662 +
69663 +/* AUXV entries are filled via a descendant of search_binary_handler
69664 + after we've already applied the subject for the target
69665 +*/
69666 +int gr_acl_enable_at_secure(void)
69667 +{
69668 + if (unlikely(!(gr_status & GR_READY)))
69669 + return 0;
69670 +
69671 + if (current->acl->mode & GR_ATSECURE)
69672 + return 1;
69673 +
69674 + return 0;
69675 +}
69676 +
69677 +int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
69678 +{
69679 + struct task_struct *task = current;
69680 + struct dentry *dentry = file->f_path.dentry;
69681 + struct vfsmount *mnt = file->f_path.mnt;
69682 + struct acl_object_label *obj, *tmp;
69683 + struct acl_subject_label *subj;
69684 + unsigned int bufsize;
69685 + int is_not_root;
69686 + char *path;
69687 + dev_t dev = __get_dev(dentry);
69688 +
69689 + if (unlikely(!(gr_status & GR_READY)))
69690 + return 1;
69691 +
69692 + if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
69693 + return 1;
69694 +
69695 + /* ignore Eric Biederman */
69696 + if (IS_PRIVATE(dentry->d_inode))
69697 + return 1;
69698 +
69699 + subj = task->acl;
69700 + read_lock(&gr_inode_lock);
69701 + do {
69702 + obj = lookup_acl_obj_label(ino, dev, subj);
69703 + if (obj != NULL) {
69704 + read_unlock(&gr_inode_lock);
69705 + return (obj->mode & GR_FIND) ? 1 : 0;
69706 + }
69707 + } while ((subj = subj->parent_subject));
69708 + read_unlock(&gr_inode_lock);
69709 +
69710 + /* this is purely an optimization since we're looking for an object
69711 + for the directory we're doing a readdir on
69712 + if it's possible for any globbed object to match the entry we're
69713 + filling into the directory, then the object we find here will be
69714 + an anchor point with attached globbed objects
69715 + */
69716 + obj = chk_obj_label_noglob(dentry, mnt, task->acl);
69717 + if (obj->globbed == NULL)
69718 + return (obj->mode & GR_FIND) ? 1 : 0;
69719 +
69720 + is_not_root = ((obj->filename[0] == '/') &&
69721 + (obj->filename[1] == '\0')) ? 0 : 1;
69722 + bufsize = PAGE_SIZE - namelen - is_not_root;
69723 +
69724 + /* check bufsize > PAGE_SIZE || bufsize == 0 */
69725 + if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
69726 + return 1;
69727 +
69728 + preempt_disable();
69729 + path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
69730 + bufsize);
69731 +
69732 + bufsize = strlen(path);
69733 +
69734 + /* if base is "/", don't append an additional slash */
69735 + if (is_not_root)
69736 + *(path + bufsize) = '/';
69737 + memcpy(path + bufsize + is_not_root, name, namelen);
69738 + *(path + bufsize + namelen + is_not_root) = '\0';
69739 +
69740 + tmp = obj->globbed;
69741 + while (tmp) {
69742 + if (!glob_match(tmp->filename, path)) {
69743 + preempt_enable();
69744 + return (tmp->mode & GR_FIND) ? 1 : 0;
69745 + }
69746 + tmp = tmp->next;
69747 + }
69748 + preempt_enable();
69749 + return (obj->mode & GR_FIND) ? 1 : 0;
69750 +}
69751 +
69752 +void gr_put_exec_file(struct task_struct *task)
69753 +{
69754 + struct file *filp;
69755 +
69756 + write_lock(&grsec_exec_file_lock);
69757 + filp = task->exec_file;
69758 + task->exec_file = NULL;
69759 + write_unlock(&grsec_exec_file_lock);
69760 +
69761 + if (filp)
69762 + fput(filp);
69763 +
69764 + return;
69765 +}
69766 +
69767 +
69768 +#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
69769 +EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
69770 +#endif
69771 +#ifdef CONFIG_SECURITY
69772 +EXPORT_SYMBOL_GPL(gr_check_user_change);
69773 +EXPORT_SYMBOL_GPL(gr_check_group_change);
69774 +#endif
69775 +
69776 diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
69777 new file mode 100644
69778 index 0000000..18ffbbd
69779 --- /dev/null
69780 +++ b/grsecurity/gracl_alloc.c
69781 @@ -0,0 +1,105 @@
69782 +#include <linux/kernel.h>
69783 +#include <linux/mm.h>
69784 +#include <linux/slab.h>
69785 +#include <linux/vmalloc.h>
69786 +#include <linux/gracl.h>
69787 +#include <linux/grsecurity.h>
69788 +
69789 +static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
69790 +struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
69791 +
69792 +static __inline__ int
69793 +alloc_pop(void)
69794 +{
69795 + if (current_alloc_state->alloc_stack_next == 1)
69796 + return 0;
69797 +
69798 + kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
69799 +
69800 + current_alloc_state->alloc_stack_next--;
69801 +
69802 + return 1;
69803 +}
69804 +
69805 +static __inline__ int
69806 +alloc_push(void *buf)
69807 +{
69808 + if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
69809 + return 1;
69810 +
69811 + current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
69812 +
69813 + current_alloc_state->alloc_stack_next++;
69814 +
69815 + return 0;
69816 +}
69817 +
69818 +void *
69819 +acl_alloc(unsigned long len)
69820 +{
69821 + void *ret = NULL;
69822 +
69823 + if (!len || len > PAGE_SIZE)
69824 + goto out;
69825 +
69826 + ret = kmalloc(len, GFP_KERNEL);
69827 +
69828 + if (ret) {
69829 + if (alloc_push(ret)) {
69830 + kfree(ret);
69831 + ret = NULL;
69832 + }
69833 + }
69834 +
69835 +out:
69836 + return ret;
69837 +}
69838 +
69839 +void *
69840 +acl_alloc_num(unsigned long num, unsigned long len)
69841 +{
69842 + if (!len || (num > (PAGE_SIZE / len)))
69843 + return NULL;
69844 +
69845 + return acl_alloc(num * len);
69846 +}
69847 +
69848 +void
69849 +acl_free_all(void)
69850 +{
69851 + if (!current_alloc_state->alloc_stack)
69852 + return;
69853 +
69854 + while (alloc_pop()) ;
69855 +
69856 + if (current_alloc_state->alloc_stack) {
69857 + if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
69858 + kfree(current_alloc_state->alloc_stack);
69859 + else
69860 + vfree(current_alloc_state->alloc_stack);
69861 + }
69862 +
69863 + current_alloc_state->alloc_stack = NULL;
69864 + current_alloc_state->alloc_stack_size = 1;
69865 + current_alloc_state->alloc_stack_next = 1;
69866 +
69867 + return;
69868 +}
69869 +
69870 +int
69871 +acl_alloc_stack_init(unsigned long size)
69872 +{
69873 + if ((size * sizeof (void *)) <= PAGE_SIZE)
69874 + current_alloc_state->alloc_stack =
69875 + (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
69876 + else
69877 + current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
69878 +
69879 + current_alloc_state->alloc_stack_size = size;
69880 + current_alloc_state->alloc_stack_next = 1;
69881 +
69882 + if (!current_alloc_state->alloc_stack)
69883 + return 0;
69884 + else
69885 + return 1;
69886 +}
69887 diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
69888 new file mode 100644
69889 index 0000000..bdd51ea
69890 --- /dev/null
69891 +++ b/grsecurity/gracl_cap.c
69892 @@ -0,0 +1,110 @@
69893 +#include <linux/kernel.h>
69894 +#include <linux/module.h>
69895 +#include <linux/sched.h>
69896 +#include <linux/gracl.h>
69897 +#include <linux/grsecurity.h>
69898 +#include <linux/grinternal.h>
69899 +
69900 +extern const char *captab_log[];
69901 +extern int captab_log_entries;
69902 +
69903 +int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
69904 +{
69905 + struct acl_subject_label *curracl;
69906 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
69907 + kernel_cap_t cap_audit = __cap_empty_set;
69908 +
69909 + if (!gr_acl_is_enabled())
69910 + return 1;
69911 +
69912 + curracl = task->acl;
69913 +
69914 + cap_drop = curracl->cap_lower;
69915 + cap_mask = curracl->cap_mask;
69916 + cap_audit = curracl->cap_invert_audit;
69917 +
69918 + while ((curracl = curracl->parent_subject)) {
69919 + /* if the cap isn't specified in the current computed mask but is specified in the
69920 + current level subject, and is lowered in the current level subject, then add
69921 + it to the set of dropped capabilities
69922 + otherwise, add the current level subject's mask to the current computed mask
69923 + */
69924 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
69925 + cap_raise(cap_mask, cap);
69926 + if (cap_raised(curracl->cap_lower, cap))
69927 + cap_raise(cap_drop, cap);
69928 + if (cap_raised(curracl->cap_invert_audit, cap))
69929 + cap_raise(cap_audit, cap);
69930 + }
69931 + }
69932 +
69933 + if (!cap_raised(cap_drop, cap)) {
69934 + if (cap_raised(cap_audit, cap))
69935 + gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
69936 + return 1;
69937 + }
69938 +
69939 + curracl = task->acl;
69940 +
69941 + if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
69942 + && cap_raised(cred->cap_effective, cap)) {
69943 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
69944 + task->role->roletype, GR_GLOBAL_UID(cred->uid),
69945 + GR_GLOBAL_GID(cred->gid), task->exec_file ?
69946 + gr_to_filename(task->exec_file->f_path.dentry,
69947 + task->exec_file->f_path.mnt) : curracl->filename,
69948 + curracl->filename, 0UL,
69949 + 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
69950 + return 1;
69951 + }
69952 +
69953 + if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
69954 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
69955 +
69956 + return 0;
69957 +}
69958 +
69959 +int
69960 +gr_acl_is_capable(const int cap)
69961 +{
69962 + return gr_task_acl_is_capable(current, current_cred(), cap);
69963 +}
69964 +
69965 +int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
69966 +{
69967 + struct acl_subject_label *curracl;
69968 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
69969 +
69970 + if (!gr_acl_is_enabled())
69971 + return 1;
69972 +
69973 + curracl = task->acl;
69974 +
69975 + cap_drop = curracl->cap_lower;
69976 + cap_mask = curracl->cap_mask;
69977 +
69978 + while ((curracl = curracl->parent_subject)) {
69979 + /* if the cap isn't specified in the current computed mask but is specified in the
69980 + current level subject, and is lowered in the current level subject, then add
69981 + it to the set of dropped capabilities
69982 + otherwise, add the current level subject's mask to the current computed mask
69983 + */
69984 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
69985 + cap_raise(cap_mask, cap);
69986 + if (cap_raised(curracl->cap_lower, cap))
69987 + cap_raise(cap_drop, cap);
69988 + }
69989 + }
69990 +
69991 + if (!cap_raised(cap_drop, cap))
69992 + return 1;
69993 +
69994 + return 0;
69995 +}
69996 +
69997 +int
69998 +gr_acl_is_capable_nolog(const int cap)
69999 +{
70000 + return gr_task_acl_is_capable_nolog(current, cap);
70001 +}
70002 +
70003 diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
70004 new file mode 100644
70005 index 0000000..ca25605
70006 --- /dev/null
70007 +++ b/grsecurity/gracl_compat.c
70008 @@ -0,0 +1,270 @@
70009 +#include <linux/kernel.h>
70010 +#include <linux/gracl.h>
70011 +#include <linux/compat.h>
70012 +#include <linux/gracl_compat.h>
70013 +
70014 +#include <asm/uaccess.h>
70015 +
70016 +int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
70017 +{
70018 + struct gr_arg_wrapper_compat uwrapcompat;
70019 +
70020 + if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
70021 + return -EFAULT;
70022 +
70023 + if (((uwrapcompat.version != GRSECURITY_VERSION) &&
70024 + (uwrapcompat.version != 0x2901)) ||
70025 + (uwrapcompat.size != sizeof(struct gr_arg_compat)))
70026 + return -EINVAL;
70027 +
70028 + uwrap->arg = compat_ptr(uwrapcompat.arg);
70029 + uwrap->version = uwrapcompat.version;
70030 + uwrap->size = sizeof(struct gr_arg);
70031 +
70032 + return 0;
70033 +}
70034 +
70035 +int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
70036 +{
70037 + struct gr_arg_compat argcompat;
70038 +
70039 + if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
70040 + return -EFAULT;
70041 +
70042 + arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
70043 + arg->role_db.num_pointers = argcompat.role_db.num_pointers;
70044 + arg->role_db.num_roles = argcompat.role_db.num_roles;
70045 + arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
70046 + arg->role_db.num_subjects = argcompat.role_db.num_subjects;
70047 + arg->role_db.num_objects = argcompat.role_db.num_objects;
70048 +
70049 + memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
70050 + memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
70051 + memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
70052 + memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
70053 + arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
70054 + arg->segv_device = argcompat.segv_device;
70055 + arg->segv_inode = argcompat.segv_inode;
70056 + arg->segv_uid = argcompat.segv_uid;
70057 + arg->num_sprole_pws = argcompat.num_sprole_pws;
70058 + arg->mode = argcompat.mode;
70059 +
70060 + return 0;
70061 +}
70062 +
70063 +int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
70064 +{
70065 + struct acl_object_label_compat objcompat;
70066 +
70067 + if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
70068 + return -EFAULT;
70069 +
70070 + obj->filename = compat_ptr(objcompat.filename);
70071 + obj->inode = objcompat.inode;
70072 + obj->device = objcompat.device;
70073 + obj->mode = objcompat.mode;
70074 +
70075 + obj->nested = compat_ptr(objcompat.nested);
70076 + obj->globbed = compat_ptr(objcompat.globbed);
70077 +
70078 + obj->prev = compat_ptr(objcompat.prev);
70079 + obj->next = compat_ptr(objcompat.next);
70080 +
70081 + return 0;
70082 +}
70083 +
70084 +int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
70085 +{
70086 + unsigned int i;
70087 + struct acl_subject_label_compat subjcompat;
70088 +
70089 + if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
70090 + return -EFAULT;
70091 +
70092 + subj->filename = compat_ptr(subjcompat.filename);
70093 + subj->inode = subjcompat.inode;
70094 + subj->device = subjcompat.device;
70095 + subj->mode = subjcompat.mode;
70096 + subj->cap_mask = subjcompat.cap_mask;
70097 + subj->cap_lower = subjcompat.cap_lower;
70098 + subj->cap_invert_audit = subjcompat.cap_invert_audit;
70099 +
70100 + for (i = 0; i < GR_NLIMITS; i++) {
70101 + if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
70102 + subj->res[i].rlim_cur = RLIM_INFINITY;
70103 + else
70104 + subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
70105 + if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
70106 + subj->res[i].rlim_max = RLIM_INFINITY;
70107 + else
70108 + subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
70109 + }
70110 + subj->resmask = subjcompat.resmask;
70111 +
70112 + subj->user_trans_type = subjcompat.user_trans_type;
70113 + subj->group_trans_type = subjcompat.group_trans_type;
70114 + subj->user_transitions = compat_ptr(subjcompat.user_transitions);
70115 + subj->group_transitions = compat_ptr(subjcompat.group_transitions);
70116 + subj->user_trans_num = subjcompat.user_trans_num;
70117 + subj->group_trans_num = subjcompat.group_trans_num;
70118 +
70119 + memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
70120 + memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
70121 + subj->ip_type = subjcompat.ip_type;
70122 + subj->ips = compat_ptr(subjcompat.ips);
70123 + subj->ip_num = subjcompat.ip_num;
70124 + subj->inaddr_any_override = subjcompat.inaddr_any_override;
70125 +
70126 + subj->crashes = subjcompat.crashes;
70127 + subj->expires = subjcompat.expires;
70128 +
70129 + subj->parent_subject = compat_ptr(subjcompat.parent_subject);
70130 + subj->hash = compat_ptr(subjcompat.hash);
70131 + subj->prev = compat_ptr(subjcompat.prev);
70132 + subj->next = compat_ptr(subjcompat.next);
70133 +
70134 + subj->obj_hash = compat_ptr(subjcompat.obj_hash);
70135 + subj->obj_hash_size = subjcompat.obj_hash_size;
70136 + subj->pax_flags = subjcompat.pax_flags;
70137 +
70138 + return 0;
70139 +}
70140 +
70141 +int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
70142 +{
70143 + struct acl_role_label_compat rolecompat;
70144 +
70145 + if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
70146 + return -EFAULT;
70147 +
70148 + role->rolename = compat_ptr(rolecompat.rolename);
70149 + role->uidgid = rolecompat.uidgid;
70150 + role->roletype = rolecompat.roletype;
70151 +
70152 + role->auth_attempts = rolecompat.auth_attempts;
70153 + role->expires = rolecompat.expires;
70154 +
70155 + role->root_label = compat_ptr(rolecompat.root_label);
70156 + role->hash = compat_ptr(rolecompat.hash);
70157 +
70158 + role->prev = compat_ptr(rolecompat.prev);
70159 + role->next = compat_ptr(rolecompat.next);
70160 +
70161 + role->transitions = compat_ptr(rolecompat.transitions);
70162 + role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
70163 + role->domain_children = compat_ptr(rolecompat.domain_children);
70164 + role->domain_child_num = rolecompat.domain_child_num;
70165 +
70166 + role->umask = rolecompat.umask;
70167 +
70168 + role->subj_hash = compat_ptr(rolecompat.subj_hash);
70169 + role->subj_hash_size = rolecompat.subj_hash_size;
70170 +
70171 + return 0;
70172 +}
70173 +
70174 +int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
70175 +{
70176 + struct role_allowed_ip_compat roleip_compat;
70177 +
70178 + if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
70179 + return -EFAULT;
70180 +
70181 + roleip->addr = roleip_compat.addr;
70182 + roleip->netmask = roleip_compat.netmask;
70183 +
70184 + roleip->prev = compat_ptr(roleip_compat.prev);
70185 + roleip->next = compat_ptr(roleip_compat.next);
70186 +
70187 + return 0;
70188 +}
70189 +
70190 +int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
70191 +{
70192 + struct role_transition_compat trans_compat;
70193 +
70194 + if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
70195 + return -EFAULT;
70196 +
70197 + trans->rolename = compat_ptr(trans_compat.rolename);
70198 +
70199 + trans->prev = compat_ptr(trans_compat.prev);
70200 + trans->next = compat_ptr(trans_compat.next);
70201 +
70202 + return 0;
70203 +
70204 +}
70205 +
70206 +int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
70207 +{
70208 + struct gr_hash_struct_compat hash_compat;
70209 +
70210 + if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
70211 + return -EFAULT;
70212 +
70213 + hash->table = compat_ptr(hash_compat.table);
70214 + hash->nametable = compat_ptr(hash_compat.nametable);
70215 + hash->first = compat_ptr(hash_compat.first);
70216 +
70217 + hash->table_size = hash_compat.table_size;
70218 + hash->used_size = hash_compat.used_size;
70219 +
70220 + hash->type = hash_compat.type;
70221 +
70222 + return 0;
70223 +}
70224 +
70225 +int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
70226 +{
70227 + compat_uptr_t ptrcompat;
70228 +
70229 + if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
70230 + return -EFAULT;
70231 +
70232 + *(void **)ptr = compat_ptr(ptrcompat);
70233 +
70234 + return 0;
70235 +}
70236 +
70237 +int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
70238 +{
70239 + struct acl_ip_label_compat ip_compat;
70240 +
70241 + if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
70242 + return -EFAULT;
70243 +
70244 + ip->iface = compat_ptr(ip_compat.iface);
70245 + ip->addr = ip_compat.addr;
70246 + ip->netmask = ip_compat.netmask;
70247 + ip->low = ip_compat.low;
70248 + ip->high = ip_compat.high;
70249 + ip->mode = ip_compat.mode;
70250 + ip->type = ip_compat.type;
70251 +
70252 + memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
70253 +
70254 + ip->prev = compat_ptr(ip_compat.prev);
70255 + ip->next = compat_ptr(ip_compat.next);
70256 +
70257 + return 0;
70258 +}
70259 +
70260 +int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
70261 +{
70262 + struct sprole_pw_compat pw_compat;
70263 +
70264 + if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
70265 + return -EFAULT;
70266 +
70267 + pw->rolename = compat_ptr(pw_compat.rolename);
70268 + memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
70269 + memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
70270 +
70271 + return 0;
70272 +}
70273 +
70274 +size_t get_gr_arg_wrapper_size_compat(void)
70275 +{
70276 + return sizeof(struct gr_arg_wrapper_compat);
70277 +}
70278 +
70279 diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
70280 new file mode 100644
70281 index 0000000..4008fdc
70282 --- /dev/null
70283 +++ b/grsecurity/gracl_fs.c
70284 @@ -0,0 +1,445 @@
70285 +#include <linux/kernel.h>
70286 +#include <linux/sched.h>
70287 +#include <linux/types.h>
70288 +#include <linux/fs.h>
70289 +#include <linux/file.h>
70290 +#include <linux/stat.h>
70291 +#include <linux/grsecurity.h>
70292 +#include <linux/grinternal.h>
70293 +#include <linux/gracl.h>
70294 +
70295 +umode_t
70296 +gr_acl_umask(void)
70297 +{
70298 + if (unlikely(!gr_acl_is_enabled()))
70299 + return 0;
70300 +
70301 + return current->role->umask;
70302 +}
70303 +
70304 +__u32
70305 +gr_acl_handle_hidden_file(const struct dentry * dentry,
70306 + const struct vfsmount * mnt)
70307 +{
70308 + __u32 mode;
70309 +
70310 + if (unlikely(d_is_negative(dentry)))
70311 + return GR_FIND;
70312 +
70313 + mode =
70314 + gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
70315 +
70316 + if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
70317 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
70318 + return mode;
70319 + } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
70320 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
70321 + return 0;
70322 + } else if (unlikely(!(mode & GR_FIND)))
70323 + return 0;
70324 +
70325 + return GR_FIND;
70326 +}
70327 +
70328 +__u32
70329 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
70330 + int acc_mode)
70331 +{
70332 + __u32 reqmode = GR_FIND;
70333 + __u32 mode;
70334 +
70335 + if (unlikely(d_is_negative(dentry)))
70336 + return reqmode;
70337 +
70338 + if (acc_mode & MAY_APPEND)
70339 + reqmode |= GR_APPEND;
70340 + else if (acc_mode & MAY_WRITE)
70341 + reqmode |= GR_WRITE;
70342 + if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
70343 + reqmode |= GR_READ;
70344 +
70345 + mode =
70346 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
70347 + mnt);
70348 +
70349 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
70350 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
70351 + reqmode & GR_READ ? " reading" : "",
70352 + reqmode & GR_WRITE ? " writing" : reqmode &
70353 + GR_APPEND ? " appending" : "");
70354 + return reqmode;
70355 + } else
70356 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
70357 + {
70358 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
70359 + reqmode & GR_READ ? " reading" : "",
70360 + reqmode & GR_WRITE ? " writing" : reqmode &
70361 + GR_APPEND ? " appending" : "");
70362 + return 0;
70363 + } else if (unlikely((mode & reqmode) != reqmode))
70364 + return 0;
70365 +
70366 + return reqmode;
70367 +}
70368 +
70369 +__u32
70370 +gr_acl_handle_creat(const struct dentry * dentry,
70371 + const struct dentry * p_dentry,
70372 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
70373 + const int imode)
70374 +{
70375 + __u32 reqmode = GR_WRITE | GR_CREATE;
70376 + __u32 mode;
70377 +
70378 + if (acc_mode & MAY_APPEND)
70379 + reqmode |= GR_APPEND;
70380 + // if a directory was required or the directory already exists, then
70381 + // don't count this open as a read
70382 + if ((acc_mode & MAY_READ) &&
70383 + !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
70384 + reqmode |= GR_READ;
70385 + if ((open_flags & O_CREAT) &&
70386 + ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
70387 + reqmode |= GR_SETID;
70388 +
70389 + mode =
70390 + gr_check_create(dentry, p_dentry, p_mnt,
70391 + reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
70392 +
70393 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
70394 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
70395 + reqmode & GR_READ ? " reading" : "",
70396 + reqmode & GR_WRITE ? " writing" : reqmode &
70397 + GR_APPEND ? " appending" : "");
70398 + return reqmode;
70399 + } else
70400 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
70401 + {
70402 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
70403 + reqmode & GR_READ ? " reading" : "",
70404 + reqmode & GR_WRITE ? " writing" : reqmode &
70405 + GR_APPEND ? " appending" : "");
70406 + return 0;
70407 + } else if (unlikely((mode & reqmode) != reqmode))
70408 + return 0;
70409 +
70410 + return reqmode;
70411 +}
70412 +
70413 +__u32
70414 +gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
70415 + const int fmode)
70416 +{
70417 + __u32 mode, reqmode = GR_FIND;
70418 +
70419 + if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
70420 + reqmode |= GR_EXEC;
70421 + if (fmode & S_IWOTH)
70422 + reqmode |= GR_WRITE;
70423 + if (fmode & S_IROTH)
70424 + reqmode |= GR_READ;
70425 +
70426 + mode =
70427 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
70428 + mnt);
70429 +
70430 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
70431 + gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
70432 + reqmode & GR_READ ? " reading" : "",
70433 + reqmode & GR_WRITE ? " writing" : "",
70434 + reqmode & GR_EXEC ? " executing" : "");
70435 + return reqmode;
70436 + } else
70437 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
70438 + {
70439 + gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
70440 + reqmode & GR_READ ? " reading" : "",
70441 + reqmode & GR_WRITE ? " writing" : "",
70442 + reqmode & GR_EXEC ? " executing" : "");
70443 + return 0;
70444 + } else if (unlikely((mode & reqmode) != reqmode))
70445 + return 0;
70446 +
70447 + return reqmode;
70448 +}
70449 +
70450 +static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
70451 +{
70452 + __u32 mode;
70453 +
70454 + mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
70455 +
70456 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
70457 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
70458 + return mode;
70459 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
70460 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
70461 + return 0;
70462 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
70463 + return 0;
70464 +
70465 + return (reqmode);
70466 +}
70467 +
70468 +__u32
70469 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
70470 +{
70471 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
70472 +}
70473 +
70474 +__u32
70475 +gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
70476 +{
70477 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
70478 +}
70479 +
70480 +__u32
70481 +gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
70482 +{
70483 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
70484 +}
70485 +
70486 +__u32
70487 +gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
70488 +{
70489 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
70490 +}
70491 +
70492 +__u32
70493 +gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
70494 + umode_t *modeptr)
70495 +{
70496 + umode_t mode;
70497 +
70498 + *modeptr &= ~gr_acl_umask();
70499 + mode = *modeptr;
70500 +
70501 + if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
70502 + return 1;
70503 +
70504 + if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
70505 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
70506 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
70507 + GR_CHMOD_ACL_MSG);
70508 + } else {
70509 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
70510 + }
70511 +}
70512 +
70513 +__u32
70514 +gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
70515 +{
70516 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
70517 +}
70518 +
70519 +__u32
70520 +gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
70521 +{
70522 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
70523 +}
70524 +
70525 +__u32
70526 +gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
70527 +{
70528 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
70529 +}
70530 +
70531 +__u32
70532 +gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
70533 +{
70534 + return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
70535 +}
70536 +
70537 +__u32
70538 +gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
70539 +{
70540 + return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
70541 + GR_UNIXCONNECT_ACL_MSG);
70542 +}
70543 +
70544 +/* hardlinks require at minimum create and link permission,
70545 + any additional privilege required is based on the
70546 + privilege of the file being linked to
70547 +*/
70548 +__u32
70549 +gr_acl_handle_link(const struct dentry * new_dentry,
70550 + const struct dentry * parent_dentry,
70551 + const struct vfsmount * parent_mnt,
70552 + const struct dentry * old_dentry,
70553 + const struct vfsmount * old_mnt, const struct filename *to)
70554 +{
70555 + __u32 mode;
70556 + __u32 needmode = GR_CREATE | GR_LINK;
70557 + __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
70558 +
70559 + mode =
70560 + gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
70561 + old_mnt);
70562 +
70563 + if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
70564 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
70565 + return mode;
70566 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
70567 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
70568 + return 0;
70569 + } else if (unlikely((mode & needmode) != needmode))
70570 + return 0;
70571 +
70572 + return 1;
70573 +}
70574 +
70575 +__u32
70576 +gr_acl_handle_symlink(const struct dentry * new_dentry,
70577 + const struct dentry * parent_dentry,
70578 + const struct vfsmount * parent_mnt, const struct filename *from)
70579 +{
70580 + __u32 needmode = GR_WRITE | GR_CREATE;
70581 + __u32 mode;
70582 +
70583 + mode =
70584 + gr_check_create(new_dentry, parent_dentry, parent_mnt,
70585 + GR_CREATE | GR_AUDIT_CREATE |
70586 + GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
70587 +
70588 + if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
70589 + gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
70590 + return mode;
70591 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
70592 + gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
70593 + return 0;
70594 + } else if (unlikely((mode & needmode) != needmode))
70595 + return 0;
70596 +
70597 + return (GR_WRITE | GR_CREATE);
70598 +}
70599 +
70600 +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)
70601 +{
70602 + __u32 mode;
70603 +
70604 + mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
70605 +
70606 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
70607 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
70608 + return mode;
70609 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
70610 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
70611 + return 0;
70612 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
70613 + return 0;
70614 +
70615 + return (reqmode);
70616 +}
70617 +
70618 +__u32
70619 +gr_acl_handle_mknod(const struct dentry * new_dentry,
70620 + const struct dentry * parent_dentry,
70621 + const struct vfsmount * parent_mnt,
70622 + const int mode)
70623 +{
70624 + __u32 reqmode = GR_WRITE | GR_CREATE;
70625 + if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
70626 + reqmode |= GR_SETID;
70627 +
70628 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
70629 + reqmode, GR_MKNOD_ACL_MSG);
70630 +}
70631 +
70632 +__u32
70633 +gr_acl_handle_mkdir(const struct dentry *new_dentry,
70634 + const struct dentry *parent_dentry,
70635 + const struct vfsmount *parent_mnt)
70636 +{
70637 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
70638 + GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
70639 +}
70640 +
70641 +#define RENAME_CHECK_SUCCESS(old, new) \
70642 + (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
70643 + ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
70644 +
70645 +int
70646 +gr_acl_handle_rename(struct dentry *new_dentry,
70647 + struct dentry *parent_dentry,
70648 + const struct vfsmount *parent_mnt,
70649 + struct dentry *old_dentry,
70650 + struct inode *old_parent_inode,
70651 + struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
70652 +{
70653 + __u32 comp1, comp2;
70654 + int error = 0;
70655 +
70656 + if (unlikely(!gr_acl_is_enabled()))
70657 + return 0;
70658 +
70659 + if (flags & RENAME_EXCHANGE) {
70660 + comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
70661 + GR_AUDIT_READ | GR_AUDIT_WRITE |
70662 + GR_SUPPRESS, parent_mnt);
70663 + comp2 =
70664 + gr_search_file(old_dentry,
70665 + GR_READ | GR_WRITE | GR_AUDIT_READ |
70666 + GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
70667 + } else if (d_is_negative(new_dentry)) {
70668 + comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
70669 + GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
70670 + GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
70671 + comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
70672 + GR_DELETE | GR_AUDIT_DELETE |
70673 + GR_AUDIT_READ | GR_AUDIT_WRITE |
70674 + GR_SUPPRESS, old_mnt);
70675 + } else {
70676 + comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
70677 + GR_CREATE | GR_DELETE |
70678 + GR_AUDIT_CREATE | GR_AUDIT_DELETE |
70679 + GR_AUDIT_READ | GR_AUDIT_WRITE |
70680 + GR_SUPPRESS, parent_mnt);
70681 + comp2 =
70682 + gr_search_file(old_dentry,
70683 + GR_READ | GR_WRITE | GR_AUDIT_READ |
70684 + GR_DELETE | GR_AUDIT_DELETE |
70685 + GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
70686 + }
70687 +
70688 + if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
70689 + ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
70690 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
70691 + else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
70692 + && !(comp2 & GR_SUPPRESS)) {
70693 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
70694 + error = -EACCES;
70695 + } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
70696 + error = -EACCES;
70697 +
70698 + return error;
70699 +}
70700 +
70701 +void
70702 +gr_acl_handle_exit(void)
70703 +{
70704 + u16 id;
70705 + char *rolename;
70706 +
70707 + if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
70708 + !(current->role->roletype & GR_ROLE_PERSIST))) {
70709 + id = current->acl_role_id;
70710 + rolename = current->role->rolename;
70711 + gr_set_acls(1);
70712 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
70713 + }
70714 +
70715 + gr_put_exec_file(current);
70716 + return;
70717 +}
70718 +
70719 +int
70720 +gr_acl_handle_procpidmem(const struct task_struct *task)
70721 +{
70722 + if (unlikely(!gr_acl_is_enabled()))
70723 + return 0;
70724 +
70725 + if (task != current && task->acl->mode & GR_PROTPROCFD)
70726 + return -EACCES;
70727 +
70728 + return 0;
70729 +}
70730 diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
70731 new file mode 100644
70732 index 0000000..f056b81
70733 --- /dev/null
70734 +++ b/grsecurity/gracl_ip.c
70735 @@ -0,0 +1,386 @@
70736 +#include <linux/kernel.h>
70737 +#include <asm/uaccess.h>
70738 +#include <asm/errno.h>
70739 +#include <net/sock.h>
70740 +#include <linux/file.h>
70741 +#include <linux/fs.h>
70742 +#include <linux/net.h>
70743 +#include <linux/in.h>
70744 +#include <linux/skbuff.h>
70745 +#include <linux/ip.h>
70746 +#include <linux/udp.h>
70747 +#include <linux/types.h>
70748 +#include <linux/sched.h>
70749 +#include <linux/netdevice.h>
70750 +#include <linux/inetdevice.h>
70751 +#include <linux/gracl.h>
70752 +#include <linux/grsecurity.h>
70753 +#include <linux/grinternal.h>
70754 +
70755 +#define GR_BIND 0x01
70756 +#define GR_CONNECT 0x02
70757 +#define GR_INVERT 0x04
70758 +#define GR_BINDOVERRIDE 0x08
70759 +#define GR_CONNECTOVERRIDE 0x10
70760 +#define GR_SOCK_FAMILY 0x20
70761 +
70762 +static const char * gr_protocols[IPPROTO_MAX] = {
70763 + "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
70764 + "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
70765 + "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
70766 + "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
70767 + "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
70768 + "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
70769 + "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
70770 + "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
70771 + "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
70772 + "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
70773 + "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
70774 + "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
70775 + "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
70776 + "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
70777 + "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
70778 + "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
70779 + "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
70780 + "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
70781 + "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
70782 + "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
70783 + "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
70784 + "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
70785 + "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
70786 + "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
70787 + "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
70788 + "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
70789 + "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
70790 + "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
70791 + "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
70792 + "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
70793 + "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
70794 + "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
70795 + };
70796 +
70797 +static const char * gr_socktypes[SOCK_MAX] = {
70798 + "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
70799 + "unknown:7", "unknown:8", "unknown:9", "packet"
70800 + };
70801 +
70802 +static const char * gr_sockfamilies[AF_MAX+1] = {
70803 + "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
70804 + "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
70805 + "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
70806 + "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
70807 + };
70808 +
70809 +const char *
70810 +gr_proto_to_name(unsigned char proto)
70811 +{
70812 + return gr_protocols[proto];
70813 +}
70814 +
70815 +const char *
70816 +gr_socktype_to_name(unsigned char type)
70817 +{
70818 + return gr_socktypes[type];
70819 +}
70820 +
70821 +const char *
70822 +gr_sockfamily_to_name(unsigned char family)
70823 +{
70824 + return gr_sockfamilies[family];
70825 +}
70826 +
70827 +extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
70828 +
70829 +int
70830 +gr_search_socket(const int domain, const int type, const int protocol)
70831 +{
70832 + struct acl_subject_label *curr;
70833 + const struct cred *cred = current_cred();
70834 +
70835 + if (unlikely(!gr_acl_is_enabled()))
70836 + goto exit;
70837 +
70838 + if ((domain < 0) || (type < 0) || (protocol < 0) ||
70839 + (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
70840 + goto exit; // let the kernel handle it
70841 +
70842 + curr = current->acl;
70843 +
70844 + if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
70845 + /* the family is allowed, if this is PF_INET allow it only if
70846 + the extra sock type/protocol checks pass */
70847 + if (domain == PF_INET)
70848 + goto inet_check;
70849 + goto exit;
70850 + } else {
70851 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
70852 + __u32 fakeip = 0;
70853 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
70854 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
70855 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
70856 + gr_to_filename(current->exec_file->f_path.dentry,
70857 + current->exec_file->f_path.mnt) :
70858 + curr->filename, curr->filename,
70859 + &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
70860 + &current->signal->saved_ip);
70861 + goto exit;
70862 + }
70863 + goto exit_fail;
70864 + }
70865 +
70866 +inet_check:
70867 + /* the rest of this checking is for IPv4 only */
70868 + if (!curr->ips)
70869 + goto exit;
70870 +
70871 + if ((curr->ip_type & (1U << type)) &&
70872 + (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
70873 + goto exit;
70874 +
70875 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
70876 + /* we don't place acls on raw sockets , and sometimes
70877 + dgram/ip sockets are opened for ioctl and not
70878 + bind/connect, so we'll fake a bind learn log */
70879 + if (type == SOCK_RAW || type == SOCK_PACKET) {
70880 + __u32 fakeip = 0;
70881 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
70882 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
70883 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
70884 + gr_to_filename(current->exec_file->f_path.dentry,
70885 + current->exec_file->f_path.mnt) :
70886 + curr->filename, curr->filename,
70887 + &fakeip, 0, type,
70888 + protocol, GR_CONNECT, &current->signal->saved_ip);
70889 + } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
70890 + __u32 fakeip = 0;
70891 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
70892 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
70893 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
70894 + gr_to_filename(current->exec_file->f_path.dentry,
70895 + current->exec_file->f_path.mnt) :
70896 + curr->filename, curr->filename,
70897 + &fakeip, 0, type,
70898 + protocol, GR_BIND, &current->signal->saved_ip);
70899 + }
70900 + /* we'll log when they use connect or bind */
70901 + goto exit;
70902 + }
70903 +
70904 +exit_fail:
70905 + if (domain == PF_INET)
70906 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
70907 + gr_socktype_to_name(type), gr_proto_to_name(protocol));
70908 + else if (rcu_access_pointer(net_families[domain]) != NULL)
70909 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
70910 + gr_socktype_to_name(type), protocol);
70911 +
70912 + return 0;
70913 +exit:
70914 + return 1;
70915 +}
70916 +
70917 +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)
70918 +{
70919 + if ((ip->mode & mode) &&
70920 + (ip_port >= ip->low) &&
70921 + (ip_port <= ip->high) &&
70922 + ((ntohl(ip_addr) & our_netmask) ==
70923 + (ntohl(our_addr) & our_netmask))
70924 + && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
70925 + && (ip->type & (1U << type))) {
70926 + if (ip->mode & GR_INVERT)
70927 + return 2; // specifically denied
70928 + else
70929 + return 1; // allowed
70930 + }
70931 +
70932 + return 0; // not specifically allowed, may continue parsing
70933 +}
70934 +
70935 +static int
70936 +gr_search_connectbind(const int full_mode, struct sock *sk,
70937 + struct sockaddr_in *addr, const int type)
70938 +{
70939 + char iface[IFNAMSIZ] = {0};
70940 + struct acl_subject_label *curr;
70941 + struct acl_ip_label *ip;
70942 + struct inet_sock *isk;
70943 + struct net_device *dev;
70944 + struct in_device *idev;
70945 + unsigned long i;
70946 + int ret;
70947 + int mode = full_mode & (GR_BIND | GR_CONNECT);
70948 + __u32 ip_addr = 0;
70949 + __u32 our_addr;
70950 + __u32 our_netmask;
70951 + char *p;
70952 + __u16 ip_port = 0;
70953 + const struct cred *cred = current_cred();
70954 +
70955 + if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
70956 + return 0;
70957 +
70958 + curr = current->acl;
70959 + isk = inet_sk(sk);
70960 +
70961 + /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
70962 + if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
70963 + addr->sin_addr.s_addr = curr->inaddr_any_override;
70964 + if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
70965 + struct sockaddr_in saddr;
70966 + int err;
70967 +
70968 + saddr.sin_family = AF_INET;
70969 + saddr.sin_addr.s_addr = curr->inaddr_any_override;
70970 + saddr.sin_port = isk->inet_sport;
70971 +
70972 + err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
70973 + if (err)
70974 + return err;
70975 +
70976 + err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
70977 + if (err)
70978 + return err;
70979 + }
70980 +
70981 + if (!curr->ips)
70982 + return 0;
70983 +
70984 + ip_addr = addr->sin_addr.s_addr;
70985 + ip_port = ntohs(addr->sin_port);
70986 +
70987 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
70988 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
70989 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
70990 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
70991 + gr_to_filename(current->exec_file->f_path.dentry,
70992 + current->exec_file->f_path.mnt) :
70993 + curr->filename, curr->filename,
70994 + &ip_addr, ip_port, type,
70995 + sk->sk_protocol, mode, &current->signal->saved_ip);
70996 + return 0;
70997 + }
70998 +
70999 + for (i = 0; i < curr->ip_num; i++) {
71000 + ip = *(curr->ips + i);
71001 + if (ip->iface != NULL) {
71002 + strncpy(iface, ip->iface, IFNAMSIZ - 1);
71003 + p = strchr(iface, ':');
71004 + if (p != NULL)
71005 + *p = '\0';
71006 + dev = dev_get_by_name(sock_net(sk), iface);
71007 + if (dev == NULL)
71008 + continue;
71009 + idev = in_dev_get(dev);
71010 + if (idev == NULL) {
71011 + dev_put(dev);
71012 + continue;
71013 + }
71014 + rcu_read_lock();
71015 + for_ifa(idev) {
71016 + if (!strcmp(ip->iface, ifa->ifa_label)) {
71017 + our_addr = ifa->ifa_address;
71018 + our_netmask = 0xffffffff;
71019 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
71020 + if (ret == 1) {
71021 + rcu_read_unlock();
71022 + in_dev_put(idev);
71023 + dev_put(dev);
71024 + return 0;
71025 + } else if (ret == 2) {
71026 + rcu_read_unlock();
71027 + in_dev_put(idev);
71028 + dev_put(dev);
71029 + goto denied;
71030 + }
71031 + }
71032 + } endfor_ifa(idev);
71033 + rcu_read_unlock();
71034 + in_dev_put(idev);
71035 + dev_put(dev);
71036 + } else {
71037 + our_addr = ip->addr;
71038 + our_netmask = ip->netmask;
71039 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
71040 + if (ret == 1)
71041 + return 0;
71042 + else if (ret == 2)
71043 + goto denied;
71044 + }
71045 + }
71046 +
71047 +denied:
71048 + if (mode == GR_BIND)
71049 + 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));
71050 + else if (mode == GR_CONNECT)
71051 + 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));
71052 +
71053 + return -EACCES;
71054 +}
71055 +
71056 +int
71057 +gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
71058 +{
71059 + /* always allow disconnection of dgram sockets with connect */
71060 + if (addr->sin_family == AF_UNSPEC)
71061 + return 0;
71062 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
71063 +}
71064 +
71065 +int
71066 +gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
71067 +{
71068 + return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
71069 +}
71070 +
71071 +int gr_search_listen(struct socket *sock)
71072 +{
71073 + struct sock *sk = sock->sk;
71074 + struct sockaddr_in addr;
71075 +
71076 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
71077 + addr.sin_port = inet_sk(sk)->inet_sport;
71078 +
71079 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
71080 +}
71081 +
71082 +int gr_search_accept(struct socket *sock)
71083 +{
71084 + struct sock *sk = sock->sk;
71085 + struct sockaddr_in addr;
71086 +
71087 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
71088 + addr.sin_port = inet_sk(sk)->inet_sport;
71089 +
71090 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
71091 +}
71092 +
71093 +int
71094 +gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
71095 +{
71096 + if (addr)
71097 + return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
71098 + else {
71099 + struct sockaddr_in sin;
71100 + const struct inet_sock *inet = inet_sk(sk);
71101 +
71102 + sin.sin_addr.s_addr = inet->inet_daddr;
71103 + sin.sin_port = inet->inet_dport;
71104 +
71105 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
71106 + }
71107 +}
71108 +
71109 +int
71110 +gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
71111 +{
71112 + struct sockaddr_in sin;
71113 +
71114 + if (unlikely(skb->len < sizeof (struct udphdr)))
71115 + return 0; // skip this packet
71116 +
71117 + sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
71118 + sin.sin_port = udp_hdr(skb)->source;
71119 +
71120 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
71121 +}
71122 diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
71123 new file mode 100644
71124 index 0000000..25f54ef
71125 --- /dev/null
71126 +++ b/grsecurity/gracl_learn.c
71127 @@ -0,0 +1,207 @@
71128 +#include <linux/kernel.h>
71129 +#include <linux/mm.h>
71130 +#include <linux/sched.h>
71131 +#include <linux/poll.h>
71132 +#include <linux/string.h>
71133 +#include <linux/file.h>
71134 +#include <linux/types.h>
71135 +#include <linux/vmalloc.h>
71136 +#include <linux/grinternal.h>
71137 +
71138 +extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
71139 + size_t count, loff_t *ppos);
71140 +extern int gr_acl_is_enabled(void);
71141 +
71142 +static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
71143 +static int gr_learn_attached;
71144 +
71145 +/* use a 512k buffer */
71146 +#define LEARN_BUFFER_SIZE (512 * 1024)
71147 +
71148 +static DEFINE_SPINLOCK(gr_learn_lock);
71149 +static DEFINE_MUTEX(gr_learn_user_mutex);
71150 +
71151 +/* we need to maintain two buffers, so that the kernel context of grlearn
71152 + uses a semaphore around the userspace copying, and the other kernel contexts
71153 + use a spinlock when copying into the buffer, since they cannot sleep
71154 +*/
71155 +static char *learn_buffer;
71156 +static char *learn_buffer_user;
71157 +static int learn_buffer_len;
71158 +static int learn_buffer_user_len;
71159 +
71160 +static ssize_t
71161 +read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
71162 +{
71163 + DECLARE_WAITQUEUE(wait, current);
71164 + ssize_t retval = 0;
71165 +
71166 + add_wait_queue(&learn_wait, &wait);
71167 + set_current_state(TASK_INTERRUPTIBLE);
71168 + do {
71169 + mutex_lock(&gr_learn_user_mutex);
71170 + spin_lock(&gr_learn_lock);
71171 + if (learn_buffer_len)
71172 + break;
71173 + spin_unlock(&gr_learn_lock);
71174 + mutex_unlock(&gr_learn_user_mutex);
71175 + if (file->f_flags & O_NONBLOCK) {
71176 + retval = -EAGAIN;
71177 + goto out;
71178 + }
71179 + if (signal_pending(current)) {
71180 + retval = -ERESTARTSYS;
71181 + goto out;
71182 + }
71183 +
71184 + schedule();
71185 + } while (1);
71186 +
71187 + memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
71188 + learn_buffer_user_len = learn_buffer_len;
71189 + retval = learn_buffer_len;
71190 + learn_buffer_len = 0;
71191 +
71192 + spin_unlock(&gr_learn_lock);
71193 +
71194 + if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
71195 + retval = -EFAULT;
71196 +
71197 + mutex_unlock(&gr_learn_user_mutex);
71198 +out:
71199 + set_current_state(TASK_RUNNING);
71200 + remove_wait_queue(&learn_wait, &wait);
71201 + return retval;
71202 +}
71203 +
71204 +static unsigned int
71205 +poll_learn(struct file * file, poll_table * wait)
71206 +{
71207 + poll_wait(file, &learn_wait, wait);
71208 +
71209 + if (learn_buffer_len)
71210 + return (POLLIN | POLLRDNORM);
71211 +
71212 + return 0;
71213 +}
71214 +
71215 +void
71216 +gr_clear_learn_entries(void)
71217 +{
71218 + char *tmp;
71219 +
71220 + mutex_lock(&gr_learn_user_mutex);
71221 + spin_lock(&gr_learn_lock);
71222 + tmp = learn_buffer;
71223 + learn_buffer = NULL;
71224 + spin_unlock(&gr_learn_lock);
71225 + if (tmp)
71226 + vfree(tmp);
71227 + if (learn_buffer_user != NULL) {
71228 + vfree(learn_buffer_user);
71229 + learn_buffer_user = NULL;
71230 + }
71231 + learn_buffer_len = 0;
71232 + mutex_unlock(&gr_learn_user_mutex);
71233 +
71234 + return;
71235 +}
71236 +
71237 +void
71238 +gr_add_learn_entry(const char *fmt, ...)
71239 +{
71240 + va_list args;
71241 + unsigned int len;
71242 +
71243 + if (!gr_learn_attached)
71244 + return;
71245 +
71246 + spin_lock(&gr_learn_lock);
71247 +
71248 + /* leave a gap at the end so we know when it's "full" but don't have to
71249 + compute the exact length of the string we're trying to append
71250 + */
71251 + if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
71252 + spin_unlock(&gr_learn_lock);
71253 + wake_up_interruptible(&learn_wait);
71254 + return;
71255 + }
71256 + if (learn_buffer == NULL) {
71257 + spin_unlock(&gr_learn_lock);
71258 + return;
71259 + }
71260 +
71261 + va_start(args, fmt);
71262 + len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
71263 + va_end(args);
71264 +
71265 + learn_buffer_len += len + 1;
71266 +
71267 + spin_unlock(&gr_learn_lock);
71268 + wake_up_interruptible(&learn_wait);
71269 +
71270 + return;
71271 +}
71272 +
71273 +static int
71274 +open_learn(struct inode *inode, struct file *file)
71275 +{
71276 + if (file->f_mode & FMODE_READ && gr_learn_attached)
71277 + return -EBUSY;
71278 + if (file->f_mode & FMODE_READ) {
71279 + int retval = 0;
71280 + mutex_lock(&gr_learn_user_mutex);
71281 + if (learn_buffer == NULL)
71282 + learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
71283 + if (learn_buffer_user == NULL)
71284 + learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
71285 + if (learn_buffer == NULL) {
71286 + retval = -ENOMEM;
71287 + goto out_error;
71288 + }
71289 + if (learn_buffer_user == NULL) {
71290 + retval = -ENOMEM;
71291 + goto out_error;
71292 + }
71293 + learn_buffer_len = 0;
71294 + learn_buffer_user_len = 0;
71295 + gr_learn_attached = 1;
71296 +out_error:
71297 + mutex_unlock(&gr_learn_user_mutex);
71298 + return retval;
71299 + }
71300 + return 0;
71301 +}
71302 +
71303 +static int
71304 +close_learn(struct inode *inode, struct file *file)
71305 +{
71306 + if (file->f_mode & FMODE_READ) {
71307 + char *tmp = NULL;
71308 + mutex_lock(&gr_learn_user_mutex);
71309 + spin_lock(&gr_learn_lock);
71310 + tmp = learn_buffer;
71311 + learn_buffer = NULL;
71312 + spin_unlock(&gr_learn_lock);
71313 + if (tmp)
71314 + vfree(tmp);
71315 + if (learn_buffer_user != NULL) {
71316 + vfree(learn_buffer_user);
71317 + learn_buffer_user = NULL;
71318 + }
71319 + learn_buffer_len = 0;
71320 + learn_buffer_user_len = 0;
71321 + gr_learn_attached = 0;
71322 + mutex_unlock(&gr_learn_user_mutex);
71323 + }
71324 +
71325 + return 0;
71326 +}
71327 +
71328 +const struct file_operations grsec_fops = {
71329 + .read = read_learn,
71330 + .write = write_grsec_handler,
71331 + .open = open_learn,
71332 + .release = close_learn,
71333 + .poll = poll_learn,
71334 +};
71335 diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
71336 new file mode 100644
71337 index 0000000..361a099
71338 --- /dev/null
71339 +++ b/grsecurity/gracl_policy.c
71340 @@ -0,0 +1,1782 @@
71341 +#include <linux/kernel.h>
71342 +#include <linux/module.h>
71343 +#include <linux/sched.h>
71344 +#include <linux/mm.h>
71345 +#include <linux/file.h>
71346 +#include <linux/fs.h>
71347 +#include <linux/namei.h>
71348 +#include <linux/mount.h>
71349 +#include <linux/tty.h>
71350 +#include <linux/proc_fs.h>
71351 +#include <linux/lglock.h>
71352 +#include <linux/slab.h>
71353 +#include <linux/vmalloc.h>
71354 +#include <linux/types.h>
71355 +#include <linux/sysctl.h>
71356 +#include <linux/netdevice.h>
71357 +#include <linux/ptrace.h>
71358 +#include <linux/gracl.h>
71359 +#include <linux/gralloc.h>
71360 +#include <linux/security.h>
71361 +#include <linux/grinternal.h>
71362 +#include <linux/pid_namespace.h>
71363 +#include <linux/stop_machine.h>
71364 +#include <linux/fdtable.h>
71365 +#include <linux/percpu.h>
71366 +#include <linux/lglock.h>
71367 +#include <linux/hugetlb.h>
71368 +#include <linux/posix-timers.h>
71369 +#include "../fs/mount.h"
71370 +
71371 +#include <asm/uaccess.h>
71372 +#include <asm/errno.h>
71373 +#include <asm/mman.h>
71374 +
71375 +extern struct gr_policy_state *polstate;
71376 +
71377 +#define FOR_EACH_ROLE_START(role) \
71378 + role = polstate->role_list; \
71379 + while (role) {
71380 +
71381 +#define FOR_EACH_ROLE_END(role) \
71382 + role = role->prev; \
71383 + }
71384 +
71385 +struct path gr_real_root;
71386 +
71387 +extern struct gr_alloc_state *current_alloc_state;
71388 +
71389 +u16 acl_sp_role_value;
71390 +
71391 +static DEFINE_MUTEX(gr_dev_mutex);
71392 +
71393 +extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
71394 +extern void gr_clear_learn_entries(void);
71395 +
71396 +static struct gr_arg gr_usermode;
71397 +static unsigned char gr_system_salt[GR_SALT_LEN];
71398 +static unsigned char gr_system_sum[GR_SHA_LEN];
71399 +
71400 +static unsigned int gr_auth_attempts = 0;
71401 +static unsigned long gr_auth_expires = 0UL;
71402 +
71403 +struct acl_object_label *fakefs_obj_rw;
71404 +struct acl_object_label *fakefs_obj_rwx;
71405 +
71406 +extern int gr_init_uidset(void);
71407 +extern void gr_free_uidset(void);
71408 +extern void gr_remove_uid(uid_t uid);
71409 +extern int gr_find_uid(uid_t uid);
71410 +
71411 +extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
71412 +extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
71413 +extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
71414 +extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
71415 +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);
71416 +extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
71417 +extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
71418 +extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
71419 +extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
71420 +extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
71421 +extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
71422 +extern void assign_special_role(const char *rolename);
71423 +extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
71424 +extern int gr_rbac_disable(void *unused);
71425 +extern void gr_enable_rbac_system(void);
71426 +
71427 +static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
71428 +{
71429 + if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
71430 + return -EFAULT;
71431 +
71432 + return 0;
71433 +}
71434 +
71435 +static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
71436 +{
71437 + if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
71438 + return -EFAULT;
71439 +
71440 + return 0;
71441 +}
71442 +
71443 +static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
71444 +{
71445 + if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
71446 + return -EFAULT;
71447 +
71448 + return 0;
71449 +}
71450 +
71451 +static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
71452 +{
71453 + if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
71454 + return -EFAULT;
71455 +
71456 + return 0;
71457 +}
71458 +
71459 +static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
71460 +{
71461 + if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
71462 + return -EFAULT;
71463 +
71464 + return 0;
71465 +}
71466 +
71467 +static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
71468 +{
71469 + if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
71470 + return -EFAULT;
71471 +
71472 + return 0;
71473 +}
71474 +
71475 +static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
71476 +{
71477 + if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
71478 + return -EFAULT;
71479 +
71480 + return 0;
71481 +}
71482 +
71483 +static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
71484 +{
71485 + if (copy_from_user(trans, userp, sizeof(struct role_transition)))
71486 + return -EFAULT;
71487 +
71488 + return 0;
71489 +}
71490 +
71491 +int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
71492 +{
71493 + if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
71494 + return -EFAULT;
71495 +
71496 + return 0;
71497 +}
71498 +
71499 +static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
71500 +{
71501 + if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
71502 + return -EFAULT;
71503 +
71504 + if (((uwrap->version != GRSECURITY_VERSION) &&
71505 + (uwrap->version != 0x2901)) ||
71506 + (uwrap->size != sizeof(struct gr_arg)))
71507 + return -EINVAL;
71508 +
71509 + return 0;
71510 +}
71511 +
71512 +static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
71513 +{
71514 + if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
71515 + return -EFAULT;
71516 +
71517 + return 0;
71518 +}
71519 +
71520 +static size_t get_gr_arg_wrapper_size_normal(void)
71521 +{
71522 + return sizeof(struct gr_arg_wrapper);
71523 +}
71524 +
71525 +#ifdef CONFIG_COMPAT
71526 +extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
71527 +extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
71528 +extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
71529 +extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
71530 +extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
71531 +extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
71532 +extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
71533 +extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
71534 +extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
71535 +extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
71536 +extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
71537 +extern size_t get_gr_arg_wrapper_size_compat(void);
71538 +
71539 +int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
71540 +int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
71541 +int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
71542 +int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
71543 +int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
71544 +int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
71545 +int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
71546 +int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
71547 +int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
71548 +int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
71549 +int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
71550 +size_t (* get_gr_arg_wrapper_size)(void) __read_only;
71551 +
71552 +#else
71553 +#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
71554 +#define copy_gr_arg copy_gr_arg_normal
71555 +#define copy_gr_hash_struct copy_gr_hash_struct_normal
71556 +#define copy_acl_object_label copy_acl_object_label_normal
71557 +#define copy_acl_subject_label copy_acl_subject_label_normal
71558 +#define copy_acl_role_label copy_acl_role_label_normal
71559 +#define copy_acl_ip_label copy_acl_ip_label_normal
71560 +#define copy_pointer_from_array copy_pointer_from_array_normal
71561 +#define copy_sprole_pw copy_sprole_pw_normal
71562 +#define copy_role_transition copy_role_transition_normal
71563 +#define copy_role_allowed_ip copy_role_allowed_ip_normal
71564 +#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
71565 +#endif
71566 +
71567 +static struct acl_subject_label *
71568 +lookup_subject_map(const struct acl_subject_label *userp)
71569 +{
71570 + unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
71571 + struct subject_map *match;
71572 +
71573 + match = polstate->subj_map_set.s_hash[index];
71574 +
71575 + while (match && match->user != userp)
71576 + match = match->next;
71577 +
71578 + if (match != NULL)
71579 + return match->kernel;
71580 + else
71581 + return NULL;
71582 +}
71583 +
71584 +static void
71585 +insert_subj_map_entry(struct subject_map *subjmap)
71586 +{
71587 + unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
71588 + struct subject_map **curr;
71589 +
71590 + subjmap->prev = NULL;
71591 +
71592 + curr = &polstate->subj_map_set.s_hash[index];
71593 + if (*curr != NULL)
71594 + (*curr)->prev = subjmap;
71595 +
71596 + subjmap->next = *curr;
71597 + *curr = subjmap;
71598 +
71599 + return;
71600 +}
71601 +
71602 +static void
71603 +__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
71604 +{
71605 + unsigned int index =
71606 + gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
71607 + struct acl_role_label **curr;
71608 + struct acl_role_label *tmp, *tmp2;
71609 +
71610 + curr = &polstate->acl_role_set.r_hash[index];
71611 +
71612 + /* simple case, slot is empty, just set it to our role */
71613 + if (*curr == NULL) {
71614 + *curr = role;
71615 + } else {
71616 + /* example:
71617 + 1 -> 2 -> 3 (adding 2 -> 3 to here)
71618 + 2 -> 3
71619 + */
71620 + /* first check to see if we can already be reached via this slot */
71621 + tmp = *curr;
71622 + while (tmp && tmp != role)
71623 + tmp = tmp->next;
71624 + if (tmp == role) {
71625 + /* we don't need to add ourselves to this slot's chain */
71626 + return;
71627 + }
71628 + /* we need to add ourselves to this chain, two cases */
71629 + if (role->next == NULL) {
71630 + /* simple case, append the current chain to our role */
71631 + role->next = *curr;
71632 + *curr = role;
71633 + } else {
71634 + /* 1 -> 2 -> 3 -> 4
71635 + 2 -> 3 -> 4
71636 + 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
71637 + */
71638 + /* trickier case: walk our role's chain until we find
71639 + the role for the start of the current slot's chain */
71640 + tmp = role;
71641 + tmp2 = *curr;
71642 + while (tmp->next && tmp->next != tmp2)
71643 + tmp = tmp->next;
71644 + if (tmp->next == tmp2) {
71645 + /* from example above, we found 3, so just
71646 + replace this slot's chain with ours */
71647 + *curr = role;
71648 + } else {
71649 + /* we didn't find a subset of our role's chain
71650 + in the current slot's chain, so append their
71651 + chain to ours, and set us as the first role in
71652 + the slot's chain
71653 +
71654 + we could fold this case with the case above,
71655 + but making it explicit for clarity
71656 + */
71657 + tmp->next = tmp2;
71658 + *curr = role;
71659 + }
71660 + }
71661 + }
71662 +
71663 + return;
71664 +}
71665 +
71666 +static void
71667 +insert_acl_role_label(struct acl_role_label *role)
71668 +{
71669 + int i;
71670 +
71671 + if (polstate->role_list == NULL) {
71672 + polstate->role_list = role;
71673 + role->prev = NULL;
71674 + } else {
71675 + role->prev = polstate->role_list;
71676 + polstate->role_list = role;
71677 + }
71678 +
71679 + /* used for hash chains */
71680 + role->next = NULL;
71681 +
71682 + if (role->roletype & GR_ROLE_DOMAIN) {
71683 + for (i = 0; i < role->domain_child_num; i++)
71684 + __insert_acl_role_label(role, role->domain_children[i]);
71685 + } else
71686 + __insert_acl_role_label(role, role->uidgid);
71687 +}
71688 +
71689 +static int
71690 +insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
71691 +{
71692 + struct name_entry **curr, *nentry;
71693 + struct inodev_entry *ientry;
71694 + unsigned int len = strlen(name);
71695 + unsigned int key = full_name_hash(name, len);
71696 + unsigned int index = key % polstate->name_set.n_size;
71697 +
71698 + curr = &polstate->name_set.n_hash[index];
71699 +
71700 + while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
71701 + curr = &((*curr)->next);
71702 +
71703 + if (*curr != NULL)
71704 + return 1;
71705 +
71706 + nentry = acl_alloc(sizeof (struct name_entry));
71707 + if (nentry == NULL)
71708 + return 0;
71709 + ientry = acl_alloc(sizeof (struct inodev_entry));
71710 + if (ientry == NULL)
71711 + return 0;
71712 + ientry->nentry = nentry;
71713 +
71714 + nentry->key = key;
71715 + nentry->name = name;
71716 + nentry->inode = inode;
71717 + nentry->device = device;
71718 + nentry->len = len;
71719 + nentry->deleted = deleted;
71720 +
71721 + nentry->prev = NULL;
71722 + curr = &polstate->name_set.n_hash[index];
71723 + if (*curr != NULL)
71724 + (*curr)->prev = nentry;
71725 + nentry->next = *curr;
71726 + *curr = nentry;
71727 +
71728 + /* insert us into the table searchable by inode/dev */
71729 + __insert_inodev_entry(polstate, ientry);
71730 +
71731 + return 1;
71732 +}
71733 +
71734 +/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
71735 +
71736 +static void *
71737 +create_table(__u32 * len, int elementsize)
71738 +{
71739 + unsigned int table_sizes[] = {
71740 + 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
71741 + 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
71742 + 4194301, 8388593, 16777213, 33554393, 67108859
71743 + };
71744 + void *newtable = NULL;
71745 + unsigned int pwr = 0;
71746 +
71747 + while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
71748 + table_sizes[pwr] <= *len)
71749 + pwr++;
71750 +
71751 + if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
71752 + return newtable;
71753 +
71754 + if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
71755 + newtable =
71756 + kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
71757 + else
71758 + newtable = vmalloc(table_sizes[pwr] * elementsize);
71759 +
71760 + *len = table_sizes[pwr];
71761 +
71762 + return newtable;
71763 +}
71764 +
71765 +static int
71766 +init_variables(const struct gr_arg *arg, bool reload)
71767 +{
71768 + struct task_struct *reaper = init_pid_ns.child_reaper;
71769 + unsigned int stacksize;
71770 +
71771 + polstate->subj_map_set.s_size = arg->role_db.num_subjects;
71772 + polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
71773 + polstate->name_set.n_size = arg->role_db.num_objects;
71774 + polstate->inodev_set.i_size = arg->role_db.num_objects;
71775 +
71776 + if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
71777 + !polstate->name_set.n_size || !polstate->inodev_set.i_size)
71778 + return 1;
71779 +
71780 + if (!reload) {
71781 + if (!gr_init_uidset())
71782 + return 1;
71783 + }
71784 +
71785 + /* set up the stack that holds allocation info */
71786 +
71787 + stacksize = arg->role_db.num_pointers + 5;
71788 +
71789 + if (!acl_alloc_stack_init(stacksize))
71790 + return 1;
71791 +
71792 + if (!reload) {
71793 + /* grab reference for the real root dentry and vfsmount */
71794 + get_fs_root(reaper->fs, &gr_real_root);
71795 +
71796 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71797 + 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);
71798 +#endif
71799 +
71800 + fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
71801 + if (fakefs_obj_rw == NULL)
71802 + return 1;
71803 + fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
71804 +
71805 + fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
71806 + if (fakefs_obj_rwx == NULL)
71807 + return 1;
71808 + fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
71809 + }
71810 +
71811 + polstate->subj_map_set.s_hash =
71812 + (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
71813 + polstate->acl_role_set.r_hash =
71814 + (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
71815 + polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
71816 + polstate->inodev_set.i_hash =
71817 + (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
71818 +
71819 + if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
71820 + !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
71821 + return 1;
71822 +
71823 + memset(polstate->subj_map_set.s_hash, 0,
71824 + sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
71825 + memset(polstate->acl_role_set.r_hash, 0,
71826 + sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
71827 + memset(polstate->name_set.n_hash, 0,
71828 + sizeof (struct name_entry *) * polstate->name_set.n_size);
71829 + memset(polstate->inodev_set.i_hash, 0,
71830 + sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
71831 +
71832 + return 0;
71833 +}
71834 +
71835 +/* free information not needed after startup
71836 + currently contains user->kernel pointer mappings for subjects
71837 +*/
71838 +
71839 +static void
71840 +free_init_variables(void)
71841 +{
71842 + __u32 i;
71843 +
71844 + if (polstate->subj_map_set.s_hash) {
71845 + for (i = 0; i < polstate->subj_map_set.s_size; i++) {
71846 + if (polstate->subj_map_set.s_hash[i]) {
71847 + kfree(polstate->subj_map_set.s_hash[i]);
71848 + polstate->subj_map_set.s_hash[i] = NULL;
71849 + }
71850 + }
71851 +
71852 + if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
71853 + PAGE_SIZE)
71854 + kfree(polstate->subj_map_set.s_hash);
71855 + else
71856 + vfree(polstate->subj_map_set.s_hash);
71857 + }
71858 +
71859 + return;
71860 +}
71861 +
71862 +static void
71863 +free_variables(bool reload)
71864 +{
71865 + struct acl_subject_label *s;
71866 + struct acl_role_label *r;
71867 + struct task_struct *task, *task2;
71868 + unsigned int x;
71869 +
71870 + if (!reload) {
71871 + gr_clear_learn_entries();
71872 +
71873 + read_lock(&tasklist_lock);
71874 + do_each_thread(task2, task) {
71875 + task->acl_sp_role = 0;
71876 + task->acl_role_id = 0;
71877 + task->inherited = 0;
71878 + task->acl = NULL;
71879 + task->role = NULL;
71880 + } while_each_thread(task2, task);
71881 + read_unlock(&tasklist_lock);
71882 +
71883 + kfree(fakefs_obj_rw);
71884 + fakefs_obj_rw = NULL;
71885 + kfree(fakefs_obj_rwx);
71886 + fakefs_obj_rwx = NULL;
71887 +
71888 + /* release the reference to the real root dentry and vfsmount */
71889 + path_put(&gr_real_root);
71890 + memset(&gr_real_root, 0, sizeof(gr_real_root));
71891 + }
71892 +
71893 + /* free all object hash tables */
71894 +
71895 + FOR_EACH_ROLE_START(r)
71896 + if (r->subj_hash == NULL)
71897 + goto next_role;
71898 + FOR_EACH_SUBJECT_START(r, s, x)
71899 + if (s->obj_hash == NULL)
71900 + break;
71901 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
71902 + kfree(s->obj_hash);
71903 + else
71904 + vfree(s->obj_hash);
71905 + FOR_EACH_SUBJECT_END(s, x)
71906 + FOR_EACH_NESTED_SUBJECT_START(r, s)
71907 + if (s->obj_hash == NULL)
71908 + break;
71909 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
71910 + kfree(s->obj_hash);
71911 + else
71912 + vfree(s->obj_hash);
71913 + FOR_EACH_NESTED_SUBJECT_END(s)
71914 + if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
71915 + kfree(r->subj_hash);
71916 + else
71917 + vfree(r->subj_hash);
71918 + r->subj_hash = NULL;
71919 +next_role:
71920 + FOR_EACH_ROLE_END(r)
71921 +
71922 + acl_free_all();
71923 +
71924 + if (polstate->acl_role_set.r_hash) {
71925 + if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
71926 + PAGE_SIZE)
71927 + kfree(polstate->acl_role_set.r_hash);
71928 + else
71929 + vfree(polstate->acl_role_set.r_hash);
71930 + }
71931 + if (polstate->name_set.n_hash) {
71932 + if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
71933 + PAGE_SIZE)
71934 + kfree(polstate->name_set.n_hash);
71935 + else
71936 + vfree(polstate->name_set.n_hash);
71937 + }
71938 +
71939 + if (polstate->inodev_set.i_hash) {
71940 + if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
71941 + PAGE_SIZE)
71942 + kfree(polstate->inodev_set.i_hash);
71943 + else
71944 + vfree(polstate->inodev_set.i_hash);
71945 + }
71946 +
71947 + if (!reload)
71948 + gr_free_uidset();
71949 +
71950 + memset(&polstate->name_set, 0, sizeof (struct name_db));
71951 + memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
71952 + memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
71953 + memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
71954 +
71955 + polstate->default_role = NULL;
71956 + polstate->kernel_role = NULL;
71957 + polstate->role_list = NULL;
71958 +
71959 + return;
71960 +}
71961 +
71962 +static struct acl_subject_label *
71963 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
71964 +
71965 +static int alloc_and_copy_string(char **name, unsigned int maxlen)
71966 +{
71967 + unsigned int len = strnlen_user(*name, maxlen);
71968 + char *tmp;
71969 +
71970 + if (!len || len >= maxlen)
71971 + return -EINVAL;
71972 +
71973 + if ((tmp = (char *) acl_alloc(len)) == NULL)
71974 + return -ENOMEM;
71975 +
71976 + if (copy_from_user(tmp, *name, len))
71977 + return -EFAULT;
71978 +
71979 + tmp[len-1] = '\0';
71980 + *name = tmp;
71981 +
71982 + return 0;
71983 +}
71984 +
71985 +static int
71986 +copy_user_glob(struct acl_object_label *obj)
71987 +{
71988 + struct acl_object_label *g_tmp, **guser;
71989 + int error;
71990 +
71991 + if (obj->globbed == NULL)
71992 + return 0;
71993 +
71994 + guser = &obj->globbed;
71995 + while (*guser) {
71996 + g_tmp = (struct acl_object_label *)
71997 + acl_alloc(sizeof (struct acl_object_label));
71998 + if (g_tmp == NULL)
71999 + return -ENOMEM;
72000 +
72001 + if (copy_acl_object_label(g_tmp, *guser))
72002 + return -EFAULT;
72003 +
72004 + error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
72005 + if (error)
72006 + return error;
72007 +
72008 + *guser = g_tmp;
72009 + guser = &(g_tmp->next);
72010 + }
72011 +
72012 + return 0;
72013 +}
72014 +
72015 +static int
72016 +copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
72017 + struct acl_role_label *role)
72018 +{
72019 + struct acl_object_label *o_tmp;
72020 + int ret;
72021 +
72022 + while (userp) {
72023 + if ((o_tmp = (struct acl_object_label *)
72024 + acl_alloc(sizeof (struct acl_object_label))) == NULL)
72025 + return -ENOMEM;
72026 +
72027 + if (copy_acl_object_label(o_tmp, userp))
72028 + return -EFAULT;
72029 +
72030 + userp = o_tmp->prev;
72031 +
72032 + ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
72033 + if (ret)
72034 + return ret;
72035 +
72036 + insert_acl_obj_label(o_tmp, subj);
72037 + if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
72038 + o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
72039 + return -ENOMEM;
72040 +
72041 + ret = copy_user_glob(o_tmp);
72042 + if (ret)
72043 + return ret;
72044 +
72045 + if (o_tmp->nested) {
72046 + int already_copied;
72047 +
72048 + o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
72049 + if (IS_ERR(o_tmp->nested))
72050 + return PTR_ERR(o_tmp->nested);
72051 +
72052 + /* insert into nested subject list if we haven't copied this one yet
72053 + to prevent duplicate entries */
72054 + if (!already_copied) {
72055 + o_tmp->nested->next = role->hash->first;
72056 + role->hash->first = o_tmp->nested;
72057 + }
72058 + }
72059 + }
72060 +
72061 + return 0;
72062 +}
72063 +
72064 +static __u32
72065 +count_user_subjs(struct acl_subject_label *userp)
72066 +{
72067 + struct acl_subject_label s_tmp;
72068 + __u32 num = 0;
72069 +
72070 + while (userp) {
72071 + if (copy_acl_subject_label(&s_tmp, userp))
72072 + break;
72073 +
72074 + userp = s_tmp.prev;
72075 + }
72076 +
72077 + return num;
72078 +}
72079 +
72080 +static int
72081 +copy_user_allowedips(struct acl_role_label *rolep)
72082 +{
72083 + struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
72084 +
72085 + ruserip = rolep->allowed_ips;
72086 +
72087 + while (ruserip) {
72088 + rlast = rtmp;
72089 +
72090 + if ((rtmp = (struct role_allowed_ip *)
72091 + acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
72092 + return -ENOMEM;
72093 +
72094 + if (copy_role_allowed_ip(rtmp, ruserip))
72095 + return -EFAULT;
72096 +
72097 + ruserip = rtmp->prev;
72098 +
72099 + if (!rlast) {
72100 + rtmp->prev = NULL;
72101 + rolep->allowed_ips = rtmp;
72102 + } else {
72103 + rlast->next = rtmp;
72104 + rtmp->prev = rlast;
72105 + }
72106 +
72107 + if (!ruserip)
72108 + rtmp->next = NULL;
72109 + }
72110 +
72111 + return 0;
72112 +}
72113 +
72114 +static int
72115 +copy_user_transitions(struct acl_role_label *rolep)
72116 +{
72117 + struct role_transition *rusertp, *rtmp = NULL, *rlast;
72118 + int error;
72119 +
72120 + rusertp = rolep->transitions;
72121 +
72122 + while (rusertp) {
72123 + rlast = rtmp;
72124 +
72125 + if ((rtmp = (struct role_transition *)
72126 + acl_alloc(sizeof (struct role_transition))) == NULL)
72127 + return -ENOMEM;
72128 +
72129 + if (copy_role_transition(rtmp, rusertp))
72130 + return -EFAULT;
72131 +
72132 + rusertp = rtmp->prev;
72133 +
72134 + error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
72135 + if (error)
72136 + return error;
72137 +
72138 + if (!rlast) {
72139 + rtmp->prev = NULL;
72140 + rolep->transitions = rtmp;
72141 + } else {
72142 + rlast->next = rtmp;
72143 + rtmp->prev = rlast;
72144 + }
72145 +
72146 + if (!rusertp)
72147 + rtmp->next = NULL;
72148 + }
72149 +
72150 + return 0;
72151 +}
72152 +
72153 +static __u32 count_user_objs(const struct acl_object_label __user *userp)
72154 +{
72155 + struct acl_object_label o_tmp;
72156 + __u32 num = 0;
72157 +
72158 + while (userp) {
72159 + if (copy_acl_object_label(&o_tmp, userp))
72160 + break;
72161 +
72162 + userp = o_tmp.prev;
72163 + num++;
72164 + }
72165 +
72166 + return num;
72167 +}
72168 +
72169 +static struct acl_subject_label *
72170 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
72171 +{
72172 + struct acl_subject_label *s_tmp = NULL, *s_tmp2;
72173 + __u32 num_objs;
72174 + struct acl_ip_label **i_tmp, *i_utmp2;
72175 + struct gr_hash_struct ghash;
72176 + struct subject_map *subjmap;
72177 + unsigned int i_num;
72178 + int err;
72179 +
72180 + if (already_copied != NULL)
72181 + *already_copied = 0;
72182 +
72183 + s_tmp = lookup_subject_map(userp);
72184 +
72185 + /* we've already copied this subject into the kernel, just return
72186 + the reference to it, and don't copy it over again
72187 + */
72188 + if (s_tmp) {
72189 + if (already_copied != NULL)
72190 + *already_copied = 1;
72191 + return(s_tmp);
72192 + }
72193 +
72194 + if ((s_tmp = (struct acl_subject_label *)
72195 + acl_alloc(sizeof (struct acl_subject_label))) == NULL)
72196 + return ERR_PTR(-ENOMEM);
72197 +
72198 + subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
72199 + if (subjmap == NULL)
72200 + return ERR_PTR(-ENOMEM);
72201 +
72202 + subjmap->user = userp;
72203 + subjmap->kernel = s_tmp;
72204 + insert_subj_map_entry(subjmap);
72205 +
72206 + if (copy_acl_subject_label(s_tmp, userp))
72207 + return ERR_PTR(-EFAULT);
72208 +
72209 + err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
72210 + if (err)
72211 + return ERR_PTR(err);
72212 +
72213 + if (!strcmp(s_tmp->filename, "/"))
72214 + role->root_label = s_tmp;
72215 +
72216 + if (copy_gr_hash_struct(&ghash, s_tmp->hash))
72217 + return ERR_PTR(-EFAULT);
72218 +
72219 + /* copy user and group transition tables */
72220 +
72221 + if (s_tmp->user_trans_num) {
72222 + uid_t *uidlist;
72223 +
72224 + uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
72225 + if (uidlist == NULL)
72226 + return ERR_PTR(-ENOMEM);
72227 + if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
72228 + return ERR_PTR(-EFAULT);
72229 +
72230 + s_tmp->user_transitions = uidlist;
72231 + }
72232 +
72233 + if (s_tmp->group_trans_num) {
72234 + gid_t *gidlist;
72235 +
72236 + gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
72237 + if (gidlist == NULL)
72238 + return ERR_PTR(-ENOMEM);
72239 + if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
72240 + return ERR_PTR(-EFAULT);
72241 +
72242 + s_tmp->group_transitions = gidlist;
72243 + }
72244 +
72245 + /* set up object hash table */
72246 + num_objs = count_user_objs(ghash.first);
72247 +
72248 + s_tmp->obj_hash_size = num_objs;
72249 + s_tmp->obj_hash =
72250 + (struct acl_object_label **)
72251 + create_table(&(s_tmp->obj_hash_size), sizeof(void *));
72252 +
72253 + if (!s_tmp->obj_hash)
72254 + return ERR_PTR(-ENOMEM);
72255 +
72256 + memset(s_tmp->obj_hash, 0,
72257 + s_tmp->obj_hash_size *
72258 + sizeof (struct acl_object_label *));
72259 +
72260 + /* add in objects */
72261 + err = copy_user_objs(ghash.first, s_tmp, role);
72262 +
72263 + if (err)
72264 + return ERR_PTR(err);
72265 +
72266 + /* set pointer for parent subject */
72267 + if (s_tmp->parent_subject) {
72268 + s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
72269 +
72270 + if (IS_ERR(s_tmp2))
72271 + return s_tmp2;
72272 +
72273 + s_tmp->parent_subject = s_tmp2;
72274 + }
72275 +
72276 + /* add in ip acls */
72277 +
72278 + if (!s_tmp->ip_num) {
72279 + s_tmp->ips = NULL;
72280 + goto insert;
72281 + }
72282 +
72283 + i_tmp =
72284 + (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
72285 + sizeof (struct acl_ip_label *));
72286 +
72287 + if (!i_tmp)
72288 + return ERR_PTR(-ENOMEM);
72289 +
72290 + for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
72291 + *(i_tmp + i_num) =
72292 + (struct acl_ip_label *)
72293 + acl_alloc(sizeof (struct acl_ip_label));
72294 + if (!*(i_tmp + i_num))
72295 + return ERR_PTR(-ENOMEM);
72296 +
72297 + if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
72298 + return ERR_PTR(-EFAULT);
72299 +
72300 + if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
72301 + return ERR_PTR(-EFAULT);
72302 +
72303 + if ((*(i_tmp + i_num))->iface == NULL)
72304 + continue;
72305 +
72306 + err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
72307 + if (err)
72308 + return ERR_PTR(err);
72309 + }
72310 +
72311 + s_tmp->ips = i_tmp;
72312 +
72313 +insert:
72314 + if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
72315 + s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
72316 + return ERR_PTR(-ENOMEM);
72317 +
72318 + return s_tmp;
72319 +}
72320 +
72321 +static int
72322 +copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
72323 +{
72324 + struct acl_subject_label s_pre;
72325 + struct acl_subject_label * ret;
72326 + int err;
72327 +
72328 + while (userp) {
72329 + if (copy_acl_subject_label(&s_pre, userp))
72330 + return -EFAULT;
72331 +
72332 + ret = do_copy_user_subj(userp, role, NULL);
72333 +
72334 + err = PTR_ERR(ret);
72335 + if (IS_ERR(ret))
72336 + return err;
72337 +
72338 + insert_acl_subj_label(ret, role);
72339 +
72340 + userp = s_pre.prev;
72341 + }
72342 +
72343 + return 0;
72344 +}
72345 +
72346 +static int
72347 +copy_user_acl(struct gr_arg *arg)
72348 +{
72349 + struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
72350 + struct acl_subject_label *subj_list;
72351 + struct sprole_pw *sptmp;
72352 + struct gr_hash_struct *ghash;
72353 + uid_t *domainlist;
72354 + unsigned int r_num;
72355 + int err = 0;
72356 + __u16 i;
72357 + __u32 num_subjs;
72358 +
72359 + /* we need a default and kernel role */
72360 + if (arg->role_db.num_roles < 2)
72361 + return -EINVAL;
72362 +
72363 + /* copy special role authentication info from userspace */
72364 +
72365 + polstate->num_sprole_pws = arg->num_sprole_pws;
72366 + polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
72367 +
72368 + if (!polstate->acl_special_roles && polstate->num_sprole_pws)
72369 + return -ENOMEM;
72370 +
72371 + for (i = 0; i < polstate->num_sprole_pws; i++) {
72372 + sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
72373 + if (!sptmp)
72374 + return -ENOMEM;
72375 + if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
72376 + return -EFAULT;
72377 +
72378 + err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
72379 + if (err)
72380 + return err;
72381 +
72382 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
72383 + printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
72384 +#endif
72385 +
72386 + polstate->acl_special_roles[i] = sptmp;
72387 + }
72388 +
72389 + r_utmp = (struct acl_role_label **) arg->role_db.r_table;
72390 +
72391 + for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
72392 + r_tmp = acl_alloc(sizeof (struct acl_role_label));
72393 +
72394 + if (!r_tmp)
72395 + return -ENOMEM;
72396 +
72397 + if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
72398 + return -EFAULT;
72399 +
72400 + if (copy_acl_role_label(r_tmp, r_utmp2))
72401 + return -EFAULT;
72402 +
72403 + err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
72404 + if (err)
72405 + return err;
72406 +
72407 + if (!strcmp(r_tmp->rolename, "default")
72408 + && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
72409 + polstate->default_role = r_tmp;
72410 + } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
72411 + polstate->kernel_role = r_tmp;
72412 + }
72413 +
72414 + if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
72415 + return -ENOMEM;
72416 +
72417 + if (copy_gr_hash_struct(ghash, r_tmp->hash))
72418 + return -EFAULT;
72419 +
72420 + r_tmp->hash = ghash;
72421 +
72422 + num_subjs = count_user_subjs(r_tmp->hash->first);
72423 +
72424 + r_tmp->subj_hash_size = num_subjs;
72425 + r_tmp->subj_hash =
72426 + (struct acl_subject_label **)
72427 + create_table(&(r_tmp->subj_hash_size), sizeof(void *));
72428 +
72429 + if (!r_tmp->subj_hash)
72430 + return -ENOMEM;
72431 +
72432 + err = copy_user_allowedips(r_tmp);
72433 + if (err)
72434 + return err;
72435 +
72436 + /* copy domain info */
72437 + if (r_tmp->domain_children != NULL) {
72438 + domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
72439 + if (domainlist == NULL)
72440 + return -ENOMEM;
72441 +
72442 + if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
72443 + return -EFAULT;
72444 +
72445 + r_tmp->domain_children = domainlist;
72446 + }
72447 +
72448 + err = copy_user_transitions(r_tmp);
72449 + if (err)
72450 + return err;
72451 +
72452 + memset(r_tmp->subj_hash, 0,
72453 + r_tmp->subj_hash_size *
72454 + sizeof (struct acl_subject_label *));
72455 +
72456 + /* acquire the list of subjects, then NULL out
72457 + the list prior to parsing the subjects for this role,
72458 + as during this parsing the list is replaced with a list
72459 + of *nested* subjects for the role
72460 + */
72461 + subj_list = r_tmp->hash->first;
72462 +
72463 + /* set nested subject list to null */
72464 + r_tmp->hash->first = NULL;
72465 +
72466 + err = copy_user_subjs(subj_list, r_tmp);
72467 +
72468 + if (err)
72469 + return err;
72470 +
72471 + insert_acl_role_label(r_tmp);
72472 + }
72473 +
72474 + if (polstate->default_role == NULL || polstate->kernel_role == NULL)
72475 + return -EINVAL;
72476 +
72477 + return err;
72478 +}
72479 +
72480 +static int gracl_reload_apply_policies(void *reload)
72481 +{
72482 + struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
72483 + struct task_struct *task, *task2;
72484 + struct acl_role_label *role, *rtmp;
72485 + struct acl_subject_label *subj;
72486 + const struct cred *cred;
72487 + int role_applied;
72488 + int ret = 0;
72489 +
72490 + memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
72491 + memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
72492 +
72493 + /* first make sure we'll be able to apply the new policy cleanly */
72494 + do_each_thread(task2, task) {
72495 + if (task->exec_file == NULL)
72496 + continue;
72497 + role_applied = 0;
72498 + if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
72499 + /* preserve special roles */
72500 + FOR_EACH_ROLE_START(role)
72501 + if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
72502 + rtmp = task->role;
72503 + task->role = role;
72504 + role_applied = 1;
72505 + break;
72506 + }
72507 + FOR_EACH_ROLE_END(role)
72508 + }
72509 + if (!role_applied) {
72510 + cred = __task_cred(task);
72511 + rtmp = task->role;
72512 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
72513 + }
72514 + /* this handles non-nested inherited subjects, nested subjects will still
72515 + be dropped currently */
72516 + subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
72517 + task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
72518 + /* change the role back so that we've made no modifications to the policy */
72519 + task->role = rtmp;
72520 +
72521 + if (subj == NULL || task->tmpacl == NULL) {
72522 + ret = -EINVAL;
72523 + goto out;
72524 + }
72525 + } while_each_thread(task2, task);
72526 +
72527 + /* now actually apply the policy */
72528 +
72529 + do_each_thread(task2, task) {
72530 + if (task->exec_file) {
72531 + role_applied = 0;
72532 + if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
72533 + /* preserve special roles */
72534 + FOR_EACH_ROLE_START(role)
72535 + if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
72536 + task->role = role;
72537 + role_applied = 1;
72538 + break;
72539 + }
72540 + FOR_EACH_ROLE_END(role)
72541 + }
72542 + if (!role_applied) {
72543 + cred = __task_cred(task);
72544 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
72545 + }
72546 + /* this handles non-nested inherited subjects, nested subjects will still
72547 + be dropped currently */
72548 + if (!reload_state->oldmode && task->inherited)
72549 + subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
72550 + else {
72551 + /* looked up and tagged to the task previously */
72552 + subj = task->tmpacl;
72553 + }
72554 + /* subj will be non-null */
72555 + __gr_apply_subject_to_task(polstate, task, subj);
72556 + if (reload_state->oldmode) {
72557 + task->acl_role_id = 0;
72558 + task->acl_sp_role = 0;
72559 + task->inherited = 0;
72560 + }
72561 + } else {
72562 + // it's a kernel process
72563 + task->role = polstate->kernel_role;
72564 + task->acl = polstate->kernel_role->root_label;
72565 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
72566 + task->acl->mode &= ~GR_PROCFIND;
72567 +#endif
72568 + }
72569 + } while_each_thread(task2, task);
72570 +
72571 + memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
72572 + memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
72573 +
72574 +out:
72575 +
72576 + return ret;
72577 +}
72578 +
72579 +static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
72580 +{
72581 + struct gr_reload_state new_reload_state = { };
72582 + int err;
72583 +
72584 + new_reload_state.oldpolicy_ptr = polstate;
72585 + new_reload_state.oldalloc_ptr = current_alloc_state;
72586 + new_reload_state.oldmode = oldmode;
72587 +
72588 + current_alloc_state = &new_reload_state.newalloc;
72589 + polstate = &new_reload_state.newpolicy;
72590 +
72591 + /* everything relevant is now saved off, copy in the new policy */
72592 + if (init_variables(args, true)) {
72593 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
72594 + err = -ENOMEM;
72595 + goto error;
72596 + }
72597 +
72598 + err = copy_user_acl(args);
72599 + free_init_variables();
72600 + if (err)
72601 + goto error;
72602 + /* the new policy is copied in, with the old policy available via saved_state
72603 + first go through applying roles, making sure to preserve special roles
72604 + then apply new subjects, making sure to preserve inherited and nested subjects,
72605 + though currently only inherited subjects will be preserved
72606 + */
72607 + err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
72608 + if (err)
72609 + goto error;
72610 +
72611 + /* we've now applied the new policy, so restore the old policy state to free it */
72612 + polstate = &new_reload_state.oldpolicy;
72613 + current_alloc_state = &new_reload_state.oldalloc;
72614 + free_variables(true);
72615 +
72616 + /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
72617 + to running_polstate/current_alloc_state inside stop_machine
72618 + */
72619 + err = 0;
72620 + goto out;
72621 +error:
72622 + /* on error of loading the new policy, we'll just keep the previous
72623 + policy set around
72624 + */
72625 + free_variables(true);
72626 +
72627 + /* doesn't affect runtime, but maintains consistent state */
72628 +out:
72629 + polstate = new_reload_state.oldpolicy_ptr;
72630 + current_alloc_state = new_reload_state.oldalloc_ptr;
72631 +
72632 + return err;
72633 +}
72634 +
72635 +static int
72636 +gracl_init(struct gr_arg *args)
72637 +{
72638 + int error = 0;
72639 +
72640 + memcpy(&gr_system_salt, args->salt, sizeof(gr_system_salt));
72641 + memcpy(&gr_system_sum, args->sum, sizeof(gr_system_sum));
72642 +
72643 + if (init_variables(args, false)) {
72644 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
72645 + error = -ENOMEM;
72646 + goto out;
72647 + }
72648 +
72649 + error = copy_user_acl(args);
72650 + free_init_variables();
72651 + if (error)
72652 + goto out;
72653 +
72654 + error = gr_set_acls(0);
72655 + if (error)
72656 + goto out;
72657 +
72658 + gr_enable_rbac_system();
72659 +
72660 + return 0;
72661 +
72662 +out:
72663 + free_variables(false);
72664 + return error;
72665 +}
72666 +
72667 +static int
72668 +lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
72669 + unsigned char **sum)
72670 +{
72671 + struct acl_role_label *r;
72672 + struct role_allowed_ip *ipp;
72673 + struct role_transition *trans;
72674 + unsigned int i;
72675 + int found = 0;
72676 + u32 curr_ip = current->signal->curr_ip;
72677 +
72678 + current->signal->saved_ip = curr_ip;
72679 +
72680 + /* check transition table */
72681 +
72682 + for (trans = current->role->transitions; trans; trans = trans->next) {
72683 + if (!strcmp(rolename, trans->rolename)) {
72684 + found = 1;
72685 + break;
72686 + }
72687 + }
72688 +
72689 + if (!found)
72690 + return 0;
72691 +
72692 + /* handle special roles that do not require authentication
72693 + and check ip */
72694 +
72695 + FOR_EACH_ROLE_START(r)
72696 + if (!strcmp(rolename, r->rolename) &&
72697 + (r->roletype & GR_ROLE_SPECIAL)) {
72698 + found = 0;
72699 + if (r->allowed_ips != NULL) {
72700 + for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
72701 + if ((ntohl(curr_ip) & ipp->netmask) ==
72702 + (ntohl(ipp->addr) & ipp->netmask))
72703 + found = 1;
72704 + }
72705 + } else
72706 + found = 2;
72707 + if (!found)
72708 + return 0;
72709 +
72710 + if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
72711 + ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
72712 + *salt = NULL;
72713 + *sum = NULL;
72714 + return 1;
72715 + }
72716 + }
72717 + FOR_EACH_ROLE_END(r)
72718 +
72719 + for (i = 0; i < polstate->num_sprole_pws; i++) {
72720 + if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
72721 + *salt = polstate->acl_special_roles[i]->salt;
72722 + *sum = polstate->acl_special_roles[i]->sum;
72723 + return 1;
72724 + }
72725 + }
72726 +
72727 + return 0;
72728 +}
72729 +
72730 +int gr_check_secure_terminal(struct task_struct *task)
72731 +{
72732 + struct task_struct *p, *p2, *p3;
72733 + struct files_struct *files;
72734 + struct fdtable *fdt;
72735 + struct file *our_file = NULL, *file;
72736 + int i;
72737 +
72738 + if (task->signal->tty == NULL)
72739 + return 1;
72740 +
72741 + files = get_files_struct(task);
72742 + if (files != NULL) {
72743 + rcu_read_lock();
72744 + fdt = files_fdtable(files);
72745 + for (i=0; i < fdt->max_fds; i++) {
72746 + file = fcheck_files(files, i);
72747 + if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
72748 + get_file(file);
72749 + our_file = file;
72750 + }
72751 + }
72752 + rcu_read_unlock();
72753 + put_files_struct(files);
72754 + }
72755 +
72756 + if (our_file == NULL)
72757 + return 1;
72758 +
72759 + read_lock(&tasklist_lock);
72760 + do_each_thread(p2, p) {
72761 + files = get_files_struct(p);
72762 + if (files == NULL ||
72763 + (p->signal && p->signal->tty == task->signal->tty)) {
72764 + if (files != NULL)
72765 + put_files_struct(files);
72766 + continue;
72767 + }
72768 + rcu_read_lock();
72769 + fdt = files_fdtable(files);
72770 + for (i=0; i < fdt->max_fds; i++) {
72771 + file = fcheck_files(files, i);
72772 + if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
72773 + file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
72774 + p3 = task;
72775 + while (task_pid_nr(p3) > 0) {
72776 + if (p3 == p)
72777 + break;
72778 + p3 = p3->real_parent;
72779 + }
72780 + if (p3 == p)
72781 + break;
72782 + gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
72783 + gr_handle_alertkill(p);
72784 + rcu_read_unlock();
72785 + put_files_struct(files);
72786 + read_unlock(&tasklist_lock);
72787 + fput(our_file);
72788 + return 0;
72789 + }
72790 + }
72791 + rcu_read_unlock();
72792 + put_files_struct(files);
72793 + } while_each_thread(p2, p);
72794 + read_unlock(&tasklist_lock);
72795 +
72796 + fput(our_file);
72797 + return 1;
72798 +}
72799 +
72800 +ssize_t
72801 +write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
72802 +{
72803 + struct gr_arg_wrapper uwrap;
72804 + unsigned char *sprole_salt = NULL;
72805 + unsigned char *sprole_sum = NULL;
72806 + int error = 0;
72807 + int error2 = 0;
72808 + size_t req_count = 0;
72809 + unsigned char oldmode = 0;
72810 +
72811 + mutex_lock(&gr_dev_mutex);
72812 +
72813 + if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
72814 + error = -EPERM;
72815 + goto out;
72816 + }
72817 +
72818 +#ifdef CONFIG_COMPAT
72819 + pax_open_kernel();
72820 + if (is_compat_task()) {
72821 + copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
72822 + copy_gr_arg = &copy_gr_arg_compat;
72823 + copy_acl_object_label = &copy_acl_object_label_compat;
72824 + copy_acl_subject_label = &copy_acl_subject_label_compat;
72825 + copy_acl_role_label = &copy_acl_role_label_compat;
72826 + copy_acl_ip_label = &copy_acl_ip_label_compat;
72827 + copy_role_allowed_ip = &copy_role_allowed_ip_compat;
72828 + copy_role_transition = &copy_role_transition_compat;
72829 + copy_sprole_pw = &copy_sprole_pw_compat;
72830 + copy_gr_hash_struct = &copy_gr_hash_struct_compat;
72831 + copy_pointer_from_array = &copy_pointer_from_array_compat;
72832 + get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
72833 + } else {
72834 + copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
72835 + copy_gr_arg = &copy_gr_arg_normal;
72836 + copy_acl_object_label = &copy_acl_object_label_normal;
72837 + copy_acl_subject_label = &copy_acl_subject_label_normal;
72838 + copy_acl_role_label = &copy_acl_role_label_normal;
72839 + copy_acl_ip_label = &copy_acl_ip_label_normal;
72840 + copy_role_allowed_ip = &copy_role_allowed_ip_normal;
72841 + copy_role_transition = &copy_role_transition_normal;
72842 + copy_sprole_pw = &copy_sprole_pw_normal;
72843 + copy_gr_hash_struct = &copy_gr_hash_struct_normal;
72844 + copy_pointer_from_array = &copy_pointer_from_array_normal;
72845 + get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
72846 + }
72847 + pax_close_kernel();
72848 +#endif
72849 +
72850 + req_count = get_gr_arg_wrapper_size();
72851 +
72852 + if (count != req_count) {
72853 + gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
72854 + error = -EINVAL;
72855 + goto out;
72856 + }
72857 +
72858 +
72859 + if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
72860 + gr_auth_expires = 0;
72861 + gr_auth_attempts = 0;
72862 + }
72863 +
72864 + error = copy_gr_arg_wrapper(buf, &uwrap);
72865 + if (error)
72866 + goto out;
72867 +
72868 + error = copy_gr_arg(uwrap.arg, &gr_usermode);
72869 + if (error)
72870 + goto out;
72871 +
72872 + if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_SPROLEPAM &&
72873 + gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
72874 + time_after(gr_auth_expires, get_seconds())) {
72875 + error = -EBUSY;
72876 + goto out;
72877 + }
72878 +
72879 + /* if non-root trying to do anything other than use a special role,
72880 + do not attempt authentication, do not count towards authentication
72881 + locking
72882 + */
72883 +
72884 + if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_STATUS &&
72885 + gr_usermode.mode != GR_UNSPROLE && gr_usermode.mode != GR_SPROLEPAM &&
72886 + gr_is_global_nonroot(current_uid())) {
72887 + error = -EPERM;
72888 + goto out;
72889 + }
72890 +
72891 + /* ensure pw and special role name are null terminated */
72892 +
72893 + gr_usermode.pw[GR_PW_LEN - 1] = '\0';
72894 + gr_usermode.sp_role[GR_SPROLE_LEN - 1] = '\0';
72895 +
72896 + /* Okay.
72897 + * We have our enough of the argument structure..(we have yet
72898 + * to copy_from_user the tables themselves) . Copy the tables
72899 + * only if we need them, i.e. for loading operations. */
72900 +
72901 + switch (gr_usermode.mode) {
72902 + case GR_STATUS:
72903 + if (gr_acl_is_enabled()) {
72904 + error = 1;
72905 + if (!gr_check_secure_terminal(current))
72906 + error = 3;
72907 + } else
72908 + error = 2;
72909 + goto out;
72910 + case GR_SHUTDOWN:
72911 + if (gr_acl_is_enabled() && !(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
72912 + stop_machine(gr_rbac_disable, NULL, NULL);
72913 + free_variables(false);
72914 + memset(&gr_usermode, 0, sizeof(gr_usermode));
72915 + memset(&gr_system_salt, 0, sizeof(gr_system_salt));
72916 + memset(&gr_system_sum, 0, sizeof(gr_system_sum));
72917 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
72918 + } else if (gr_acl_is_enabled()) {
72919 + gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
72920 + error = -EPERM;
72921 + } else {
72922 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
72923 + error = -EAGAIN;
72924 + }
72925 + break;
72926 + case GR_ENABLE:
72927 + if (!gr_acl_is_enabled() && !(error2 = gracl_init(&gr_usermode)))
72928 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
72929 + else {
72930 + if (gr_acl_is_enabled())
72931 + error = -EAGAIN;
72932 + else
72933 + error = error2;
72934 + gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
72935 + }
72936 + break;
72937 + case GR_OLDRELOAD:
72938 + oldmode = 1;
72939 + case GR_RELOAD:
72940 + if (!gr_acl_is_enabled()) {
72941 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
72942 + error = -EAGAIN;
72943 + } else if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
72944 + error2 = gracl_reload(&gr_usermode, oldmode);
72945 + if (!error2)
72946 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
72947 + else {
72948 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
72949 + error = error2;
72950 + }
72951 + } else {
72952 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
72953 + error = -EPERM;
72954 + }
72955 + break;
72956 + case GR_SEGVMOD:
72957 + if (unlikely(!gr_acl_is_enabled())) {
72958 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
72959 + error = -EAGAIN;
72960 + break;
72961 + }
72962 +
72963 + if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
72964 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
72965 + if (gr_usermode.segv_device && gr_usermode.segv_inode) {
72966 + struct acl_subject_label *segvacl;
72967 + segvacl =
72968 + lookup_acl_subj_label(gr_usermode.segv_inode,
72969 + gr_usermode.segv_device,
72970 + current->role);
72971 + if (segvacl) {
72972 + segvacl->crashes = 0;
72973 + segvacl->expires = 0;
72974 + }
72975 + } else if (gr_find_uid(gr_usermode.segv_uid) >= 0) {
72976 + gr_remove_uid(gr_usermode.segv_uid);
72977 + }
72978 + } else {
72979 + gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
72980 + error = -EPERM;
72981 + }
72982 + break;
72983 + case GR_SPROLE:
72984 + case GR_SPROLEPAM:
72985 + if (unlikely(!gr_acl_is_enabled())) {
72986 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
72987 + error = -EAGAIN;
72988 + break;
72989 + }
72990 +
72991 + if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
72992 + current->role->expires = 0;
72993 + current->role->auth_attempts = 0;
72994 + }
72995 +
72996 + if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
72997 + time_after(current->role->expires, get_seconds())) {
72998 + error = -EBUSY;
72999 + goto out;
73000 + }
73001 +
73002 + if (lookup_special_role_auth
73003 + (gr_usermode.mode, gr_usermode.sp_role, &sprole_salt, &sprole_sum)
73004 + && ((!sprole_salt && !sprole_sum)
73005 + || !(chkpw(&gr_usermode, sprole_salt, sprole_sum)))) {
73006 + char *p = "";
73007 + assign_special_role(gr_usermode.sp_role);
73008 + read_lock(&tasklist_lock);
73009 + if (current->real_parent)
73010 + p = current->real_parent->role->rolename;
73011 + read_unlock(&tasklist_lock);
73012 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
73013 + p, acl_sp_role_value);
73014 + } else {
73015 + gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode.sp_role);
73016 + error = -EPERM;
73017 + if(!(current->role->auth_attempts++))
73018 + current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
73019 +
73020 + goto out;
73021 + }
73022 + break;
73023 + case GR_UNSPROLE:
73024 + if (unlikely(!gr_acl_is_enabled())) {
73025 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
73026 + error = -EAGAIN;
73027 + break;
73028 + }
73029 +
73030 + if (current->role->roletype & GR_ROLE_SPECIAL) {
73031 + char *p = "";
73032 + int i = 0;
73033 +
73034 + read_lock(&tasklist_lock);
73035 + if (current->real_parent) {
73036 + p = current->real_parent->role->rolename;
73037 + i = current->real_parent->acl_role_id;
73038 + }
73039 + read_unlock(&tasklist_lock);
73040 +
73041 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
73042 + gr_set_acls(1);
73043 + } else {
73044 + error = -EPERM;
73045 + goto out;
73046 + }
73047 + break;
73048 + default:
73049 + gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode.mode);
73050 + error = -EINVAL;
73051 + break;
73052 + }
73053 +
73054 + if (error != -EPERM)
73055 + goto out;
73056 +
73057 + if(!(gr_auth_attempts++))
73058 + gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
73059 +
73060 + out:
73061 + mutex_unlock(&gr_dev_mutex);
73062 +
73063 + if (!error)
73064 + error = req_count;
73065 +
73066 + return error;
73067 +}
73068 +
73069 +int
73070 +gr_set_acls(const int type)
73071 +{
73072 + struct task_struct *task, *task2;
73073 + struct acl_role_label *role = current->role;
73074 + struct acl_subject_label *subj;
73075 + __u16 acl_role_id = current->acl_role_id;
73076 + const struct cred *cred;
73077 + int ret;
73078 +
73079 + rcu_read_lock();
73080 + read_lock(&tasklist_lock);
73081 + read_lock(&grsec_exec_file_lock);
73082 + do_each_thread(task2, task) {
73083 + /* check to see if we're called from the exit handler,
73084 + if so, only replace ACLs that have inherited the admin
73085 + ACL */
73086 +
73087 + if (type && (task->role != role ||
73088 + task->acl_role_id != acl_role_id))
73089 + continue;
73090 +
73091 + task->acl_role_id = 0;
73092 + task->acl_sp_role = 0;
73093 + task->inherited = 0;
73094 +
73095 + if (task->exec_file) {
73096 + cred = __task_cred(task);
73097 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
73098 + subj = __gr_get_subject_for_task(polstate, task, NULL);
73099 + if (subj == NULL) {
73100 + ret = -EINVAL;
73101 + read_unlock(&grsec_exec_file_lock);
73102 + read_unlock(&tasklist_lock);
73103 + rcu_read_unlock();
73104 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
73105 + return ret;
73106 + }
73107 + __gr_apply_subject_to_task(polstate, task, subj);
73108 + } else {
73109 + // it's a kernel process
73110 + task->role = polstate->kernel_role;
73111 + task->acl = polstate->kernel_role->root_label;
73112 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
73113 + task->acl->mode &= ~GR_PROCFIND;
73114 +#endif
73115 + }
73116 + } while_each_thread(task2, task);
73117 + read_unlock(&grsec_exec_file_lock);
73118 + read_unlock(&tasklist_lock);
73119 + rcu_read_unlock();
73120 +
73121 + return 0;
73122 +}
73123 diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
73124 new file mode 100644
73125 index 0000000..39645c9
73126 --- /dev/null
73127 +++ b/grsecurity/gracl_res.c
73128 @@ -0,0 +1,68 @@
73129 +#include <linux/kernel.h>
73130 +#include <linux/sched.h>
73131 +#include <linux/gracl.h>
73132 +#include <linux/grinternal.h>
73133 +
73134 +static const char *restab_log[] = {
73135 + [RLIMIT_CPU] = "RLIMIT_CPU",
73136 + [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
73137 + [RLIMIT_DATA] = "RLIMIT_DATA",
73138 + [RLIMIT_STACK] = "RLIMIT_STACK",
73139 + [RLIMIT_CORE] = "RLIMIT_CORE",
73140 + [RLIMIT_RSS] = "RLIMIT_RSS",
73141 + [RLIMIT_NPROC] = "RLIMIT_NPROC",
73142 + [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
73143 + [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
73144 + [RLIMIT_AS] = "RLIMIT_AS",
73145 + [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
73146 + [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
73147 + [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
73148 + [RLIMIT_NICE] = "RLIMIT_NICE",
73149 + [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
73150 + [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
73151 + [GR_CRASH_RES] = "RLIMIT_CRASH"
73152 +};
73153 +
73154 +void
73155 +gr_log_resource(const struct task_struct *task,
73156 + const int res, const unsigned long wanted, const int gt)
73157 +{
73158 + const struct cred *cred;
73159 + unsigned long rlim;
73160 +
73161 + if (!gr_acl_is_enabled() && !grsec_resource_logging)
73162 + return;
73163 +
73164 + // not yet supported resource
73165 + if (unlikely(!restab_log[res]))
73166 + return;
73167 +
73168 + if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
73169 + rlim = task_rlimit_max(task, res);
73170 + else
73171 + rlim = task_rlimit(task, res);
73172 +
73173 + if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
73174 + return;
73175 +
73176 + rcu_read_lock();
73177 + cred = __task_cred(task);
73178 +
73179 + if (res == RLIMIT_NPROC &&
73180 + (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
73181 + cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
73182 + goto out_rcu_unlock;
73183 + else if (res == RLIMIT_MEMLOCK &&
73184 + cap_raised(cred->cap_effective, CAP_IPC_LOCK))
73185 + goto out_rcu_unlock;
73186 + else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
73187 + goto out_rcu_unlock;
73188 + rcu_read_unlock();
73189 +
73190 + gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
73191 +
73192 + return;
73193 +out_rcu_unlock:
73194 + rcu_read_unlock();
73195 + return;
73196 +}
73197 diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
73198 new file mode 100644
73199 index 0000000..2040e61
73200 --- /dev/null
73201 +++ b/grsecurity/gracl_segv.c
73202 @@ -0,0 +1,313 @@
73203 +#include <linux/kernel.h>
73204 +#include <linux/mm.h>
73205 +#include <asm/uaccess.h>
73206 +#include <asm/errno.h>
73207 +#include <asm/mman.h>
73208 +#include <net/sock.h>
73209 +#include <linux/file.h>
73210 +#include <linux/fs.h>
73211 +#include <linux/net.h>
73212 +#include <linux/in.h>
73213 +#include <linux/slab.h>
73214 +#include <linux/types.h>
73215 +#include <linux/sched.h>
73216 +#include <linux/timer.h>
73217 +#include <linux/gracl.h>
73218 +#include <linux/grsecurity.h>
73219 +#include <linux/grinternal.h>
73220 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
73221 +#include <linux/magic.h>
73222 +#include <linux/pagemap.h>
73223 +#include "../fs/btrfs/async-thread.h"
73224 +#include "../fs/btrfs/ctree.h"
73225 +#include "../fs/btrfs/btrfs_inode.h"
73226 +#endif
73227 +
73228 +static struct crash_uid *uid_set;
73229 +static unsigned short uid_used;
73230 +static DEFINE_SPINLOCK(gr_uid_lock);
73231 +extern rwlock_t gr_inode_lock;
73232 +extern struct acl_subject_label *
73233 + lookup_acl_subj_label(const ino_t inode, const dev_t dev,
73234 + struct acl_role_label *role);
73235 +
73236 +static inline dev_t __get_dev(const struct dentry *dentry)
73237 +{
73238 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
73239 + if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
73240 + return BTRFS_I(dentry->d_inode)->root->anon_dev;
73241 + else
73242 +#endif
73243 + return dentry->d_sb->s_dev;
73244 +}
73245 +
73246 +int
73247 +gr_init_uidset(void)
73248 +{
73249 + uid_set =
73250 + kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
73251 + uid_used = 0;
73252 +
73253 + return uid_set ? 1 : 0;
73254 +}
73255 +
73256 +void
73257 +gr_free_uidset(void)
73258 +{
73259 + if (uid_set) {
73260 + struct crash_uid *tmpset;
73261 + spin_lock(&gr_uid_lock);
73262 + tmpset = uid_set;
73263 + uid_set = NULL;
73264 + uid_used = 0;
73265 + spin_unlock(&gr_uid_lock);
73266 + if (tmpset)
73267 + kfree(tmpset);
73268 + }
73269 +
73270 + return;
73271 +}
73272 +
73273 +int
73274 +gr_find_uid(const uid_t uid)
73275 +{
73276 + struct crash_uid *tmp = uid_set;
73277 + uid_t buid;
73278 + int low = 0, high = uid_used - 1, mid;
73279 +
73280 + while (high >= low) {
73281 + mid = (low + high) >> 1;
73282 + buid = tmp[mid].uid;
73283 + if (buid == uid)
73284 + return mid;
73285 + if (buid > uid)
73286 + high = mid - 1;
73287 + if (buid < uid)
73288 + low = mid + 1;
73289 + }
73290 +
73291 + return -1;
73292 +}
73293 +
73294 +static __inline__ void
73295 +gr_insertsort(void)
73296 +{
73297 + unsigned short i, j;
73298 + struct crash_uid index;
73299 +
73300 + for (i = 1; i < uid_used; i++) {
73301 + index = uid_set[i];
73302 + j = i;
73303 + while ((j > 0) && uid_set[j - 1].uid > index.uid) {
73304 + uid_set[j] = uid_set[j - 1];
73305 + j--;
73306 + }
73307 + uid_set[j] = index;
73308 + }
73309 +
73310 + return;
73311 +}
73312 +
73313 +static __inline__ void
73314 +gr_insert_uid(const kuid_t kuid, const unsigned long expires)
73315 +{
73316 + int loc;
73317 + uid_t uid = GR_GLOBAL_UID(kuid);
73318 +
73319 + if (uid_used == GR_UIDTABLE_MAX)
73320 + return;
73321 +
73322 + loc = gr_find_uid(uid);
73323 +
73324 + if (loc >= 0) {
73325 + uid_set[loc].expires = expires;
73326 + return;
73327 + }
73328 +
73329 + uid_set[uid_used].uid = uid;
73330 + uid_set[uid_used].expires = expires;
73331 + uid_used++;
73332 +
73333 + gr_insertsort();
73334 +
73335 + return;
73336 +}
73337 +
73338 +void
73339 +gr_remove_uid(const unsigned short loc)
73340 +{
73341 + unsigned short i;
73342 +
73343 + for (i = loc + 1; i < uid_used; i++)
73344 + uid_set[i - 1] = uid_set[i];
73345 +
73346 + uid_used--;
73347 +
73348 + return;
73349 +}
73350 +
73351 +int
73352 +gr_check_crash_uid(const kuid_t kuid)
73353 +{
73354 + int loc;
73355 + int ret = 0;
73356 + uid_t uid;
73357 +
73358 + if (unlikely(!gr_acl_is_enabled()))
73359 + return 0;
73360 +
73361 + uid = GR_GLOBAL_UID(kuid);
73362 +
73363 + spin_lock(&gr_uid_lock);
73364 + loc = gr_find_uid(uid);
73365 +
73366 + if (loc < 0)
73367 + goto out_unlock;
73368 +
73369 + if (time_before_eq(uid_set[loc].expires, get_seconds()))
73370 + gr_remove_uid(loc);
73371 + else
73372 + ret = 1;
73373 +
73374 +out_unlock:
73375 + spin_unlock(&gr_uid_lock);
73376 + return ret;
73377 +}
73378 +
73379 +static __inline__ int
73380 +proc_is_setxid(const struct cred *cred)
73381 +{
73382 + if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
73383 + !uid_eq(cred->uid, cred->fsuid))
73384 + return 1;
73385 + if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
73386 + !gid_eq(cred->gid, cred->fsgid))
73387 + return 1;
73388 +
73389 + return 0;
73390 +}
73391 +
73392 +extern int gr_fake_force_sig(int sig, struct task_struct *t);
73393 +
73394 +void
73395 +gr_handle_crash(struct task_struct *task, const int sig)
73396 +{
73397 + struct acl_subject_label *curr;
73398 + struct task_struct *tsk, *tsk2;
73399 + const struct cred *cred;
73400 + const struct cred *cred2;
73401 +
73402 + if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
73403 + return;
73404 +
73405 + if (unlikely(!gr_acl_is_enabled()))
73406 + return;
73407 +
73408 + curr = task->acl;
73409 +
73410 + if (!(curr->resmask & (1U << GR_CRASH_RES)))
73411 + return;
73412 +
73413 + if (time_before_eq(curr->expires, get_seconds())) {
73414 + curr->expires = 0;
73415 + curr->crashes = 0;
73416 + }
73417 +
73418 + curr->crashes++;
73419 +
73420 + if (!curr->expires)
73421 + curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
73422 +
73423 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
73424 + time_after(curr->expires, get_seconds())) {
73425 + rcu_read_lock();
73426 + cred = __task_cred(task);
73427 + if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
73428 + gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
73429 + spin_lock(&gr_uid_lock);
73430 + gr_insert_uid(cred->uid, curr->expires);
73431 + spin_unlock(&gr_uid_lock);
73432 + curr->expires = 0;
73433 + curr->crashes = 0;
73434 + read_lock(&tasklist_lock);
73435 + do_each_thread(tsk2, tsk) {
73436 + cred2 = __task_cred(tsk);
73437 + if (tsk != task && uid_eq(cred2->uid, cred->uid))
73438 + gr_fake_force_sig(SIGKILL, tsk);
73439 + } while_each_thread(tsk2, tsk);
73440 + read_unlock(&tasklist_lock);
73441 + } else {
73442 + gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
73443 + read_lock(&tasklist_lock);
73444 + read_lock(&grsec_exec_file_lock);
73445 + do_each_thread(tsk2, tsk) {
73446 + if (likely(tsk != task)) {
73447 + // if this thread has the same subject as the one that triggered
73448 + // RES_CRASH and it's the same binary, kill it
73449 + if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
73450 + gr_fake_force_sig(SIGKILL, tsk);
73451 + }
73452 + } while_each_thread(tsk2, tsk);
73453 + read_unlock(&grsec_exec_file_lock);
73454 + read_unlock(&tasklist_lock);
73455 + }
73456 + rcu_read_unlock();
73457 + }
73458 +
73459 + return;
73460 +}
73461 +
73462 +int
73463 +gr_check_crash_exec(const struct file *filp)
73464 +{
73465 + struct acl_subject_label *curr;
73466 +
73467 + if (unlikely(!gr_acl_is_enabled()))
73468 + return 0;
73469 +
73470 + read_lock(&gr_inode_lock);
73471 + curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
73472 + __get_dev(filp->f_path.dentry),
73473 + current->role);
73474 + read_unlock(&gr_inode_lock);
73475 +
73476 + if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
73477 + (!curr->crashes && !curr->expires))
73478 + return 0;
73479 +
73480 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
73481 + time_after(curr->expires, get_seconds()))
73482 + return 1;
73483 + else if (time_before_eq(curr->expires, get_seconds())) {
73484 + curr->crashes = 0;
73485 + curr->expires = 0;
73486 + }
73487 +
73488 + return 0;
73489 +}
73490 +
73491 +void
73492 +gr_handle_alertkill(struct task_struct *task)
73493 +{
73494 + struct acl_subject_label *curracl;
73495 + __u32 curr_ip;
73496 + struct task_struct *p, *p2;
73497 +
73498 + if (unlikely(!gr_acl_is_enabled()))
73499 + return;
73500 +
73501 + curracl = task->acl;
73502 + curr_ip = task->signal->curr_ip;
73503 +
73504 + if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
73505 + read_lock(&tasklist_lock);
73506 + do_each_thread(p2, p) {
73507 + if (p->signal->curr_ip == curr_ip)
73508 + gr_fake_force_sig(SIGKILL, p);
73509 + } while_each_thread(p2, p);
73510 + read_unlock(&tasklist_lock);
73511 + } else if (curracl->mode & GR_KILLPROC)
73512 + gr_fake_force_sig(SIGKILL, task);
73513 +
73514 + return;
73515 +}
73516 diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
73517 new file mode 100644
73518 index 0000000..98011b0
73519 --- /dev/null
73520 +++ b/grsecurity/gracl_shm.c
73521 @@ -0,0 +1,40 @@
73522 +#include <linux/kernel.h>
73523 +#include <linux/mm.h>
73524 +#include <linux/sched.h>
73525 +#include <linux/file.h>
73526 +#include <linux/ipc.h>
73527 +#include <linux/gracl.h>
73528 +#include <linux/grsecurity.h>
73529 +#include <linux/grinternal.h>
73530 +
73531 +int
73532 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
73533 + const time_t shm_createtime, const kuid_t cuid, const int shmid)
73534 +{
73535 + struct task_struct *task;
73536 +
73537 + if (!gr_acl_is_enabled())
73538 + return 1;
73539 +
73540 + rcu_read_lock();
73541 + read_lock(&tasklist_lock);
73542 +
73543 + task = find_task_by_vpid(shm_cprid);
73544 +
73545 + if (unlikely(!task))
73546 + task = find_task_by_vpid(shm_lapid);
73547 +
73548 + if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
73549 + (task_pid_nr(task) == shm_lapid)) &&
73550 + (task->acl->mode & GR_PROTSHM) &&
73551 + (task->acl != current->acl))) {
73552 + read_unlock(&tasklist_lock);
73553 + rcu_read_unlock();
73554 + gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
73555 + return 0;
73556 + }
73557 + read_unlock(&tasklist_lock);
73558 + rcu_read_unlock();
73559 +
73560 + return 1;
73561 +}
73562 diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
73563 new file mode 100644
73564 index 0000000..bc0be01
73565 --- /dev/null
73566 +++ b/grsecurity/grsec_chdir.c
73567 @@ -0,0 +1,19 @@
73568 +#include <linux/kernel.h>
73569 +#include <linux/sched.h>
73570 +#include <linux/fs.h>
73571 +#include <linux/file.h>
73572 +#include <linux/grsecurity.h>
73573 +#include <linux/grinternal.h>
73574 +
73575 +void
73576 +gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
73577 +{
73578 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
73579 + if ((grsec_enable_chdir && grsec_enable_group &&
73580 + in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
73581 + !grsec_enable_group)) {
73582 + gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
73583 + }
73584 +#endif
73585 + return;
73586 +}
73587 diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
73588 new file mode 100644
73589 index 0000000..baa635c
73590 --- /dev/null
73591 +++ b/grsecurity/grsec_chroot.c
73592 @@ -0,0 +1,387 @@
73593 +#include <linux/kernel.h>
73594 +#include <linux/module.h>
73595 +#include <linux/sched.h>
73596 +#include <linux/file.h>
73597 +#include <linux/fs.h>
73598 +#include <linux/mount.h>
73599 +#include <linux/types.h>
73600 +#include "../fs/mount.h"
73601 +#include <linux/grsecurity.h>
73602 +#include <linux/grinternal.h>
73603 +
73604 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
73605 +int gr_init_ran;
73606 +#endif
73607 +
73608 +void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
73609 +{
73610 +#ifdef CONFIG_GRKERNSEC
73611 + if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
73612 + path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
73613 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
73614 + && gr_init_ran
73615 +#endif
73616 + )
73617 + task->gr_is_chrooted = 1;
73618 + else {
73619 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
73620 + if (task_pid_nr(task) == 1 && !gr_init_ran)
73621 + gr_init_ran = 1;
73622 +#endif
73623 + task->gr_is_chrooted = 0;
73624 + }
73625 +
73626 + task->gr_chroot_dentry = path->dentry;
73627 +#endif
73628 + return;
73629 +}
73630 +
73631 +void gr_clear_chroot_entries(struct task_struct *task)
73632 +{
73633 +#ifdef CONFIG_GRKERNSEC
73634 + task->gr_is_chrooted = 0;
73635 + task->gr_chroot_dentry = NULL;
73636 +#endif
73637 + return;
73638 +}
73639 +
73640 +int
73641 +gr_handle_chroot_unix(const pid_t pid)
73642 +{
73643 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
73644 + struct task_struct *p;
73645 +
73646 + if (unlikely(!grsec_enable_chroot_unix))
73647 + return 1;
73648 +
73649 + if (likely(!proc_is_chrooted(current)))
73650 + return 1;
73651 +
73652 + rcu_read_lock();
73653 + read_lock(&tasklist_lock);
73654 + p = find_task_by_vpid_unrestricted(pid);
73655 + if (unlikely(p && !have_same_root(current, p))) {
73656 + read_unlock(&tasklist_lock);
73657 + rcu_read_unlock();
73658 + gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
73659 + return 0;
73660 + }
73661 + read_unlock(&tasklist_lock);
73662 + rcu_read_unlock();
73663 +#endif
73664 + return 1;
73665 +}
73666 +
73667 +int
73668 +gr_handle_chroot_nice(void)
73669 +{
73670 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
73671 + if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
73672 + gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
73673 + return -EPERM;
73674 + }
73675 +#endif
73676 + return 0;
73677 +}
73678 +
73679 +int
73680 +gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
73681 +{
73682 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
73683 + if (grsec_enable_chroot_nice && (niceval < task_nice(p))
73684 + && proc_is_chrooted(current)) {
73685 + gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
73686 + return -EACCES;
73687 + }
73688 +#endif
73689 + return 0;
73690 +}
73691 +
73692 +int
73693 +gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
73694 +{
73695 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
73696 + struct task_struct *p;
73697 + int ret = 0;
73698 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
73699 + return ret;
73700 +
73701 + read_lock(&tasklist_lock);
73702 + do_each_pid_task(pid, type, p) {
73703 + if (!have_same_root(current, p)) {
73704 + ret = 1;
73705 + goto out;
73706 + }
73707 + } while_each_pid_task(pid, type, p);
73708 +out:
73709 + read_unlock(&tasklist_lock);
73710 + return ret;
73711 +#endif
73712 + return 0;
73713 +}
73714 +
73715 +int
73716 +gr_pid_is_chrooted(struct task_struct *p)
73717 +{
73718 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
73719 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
73720 + return 0;
73721 +
73722 + if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
73723 + !have_same_root(current, p)) {
73724 + return 1;
73725 + }
73726 +#endif
73727 + return 0;
73728 +}
73729 +
73730 +EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
73731 +
73732 +#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
73733 +int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
73734 +{
73735 + struct path path, currentroot;
73736 + int ret = 0;
73737 +
73738 + path.dentry = (struct dentry *)u_dentry;
73739 + path.mnt = (struct vfsmount *)u_mnt;
73740 + get_fs_root(current->fs, &currentroot);
73741 + if (path_is_under(&path, &currentroot))
73742 + ret = 1;
73743 + path_put(&currentroot);
73744 +
73745 + return ret;
73746 +}
73747 +#endif
73748 +
73749 +int
73750 +gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
73751 +{
73752 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
73753 + if (!grsec_enable_chroot_fchdir)
73754 + return 1;
73755 +
73756 + if (!proc_is_chrooted(current))
73757 + return 1;
73758 + else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
73759 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
73760 + return 0;
73761 + }
73762 +#endif
73763 + return 1;
73764 +}
73765 +
73766 +int
73767 +gr_chroot_fhandle(void)
73768 +{
73769 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
73770 + if (!grsec_enable_chroot_fchdir)
73771 + return 1;
73772 +
73773 + if (!proc_is_chrooted(current))
73774 + return 1;
73775 + else {
73776 + gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
73777 + return 0;
73778 + }
73779 +#endif
73780 + return 1;
73781 +}
73782 +
73783 +int
73784 +gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
73785 + const time_t shm_createtime)
73786 +{
73787 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
73788 + struct task_struct *p;
73789 + time_t starttime;
73790 +
73791 + if (unlikely(!grsec_enable_chroot_shmat))
73792 + return 1;
73793 +
73794 + if (likely(!proc_is_chrooted(current)))
73795 + return 1;
73796 +
73797 + rcu_read_lock();
73798 + read_lock(&tasklist_lock);
73799 +
73800 + if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
73801 + starttime = p->start_time.tv_sec;
73802 + if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
73803 + if (have_same_root(current, p)) {
73804 + goto allow;
73805 + } else {
73806 + read_unlock(&tasklist_lock);
73807 + rcu_read_unlock();
73808 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
73809 + return 0;
73810 + }
73811 + }
73812 + /* creator exited, pid reuse, fall through to next check */
73813 + }
73814 + if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
73815 + if (unlikely(!have_same_root(current, p))) {
73816 + read_unlock(&tasklist_lock);
73817 + rcu_read_unlock();
73818 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
73819 + return 0;
73820 + }
73821 + }
73822 +
73823 +allow:
73824 + read_unlock(&tasklist_lock);
73825 + rcu_read_unlock();
73826 +#endif
73827 + return 1;
73828 +}
73829 +
73830 +void
73831 +gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
73832 +{
73833 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
73834 + if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
73835 + gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
73836 +#endif
73837 + return;
73838 +}
73839 +
73840 +int
73841 +gr_handle_chroot_mknod(const struct dentry *dentry,
73842 + const struct vfsmount *mnt, const int mode)
73843 +{
73844 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
73845 + if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
73846 + proc_is_chrooted(current)) {
73847 + gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
73848 + return -EPERM;
73849 + }
73850 +#endif
73851 + return 0;
73852 +}
73853 +
73854 +int
73855 +gr_handle_chroot_mount(const struct dentry *dentry,
73856 + const struct vfsmount *mnt, const char *dev_name)
73857 +{
73858 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
73859 + if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
73860 + gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
73861 + return -EPERM;
73862 + }
73863 +#endif
73864 + return 0;
73865 +}
73866 +
73867 +int
73868 +gr_handle_chroot_pivot(void)
73869 +{
73870 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
73871 + if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
73872 + gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
73873 + return -EPERM;
73874 + }
73875 +#endif
73876 + return 0;
73877 +}
73878 +
73879 +int
73880 +gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
73881 +{
73882 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
73883 + if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
73884 + !gr_is_outside_chroot(dentry, mnt)) {
73885 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
73886 + return -EPERM;
73887 + }
73888 +#endif
73889 + return 0;
73890 +}
73891 +
73892 +extern const char *captab_log[];
73893 +extern int captab_log_entries;
73894 +
73895 +int
73896 +gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
73897 +{
73898 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
73899 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
73900 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
73901 + if (cap_raised(chroot_caps, cap)) {
73902 + if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
73903 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
73904 + }
73905 + return 0;
73906 + }
73907 + }
73908 +#endif
73909 + return 1;
73910 +}
73911 +
73912 +int
73913 +gr_chroot_is_capable(const int cap)
73914 +{
73915 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
73916 + return gr_task_chroot_is_capable(current, current_cred(), cap);
73917 +#endif
73918 + return 1;
73919 +}
73920 +
73921 +int
73922 +gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
73923 +{
73924 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
73925 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
73926 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
73927 + if (cap_raised(chroot_caps, cap)) {
73928 + return 0;
73929 + }
73930 + }
73931 +#endif
73932 + return 1;
73933 +}
73934 +
73935 +int
73936 +gr_chroot_is_capable_nolog(const int cap)
73937 +{
73938 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
73939 + return gr_task_chroot_is_capable_nolog(current, cap);
73940 +#endif
73941 + return 1;
73942 +}
73943 +
73944 +int
73945 +gr_handle_chroot_sysctl(const int op)
73946 +{
73947 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
73948 + if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
73949 + proc_is_chrooted(current))
73950 + return -EACCES;
73951 +#endif
73952 + return 0;
73953 +}
73954 +
73955 +void
73956 +gr_handle_chroot_chdir(const struct path *path)
73957 +{
73958 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
73959 + if (grsec_enable_chroot_chdir)
73960 + set_fs_pwd(current->fs, path);
73961 +#endif
73962 + return;
73963 +}
73964 +
73965 +int
73966 +gr_handle_chroot_chmod(const struct dentry *dentry,
73967 + const struct vfsmount *mnt, const int mode)
73968 +{
73969 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
73970 + /* allow chmod +s on directories, but not files */
73971 + if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
73972 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
73973 + proc_is_chrooted(current)) {
73974 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
73975 + return -EPERM;
73976 + }
73977 +#endif
73978 + return 0;
73979 +}
73980 diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
73981 new file mode 100644
73982 index 0000000..de31e65
73983 --- /dev/null
73984 +++ b/grsecurity/grsec_disabled.c
73985 @@ -0,0 +1,434 @@
73986 +#include <linux/kernel.h>
73987 +#include <linux/module.h>
73988 +#include <linux/sched.h>
73989 +#include <linux/file.h>
73990 +#include <linux/fs.h>
73991 +#include <linux/kdev_t.h>
73992 +#include <linux/net.h>
73993 +#include <linux/in.h>
73994 +#include <linux/ip.h>
73995 +#include <linux/skbuff.h>
73996 +#include <linux/sysctl.h>
73997 +
73998 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
73999 +void
74000 +pax_set_initial_flags(struct linux_binprm *bprm)
74001 +{
74002 + return;
74003 +}
74004 +#endif
74005 +
74006 +#ifdef CONFIG_SYSCTL
74007 +__u32
74008 +gr_handle_sysctl(const struct ctl_table * table, const int op)
74009 +{
74010 + return 0;
74011 +}
74012 +#endif
74013 +
74014 +#ifdef CONFIG_TASKSTATS
74015 +int gr_is_taskstats_denied(int pid)
74016 +{
74017 + return 0;
74018 +}
74019 +#endif
74020 +
74021 +int
74022 +gr_acl_is_enabled(void)
74023 +{
74024 + return 0;
74025 +}
74026 +
74027 +void
74028 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
74029 +{
74030 + return;
74031 +}
74032 +
74033 +int
74034 +gr_handle_rawio(const struct inode *inode)
74035 +{
74036 + return 0;
74037 +}
74038 +
74039 +void
74040 +gr_acl_handle_psacct(struct task_struct *task, const long code)
74041 +{
74042 + return;
74043 +}
74044 +
74045 +int
74046 +gr_handle_ptrace(struct task_struct *task, const long request)
74047 +{
74048 + return 0;
74049 +}
74050 +
74051 +int
74052 +gr_handle_proc_ptrace(struct task_struct *task)
74053 +{
74054 + return 0;
74055 +}
74056 +
74057 +int
74058 +gr_set_acls(const int type)
74059 +{
74060 + return 0;
74061 +}
74062 +
74063 +int
74064 +gr_check_hidden_task(const struct task_struct *tsk)
74065 +{
74066 + return 0;
74067 +}
74068 +
74069 +int
74070 +gr_check_protected_task(const struct task_struct *task)
74071 +{
74072 + return 0;
74073 +}
74074 +
74075 +int
74076 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
74077 +{
74078 + return 0;
74079 +}
74080 +
74081 +void
74082 +gr_copy_label(struct task_struct *tsk)
74083 +{
74084 + return;
74085 +}
74086 +
74087 +void
74088 +gr_set_pax_flags(struct task_struct *task)
74089 +{
74090 + return;
74091 +}
74092 +
74093 +int
74094 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
74095 + const int unsafe_share)
74096 +{
74097 + return 0;
74098 +}
74099 +
74100 +void
74101 +gr_handle_delete(const ino_t ino, const dev_t dev)
74102 +{
74103 + return;
74104 +}
74105 +
74106 +void
74107 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
74108 +{
74109 + return;
74110 +}
74111 +
74112 +void
74113 +gr_handle_crash(struct task_struct *task, const int sig)
74114 +{
74115 + return;
74116 +}
74117 +
74118 +int
74119 +gr_check_crash_exec(const struct file *filp)
74120 +{
74121 + return 0;
74122 +}
74123 +
74124 +int
74125 +gr_check_crash_uid(const kuid_t uid)
74126 +{
74127 + return 0;
74128 +}
74129 +
74130 +void
74131 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
74132 + struct dentry *old_dentry,
74133 + struct dentry *new_dentry,
74134 + struct vfsmount *mnt, const __u8 replace, unsigned int flags)
74135 +{
74136 + return;
74137 +}
74138 +
74139 +int
74140 +gr_search_socket(const int family, const int type, const int protocol)
74141 +{
74142 + return 1;
74143 +}
74144 +
74145 +int
74146 +gr_search_connectbind(const int mode, const struct socket *sock,
74147 + const struct sockaddr_in *addr)
74148 +{
74149 + return 0;
74150 +}
74151 +
74152 +void
74153 +gr_handle_alertkill(struct task_struct *task)
74154 +{
74155 + return;
74156 +}
74157 +
74158 +__u32
74159 +gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
74160 +{
74161 + return 1;
74162 +}
74163 +
74164 +__u32
74165 +gr_acl_handle_hidden_file(const struct dentry * dentry,
74166 + const struct vfsmount * mnt)
74167 +{
74168 + return 1;
74169 +}
74170 +
74171 +__u32
74172 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
74173 + int acc_mode)
74174 +{
74175 + return 1;
74176 +}
74177 +
74178 +__u32
74179 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
74180 +{
74181 + return 1;
74182 +}
74183 +
74184 +__u32
74185 +gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
74186 +{
74187 + return 1;
74188 +}
74189 +
74190 +int
74191 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
74192 + unsigned int *vm_flags)
74193 +{
74194 + return 1;
74195 +}
74196 +
74197 +__u32
74198 +gr_acl_handle_truncate(const struct dentry * dentry,
74199 + const struct vfsmount * mnt)
74200 +{
74201 + return 1;
74202 +}
74203 +
74204 +__u32
74205 +gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
74206 +{
74207 + return 1;
74208 +}
74209 +
74210 +__u32
74211 +gr_acl_handle_access(const struct dentry * dentry,
74212 + const struct vfsmount * mnt, const int fmode)
74213 +{
74214 + return 1;
74215 +}
74216 +
74217 +__u32
74218 +gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
74219 + umode_t *mode)
74220 +{
74221 + return 1;
74222 +}
74223 +
74224 +__u32
74225 +gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
74226 +{
74227 + return 1;
74228 +}
74229 +
74230 +__u32
74231 +gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
74232 +{
74233 + return 1;
74234 +}
74235 +
74236 +__u32
74237 +gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
74238 +{
74239 + return 1;
74240 +}
74241 +
74242 +void
74243 +grsecurity_init(void)
74244 +{
74245 + return;
74246 +}
74247 +
74248 +umode_t gr_acl_umask(void)
74249 +{
74250 + return 0;
74251 +}
74252 +
74253 +__u32
74254 +gr_acl_handle_mknod(const struct dentry * new_dentry,
74255 + const struct dentry * parent_dentry,
74256 + const struct vfsmount * parent_mnt,
74257 + const int mode)
74258 +{
74259 + return 1;
74260 +}
74261 +
74262 +__u32
74263 +gr_acl_handle_mkdir(const struct dentry * new_dentry,
74264 + const struct dentry * parent_dentry,
74265 + const struct vfsmount * parent_mnt)
74266 +{
74267 + return 1;
74268 +}
74269 +
74270 +__u32
74271 +gr_acl_handle_symlink(const struct dentry * new_dentry,
74272 + const struct dentry * parent_dentry,
74273 + const struct vfsmount * parent_mnt, const struct filename *from)
74274 +{
74275 + return 1;
74276 +}
74277 +
74278 +__u32
74279 +gr_acl_handle_link(const struct dentry * new_dentry,
74280 + const struct dentry * parent_dentry,
74281 + const struct vfsmount * parent_mnt,
74282 + const struct dentry * old_dentry,
74283 + const struct vfsmount * old_mnt, const struct filename *to)
74284 +{
74285 + return 1;
74286 +}
74287 +
74288 +int
74289 +gr_acl_handle_rename(const struct dentry *new_dentry,
74290 + const struct dentry *parent_dentry,
74291 + const struct vfsmount *parent_mnt,
74292 + const struct dentry *old_dentry,
74293 + const struct inode *old_parent_inode,
74294 + const struct vfsmount *old_mnt, const struct filename *newname,
74295 + unsigned int flags)
74296 +{
74297 + return 0;
74298 +}
74299 +
74300 +int
74301 +gr_acl_handle_filldir(const struct file *file, const char *name,
74302 + const int namelen, const ino_t ino)
74303 +{
74304 + return 1;
74305 +}
74306 +
74307 +int
74308 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
74309 + const time_t shm_createtime, const kuid_t cuid, const int shmid)
74310 +{
74311 + return 1;
74312 +}
74313 +
74314 +int
74315 +gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
74316 +{
74317 + return 0;
74318 +}
74319 +
74320 +int
74321 +gr_search_accept(const struct socket *sock)
74322 +{
74323 + return 0;
74324 +}
74325 +
74326 +int
74327 +gr_search_listen(const struct socket *sock)
74328 +{
74329 + return 0;
74330 +}
74331 +
74332 +int
74333 +gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
74334 +{
74335 + return 0;
74336 +}
74337 +
74338 +__u32
74339 +gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
74340 +{
74341 + return 1;
74342 +}
74343 +
74344 +__u32
74345 +gr_acl_handle_creat(const struct dentry * dentry,
74346 + const struct dentry * p_dentry,
74347 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
74348 + const int imode)
74349 +{
74350 + return 1;
74351 +}
74352 +
74353 +void
74354 +gr_acl_handle_exit(void)
74355 +{
74356 + return;
74357 +}
74358 +
74359 +int
74360 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
74361 +{
74362 + return 1;
74363 +}
74364 +
74365 +void
74366 +gr_set_role_label(const kuid_t uid, const kgid_t gid)
74367 +{
74368 + return;
74369 +}
74370 +
74371 +int
74372 +gr_acl_handle_procpidmem(const struct task_struct *task)
74373 +{
74374 + return 0;
74375 +}
74376 +
74377 +int
74378 +gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
74379 +{
74380 + return 0;
74381 +}
74382 +
74383 +int
74384 +gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
74385 +{
74386 + return 0;
74387 +}
74388 +
74389 +int
74390 +gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
74391 +{
74392 + return 0;
74393 +}
74394 +
74395 +int
74396 +gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
74397 +{
74398 + return 0;
74399 +}
74400 +
74401 +int gr_acl_enable_at_secure(void)
74402 +{
74403 + return 0;
74404 +}
74405 +
74406 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
74407 +{
74408 + return dentry->d_sb->s_dev;
74409 +}
74410 +
74411 +void gr_put_exec_file(struct task_struct *task)
74412 +{
74413 + return;
74414 +}
74415 +
74416 +#ifdef CONFIG_SECURITY
74417 +EXPORT_SYMBOL_GPL(gr_check_user_change);
74418 +EXPORT_SYMBOL_GPL(gr_check_group_change);
74419 +#endif
74420 diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
74421 new file mode 100644
74422 index 0000000..f35f454
74423 --- /dev/null
74424 +++ b/grsecurity/grsec_exec.c
74425 @@ -0,0 +1,187 @@
74426 +#include <linux/kernel.h>
74427 +#include <linux/sched.h>
74428 +#include <linux/file.h>
74429 +#include <linux/binfmts.h>
74430 +#include <linux/fs.h>
74431 +#include <linux/types.h>
74432 +#include <linux/grdefs.h>
74433 +#include <linux/grsecurity.h>
74434 +#include <linux/grinternal.h>
74435 +#include <linux/capability.h>
74436 +#include <linux/module.h>
74437 +#include <linux/compat.h>
74438 +
74439 +#include <asm/uaccess.h>
74440 +
74441 +#ifdef CONFIG_GRKERNSEC_EXECLOG
74442 +static char gr_exec_arg_buf[132];
74443 +static DEFINE_MUTEX(gr_exec_arg_mutex);
74444 +#endif
74445 +
74446 +struct user_arg_ptr {
74447 +#ifdef CONFIG_COMPAT
74448 + bool is_compat;
74449 +#endif
74450 + union {
74451 + const char __user *const __user *native;
74452 +#ifdef CONFIG_COMPAT
74453 + const compat_uptr_t __user *compat;
74454 +#endif
74455 + } ptr;
74456 +};
74457 +
74458 +extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
74459 +
74460 +void
74461 +gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
74462 +{
74463 +#ifdef CONFIG_GRKERNSEC_EXECLOG
74464 + char *grarg = gr_exec_arg_buf;
74465 + unsigned int i, x, execlen = 0;
74466 + char c;
74467 +
74468 + if (!((grsec_enable_execlog && grsec_enable_group &&
74469 + in_group_p(grsec_audit_gid))
74470 + || (grsec_enable_execlog && !grsec_enable_group)))
74471 + return;
74472 +
74473 + mutex_lock(&gr_exec_arg_mutex);
74474 + memset(grarg, 0, sizeof(gr_exec_arg_buf));
74475 +
74476 + for (i = 0; i < bprm->argc && execlen < 128; i++) {
74477 + const char __user *p;
74478 + unsigned int len;
74479 +
74480 + p = get_user_arg_ptr(argv, i);
74481 + if (IS_ERR(p))
74482 + goto log;
74483 +
74484 + len = strnlen_user(p, 128 - execlen);
74485 + if (len > 128 - execlen)
74486 + len = 128 - execlen;
74487 + else if (len > 0)
74488 + len--;
74489 + if (copy_from_user(grarg + execlen, p, len))
74490 + goto log;
74491 +
74492 + /* rewrite unprintable characters */
74493 + for (x = 0; x < len; x++) {
74494 + c = *(grarg + execlen + x);
74495 + if (c < 32 || c > 126)
74496 + *(grarg + execlen + x) = ' ';
74497 + }
74498 +
74499 + execlen += len;
74500 + *(grarg + execlen) = ' ';
74501 + *(grarg + execlen + 1) = '\0';
74502 + execlen++;
74503 + }
74504 +
74505 + log:
74506 + gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
74507 + bprm->file->f_path.mnt, grarg);
74508 + mutex_unlock(&gr_exec_arg_mutex);
74509 +#endif
74510 + return;
74511 +}
74512 +
74513 +#ifdef CONFIG_GRKERNSEC
74514 +extern int gr_acl_is_capable(const int cap);
74515 +extern int gr_acl_is_capable_nolog(const int cap);
74516 +extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
74517 +extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
74518 +extern int gr_chroot_is_capable(const int cap);
74519 +extern int gr_chroot_is_capable_nolog(const int cap);
74520 +extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
74521 +extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
74522 +#endif
74523 +
74524 +const char *captab_log[] = {
74525 + "CAP_CHOWN",
74526 + "CAP_DAC_OVERRIDE",
74527 + "CAP_DAC_READ_SEARCH",
74528 + "CAP_FOWNER",
74529 + "CAP_FSETID",
74530 + "CAP_KILL",
74531 + "CAP_SETGID",
74532 + "CAP_SETUID",
74533 + "CAP_SETPCAP",
74534 + "CAP_LINUX_IMMUTABLE",
74535 + "CAP_NET_BIND_SERVICE",
74536 + "CAP_NET_BROADCAST",
74537 + "CAP_NET_ADMIN",
74538 + "CAP_NET_RAW",
74539 + "CAP_IPC_LOCK",
74540 + "CAP_IPC_OWNER",
74541 + "CAP_SYS_MODULE",
74542 + "CAP_SYS_RAWIO",
74543 + "CAP_SYS_CHROOT",
74544 + "CAP_SYS_PTRACE",
74545 + "CAP_SYS_PACCT",
74546 + "CAP_SYS_ADMIN",
74547 + "CAP_SYS_BOOT",
74548 + "CAP_SYS_NICE",
74549 + "CAP_SYS_RESOURCE",
74550 + "CAP_SYS_TIME",
74551 + "CAP_SYS_TTY_CONFIG",
74552 + "CAP_MKNOD",
74553 + "CAP_LEASE",
74554 + "CAP_AUDIT_WRITE",
74555 + "CAP_AUDIT_CONTROL",
74556 + "CAP_SETFCAP",
74557 + "CAP_MAC_OVERRIDE",
74558 + "CAP_MAC_ADMIN",
74559 + "CAP_SYSLOG",
74560 + "CAP_WAKE_ALARM"
74561 +};
74562 +
74563 +int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
74564 +
74565 +int gr_is_capable(const int cap)
74566 +{
74567 +#ifdef CONFIG_GRKERNSEC
74568 + if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
74569 + return 1;
74570 + return 0;
74571 +#else
74572 + return 1;
74573 +#endif
74574 +}
74575 +
74576 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
74577 +{
74578 +#ifdef CONFIG_GRKERNSEC
74579 + if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
74580 + return 1;
74581 + return 0;
74582 +#else
74583 + return 1;
74584 +#endif
74585 +}
74586 +
74587 +int gr_is_capable_nolog(const int cap)
74588 +{
74589 +#ifdef CONFIG_GRKERNSEC
74590 + if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
74591 + return 1;
74592 + return 0;
74593 +#else
74594 + return 1;
74595 +#endif
74596 +}
74597 +
74598 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
74599 +{
74600 +#ifdef CONFIG_GRKERNSEC
74601 + if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
74602 + return 1;
74603 + return 0;
74604 +#else
74605 + return 1;
74606 +#endif
74607 +}
74608 +
74609 +EXPORT_SYMBOL_GPL(gr_is_capable);
74610 +EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
74611 +EXPORT_SYMBOL_GPL(gr_task_is_capable);
74612 +EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
74613 diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
74614 new file mode 100644
74615 index 0000000..06cc6ea
74616 --- /dev/null
74617 +++ b/grsecurity/grsec_fifo.c
74618 @@ -0,0 +1,24 @@
74619 +#include <linux/kernel.h>
74620 +#include <linux/sched.h>
74621 +#include <linux/fs.h>
74622 +#include <linux/file.h>
74623 +#include <linux/grinternal.h>
74624 +
74625 +int
74626 +gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
74627 + const struct dentry *dir, const int flag, const int acc_mode)
74628 +{
74629 +#ifdef CONFIG_GRKERNSEC_FIFO
74630 + const struct cred *cred = current_cred();
74631 +
74632 + if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
74633 + !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
74634 + !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
74635 + !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
74636 + if (!inode_permission(dentry->d_inode, acc_mode))
74637 + 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));
74638 + return -EACCES;
74639 + }
74640 +#endif
74641 + return 0;
74642 +}
74643 diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
74644 new file mode 100644
74645 index 0000000..8ca18bf
74646 --- /dev/null
74647 +++ b/grsecurity/grsec_fork.c
74648 @@ -0,0 +1,23 @@
74649 +#include <linux/kernel.h>
74650 +#include <linux/sched.h>
74651 +#include <linux/grsecurity.h>
74652 +#include <linux/grinternal.h>
74653 +#include <linux/errno.h>
74654 +
74655 +void
74656 +gr_log_forkfail(const int retval)
74657 +{
74658 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
74659 + if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
74660 + switch (retval) {
74661 + case -EAGAIN:
74662 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
74663 + break;
74664 + case -ENOMEM:
74665 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
74666 + break;
74667 + }
74668 + }
74669 +#endif
74670 + return;
74671 +}
74672 diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
74673 new file mode 100644
74674 index 0000000..ae6c028
74675 --- /dev/null
74676 +++ b/grsecurity/grsec_init.c
74677 @@ -0,0 +1,272 @@
74678 +#include <linux/kernel.h>
74679 +#include <linux/sched.h>
74680 +#include <linux/mm.h>
74681 +#include <linux/gracl.h>
74682 +#include <linux/slab.h>
74683 +#include <linux/vmalloc.h>
74684 +#include <linux/percpu.h>
74685 +#include <linux/module.h>
74686 +
74687 +int grsec_enable_ptrace_readexec;
74688 +int grsec_enable_setxid;
74689 +int grsec_enable_symlinkown;
74690 +kgid_t grsec_symlinkown_gid;
74691 +int grsec_enable_brute;
74692 +int grsec_enable_link;
74693 +int grsec_enable_dmesg;
74694 +int grsec_enable_harden_ptrace;
74695 +int grsec_enable_harden_ipc;
74696 +int grsec_enable_fifo;
74697 +int grsec_enable_execlog;
74698 +int grsec_enable_signal;
74699 +int grsec_enable_forkfail;
74700 +int grsec_enable_audit_ptrace;
74701 +int grsec_enable_time;
74702 +int grsec_enable_group;
74703 +kgid_t grsec_audit_gid;
74704 +int grsec_enable_chdir;
74705 +int grsec_enable_mount;
74706 +int grsec_enable_rofs;
74707 +int grsec_deny_new_usb;
74708 +int grsec_enable_chroot_findtask;
74709 +int grsec_enable_chroot_mount;
74710 +int grsec_enable_chroot_shmat;
74711 +int grsec_enable_chroot_fchdir;
74712 +int grsec_enable_chroot_double;
74713 +int grsec_enable_chroot_pivot;
74714 +int grsec_enable_chroot_chdir;
74715 +int grsec_enable_chroot_chmod;
74716 +int grsec_enable_chroot_mknod;
74717 +int grsec_enable_chroot_nice;
74718 +int grsec_enable_chroot_execlog;
74719 +int grsec_enable_chroot_caps;
74720 +int grsec_enable_chroot_sysctl;
74721 +int grsec_enable_chroot_unix;
74722 +int grsec_enable_tpe;
74723 +kgid_t grsec_tpe_gid;
74724 +int grsec_enable_blackhole;
74725 +#ifdef CONFIG_IPV6_MODULE
74726 +EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
74727 +#endif
74728 +int grsec_lastack_retries;
74729 +int grsec_enable_tpe_all;
74730 +int grsec_enable_tpe_invert;
74731 +int grsec_enable_socket_all;
74732 +kgid_t grsec_socket_all_gid;
74733 +int grsec_enable_socket_client;
74734 +kgid_t grsec_socket_client_gid;
74735 +int grsec_enable_socket_server;
74736 +kgid_t grsec_socket_server_gid;
74737 +int grsec_resource_logging;
74738 +int grsec_disable_privio;
74739 +int grsec_enable_log_rwxmaps;
74740 +int grsec_lock;
74741 +
74742 +DEFINE_SPINLOCK(grsec_alert_lock);
74743 +unsigned long grsec_alert_wtime = 0;
74744 +unsigned long grsec_alert_fyet = 0;
74745 +
74746 +DEFINE_SPINLOCK(grsec_audit_lock);
74747 +
74748 +DEFINE_RWLOCK(grsec_exec_file_lock);
74749 +
74750 +char *gr_shared_page[4];
74751 +
74752 +char *gr_alert_log_fmt;
74753 +char *gr_audit_log_fmt;
74754 +char *gr_alert_log_buf;
74755 +char *gr_audit_log_buf;
74756 +
74757 +void __init
74758 +grsecurity_init(void)
74759 +{
74760 + int j;
74761 + /* create the per-cpu shared pages */
74762 +
74763 +#ifdef CONFIG_X86
74764 + memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
74765 +#endif
74766 +
74767 + for (j = 0; j < 4; j++) {
74768 + gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
74769 + if (gr_shared_page[j] == NULL) {
74770 + panic("Unable to allocate grsecurity shared page");
74771 + return;
74772 + }
74773 + }
74774 +
74775 + /* allocate log buffers */
74776 + gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
74777 + if (!gr_alert_log_fmt) {
74778 + panic("Unable to allocate grsecurity alert log format buffer");
74779 + return;
74780 + }
74781 + gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
74782 + if (!gr_audit_log_fmt) {
74783 + panic("Unable to allocate grsecurity audit log format buffer");
74784 + return;
74785 + }
74786 + gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
74787 + if (!gr_alert_log_buf) {
74788 + panic("Unable to allocate grsecurity alert log buffer");
74789 + return;
74790 + }
74791 + gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
74792 + if (!gr_audit_log_buf) {
74793 + panic("Unable to allocate grsecurity audit log buffer");
74794 + return;
74795 + }
74796 +
74797 +#ifdef CONFIG_GRKERNSEC_IO
74798 +#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
74799 + grsec_disable_privio = 1;
74800 +#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
74801 + grsec_disable_privio = 1;
74802 +#else
74803 + grsec_disable_privio = 0;
74804 +#endif
74805 +#endif
74806 +
74807 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
74808 + /* for backward compatibility, tpe_invert always defaults to on if
74809 + enabled in the kernel
74810 + */
74811 + grsec_enable_tpe_invert = 1;
74812 +#endif
74813 +
74814 +#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
74815 +#ifndef CONFIG_GRKERNSEC_SYSCTL
74816 + grsec_lock = 1;
74817 +#endif
74818 +
74819 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
74820 + grsec_enable_log_rwxmaps = 1;
74821 +#endif
74822 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
74823 + grsec_enable_group = 1;
74824 + grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
74825 +#endif
74826 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
74827 + grsec_enable_ptrace_readexec = 1;
74828 +#endif
74829 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
74830 + grsec_enable_chdir = 1;
74831 +#endif
74832 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
74833 + grsec_enable_harden_ptrace = 1;
74834 +#endif
74835 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
74836 + grsec_enable_harden_ipc = 1;
74837 +#endif
74838 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
74839 + grsec_enable_mount = 1;
74840 +#endif
74841 +#ifdef CONFIG_GRKERNSEC_LINK
74842 + grsec_enable_link = 1;
74843 +#endif
74844 +#ifdef CONFIG_GRKERNSEC_BRUTE
74845 + grsec_enable_brute = 1;
74846 +#endif
74847 +#ifdef CONFIG_GRKERNSEC_DMESG
74848 + grsec_enable_dmesg = 1;
74849 +#endif
74850 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
74851 + grsec_enable_blackhole = 1;
74852 + grsec_lastack_retries = 4;
74853 +#endif
74854 +#ifdef CONFIG_GRKERNSEC_FIFO
74855 + grsec_enable_fifo = 1;
74856 +#endif
74857 +#ifdef CONFIG_GRKERNSEC_EXECLOG
74858 + grsec_enable_execlog = 1;
74859 +#endif
74860 +#ifdef CONFIG_GRKERNSEC_SETXID
74861 + grsec_enable_setxid = 1;
74862 +#endif
74863 +#ifdef CONFIG_GRKERNSEC_SIGNAL
74864 + grsec_enable_signal = 1;
74865 +#endif
74866 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
74867 + grsec_enable_forkfail = 1;
74868 +#endif
74869 +#ifdef CONFIG_GRKERNSEC_TIME
74870 + grsec_enable_time = 1;
74871 +#endif
74872 +#ifdef CONFIG_GRKERNSEC_RESLOG
74873 + grsec_resource_logging = 1;
74874 +#endif
74875 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
74876 + grsec_enable_chroot_findtask = 1;
74877 +#endif
74878 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
74879 + grsec_enable_chroot_unix = 1;
74880 +#endif
74881 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
74882 + grsec_enable_chroot_mount = 1;
74883 +#endif
74884 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
74885 + grsec_enable_chroot_fchdir = 1;
74886 +#endif
74887 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
74888 + grsec_enable_chroot_shmat = 1;
74889 +#endif
74890 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
74891 + grsec_enable_audit_ptrace = 1;
74892 +#endif
74893 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
74894 + grsec_enable_chroot_double = 1;
74895 +#endif
74896 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
74897 + grsec_enable_chroot_pivot = 1;
74898 +#endif
74899 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
74900 + grsec_enable_chroot_chdir = 1;
74901 +#endif
74902 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
74903 + grsec_enable_chroot_chmod = 1;
74904 +#endif
74905 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
74906 + grsec_enable_chroot_mknod = 1;
74907 +#endif
74908 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
74909 + grsec_enable_chroot_nice = 1;
74910 +#endif
74911 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
74912 + grsec_enable_chroot_execlog = 1;
74913 +#endif
74914 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
74915 + grsec_enable_chroot_caps = 1;
74916 +#endif
74917 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
74918 + grsec_enable_chroot_sysctl = 1;
74919 +#endif
74920 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
74921 + grsec_enable_symlinkown = 1;
74922 + grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
74923 +#endif
74924 +#ifdef CONFIG_GRKERNSEC_TPE
74925 + grsec_enable_tpe = 1;
74926 + grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
74927 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
74928 + grsec_enable_tpe_all = 1;
74929 +#endif
74930 +#endif
74931 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
74932 + grsec_enable_socket_all = 1;
74933 + grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
74934 +#endif
74935 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
74936 + grsec_enable_socket_client = 1;
74937 + grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
74938 +#endif
74939 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
74940 + grsec_enable_socket_server = 1;
74941 + grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
74942 +#endif
74943 +#endif
74944 +#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
74945 + grsec_deny_new_usb = 1;
74946 +#endif
74947 +
74948 + return;
74949 +}
74950 diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
74951 new file mode 100644
74952 index 0000000..1773300
74953 --- /dev/null
74954 +++ b/grsecurity/grsec_ipc.c
74955 @@ -0,0 +1,48 @@
74956 +#include <linux/kernel.h>
74957 +#include <linux/mm.h>
74958 +#include <linux/sched.h>
74959 +#include <linux/file.h>
74960 +#include <linux/ipc.h>
74961 +#include <linux/ipc_namespace.h>
74962 +#include <linux/grsecurity.h>
74963 +#include <linux/grinternal.h>
74964 +
74965 +int
74966 +gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
74967 +{
74968 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
74969 + int write;
74970 + int orig_granted_mode;
74971 + kuid_t euid;
74972 + kgid_t egid;
74973 +
74974 + if (!grsec_enable_harden_ipc)
74975 + return 1;
74976 +
74977 + euid = current_euid();
74978 + egid = current_egid();
74979 +
74980 + write = requested_mode & 00002;
74981 + orig_granted_mode = ipcp->mode;
74982 +
74983 + if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
74984 + orig_granted_mode >>= 6;
74985 + else {
74986 + /* if likely wrong permissions, lock to user */
74987 + if (orig_granted_mode & 0007)
74988 + orig_granted_mode = 0;
74989 + /* otherwise do a egid-only check */
74990 + else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
74991 + orig_granted_mode >>= 3;
74992 + /* otherwise, no access */
74993 + else
74994 + orig_granted_mode = 0;
74995 + }
74996 + if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
74997 + !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
74998 + gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
74999 + return 0;
75000 + }
75001 +#endif
75002 + return 1;
75003 +}
75004 diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
75005 new file mode 100644
75006 index 0000000..5e05e20
75007 --- /dev/null
75008 +++ b/grsecurity/grsec_link.c
75009 @@ -0,0 +1,58 @@
75010 +#include <linux/kernel.h>
75011 +#include <linux/sched.h>
75012 +#include <linux/fs.h>
75013 +#include <linux/file.h>
75014 +#include <linux/grinternal.h>
75015 +
75016 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
75017 +{
75018 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
75019 + const struct inode *link_inode = link->dentry->d_inode;
75020 +
75021 + if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
75022 + /* ignore root-owned links, e.g. /proc/self */
75023 + gr_is_global_nonroot(link_inode->i_uid) && target &&
75024 + !uid_eq(link_inode->i_uid, target->i_uid)) {
75025 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
75026 + return 1;
75027 + }
75028 +#endif
75029 + return 0;
75030 +}
75031 +
75032 +int
75033 +gr_handle_follow_link(const struct inode *parent,
75034 + const struct inode *inode,
75035 + const struct dentry *dentry, const struct vfsmount *mnt)
75036 +{
75037 +#ifdef CONFIG_GRKERNSEC_LINK
75038 + const struct cred *cred = current_cred();
75039 +
75040 + if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
75041 + (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
75042 + (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
75043 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
75044 + return -EACCES;
75045 + }
75046 +#endif
75047 + return 0;
75048 +}
75049 +
75050 +int
75051 +gr_handle_hardlink(const struct dentry *dentry,
75052 + const struct vfsmount *mnt,
75053 + struct inode *inode, const int mode, const struct filename *to)
75054 +{
75055 +#ifdef CONFIG_GRKERNSEC_LINK
75056 + const struct cred *cred = current_cred();
75057 +
75058 + if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
75059 + (!S_ISREG(mode) || is_privileged_binary(dentry) ||
75060 + (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
75061 + !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
75062 + gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
75063 + return -EPERM;
75064 + }
75065 +#endif
75066 + return 0;
75067 +}
75068 diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
75069 new file mode 100644
75070 index 0000000..dbe0a6b
75071 --- /dev/null
75072 +++ b/grsecurity/grsec_log.c
75073 @@ -0,0 +1,341 @@
75074 +#include <linux/kernel.h>
75075 +#include <linux/sched.h>
75076 +#include <linux/file.h>
75077 +#include <linux/tty.h>
75078 +#include <linux/fs.h>
75079 +#include <linux/mm.h>
75080 +#include <linux/grinternal.h>
75081 +
75082 +#ifdef CONFIG_TREE_PREEMPT_RCU
75083 +#define DISABLE_PREEMPT() preempt_disable()
75084 +#define ENABLE_PREEMPT() preempt_enable()
75085 +#else
75086 +#define DISABLE_PREEMPT()
75087 +#define ENABLE_PREEMPT()
75088 +#endif
75089 +
75090 +#define BEGIN_LOCKS(x) \
75091 + DISABLE_PREEMPT(); \
75092 + rcu_read_lock(); \
75093 + read_lock(&tasklist_lock); \
75094 + read_lock(&grsec_exec_file_lock); \
75095 + if (x != GR_DO_AUDIT) \
75096 + spin_lock(&grsec_alert_lock); \
75097 + else \
75098 + spin_lock(&grsec_audit_lock)
75099 +
75100 +#define END_LOCKS(x) \
75101 + if (x != GR_DO_AUDIT) \
75102 + spin_unlock(&grsec_alert_lock); \
75103 + else \
75104 + spin_unlock(&grsec_audit_lock); \
75105 + read_unlock(&grsec_exec_file_lock); \
75106 + read_unlock(&tasklist_lock); \
75107 + rcu_read_unlock(); \
75108 + ENABLE_PREEMPT(); \
75109 + if (x == GR_DONT_AUDIT) \
75110 + gr_handle_alertkill(current)
75111 +
75112 +enum {
75113 + FLOODING,
75114 + NO_FLOODING
75115 +};
75116 +
75117 +extern char *gr_alert_log_fmt;
75118 +extern char *gr_audit_log_fmt;
75119 +extern char *gr_alert_log_buf;
75120 +extern char *gr_audit_log_buf;
75121 +
75122 +static int gr_log_start(int audit)
75123 +{
75124 + char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
75125 + char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
75126 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
75127 +#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
75128 + unsigned long curr_secs = get_seconds();
75129 +
75130 + if (audit == GR_DO_AUDIT)
75131 + goto set_fmt;
75132 +
75133 + if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
75134 + grsec_alert_wtime = curr_secs;
75135 + grsec_alert_fyet = 0;
75136 + } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
75137 + && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
75138 + grsec_alert_fyet++;
75139 + } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
75140 + grsec_alert_wtime = curr_secs;
75141 + grsec_alert_fyet++;
75142 + printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
75143 + return FLOODING;
75144 + }
75145 + else return FLOODING;
75146 +
75147 +set_fmt:
75148 +#endif
75149 + memset(buf, 0, PAGE_SIZE);
75150 + if (current->signal->curr_ip && gr_acl_is_enabled()) {
75151 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
75152 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
75153 + } else if (current->signal->curr_ip) {
75154 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
75155 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
75156 + } else if (gr_acl_is_enabled()) {
75157 + sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
75158 + snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
75159 + } else {
75160 + sprintf(fmt, "%s%s", loglevel, "grsec: ");
75161 + strcpy(buf, fmt);
75162 + }
75163 +
75164 + return NO_FLOODING;
75165 +}
75166 +
75167 +static void gr_log_middle(int audit, const char *msg, va_list ap)
75168 + __attribute__ ((format (printf, 2, 0)));
75169 +
75170 +static void gr_log_middle(int audit, const char *msg, va_list ap)
75171 +{
75172 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
75173 + unsigned int len = strlen(buf);
75174 +
75175 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
75176 +
75177 + return;
75178 +}
75179 +
75180 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
75181 + __attribute__ ((format (printf, 2, 3)));
75182 +
75183 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
75184 +{
75185 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
75186 + unsigned int len = strlen(buf);
75187 + va_list ap;
75188 +
75189 + va_start(ap, msg);
75190 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
75191 + va_end(ap);
75192 +
75193 + return;
75194 +}
75195 +
75196 +static void gr_log_end(int audit, int append_default)
75197 +{
75198 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
75199 + if (append_default) {
75200 + struct task_struct *task = current;
75201 + struct task_struct *parent = task->real_parent;
75202 + const struct cred *cred = __task_cred(task);
75203 + const struct cred *pcred = __task_cred(parent);
75204 + unsigned int len = strlen(buf);
75205 +
75206 + 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));
75207 + }
75208 +
75209 + printk("%s\n", buf);
75210 +
75211 + return;
75212 +}
75213 +
75214 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
75215 +{
75216 + int logtype;
75217 + char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
75218 + char *str1 = NULL, *str2 = NULL, *str3 = NULL;
75219 + void *voidptr = NULL;
75220 + int num1 = 0, num2 = 0;
75221 + unsigned long ulong1 = 0, ulong2 = 0;
75222 + struct dentry *dentry = NULL;
75223 + struct vfsmount *mnt = NULL;
75224 + struct file *file = NULL;
75225 + struct task_struct *task = NULL;
75226 + struct vm_area_struct *vma = NULL;
75227 + const struct cred *cred, *pcred;
75228 + va_list ap;
75229 +
75230 + BEGIN_LOCKS(audit);
75231 + logtype = gr_log_start(audit);
75232 + if (logtype == FLOODING) {
75233 + END_LOCKS(audit);
75234 + return;
75235 + }
75236 + va_start(ap, argtypes);
75237 + switch (argtypes) {
75238 + case GR_TTYSNIFF:
75239 + task = va_arg(ap, struct task_struct *);
75240 + 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));
75241 + break;
75242 + case GR_SYSCTL_HIDDEN:
75243 + str1 = va_arg(ap, char *);
75244 + gr_log_middle_varargs(audit, msg, result, str1);
75245 + break;
75246 + case GR_RBAC:
75247 + dentry = va_arg(ap, struct dentry *);
75248 + mnt = va_arg(ap, struct vfsmount *);
75249 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
75250 + break;
75251 + case GR_RBAC_STR:
75252 + dentry = va_arg(ap, struct dentry *);
75253 + mnt = va_arg(ap, struct vfsmount *);
75254 + str1 = va_arg(ap, char *);
75255 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
75256 + break;
75257 + case GR_STR_RBAC:
75258 + str1 = va_arg(ap, char *);
75259 + dentry = va_arg(ap, struct dentry *);
75260 + mnt = va_arg(ap, struct vfsmount *);
75261 + gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
75262 + break;
75263 + case GR_RBAC_MODE2:
75264 + dentry = va_arg(ap, struct dentry *);
75265 + mnt = va_arg(ap, struct vfsmount *);
75266 + str1 = va_arg(ap, char *);
75267 + str2 = va_arg(ap, char *);
75268 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
75269 + break;
75270 + case GR_RBAC_MODE3:
75271 + dentry = va_arg(ap, struct dentry *);
75272 + mnt = va_arg(ap, struct vfsmount *);
75273 + str1 = va_arg(ap, char *);
75274 + str2 = va_arg(ap, char *);
75275 + str3 = va_arg(ap, char *);
75276 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
75277 + break;
75278 + case GR_FILENAME:
75279 + dentry = va_arg(ap, struct dentry *);
75280 + mnt = va_arg(ap, struct vfsmount *);
75281 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
75282 + break;
75283 + case GR_STR_FILENAME:
75284 + str1 = va_arg(ap, char *);
75285 + dentry = va_arg(ap, struct dentry *);
75286 + mnt = va_arg(ap, struct vfsmount *);
75287 + gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
75288 + break;
75289 + case GR_FILENAME_STR:
75290 + dentry = va_arg(ap, struct dentry *);
75291 + mnt = va_arg(ap, struct vfsmount *);
75292 + str1 = va_arg(ap, char *);
75293 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
75294 + break;
75295 + case GR_FILENAME_TWO_INT:
75296 + dentry = va_arg(ap, struct dentry *);
75297 + mnt = va_arg(ap, struct vfsmount *);
75298 + num1 = va_arg(ap, int);
75299 + num2 = va_arg(ap, int);
75300 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
75301 + break;
75302 + case GR_FILENAME_TWO_INT_STR:
75303 + dentry = va_arg(ap, struct dentry *);
75304 + mnt = va_arg(ap, struct vfsmount *);
75305 + num1 = va_arg(ap, int);
75306 + num2 = va_arg(ap, int);
75307 + str1 = va_arg(ap, char *);
75308 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
75309 + break;
75310 + case GR_TEXTREL:
75311 + file = va_arg(ap, struct file *);
75312 + ulong1 = va_arg(ap, unsigned long);
75313 + ulong2 = va_arg(ap, unsigned long);
75314 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
75315 + break;
75316 + case GR_PTRACE:
75317 + task = va_arg(ap, struct task_struct *);
75318 + 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));
75319 + break;
75320 + case GR_RESOURCE:
75321 + task = va_arg(ap, struct task_struct *);
75322 + cred = __task_cred(task);
75323 + pcred = __task_cred(task->real_parent);
75324 + ulong1 = va_arg(ap, unsigned long);
75325 + str1 = va_arg(ap, char *);
75326 + ulong2 = va_arg(ap, unsigned long);
75327 + 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));
75328 + break;
75329 + case GR_CAP:
75330 + task = va_arg(ap, struct task_struct *);
75331 + cred = __task_cred(task);
75332 + pcred = __task_cred(task->real_parent);
75333 + str1 = va_arg(ap, char *);
75334 + 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));
75335 + break;
75336 + case GR_SIG:
75337 + str1 = va_arg(ap, char *);
75338 + voidptr = va_arg(ap, void *);
75339 + gr_log_middle_varargs(audit, msg, str1, voidptr);
75340 + break;
75341 + case GR_SIG2:
75342 + task = va_arg(ap, struct task_struct *);
75343 + cred = __task_cred(task);
75344 + pcred = __task_cred(task->real_parent);
75345 + num1 = va_arg(ap, int);
75346 + 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));
75347 + break;
75348 + case GR_CRASH1:
75349 + task = va_arg(ap, struct task_struct *);
75350 + cred = __task_cred(task);
75351 + pcred = __task_cred(task->real_parent);
75352 + ulong1 = va_arg(ap, unsigned long);
75353 + 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);
75354 + break;
75355 + case GR_CRASH2:
75356 + task = va_arg(ap, struct task_struct *);
75357 + cred = __task_cred(task);
75358 + pcred = __task_cred(task->real_parent);
75359 + ulong1 = va_arg(ap, unsigned long);
75360 + 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);
75361 + break;
75362 + case GR_RWXMAP:
75363 + file = va_arg(ap, struct file *);
75364 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
75365 + break;
75366 + case GR_RWXMAPVMA:
75367 + vma = va_arg(ap, struct vm_area_struct *);
75368 + if (vma->vm_file)
75369 + str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
75370 + else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
75371 + str1 = "<stack>";
75372 + else if (vma->vm_start <= current->mm->brk &&
75373 + vma->vm_end >= current->mm->start_brk)
75374 + str1 = "<heap>";
75375 + else
75376 + str1 = "<anonymous mapping>";
75377 + gr_log_middle_varargs(audit, msg, str1);
75378 + break;
75379 + case GR_PSACCT:
75380 + {
75381 + unsigned int wday, cday;
75382 + __u8 whr, chr;
75383 + __u8 wmin, cmin;
75384 + __u8 wsec, csec;
75385 + char cur_tty[64] = { 0 };
75386 + char parent_tty[64] = { 0 };
75387 +
75388 + task = va_arg(ap, struct task_struct *);
75389 + wday = va_arg(ap, unsigned int);
75390 + cday = va_arg(ap, unsigned int);
75391 + whr = va_arg(ap, int);
75392 + chr = va_arg(ap, int);
75393 + wmin = va_arg(ap, int);
75394 + cmin = va_arg(ap, int);
75395 + wsec = va_arg(ap, int);
75396 + csec = va_arg(ap, int);
75397 + ulong1 = va_arg(ap, unsigned long);
75398 + cred = __task_cred(task);
75399 + pcred = __task_cred(task->real_parent);
75400 +
75401 + 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));
75402 + }
75403 + break;
75404 + default:
75405 + gr_log_middle(audit, msg, ap);
75406 + }
75407 + va_end(ap);
75408 + // these don't need DEFAULTSECARGS printed on the end
75409 + if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
75410 + gr_log_end(audit, 0);
75411 + else
75412 + gr_log_end(audit, 1);
75413 + END_LOCKS(audit);
75414 +}
75415 diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
75416 new file mode 100644
75417 index 0000000..0e39d8c
75418 --- /dev/null
75419 +++ b/grsecurity/grsec_mem.c
75420 @@ -0,0 +1,48 @@
75421 +#include <linux/kernel.h>
75422 +#include <linux/sched.h>
75423 +#include <linux/mm.h>
75424 +#include <linux/mman.h>
75425 +#include <linux/module.h>
75426 +#include <linux/grinternal.h>
75427 +
75428 +void gr_handle_msr_write(void)
75429 +{
75430 + gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
75431 + return;
75432 +}
75433 +EXPORT_SYMBOL_GPL(gr_handle_msr_write);
75434 +
75435 +void
75436 +gr_handle_ioperm(void)
75437 +{
75438 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
75439 + return;
75440 +}
75441 +
75442 +void
75443 +gr_handle_iopl(void)
75444 +{
75445 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
75446 + return;
75447 +}
75448 +
75449 +void
75450 +gr_handle_mem_readwrite(u64 from, u64 to)
75451 +{
75452 + gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
75453 + return;
75454 +}
75455 +
75456 +void
75457 +gr_handle_vm86(void)
75458 +{
75459 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
75460 + return;
75461 +}
75462 +
75463 +void
75464 +gr_log_badprocpid(const char *entry)
75465 +{
75466 + gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
75467 + return;
75468 +}
75469 diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
75470 new file mode 100644
75471 index 0000000..cd9e124
75472 --- /dev/null
75473 +++ b/grsecurity/grsec_mount.c
75474 @@ -0,0 +1,65 @@
75475 +#include <linux/kernel.h>
75476 +#include <linux/sched.h>
75477 +#include <linux/mount.h>
75478 +#include <linux/major.h>
75479 +#include <linux/grsecurity.h>
75480 +#include <linux/grinternal.h>
75481 +
75482 +void
75483 +gr_log_remount(const char *devname, const int retval)
75484 +{
75485 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
75486 + if (grsec_enable_mount && (retval >= 0))
75487 + gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
75488 +#endif
75489 + return;
75490 +}
75491 +
75492 +void
75493 +gr_log_unmount(const char *devname, const int retval)
75494 +{
75495 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
75496 + if (grsec_enable_mount && (retval >= 0))
75497 + gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
75498 +#endif
75499 + return;
75500 +}
75501 +
75502 +void
75503 +gr_log_mount(const char *from, const char *to, const int retval)
75504 +{
75505 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
75506 + if (grsec_enable_mount && (retval >= 0))
75507 + gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
75508 +#endif
75509 + return;
75510 +}
75511 +
75512 +int
75513 +gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
75514 +{
75515 +#ifdef CONFIG_GRKERNSEC_ROFS
75516 + if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
75517 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
75518 + return -EPERM;
75519 + } else
75520 + return 0;
75521 +#endif
75522 + return 0;
75523 +}
75524 +
75525 +int
75526 +gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
75527 +{
75528 +#ifdef CONFIG_GRKERNSEC_ROFS
75529 + struct inode *inode = dentry->d_inode;
75530 +
75531 + if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
75532 + inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
75533 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
75534 + return -EPERM;
75535 + } else
75536 + return 0;
75537 +#endif
75538 + return 0;
75539 +}
75540 diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
75541 new file mode 100644
75542 index 0000000..6ee9d50
75543 --- /dev/null
75544 +++ b/grsecurity/grsec_pax.c
75545 @@ -0,0 +1,45 @@
75546 +#include <linux/kernel.h>
75547 +#include <linux/sched.h>
75548 +#include <linux/mm.h>
75549 +#include <linux/file.h>
75550 +#include <linux/grinternal.h>
75551 +#include <linux/grsecurity.h>
75552 +
75553 +void
75554 +gr_log_textrel(struct vm_area_struct * vma)
75555 +{
75556 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
75557 + if (grsec_enable_log_rwxmaps)
75558 + gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
75559 +#endif
75560 + return;
75561 +}
75562 +
75563 +void gr_log_ptgnustack(struct file *file)
75564 +{
75565 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
75566 + if (grsec_enable_log_rwxmaps)
75567 + gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
75568 +#endif
75569 + return;
75570 +}
75571 +
75572 +void
75573 +gr_log_rwxmmap(struct file *file)
75574 +{
75575 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
75576 + if (grsec_enable_log_rwxmaps)
75577 + gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
75578 +#endif
75579 + return;
75580 +}
75581 +
75582 +void
75583 +gr_log_rwxmprotect(struct vm_area_struct *vma)
75584 +{
75585 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
75586 + if (grsec_enable_log_rwxmaps)
75587 + gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
75588 +#endif
75589 + return;
75590 +}
75591 diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
75592 new file mode 100644
75593 index 0000000..2005a3a
75594 --- /dev/null
75595 +++ b/grsecurity/grsec_proc.c
75596 @@ -0,0 +1,20 @@
75597 +#include <linux/kernel.h>
75598 +#include <linux/sched.h>
75599 +#include <linux/grsecurity.h>
75600 +#include <linux/grinternal.h>
75601 +
75602 +int gr_proc_is_restricted(void)
75603 +{
75604 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
75605 + const struct cred *cred = current_cred();
75606 +#endif
75607 +
75608 +#ifdef CONFIG_GRKERNSEC_PROC_USER
75609 + if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
75610 + return -EACCES;
75611 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
75612 + if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
75613 + return -EACCES;
75614 +#endif
75615 + return 0;
75616 +}
75617 diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
75618 new file mode 100644
75619 index 0000000..f7f29aa
75620 --- /dev/null
75621 +++ b/grsecurity/grsec_ptrace.c
75622 @@ -0,0 +1,30 @@
75623 +#include <linux/kernel.h>
75624 +#include <linux/sched.h>
75625 +#include <linux/grinternal.h>
75626 +#include <linux/security.h>
75627 +
75628 +void
75629 +gr_audit_ptrace(struct task_struct *task)
75630 +{
75631 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
75632 + if (grsec_enable_audit_ptrace)
75633 + gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
75634 +#endif
75635 + return;
75636 +}
75637 +
75638 +int
75639 +gr_ptrace_readexec(struct file *file, int unsafe_flags)
75640 +{
75641 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
75642 + const struct dentry *dentry = file->f_path.dentry;
75643 + const struct vfsmount *mnt = file->f_path.mnt;
75644 +
75645 + if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
75646 + (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
75647 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
75648 + return -EACCES;
75649 + }
75650 +#endif
75651 + return 0;
75652 +}
75653 diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
75654 new file mode 100644
75655 index 0000000..3860c7e
75656 --- /dev/null
75657 +++ b/grsecurity/grsec_sig.c
75658 @@ -0,0 +1,236 @@
75659 +#include <linux/kernel.h>
75660 +#include <linux/sched.h>
75661 +#include <linux/fs.h>
75662 +#include <linux/delay.h>
75663 +#include <linux/grsecurity.h>
75664 +#include <linux/grinternal.h>
75665 +#include <linux/hardirq.h>
75666 +
75667 +char *signames[] = {
75668 + [SIGSEGV] = "Segmentation fault",
75669 + [SIGILL] = "Illegal instruction",
75670 + [SIGABRT] = "Abort",
75671 + [SIGBUS] = "Invalid alignment/Bus error"
75672 +};
75673 +
75674 +void
75675 +gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
75676 +{
75677 +#ifdef CONFIG_GRKERNSEC_SIGNAL
75678 + if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
75679 + (sig == SIGABRT) || (sig == SIGBUS))) {
75680 + if (task_pid_nr(t) == task_pid_nr(current)) {
75681 + gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
75682 + } else {
75683 + gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
75684 + }
75685 + }
75686 +#endif
75687 + return;
75688 +}
75689 +
75690 +int
75691 +gr_handle_signal(const struct task_struct *p, const int sig)
75692 +{
75693 +#ifdef CONFIG_GRKERNSEC
75694 + /* ignore the 0 signal for protected task checks */
75695 + if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
75696 + gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
75697 + return -EPERM;
75698 + } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
75699 + return -EPERM;
75700 + }
75701 +#endif
75702 + return 0;
75703 +}
75704 +
75705 +#ifdef CONFIG_GRKERNSEC
75706 +extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
75707 +
75708 +int gr_fake_force_sig(int sig, struct task_struct *t)
75709 +{
75710 + unsigned long int flags;
75711 + int ret, blocked, ignored;
75712 + struct k_sigaction *action;
75713 +
75714 + spin_lock_irqsave(&t->sighand->siglock, flags);
75715 + action = &t->sighand->action[sig-1];
75716 + ignored = action->sa.sa_handler == SIG_IGN;
75717 + blocked = sigismember(&t->blocked, sig);
75718 + if (blocked || ignored) {
75719 + action->sa.sa_handler = SIG_DFL;
75720 + if (blocked) {
75721 + sigdelset(&t->blocked, sig);
75722 + recalc_sigpending_and_wake(t);
75723 + }
75724 + }
75725 + if (action->sa.sa_handler == SIG_DFL)
75726 + t->signal->flags &= ~SIGNAL_UNKILLABLE;
75727 + ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
75728 +
75729 + spin_unlock_irqrestore(&t->sighand->siglock, flags);
75730 +
75731 + return ret;
75732 +}
75733 +#endif
75734 +
75735 +#define GR_USER_BAN_TIME (15 * 60)
75736 +#define GR_DAEMON_BRUTE_TIME (30 * 60)
75737 +
75738 +void gr_handle_brute_attach(int dumpable)
75739 +{
75740 +#ifdef CONFIG_GRKERNSEC_BRUTE
75741 + struct task_struct *p = current;
75742 + kuid_t uid = GLOBAL_ROOT_UID;
75743 + int daemon = 0;
75744 +
75745 + if (!grsec_enable_brute)
75746 + return;
75747 +
75748 + rcu_read_lock();
75749 + read_lock(&tasklist_lock);
75750 + read_lock(&grsec_exec_file_lock);
75751 + if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
75752 + p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
75753 + p->real_parent->brute = 1;
75754 + daemon = 1;
75755 + } else {
75756 + const struct cred *cred = __task_cred(p), *cred2;
75757 + struct task_struct *tsk, *tsk2;
75758 +
75759 + if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
75760 + struct user_struct *user;
75761 +
75762 + uid = cred->uid;
75763 +
75764 + /* this is put upon execution past expiration */
75765 + user = find_user(uid);
75766 + if (user == NULL)
75767 + goto unlock;
75768 + user->suid_banned = 1;
75769 + user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
75770 + if (user->suid_ban_expires == ~0UL)
75771 + user->suid_ban_expires--;
75772 +
75773 + /* only kill other threads of the same binary, from the same user */
75774 + do_each_thread(tsk2, tsk) {
75775 + cred2 = __task_cred(tsk);
75776 + if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
75777 + gr_fake_force_sig(SIGKILL, tsk);
75778 + } while_each_thread(tsk2, tsk);
75779 + }
75780 + }
75781 +unlock:
75782 + read_unlock(&grsec_exec_file_lock);
75783 + read_unlock(&tasklist_lock);
75784 + rcu_read_unlock();
75785 +
75786 + if (gr_is_global_nonroot(uid))
75787 + 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);
75788 + else if (daemon)
75789 + gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
75790 +
75791 +#endif
75792 + return;
75793 +}
75794 +
75795 +void gr_handle_brute_check(void)
75796 +{
75797 +#ifdef CONFIG_GRKERNSEC_BRUTE
75798 + struct task_struct *p = current;
75799 +
75800 + if (unlikely(p->brute)) {
75801 + if (!grsec_enable_brute)
75802 + p->brute = 0;
75803 + else if (time_before(get_seconds(), p->brute_expires))
75804 + msleep(30 * 1000);
75805 + }
75806 +#endif
75807 + return;
75808 +}
75809 +
75810 +void gr_handle_kernel_exploit(void)
75811 +{
75812 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
75813 + const struct cred *cred;
75814 + struct task_struct *tsk, *tsk2;
75815 + struct user_struct *user;
75816 + kuid_t uid;
75817 +
75818 + if (in_irq() || in_serving_softirq() || in_nmi())
75819 + panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
75820 +
75821 + uid = current_uid();
75822 +
75823 + if (gr_is_global_root(uid))
75824 + panic("grsec: halting the system due to suspicious kernel crash caused by root");
75825 + else {
75826 + /* kill all the processes of this user, hold a reference
75827 + to their creds struct, and prevent them from creating
75828 + another process until system reset
75829 + */
75830 + printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
75831 + GR_GLOBAL_UID(uid));
75832 + /* we intentionally leak this ref */
75833 + user = get_uid(current->cred->user);
75834 + if (user)
75835 + user->kernel_banned = 1;
75836 +
75837 + /* kill all processes of this user */
75838 + read_lock(&tasklist_lock);
75839 + do_each_thread(tsk2, tsk) {
75840 + cred = __task_cred(tsk);
75841 + if (uid_eq(cred->uid, uid))
75842 + gr_fake_force_sig(SIGKILL, tsk);
75843 + } while_each_thread(tsk2, tsk);
75844 + read_unlock(&tasklist_lock);
75845 + }
75846 +#endif
75847 +}
75848 +
75849 +#ifdef CONFIG_GRKERNSEC_BRUTE
75850 +static bool suid_ban_expired(struct user_struct *user)
75851 +{
75852 + if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
75853 + user->suid_banned = 0;
75854 + user->suid_ban_expires = 0;
75855 + free_uid(user);
75856 + return true;
75857 + }
75858 +
75859 + return false;
75860 +}
75861 +#endif
75862 +
75863 +int gr_process_kernel_exec_ban(void)
75864 +{
75865 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
75866 + if (unlikely(current->cred->user->kernel_banned))
75867 + return -EPERM;
75868 +#endif
75869 + return 0;
75870 +}
75871 +
75872 +int gr_process_kernel_setuid_ban(struct user_struct *user)
75873 +{
75874 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
75875 + if (unlikely(user->kernel_banned))
75876 + gr_fake_force_sig(SIGKILL, current);
75877 +#endif
75878 + return 0;
75879 +}
75880 +
75881 +int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
75882 +{
75883 +#ifdef CONFIG_GRKERNSEC_BRUTE
75884 + struct user_struct *user = current->cred->user;
75885 + if (unlikely(user->suid_banned)) {
75886 + if (suid_ban_expired(user))
75887 + return 0;
75888 + /* disallow execution of suid binaries only */
75889 + else if (!uid_eq(bprm->cred->euid, current->cred->uid))
75890 + return -EPERM;
75891 + }
75892 +#endif
75893 + return 0;
75894 +}
75895 diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
75896 new file mode 100644
75897 index 0000000..c0aef3a
75898 --- /dev/null
75899 +++ b/grsecurity/grsec_sock.c
75900 @@ -0,0 +1,244 @@
75901 +#include <linux/kernel.h>
75902 +#include <linux/module.h>
75903 +#include <linux/sched.h>
75904 +#include <linux/file.h>
75905 +#include <linux/net.h>
75906 +#include <linux/in.h>
75907 +#include <linux/ip.h>
75908 +#include <net/sock.h>
75909 +#include <net/inet_sock.h>
75910 +#include <linux/grsecurity.h>
75911 +#include <linux/grinternal.h>
75912 +#include <linux/gracl.h>
75913 +
75914 +extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
75915 +extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
75916 +
75917 +EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
75918 +EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
75919 +
75920 +#ifdef CONFIG_UNIX_MODULE
75921 +EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
75922 +EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
75923 +EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
75924 +EXPORT_SYMBOL_GPL(gr_handle_create);
75925 +#endif
75926 +
75927 +#ifdef CONFIG_GRKERNSEC
75928 +#define gr_conn_table_size 32749
75929 +struct conn_table_entry {
75930 + struct conn_table_entry *next;
75931 + struct signal_struct *sig;
75932 +};
75933 +
75934 +struct conn_table_entry *gr_conn_table[gr_conn_table_size];
75935 +DEFINE_SPINLOCK(gr_conn_table_lock);
75936 +
75937 +extern const char * gr_socktype_to_name(unsigned char type);
75938 +extern const char * gr_proto_to_name(unsigned char proto);
75939 +extern const char * gr_sockfamily_to_name(unsigned char family);
75940 +
75941 +static __inline__ int
75942 +conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
75943 +{
75944 + return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
75945 +}
75946 +
75947 +static __inline__ int
75948 +conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
75949 + __u16 sport, __u16 dport)
75950 +{
75951 + if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
75952 + sig->gr_sport == sport && sig->gr_dport == dport))
75953 + return 1;
75954 + else
75955 + return 0;
75956 +}
75957 +
75958 +static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
75959 +{
75960 + struct conn_table_entry **match;
75961 + unsigned int index;
75962 +
75963 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
75964 + sig->gr_sport, sig->gr_dport,
75965 + gr_conn_table_size);
75966 +
75967 + newent->sig = sig;
75968 +
75969 + match = &gr_conn_table[index];
75970 + newent->next = *match;
75971 + *match = newent;
75972 +
75973 + return;
75974 +}
75975 +
75976 +static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
75977 +{
75978 + struct conn_table_entry *match, *last = NULL;
75979 + unsigned int index;
75980 +
75981 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
75982 + sig->gr_sport, sig->gr_dport,
75983 + gr_conn_table_size);
75984 +
75985 + match = gr_conn_table[index];
75986 + while (match && !conn_match(match->sig,
75987 + sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
75988 + sig->gr_dport)) {
75989 + last = match;
75990 + match = match->next;
75991 + }
75992 +
75993 + if (match) {
75994 + if (last)
75995 + last->next = match->next;
75996 + else
75997 + gr_conn_table[index] = NULL;
75998 + kfree(match);
75999 + }
76000 +
76001 + return;
76002 +}
76003 +
76004 +static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
76005 + __u16 sport, __u16 dport)
76006 +{
76007 + struct conn_table_entry *match;
76008 + unsigned int index;
76009 +
76010 + index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
76011 +
76012 + match = gr_conn_table[index];
76013 + while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
76014 + match = match->next;
76015 +
76016 + if (match)
76017 + return match->sig;
76018 + else
76019 + return NULL;
76020 +}
76021 +
76022 +#endif
76023 +
76024 +void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
76025 +{
76026 +#ifdef CONFIG_GRKERNSEC
76027 + struct signal_struct *sig = task->signal;
76028 + struct conn_table_entry *newent;
76029 +
76030 + newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
76031 + if (newent == NULL)
76032 + return;
76033 + /* no bh lock needed since we are called with bh disabled */
76034 + spin_lock(&gr_conn_table_lock);
76035 + gr_del_task_from_ip_table_nolock(sig);
76036 + sig->gr_saddr = inet->inet_rcv_saddr;
76037 + sig->gr_daddr = inet->inet_daddr;
76038 + sig->gr_sport = inet->inet_sport;
76039 + sig->gr_dport = inet->inet_dport;
76040 + gr_add_to_task_ip_table_nolock(sig, newent);
76041 + spin_unlock(&gr_conn_table_lock);
76042 +#endif
76043 + return;
76044 +}
76045 +
76046 +void gr_del_task_from_ip_table(struct task_struct *task)
76047 +{
76048 +#ifdef CONFIG_GRKERNSEC
76049 + spin_lock_bh(&gr_conn_table_lock);
76050 + gr_del_task_from_ip_table_nolock(task->signal);
76051 + spin_unlock_bh(&gr_conn_table_lock);
76052 +#endif
76053 + return;
76054 +}
76055 +
76056 +void
76057 +gr_attach_curr_ip(const struct sock *sk)
76058 +{
76059 +#ifdef CONFIG_GRKERNSEC
76060 + struct signal_struct *p, *set;
76061 + const struct inet_sock *inet = inet_sk(sk);
76062 +
76063 + if (unlikely(sk->sk_protocol != IPPROTO_TCP))
76064 + return;
76065 +
76066 + set = current->signal;
76067 +
76068 + spin_lock_bh(&gr_conn_table_lock);
76069 + p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
76070 + inet->inet_dport, inet->inet_sport);
76071 + if (unlikely(p != NULL)) {
76072 + set->curr_ip = p->curr_ip;
76073 + set->used_accept = 1;
76074 + gr_del_task_from_ip_table_nolock(p);
76075 + spin_unlock_bh(&gr_conn_table_lock);
76076 + return;
76077 + }
76078 + spin_unlock_bh(&gr_conn_table_lock);
76079 +
76080 + set->curr_ip = inet->inet_daddr;
76081 + set->used_accept = 1;
76082 +#endif
76083 + return;
76084 +}
76085 +
76086 +int
76087 +gr_handle_sock_all(const int family, const int type, const int protocol)
76088 +{
76089 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
76090 + if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
76091 + (family != AF_UNIX)) {
76092 + if (family == AF_INET)
76093 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
76094 + else
76095 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
76096 + return -EACCES;
76097 + }
76098 +#endif
76099 + return 0;
76100 +}
76101 +
76102 +int
76103 +gr_handle_sock_server(const struct sockaddr *sck)
76104 +{
76105 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
76106 + if (grsec_enable_socket_server &&
76107 + in_group_p(grsec_socket_server_gid) &&
76108 + sck && (sck->sa_family != AF_UNIX) &&
76109 + (sck->sa_family != AF_LOCAL)) {
76110 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
76111 + return -EACCES;
76112 + }
76113 +#endif
76114 + return 0;
76115 +}
76116 +
76117 +int
76118 +gr_handle_sock_server_other(const struct sock *sck)
76119 +{
76120 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
76121 + if (grsec_enable_socket_server &&
76122 + in_group_p(grsec_socket_server_gid) &&
76123 + sck && (sck->sk_family != AF_UNIX) &&
76124 + (sck->sk_family != AF_LOCAL)) {
76125 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
76126 + return -EACCES;
76127 + }
76128 +#endif
76129 + return 0;
76130 +}
76131 +
76132 +int
76133 +gr_handle_sock_client(const struct sockaddr *sck)
76134 +{
76135 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
76136 + if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
76137 + sck && (sck->sa_family != AF_UNIX) &&
76138 + (sck->sa_family != AF_LOCAL)) {
76139 + gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
76140 + return -EACCES;
76141 + }
76142 +#endif
76143 + return 0;
76144 +}
76145 diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
76146 new file mode 100644
76147 index 0000000..8159888
76148 --- /dev/null
76149 +++ b/grsecurity/grsec_sysctl.c
76150 @@ -0,0 +1,479 @@
76151 +#include <linux/kernel.h>
76152 +#include <linux/sched.h>
76153 +#include <linux/sysctl.h>
76154 +#include <linux/grsecurity.h>
76155 +#include <linux/grinternal.h>
76156 +
76157 +int
76158 +gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
76159 +{
76160 +#ifdef CONFIG_GRKERNSEC_SYSCTL
76161 + if (dirname == NULL || name == NULL)
76162 + return 0;
76163 + if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
76164 + gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
76165 + return -EACCES;
76166 + }
76167 +#endif
76168 + return 0;
76169 +}
76170 +
76171 +#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
76172 +static int __maybe_unused __read_only one = 1;
76173 +#endif
76174 +
76175 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
76176 + defined(CONFIG_GRKERNSEC_DENYUSB)
76177 +struct ctl_table grsecurity_table[] = {
76178 +#ifdef CONFIG_GRKERNSEC_SYSCTL
76179 +#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
76180 +#ifdef CONFIG_GRKERNSEC_IO
76181 + {
76182 + .procname = "disable_priv_io",
76183 + .data = &grsec_disable_privio,
76184 + .maxlen = sizeof(int),
76185 + .mode = 0600,
76186 + .proc_handler = &proc_dointvec,
76187 + },
76188 +#endif
76189 +#endif
76190 +#ifdef CONFIG_GRKERNSEC_LINK
76191 + {
76192 + .procname = "linking_restrictions",
76193 + .data = &grsec_enable_link,
76194 + .maxlen = sizeof(int),
76195 + .mode = 0600,
76196 + .proc_handler = &proc_dointvec,
76197 + },
76198 +#endif
76199 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
76200 + {
76201 + .procname = "enforce_symlinksifowner",
76202 + .data = &grsec_enable_symlinkown,
76203 + .maxlen = sizeof(int),
76204 + .mode = 0600,
76205 + .proc_handler = &proc_dointvec,
76206 + },
76207 + {
76208 + .procname = "symlinkown_gid",
76209 + .data = &grsec_symlinkown_gid,
76210 + .maxlen = sizeof(int),
76211 + .mode = 0600,
76212 + .proc_handler = &proc_dointvec,
76213 + },
76214 +#endif
76215 +#ifdef CONFIG_GRKERNSEC_BRUTE
76216 + {
76217 + .procname = "deter_bruteforce",
76218 + .data = &grsec_enable_brute,
76219 + .maxlen = sizeof(int),
76220 + .mode = 0600,
76221 + .proc_handler = &proc_dointvec,
76222 + },
76223 +#endif
76224 +#ifdef CONFIG_GRKERNSEC_FIFO
76225 + {
76226 + .procname = "fifo_restrictions",
76227 + .data = &grsec_enable_fifo,
76228 + .maxlen = sizeof(int),
76229 + .mode = 0600,
76230 + .proc_handler = &proc_dointvec,
76231 + },
76232 +#endif
76233 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
76234 + {
76235 + .procname = "ptrace_readexec",
76236 + .data = &grsec_enable_ptrace_readexec,
76237 + .maxlen = sizeof(int),
76238 + .mode = 0600,
76239 + .proc_handler = &proc_dointvec,
76240 + },
76241 +#endif
76242 +#ifdef CONFIG_GRKERNSEC_SETXID
76243 + {
76244 + .procname = "consistent_setxid",
76245 + .data = &grsec_enable_setxid,
76246 + .maxlen = sizeof(int),
76247 + .mode = 0600,
76248 + .proc_handler = &proc_dointvec,
76249 + },
76250 +#endif
76251 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76252 + {
76253 + .procname = "ip_blackhole",
76254 + .data = &grsec_enable_blackhole,
76255 + .maxlen = sizeof(int),
76256 + .mode = 0600,
76257 + .proc_handler = &proc_dointvec,
76258 + },
76259 + {
76260 + .procname = "lastack_retries",
76261 + .data = &grsec_lastack_retries,
76262 + .maxlen = sizeof(int),
76263 + .mode = 0600,
76264 + .proc_handler = &proc_dointvec,
76265 + },
76266 +#endif
76267 +#ifdef CONFIG_GRKERNSEC_EXECLOG
76268 + {
76269 + .procname = "exec_logging",
76270 + .data = &grsec_enable_execlog,
76271 + .maxlen = sizeof(int),
76272 + .mode = 0600,
76273 + .proc_handler = &proc_dointvec,
76274 + },
76275 +#endif
76276 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
76277 + {
76278 + .procname = "rwxmap_logging",
76279 + .data = &grsec_enable_log_rwxmaps,
76280 + .maxlen = sizeof(int),
76281 + .mode = 0600,
76282 + .proc_handler = &proc_dointvec,
76283 + },
76284 +#endif
76285 +#ifdef CONFIG_GRKERNSEC_SIGNAL
76286 + {
76287 + .procname = "signal_logging",
76288 + .data = &grsec_enable_signal,
76289 + .maxlen = sizeof(int),
76290 + .mode = 0600,
76291 + .proc_handler = &proc_dointvec,
76292 + },
76293 +#endif
76294 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
76295 + {
76296 + .procname = "forkfail_logging",
76297 + .data = &grsec_enable_forkfail,
76298 + .maxlen = sizeof(int),
76299 + .mode = 0600,
76300 + .proc_handler = &proc_dointvec,
76301 + },
76302 +#endif
76303 +#ifdef CONFIG_GRKERNSEC_TIME
76304 + {
76305 + .procname = "timechange_logging",
76306 + .data = &grsec_enable_time,
76307 + .maxlen = sizeof(int),
76308 + .mode = 0600,
76309 + .proc_handler = &proc_dointvec,
76310 + },
76311 +#endif
76312 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
76313 + {
76314 + .procname = "chroot_deny_shmat",
76315 + .data = &grsec_enable_chroot_shmat,
76316 + .maxlen = sizeof(int),
76317 + .mode = 0600,
76318 + .proc_handler = &proc_dointvec,
76319 + },
76320 +#endif
76321 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
76322 + {
76323 + .procname = "chroot_deny_unix",
76324 + .data = &grsec_enable_chroot_unix,
76325 + .maxlen = sizeof(int),
76326 + .mode = 0600,
76327 + .proc_handler = &proc_dointvec,
76328 + },
76329 +#endif
76330 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
76331 + {
76332 + .procname = "chroot_deny_mount",
76333 + .data = &grsec_enable_chroot_mount,
76334 + .maxlen = sizeof(int),
76335 + .mode = 0600,
76336 + .proc_handler = &proc_dointvec,
76337 + },
76338 +#endif
76339 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
76340 + {
76341 + .procname = "chroot_deny_fchdir",
76342 + .data = &grsec_enable_chroot_fchdir,
76343 + .maxlen = sizeof(int),
76344 + .mode = 0600,
76345 + .proc_handler = &proc_dointvec,
76346 + },
76347 +#endif
76348 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
76349 + {
76350 + .procname = "chroot_deny_chroot",
76351 + .data = &grsec_enable_chroot_double,
76352 + .maxlen = sizeof(int),
76353 + .mode = 0600,
76354 + .proc_handler = &proc_dointvec,
76355 + },
76356 +#endif
76357 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
76358 + {
76359 + .procname = "chroot_deny_pivot",
76360 + .data = &grsec_enable_chroot_pivot,
76361 + .maxlen = sizeof(int),
76362 + .mode = 0600,
76363 + .proc_handler = &proc_dointvec,
76364 + },
76365 +#endif
76366 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
76367 + {
76368 + .procname = "chroot_enforce_chdir",
76369 + .data = &grsec_enable_chroot_chdir,
76370 + .maxlen = sizeof(int),
76371 + .mode = 0600,
76372 + .proc_handler = &proc_dointvec,
76373 + },
76374 +#endif
76375 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
76376 + {
76377 + .procname = "chroot_deny_chmod",
76378 + .data = &grsec_enable_chroot_chmod,
76379 + .maxlen = sizeof(int),
76380 + .mode = 0600,
76381 + .proc_handler = &proc_dointvec,
76382 + },
76383 +#endif
76384 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
76385 + {
76386 + .procname = "chroot_deny_mknod",
76387 + .data = &grsec_enable_chroot_mknod,
76388 + .maxlen = sizeof(int),
76389 + .mode = 0600,
76390 + .proc_handler = &proc_dointvec,
76391 + },
76392 +#endif
76393 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
76394 + {
76395 + .procname = "chroot_restrict_nice",
76396 + .data = &grsec_enable_chroot_nice,
76397 + .maxlen = sizeof(int),
76398 + .mode = 0600,
76399 + .proc_handler = &proc_dointvec,
76400 + },
76401 +#endif
76402 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
76403 + {
76404 + .procname = "chroot_execlog",
76405 + .data = &grsec_enable_chroot_execlog,
76406 + .maxlen = sizeof(int),
76407 + .mode = 0600,
76408 + .proc_handler = &proc_dointvec,
76409 + },
76410 +#endif
76411 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76412 + {
76413 + .procname = "chroot_caps",
76414 + .data = &grsec_enable_chroot_caps,
76415 + .maxlen = sizeof(int),
76416 + .mode = 0600,
76417 + .proc_handler = &proc_dointvec,
76418 + },
76419 +#endif
76420 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
76421 + {
76422 + .procname = "chroot_deny_sysctl",
76423 + .data = &grsec_enable_chroot_sysctl,
76424 + .maxlen = sizeof(int),
76425 + .mode = 0600,
76426 + .proc_handler = &proc_dointvec,
76427 + },
76428 +#endif
76429 +#ifdef CONFIG_GRKERNSEC_TPE
76430 + {
76431 + .procname = "tpe",
76432 + .data = &grsec_enable_tpe,
76433 + .maxlen = sizeof(int),
76434 + .mode = 0600,
76435 + .proc_handler = &proc_dointvec,
76436 + },
76437 + {
76438 + .procname = "tpe_gid",
76439 + .data = &grsec_tpe_gid,
76440 + .maxlen = sizeof(int),
76441 + .mode = 0600,
76442 + .proc_handler = &proc_dointvec,
76443 + },
76444 +#endif
76445 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
76446 + {
76447 + .procname = "tpe_invert",
76448 + .data = &grsec_enable_tpe_invert,
76449 + .maxlen = sizeof(int),
76450 + .mode = 0600,
76451 + .proc_handler = &proc_dointvec,
76452 + },
76453 +#endif
76454 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
76455 + {
76456 + .procname = "tpe_restrict_all",
76457 + .data = &grsec_enable_tpe_all,
76458 + .maxlen = sizeof(int),
76459 + .mode = 0600,
76460 + .proc_handler = &proc_dointvec,
76461 + },
76462 +#endif
76463 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
76464 + {
76465 + .procname = "socket_all",
76466 + .data = &grsec_enable_socket_all,
76467 + .maxlen = sizeof(int),
76468 + .mode = 0600,
76469 + .proc_handler = &proc_dointvec,
76470 + },
76471 + {
76472 + .procname = "socket_all_gid",
76473 + .data = &grsec_socket_all_gid,
76474 + .maxlen = sizeof(int),
76475 + .mode = 0600,
76476 + .proc_handler = &proc_dointvec,
76477 + },
76478 +#endif
76479 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
76480 + {
76481 + .procname = "socket_client",
76482 + .data = &grsec_enable_socket_client,
76483 + .maxlen = sizeof(int),
76484 + .mode = 0600,
76485 + .proc_handler = &proc_dointvec,
76486 + },
76487 + {
76488 + .procname = "socket_client_gid",
76489 + .data = &grsec_socket_client_gid,
76490 + .maxlen = sizeof(int),
76491 + .mode = 0600,
76492 + .proc_handler = &proc_dointvec,
76493 + },
76494 +#endif
76495 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
76496 + {
76497 + .procname = "socket_server",
76498 + .data = &grsec_enable_socket_server,
76499 + .maxlen = sizeof(int),
76500 + .mode = 0600,
76501 + .proc_handler = &proc_dointvec,
76502 + },
76503 + {
76504 + .procname = "socket_server_gid",
76505 + .data = &grsec_socket_server_gid,
76506 + .maxlen = sizeof(int),
76507 + .mode = 0600,
76508 + .proc_handler = &proc_dointvec,
76509 + },
76510 +#endif
76511 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
76512 + {
76513 + .procname = "audit_group",
76514 + .data = &grsec_enable_group,
76515 + .maxlen = sizeof(int),
76516 + .mode = 0600,
76517 + .proc_handler = &proc_dointvec,
76518 + },
76519 + {
76520 + .procname = "audit_gid",
76521 + .data = &grsec_audit_gid,
76522 + .maxlen = sizeof(int),
76523 + .mode = 0600,
76524 + .proc_handler = &proc_dointvec,
76525 + },
76526 +#endif
76527 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
76528 + {
76529 + .procname = "audit_chdir",
76530 + .data = &grsec_enable_chdir,
76531 + .maxlen = sizeof(int),
76532 + .mode = 0600,
76533 + .proc_handler = &proc_dointvec,
76534 + },
76535 +#endif
76536 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
76537 + {
76538 + .procname = "audit_mount",
76539 + .data = &grsec_enable_mount,
76540 + .maxlen = sizeof(int),
76541 + .mode = 0600,
76542 + .proc_handler = &proc_dointvec,
76543 + },
76544 +#endif
76545 +#ifdef CONFIG_GRKERNSEC_DMESG
76546 + {
76547 + .procname = "dmesg",
76548 + .data = &grsec_enable_dmesg,
76549 + .maxlen = sizeof(int),
76550 + .mode = 0600,
76551 + .proc_handler = &proc_dointvec,
76552 + },
76553 +#endif
76554 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76555 + {
76556 + .procname = "chroot_findtask",
76557 + .data = &grsec_enable_chroot_findtask,
76558 + .maxlen = sizeof(int),
76559 + .mode = 0600,
76560 + .proc_handler = &proc_dointvec,
76561 + },
76562 +#endif
76563 +#ifdef CONFIG_GRKERNSEC_RESLOG
76564 + {
76565 + .procname = "resource_logging",
76566 + .data = &grsec_resource_logging,
76567 + .maxlen = sizeof(int),
76568 + .mode = 0600,
76569 + .proc_handler = &proc_dointvec,
76570 + },
76571 +#endif
76572 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
76573 + {
76574 + .procname = "audit_ptrace",
76575 + .data = &grsec_enable_audit_ptrace,
76576 + .maxlen = sizeof(int),
76577 + .mode = 0600,
76578 + .proc_handler = &proc_dointvec,
76579 + },
76580 +#endif
76581 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
76582 + {
76583 + .procname = "harden_ptrace",
76584 + .data = &grsec_enable_harden_ptrace,
76585 + .maxlen = sizeof(int),
76586 + .mode = 0600,
76587 + .proc_handler = &proc_dointvec,
76588 + },
76589 +#endif
76590 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
76591 + {
76592 + .procname = "harden_ipc",
76593 + .data = &grsec_enable_harden_ipc,
76594 + .maxlen = sizeof(int),
76595 + .mode = 0600,
76596 + .proc_handler = &proc_dointvec,
76597 + },
76598 +#endif
76599 + {
76600 + .procname = "grsec_lock",
76601 + .data = &grsec_lock,
76602 + .maxlen = sizeof(int),
76603 + .mode = 0600,
76604 + .proc_handler = &proc_dointvec,
76605 + },
76606 +#endif
76607 +#ifdef CONFIG_GRKERNSEC_ROFS
76608 + {
76609 + .procname = "romount_protect",
76610 + .data = &grsec_enable_rofs,
76611 + .maxlen = sizeof(int),
76612 + .mode = 0600,
76613 + .proc_handler = &proc_dointvec_minmax,
76614 + .extra1 = &one,
76615 + .extra2 = &one,
76616 + },
76617 +#endif
76618 +#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
76619 + {
76620 + .procname = "deny_new_usb",
76621 + .data = &grsec_deny_new_usb,
76622 + .maxlen = sizeof(int),
76623 + .mode = 0600,
76624 + .proc_handler = &proc_dointvec,
76625 + },
76626 +#endif
76627 + { }
76628 +};
76629 +#endif
76630 diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
76631 new file mode 100644
76632 index 0000000..61b514e
76633 --- /dev/null
76634 +++ b/grsecurity/grsec_time.c
76635 @@ -0,0 +1,16 @@
76636 +#include <linux/kernel.h>
76637 +#include <linux/sched.h>
76638 +#include <linux/grinternal.h>
76639 +#include <linux/module.h>
76640 +
76641 +void
76642 +gr_log_timechange(void)
76643 +{
76644 +#ifdef CONFIG_GRKERNSEC_TIME
76645 + if (grsec_enable_time)
76646 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
76647 +#endif
76648 + return;
76649 +}
76650 +
76651 +EXPORT_SYMBOL_GPL(gr_log_timechange);
76652 diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
76653 new file mode 100644
76654 index 0000000..d1953de
76655 --- /dev/null
76656 +++ b/grsecurity/grsec_tpe.c
76657 @@ -0,0 +1,78 @@
76658 +#include <linux/kernel.h>
76659 +#include <linux/sched.h>
76660 +#include <linux/file.h>
76661 +#include <linux/fs.h>
76662 +#include <linux/grinternal.h>
76663 +
76664 +extern int gr_acl_tpe_check(void);
76665 +
76666 +int
76667 +gr_tpe_allow(const struct file *file)
76668 +{
76669 +#ifdef CONFIG_GRKERNSEC
76670 + struct inode *inode = file->f_path.dentry->d_parent->d_inode;
76671 + struct inode *file_inode = file->f_path.dentry->d_inode;
76672 + const struct cred *cred = current_cred();
76673 + char *msg = NULL;
76674 + char *msg2 = NULL;
76675 +
76676 + // never restrict root
76677 + if (gr_is_global_root(cred->uid))
76678 + return 1;
76679 +
76680 + if (grsec_enable_tpe) {
76681 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
76682 + if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
76683 + msg = "not being in trusted group";
76684 + else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
76685 + msg = "being in untrusted group";
76686 +#else
76687 + if (in_group_p(grsec_tpe_gid))
76688 + msg = "being in untrusted group";
76689 +#endif
76690 + }
76691 + if (!msg && gr_acl_tpe_check())
76692 + msg = "being in untrusted role";
76693 +
76694 + // not in any affected group/role
76695 + if (!msg)
76696 + goto next_check;
76697 +
76698 + if (gr_is_global_nonroot(inode->i_uid))
76699 + msg2 = "file in non-root-owned directory";
76700 + else if (inode->i_mode & S_IWOTH)
76701 + msg2 = "file in world-writable directory";
76702 + else if (inode->i_mode & S_IWGRP)
76703 + msg2 = "file in group-writable directory";
76704 + else if (file_inode->i_mode & S_IWOTH)
76705 + msg2 = "file is world-writable";
76706 +
76707 + if (msg && msg2) {
76708 + char fullmsg[70] = {0};
76709 + snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
76710 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
76711 + return 0;
76712 + }
76713 + msg = NULL;
76714 +next_check:
76715 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
76716 + if (!grsec_enable_tpe || !grsec_enable_tpe_all)
76717 + return 1;
76718 +
76719 + if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
76720 + msg = "directory not owned by user";
76721 + else if (inode->i_mode & S_IWOTH)
76722 + msg = "file in world-writable directory";
76723 + else if (inode->i_mode & S_IWGRP)
76724 + msg = "file in group-writable directory";
76725 + else if (file_inode->i_mode & S_IWOTH)
76726 + msg = "file is world-writable";
76727 +
76728 + if (msg) {
76729 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
76730 + return 0;
76731 + }
76732 +#endif
76733 +#endif
76734 + return 1;
76735 +}
76736 diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
76737 new file mode 100644
76738 index 0000000..ae02d8e
76739 --- /dev/null
76740 +++ b/grsecurity/grsec_usb.c
76741 @@ -0,0 +1,15 @@
76742 +#include <linux/kernel.h>
76743 +#include <linux/grinternal.h>
76744 +#include <linux/module.h>
76745 +
76746 +int gr_handle_new_usb(void)
76747 +{
76748 +#ifdef CONFIG_GRKERNSEC_DENYUSB
76749 + if (grsec_deny_new_usb) {
76750 + printk(KERN_ALERT "grsec: denied insert of new USB device\n");
76751 + return 1;
76752 + }
76753 +#endif
76754 + return 0;
76755 +}
76756 +EXPORT_SYMBOL_GPL(gr_handle_new_usb);
76757 diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
76758 new file mode 100644
76759 index 0000000..9f7b1ac
76760 --- /dev/null
76761 +++ b/grsecurity/grsum.c
76762 @@ -0,0 +1,61 @@
76763 +#include <linux/err.h>
76764 +#include <linux/kernel.h>
76765 +#include <linux/sched.h>
76766 +#include <linux/mm.h>
76767 +#include <linux/scatterlist.h>
76768 +#include <linux/crypto.h>
76769 +#include <linux/gracl.h>
76770 +
76771 +
76772 +#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
76773 +#error "crypto and sha256 must be built into the kernel"
76774 +#endif
76775 +
76776 +int
76777 +chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
76778 +{
76779 + char *p;
76780 + struct crypto_hash *tfm;
76781 + struct hash_desc desc;
76782 + struct scatterlist sg;
76783 + unsigned char temp_sum[GR_SHA_LEN];
76784 + volatile int retval = 0;
76785 + volatile int dummy = 0;
76786 + unsigned int i;
76787 +
76788 + sg_init_table(&sg, 1);
76789 +
76790 + tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
76791 + if (IS_ERR(tfm)) {
76792 + /* should never happen, since sha256 should be built in */
76793 + return 1;
76794 + }
76795 +
76796 + desc.tfm = tfm;
76797 + desc.flags = 0;
76798 +
76799 + crypto_hash_init(&desc);
76800 +
76801 + p = salt;
76802 + sg_set_buf(&sg, p, GR_SALT_LEN);
76803 + crypto_hash_update(&desc, &sg, sg.length);
76804 +
76805 + p = entry->pw;
76806 + sg_set_buf(&sg, p, strlen(p));
76807 +
76808 + crypto_hash_update(&desc, &sg, sg.length);
76809 +
76810 + crypto_hash_final(&desc, temp_sum);
76811 +
76812 + memset(entry->pw, 0, GR_PW_LEN);
76813 +
76814 + for (i = 0; i < GR_SHA_LEN; i++)
76815 + if (sum[i] != temp_sum[i])
76816 + retval = 1;
76817 + else
76818 + dummy = 1; // waste a cycle
76819 +
76820 + crypto_free_hash(tfm);
76821 +
76822 + return retval;
76823 +}
76824 diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
76825 index 77ff547..181834f 100644
76826 --- a/include/asm-generic/4level-fixup.h
76827 +++ b/include/asm-generic/4level-fixup.h
76828 @@ -13,8 +13,10 @@
76829 #define pmd_alloc(mm, pud, address) \
76830 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
76831 NULL: pmd_offset(pud, address))
76832 +#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
76833
76834 #define pud_alloc(mm, pgd, address) (pgd)
76835 +#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
76836 #define pud_offset(pgd, start) (pgd)
76837 #define pud_none(pud) 0
76838 #define pud_bad(pud) 0
76839 diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
76840 index b7babf0..97f4c4f 100644
76841 --- a/include/asm-generic/atomic-long.h
76842 +++ b/include/asm-generic/atomic-long.h
76843 @@ -22,6 +22,12 @@
76844
76845 typedef atomic64_t atomic_long_t;
76846
76847 +#ifdef CONFIG_PAX_REFCOUNT
76848 +typedef atomic64_unchecked_t atomic_long_unchecked_t;
76849 +#else
76850 +typedef atomic64_t atomic_long_unchecked_t;
76851 +#endif
76852 +
76853 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
76854
76855 static inline long atomic_long_read(atomic_long_t *l)
76856 @@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
76857 return (long)atomic64_read(v);
76858 }
76859
76860 +#ifdef CONFIG_PAX_REFCOUNT
76861 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
76862 +{
76863 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76864 +
76865 + return (long)atomic64_read_unchecked(v);
76866 +}
76867 +#endif
76868 +
76869 static inline void atomic_long_set(atomic_long_t *l, long i)
76870 {
76871 atomic64_t *v = (atomic64_t *)l;
76872 @@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
76873 atomic64_set(v, i);
76874 }
76875
76876 +#ifdef CONFIG_PAX_REFCOUNT
76877 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
76878 +{
76879 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76880 +
76881 + atomic64_set_unchecked(v, i);
76882 +}
76883 +#endif
76884 +
76885 static inline void atomic_long_inc(atomic_long_t *l)
76886 {
76887 atomic64_t *v = (atomic64_t *)l;
76888 @@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
76889 atomic64_inc(v);
76890 }
76891
76892 +#ifdef CONFIG_PAX_REFCOUNT
76893 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
76894 +{
76895 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76896 +
76897 + atomic64_inc_unchecked(v);
76898 +}
76899 +#endif
76900 +
76901 static inline void atomic_long_dec(atomic_long_t *l)
76902 {
76903 atomic64_t *v = (atomic64_t *)l;
76904 @@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
76905 atomic64_dec(v);
76906 }
76907
76908 +#ifdef CONFIG_PAX_REFCOUNT
76909 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
76910 +{
76911 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76912 +
76913 + atomic64_dec_unchecked(v);
76914 +}
76915 +#endif
76916 +
76917 static inline void atomic_long_add(long i, atomic_long_t *l)
76918 {
76919 atomic64_t *v = (atomic64_t *)l;
76920 @@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
76921 atomic64_add(i, v);
76922 }
76923
76924 +#ifdef CONFIG_PAX_REFCOUNT
76925 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
76926 +{
76927 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76928 +
76929 + atomic64_add_unchecked(i, v);
76930 +}
76931 +#endif
76932 +
76933 static inline void atomic_long_sub(long i, atomic_long_t *l)
76934 {
76935 atomic64_t *v = (atomic64_t *)l;
76936 @@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
76937 atomic64_sub(i, v);
76938 }
76939
76940 +#ifdef CONFIG_PAX_REFCOUNT
76941 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
76942 +{
76943 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76944 +
76945 + atomic64_sub_unchecked(i, v);
76946 +}
76947 +#endif
76948 +
76949 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
76950 {
76951 atomic64_t *v = (atomic64_t *)l;
76952 @@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
76953 return atomic64_add_negative(i, v);
76954 }
76955
76956 -static inline long atomic_long_add_return(long i, atomic_long_t *l)
76957 +static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
76958 {
76959 atomic64_t *v = (atomic64_t *)l;
76960
76961 return (long)atomic64_add_return(i, v);
76962 }
76963
76964 +#ifdef CONFIG_PAX_REFCOUNT
76965 +static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
76966 +{
76967 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76968 +
76969 + return (long)atomic64_add_return_unchecked(i, v);
76970 +}
76971 +#endif
76972 +
76973 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
76974 {
76975 atomic64_t *v = (atomic64_t *)l;
76976 @@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
76977 return (long)atomic64_inc_return(v);
76978 }
76979
76980 +#ifdef CONFIG_PAX_REFCOUNT
76981 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
76982 +{
76983 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76984 +
76985 + return (long)atomic64_inc_return_unchecked(v);
76986 +}
76987 +#endif
76988 +
76989 static inline long atomic_long_dec_return(atomic_long_t *l)
76990 {
76991 atomic64_t *v = (atomic64_t *)l;
76992 @@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
76993
76994 typedef atomic_t atomic_long_t;
76995
76996 +#ifdef CONFIG_PAX_REFCOUNT
76997 +typedef atomic_unchecked_t atomic_long_unchecked_t;
76998 +#else
76999 +typedef atomic_t atomic_long_unchecked_t;
77000 +#endif
77001 +
77002 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
77003 static inline long atomic_long_read(atomic_long_t *l)
77004 {
77005 @@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
77006 return (long)atomic_read(v);
77007 }
77008
77009 +#ifdef CONFIG_PAX_REFCOUNT
77010 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
77011 +{
77012 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
77013 +
77014 + return (long)atomic_read_unchecked(v);
77015 +}
77016 +#endif
77017 +
77018 static inline void atomic_long_set(atomic_long_t *l, long i)
77019 {
77020 atomic_t *v = (atomic_t *)l;
77021 @@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
77022 atomic_set(v, i);
77023 }
77024
77025 +#ifdef CONFIG_PAX_REFCOUNT
77026 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
77027 +{
77028 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
77029 +
77030 + atomic_set_unchecked(v, i);
77031 +}
77032 +#endif
77033 +
77034 static inline void atomic_long_inc(atomic_long_t *l)
77035 {
77036 atomic_t *v = (atomic_t *)l;
77037 @@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
77038 atomic_inc(v);
77039 }
77040
77041 +#ifdef CONFIG_PAX_REFCOUNT
77042 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
77043 +{
77044 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
77045 +
77046 + atomic_inc_unchecked(v);
77047 +}
77048 +#endif
77049 +
77050 static inline void atomic_long_dec(atomic_long_t *l)
77051 {
77052 atomic_t *v = (atomic_t *)l;
77053 @@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
77054 atomic_dec(v);
77055 }
77056
77057 +#ifdef CONFIG_PAX_REFCOUNT
77058 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
77059 +{
77060 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
77061 +
77062 + atomic_dec_unchecked(v);
77063 +}
77064 +#endif
77065 +
77066 static inline void atomic_long_add(long i, atomic_long_t *l)
77067 {
77068 atomic_t *v = (atomic_t *)l;
77069 @@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
77070 atomic_add(i, v);
77071 }
77072
77073 +#ifdef CONFIG_PAX_REFCOUNT
77074 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
77075 +{
77076 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
77077 +
77078 + atomic_add_unchecked(i, v);
77079 +}
77080 +#endif
77081 +
77082 static inline void atomic_long_sub(long i, atomic_long_t *l)
77083 {
77084 atomic_t *v = (atomic_t *)l;
77085 @@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
77086 atomic_sub(i, v);
77087 }
77088
77089 +#ifdef CONFIG_PAX_REFCOUNT
77090 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
77091 +{
77092 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
77093 +
77094 + atomic_sub_unchecked(i, v);
77095 +}
77096 +#endif
77097 +
77098 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
77099 {
77100 atomic_t *v = (atomic_t *)l;
77101 @@ -218,6 +356,16 @@ static inline long atomic_long_add_return(long i, atomic_long_t *l)
77102 return (long)atomic_add_return(i, v);
77103 }
77104
77105 +#ifdef CONFIG_PAX_REFCOUNT
77106 +static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
77107 +{
77108 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
77109 +
77110 + return (long)atomic_add_return_unchecked(i, v);
77111 +}
77112 +
77113 +#endif
77114 +
77115 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
77116 {
77117 atomic_t *v = (atomic_t *)l;
77118 @@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
77119 return (long)atomic_inc_return(v);
77120 }
77121
77122 +#ifdef CONFIG_PAX_REFCOUNT
77123 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
77124 +{
77125 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
77126 +
77127 + return (long)atomic_inc_return_unchecked(v);
77128 +}
77129 +#endif
77130 +
77131 static inline long atomic_long_dec_return(atomic_long_t *l)
77132 {
77133 atomic_t *v = (atomic_t *)l;
77134 @@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
77135
77136 #endif /* BITS_PER_LONG == 64 */
77137
77138 +#ifdef CONFIG_PAX_REFCOUNT
77139 +static inline void pax_refcount_needs_these_functions(void)
77140 +{
77141 + atomic_read_unchecked((atomic_unchecked_t *)NULL);
77142 + atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
77143 + atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
77144 + atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
77145 + atomic_inc_unchecked((atomic_unchecked_t *)NULL);
77146 + (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
77147 + atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
77148 + atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
77149 + atomic_dec_unchecked((atomic_unchecked_t *)NULL);
77150 + atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
77151 + (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
77152 +#ifdef CONFIG_X86
77153 + atomic_clear_mask_unchecked(0, NULL);
77154 + atomic_set_mask_unchecked(0, NULL);
77155 +#endif
77156 +
77157 + atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
77158 + atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
77159 + atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
77160 + atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
77161 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
77162 + atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
77163 + atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
77164 + atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
77165 +}
77166 +#else
77167 +#define atomic_read_unchecked(v) atomic_read(v)
77168 +#define atomic_set_unchecked(v, i) atomic_set((v), (i))
77169 +#define atomic_add_unchecked(i, v) atomic_add((i), (v))
77170 +#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
77171 +#define atomic_inc_unchecked(v) atomic_inc(v)
77172 +#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
77173 +#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
77174 +#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
77175 +#define atomic_dec_unchecked(v) atomic_dec(v)
77176 +#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
77177 +#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
77178 +#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
77179 +#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
77180 +
77181 +#define atomic_long_read_unchecked(v) atomic_long_read(v)
77182 +#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
77183 +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
77184 +#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
77185 +#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
77186 +#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
77187 +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
77188 +#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
77189 +#endif
77190 +
77191 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
77192 diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
77193 index 33bd2de..f31bff97 100644
77194 --- a/include/asm-generic/atomic.h
77195 +++ b/include/asm-generic/atomic.h
77196 @@ -153,7 +153,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
77197 * Atomically clears the bits set in @mask from @v
77198 */
77199 #ifndef atomic_clear_mask
77200 -static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
77201 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
77202 {
77203 unsigned long flags;
77204
77205 diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
77206 index b18ce4f..2ee2843 100644
77207 --- a/include/asm-generic/atomic64.h
77208 +++ b/include/asm-generic/atomic64.h
77209 @@ -16,6 +16,8 @@ typedef struct {
77210 long long counter;
77211 } atomic64_t;
77212
77213 +typedef atomic64_t atomic64_unchecked_t;
77214 +
77215 #define ATOMIC64_INIT(i) { (i) }
77216
77217 extern long long atomic64_read(const atomic64_t *v);
77218 @@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
77219 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
77220 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
77221
77222 +#define atomic64_read_unchecked(v) atomic64_read(v)
77223 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
77224 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
77225 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
77226 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
77227 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
77228 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
77229 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
77230 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
77231 +
77232 #endif /* _ASM_GENERIC_ATOMIC64_H */
77233 diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
77234 index 6f692f8..2ad9dd2 100644
77235 --- a/include/asm-generic/barrier.h
77236 +++ b/include/asm-generic/barrier.h
77237 @@ -66,7 +66,7 @@
77238 do { \
77239 compiletime_assert_atomic_type(*p); \
77240 smp_mb(); \
77241 - ACCESS_ONCE(*p) = (v); \
77242 + ACCESS_ONCE_RW(*p) = (v); \
77243 } while (0)
77244
77245 #define smp_load_acquire(p) \
77246 diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
77247 index a60a7cc..0fe12f2 100644
77248 --- a/include/asm-generic/bitops/__fls.h
77249 +++ b/include/asm-generic/bitops/__fls.h
77250 @@ -9,7 +9,7 @@
77251 *
77252 * Undefined if no set bit exists, so code should check against 0 first.
77253 */
77254 -static __always_inline unsigned long __fls(unsigned long word)
77255 +static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
77256 {
77257 int num = BITS_PER_LONG - 1;
77258
77259 diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
77260 index 0576d1f..dad6c71 100644
77261 --- a/include/asm-generic/bitops/fls.h
77262 +++ b/include/asm-generic/bitops/fls.h
77263 @@ -9,7 +9,7 @@
77264 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
77265 */
77266
77267 -static __always_inline int fls(int x)
77268 +static __always_inline int __intentional_overflow(-1) fls(int x)
77269 {
77270 int r = 32;
77271
77272 diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
77273 index b097cf8..3d40e14 100644
77274 --- a/include/asm-generic/bitops/fls64.h
77275 +++ b/include/asm-generic/bitops/fls64.h
77276 @@ -15,7 +15,7 @@
77277 * at position 64.
77278 */
77279 #if BITS_PER_LONG == 32
77280 -static __always_inline int fls64(__u64 x)
77281 +static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
77282 {
77283 __u32 h = x >> 32;
77284 if (h)
77285 @@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
77286 return fls(x);
77287 }
77288 #elif BITS_PER_LONG == 64
77289 -static __always_inline int fls64(__u64 x)
77290 +static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
77291 {
77292 if (x == 0)
77293 return 0;
77294 diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
77295 index 1bfcfe5..e04c5c9 100644
77296 --- a/include/asm-generic/cache.h
77297 +++ b/include/asm-generic/cache.h
77298 @@ -6,7 +6,7 @@
77299 * cache lines need to provide their own cache.h.
77300 */
77301
77302 -#define L1_CACHE_SHIFT 5
77303 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
77304 +#define L1_CACHE_SHIFT 5UL
77305 +#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
77306
77307 #endif /* __ASM_GENERIC_CACHE_H */
77308 diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
77309 index 0d68a1e..b74a761 100644
77310 --- a/include/asm-generic/emergency-restart.h
77311 +++ b/include/asm-generic/emergency-restart.h
77312 @@ -1,7 +1,7 @@
77313 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
77314 #define _ASM_GENERIC_EMERGENCY_RESTART_H
77315
77316 -static inline void machine_emergency_restart(void)
77317 +static inline __noreturn void machine_emergency_restart(void)
77318 {
77319 machine_restart(NULL);
77320 }
77321 diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
77322 index 975e1cc..0b8a083 100644
77323 --- a/include/asm-generic/io.h
77324 +++ b/include/asm-generic/io.h
77325 @@ -289,7 +289,7 @@ static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
77326 * These are pretty trivial
77327 */
77328 #ifndef virt_to_phys
77329 -static inline unsigned long virt_to_phys(volatile void *address)
77330 +static inline unsigned long __intentional_overflow(-1) virt_to_phys(volatile void *address)
77331 {
77332 return __pa((unsigned long)address);
77333 }
77334 diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
77335 index 90f99c7..00ce236 100644
77336 --- a/include/asm-generic/kmap_types.h
77337 +++ b/include/asm-generic/kmap_types.h
77338 @@ -2,9 +2,9 @@
77339 #define _ASM_GENERIC_KMAP_TYPES_H
77340
77341 #ifdef __WITH_KM_FENCE
77342 -# define KM_TYPE_NR 41
77343 +# define KM_TYPE_NR 42
77344 #else
77345 -# define KM_TYPE_NR 20
77346 +# define KM_TYPE_NR 21
77347 #endif
77348
77349 #endif
77350 diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
77351 index 9ceb03b..62b0b8f 100644
77352 --- a/include/asm-generic/local.h
77353 +++ b/include/asm-generic/local.h
77354 @@ -23,24 +23,37 @@ typedef struct
77355 atomic_long_t a;
77356 } local_t;
77357
77358 +typedef struct {
77359 + atomic_long_unchecked_t a;
77360 +} local_unchecked_t;
77361 +
77362 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
77363
77364 #define local_read(l) atomic_long_read(&(l)->a)
77365 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
77366 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
77367 +#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
77368 #define local_inc(l) atomic_long_inc(&(l)->a)
77369 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
77370 #define local_dec(l) atomic_long_dec(&(l)->a)
77371 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
77372 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
77373 +#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
77374 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
77375 +#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
77376
77377 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
77378 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
77379 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
77380 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
77381 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
77382 +#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
77383 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
77384 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
77385 +#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
77386
77387 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
77388 +#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
77389 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
77390 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
77391 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
77392 diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
77393 index 725612b..9cc513a 100644
77394 --- a/include/asm-generic/pgtable-nopmd.h
77395 +++ b/include/asm-generic/pgtable-nopmd.h
77396 @@ -1,14 +1,19 @@
77397 #ifndef _PGTABLE_NOPMD_H
77398 #define _PGTABLE_NOPMD_H
77399
77400 -#ifndef __ASSEMBLY__
77401 -
77402 #include <asm-generic/pgtable-nopud.h>
77403
77404 -struct mm_struct;
77405 -
77406 #define __PAGETABLE_PMD_FOLDED
77407
77408 +#define PMD_SHIFT PUD_SHIFT
77409 +#define PTRS_PER_PMD 1
77410 +#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
77411 +#define PMD_MASK (~(PMD_SIZE-1))
77412 +
77413 +#ifndef __ASSEMBLY__
77414 +
77415 +struct mm_struct;
77416 +
77417 /*
77418 * Having the pmd type consist of a pud gets the size right, and allows
77419 * us to conceptually access the pud entry that this pmd is folded into
77420 @@ -16,11 +21,6 @@ struct mm_struct;
77421 */
77422 typedef struct { pud_t pud; } pmd_t;
77423
77424 -#define PMD_SHIFT PUD_SHIFT
77425 -#define PTRS_PER_PMD 1
77426 -#define PMD_SIZE (1UL << PMD_SHIFT)
77427 -#define PMD_MASK (~(PMD_SIZE-1))
77428 -
77429 /*
77430 * The "pud_xxx()" functions here are trivial for a folded two-level
77431 * setup: the pmd is never bad, and a pmd always exists (as it's folded
77432 diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
77433 index 810431d..0ec4804f 100644
77434 --- a/include/asm-generic/pgtable-nopud.h
77435 +++ b/include/asm-generic/pgtable-nopud.h
77436 @@ -1,10 +1,15 @@
77437 #ifndef _PGTABLE_NOPUD_H
77438 #define _PGTABLE_NOPUD_H
77439
77440 -#ifndef __ASSEMBLY__
77441 -
77442 #define __PAGETABLE_PUD_FOLDED
77443
77444 +#define PUD_SHIFT PGDIR_SHIFT
77445 +#define PTRS_PER_PUD 1
77446 +#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
77447 +#define PUD_MASK (~(PUD_SIZE-1))
77448 +
77449 +#ifndef __ASSEMBLY__
77450 +
77451 /*
77452 * Having the pud type consist of a pgd gets the size right, and allows
77453 * us to conceptually access the pgd entry that this pud is folded into
77454 @@ -12,11 +17,6 @@
77455 */
77456 typedef struct { pgd_t pgd; } pud_t;
77457
77458 -#define PUD_SHIFT PGDIR_SHIFT
77459 -#define PTRS_PER_PUD 1
77460 -#define PUD_SIZE (1UL << PUD_SHIFT)
77461 -#define PUD_MASK (~(PUD_SIZE-1))
77462 -
77463 /*
77464 * The "pgd_xxx()" functions here are trivial for a folded two-level
77465 * setup: the pud is never bad, and a pud always exists (as it's folded
77466 @@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
77467 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
77468
77469 #define pgd_populate(mm, pgd, pud) do { } while (0)
77470 +#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
77471 /*
77472 * (puds are folded into pgds so this doesn't get actually called,
77473 * but the define is needed for a generic inline function.)
77474 diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
77475 index a8015a7..7a4407b 100644
77476 --- a/include/asm-generic/pgtable.h
77477 +++ b/include/asm-generic/pgtable.h
77478 @@ -815,6 +815,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
77479 }
77480 #endif /* CONFIG_NUMA_BALANCING */
77481
77482 +#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
77483 +#ifdef CONFIG_PAX_KERNEXEC
77484 +#error KERNEXEC requires pax_open_kernel
77485 +#else
77486 +static inline unsigned long pax_open_kernel(void) { return 0; }
77487 +#endif
77488 +#endif
77489 +
77490 +#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
77491 +#ifdef CONFIG_PAX_KERNEXEC
77492 +#error KERNEXEC requires pax_close_kernel
77493 +#else
77494 +static inline unsigned long pax_close_kernel(void) { return 0; }
77495 +#endif
77496 +#endif
77497 +
77498 #endif /* CONFIG_MMU */
77499
77500 #endif /* !__ASSEMBLY__ */
77501 diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
77502 index 72d8803..cb9749c 100644
77503 --- a/include/asm-generic/uaccess.h
77504 +++ b/include/asm-generic/uaccess.h
77505 @@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
77506 return __clear_user(to, n);
77507 }
77508
77509 +#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
77510 +#ifdef CONFIG_PAX_MEMORY_UDEREF
77511 +#error UDEREF requires pax_open_userland
77512 +#else
77513 +static inline unsigned long pax_open_userland(void) { return 0; }
77514 +#endif
77515 +#endif
77516 +
77517 +#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
77518 +#ifdef CONFIG_PAX_MEMORY_UDEREF
77519 +#error UDEREF requires pax_close_userland
77520 +#else
77521 +static inline unsigned long pax_close_userland(void) { return 0; }
77522 +#endif
77523 +#endif
77524 +
77525 #endif /* __ASM_GENERIC_UACCESS_H */
77526 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
77527 index 146e4ff..f4f9609 100644
77528 --- a/include/asm-generic/vmlinux.lds.h
77529 +++ b/include/asm-generic/vmlinux.lds.h
77530 @@ -251,6 +251,7 @@
77531 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
77532 VMLINUX_SYMBOL(__start_rodata) = .; \
77533 *(.rodata) *(.rodata.*) \
77534 + *(.data..read_only) \
77535 *(__vermagic) /* Kernel version magic */ \
77536 . = ALIGN(8); \
77537 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
77538 @@ -737,17 +738,18 @@
77539 * section in the linker script will go there too. @phdr should have
77540 * a leading colon.
77541 *
77542 - * Note that this macros defines __per_cpu_load as an absolute symbol.
77543 + * Note that this macros defines per_cpu_load as an absolute symbol.
77544 * If there is no need to put the percpu section at a predetermined
77545 * address, use PERCPU_SECTION.
77546 */
77547 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
77548 - VMLINUX_SYMBOL(__per_cpu_load) = .; \
77549 - .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
77550 + per_cpu_load = .; \
77551 + .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
77552 - LOAD_OFFSET) { \
77553 + VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
77554 PERCPU_INPUT(cacheline) \
77555 } phdr \
77556 - . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
77557 + . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
77558
77559 /**
77560 * PERCPU_SECTION - define output section for percpu area, simple version
77561 diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
77562 index 016c2f1..c4baa98 100644
77563 --- a/include/crypto/algapi.h
77564 +++ b/include/crypto/algapi.h
77565 @@ -34,7 +34,7 @@ struct crypto_type {
77566 unsigned int maskclear;
77567 unsigned int maskset;
77568 unsigned int tfmsize;
77569 -};
77570 +} __do_const;
77571
77572 struct crypto_instance {
77573 struct crypto_alg alg;
77574 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
77575 index a7c2a86..078f1b6 100644
77576 --- a/include/drm/drmP.h
77577 +++ b/include/drm/drmP.h
77578 @@ -68,6 +68,7 @@
77579 #include <linux/workqueue.h>
77580 #include <linux/poll.h>
77581 #include <asm/pgalloc.h>
77582 +#include <asm/local.h>
77583 #include <drm/drm.h>
77584 #include <drm/drm_sarea.h>
77585 #include <drm/drm_vma_manager.h>
77586 @@ -268,10 +269,12 @@ do { \
77587 * \param cmd command.
77588 * \param arg argument.
77589 */
77590 -typedef int drm_ioctl_t(struct drm_device *dev, void *data,
77591 +typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
77592 + struct drm_file *file_priv);
77593 +typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
77594 struct drm_file *file_priv);
77595
77596 -typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
77597 +typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
77598 unsigned long arg);
77599
77600 #define DRM_IOCTL_NR(n) _IOC_NR(n)
77601 @@ -287,10 +290,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
77602 struct drm_ioctl_desc {
77603 unsigned int cmd;
77604 int flags;
77605 - drm_ioctl_t *func;
77606 + drm_ioctl_t func;
77607 unsigned int cmd_drv;
77608 const char *name;
77609 -};
77610 +} __do_const;
77611
77612 /**
77613 * Creates a driver or general drm_ioctl_desc array entry for the given
77614 @@ -1001,7 +1004,8 @@ struct drm_info_list {
77615 int (*show)(struct seq_file*, void*); /** show callback */
77616 u32 driver_features; /**< Required driver features for this entry */
77617 void *data;
77618 -};
77619 +} __do_const;
77620 +typedef struct drm_info_list __no_const drm_info_list_no_const;
77621
77622 /**
77623 * debugfs node structure. This structure represents a debugfs file.
77624 @@ -1083,7 +1087,7 @@ struct drm_device {
77625
77626 /** \name Usage Counters */
77627 /*@{ */
77628 - int open_count; /**< Outstanding files open */
77629 + local_t open_count; /**< Outstanding files open */
77630 int buf_use; /**< Buffers in use -- cannot alloc */
77631 atomic_t buf_alloc; /**< Buffer allocation in progress */
77632 /*@} */
77633 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
77634 index 36a5feb..d9f01aa 100644
77635 --- a/include/drm/drm_crtc_helper.h
77636 +++ b/include/drm/drm_crtc_helper.h
77637 @@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
77638 struct drm_connector *connector);
77639 /* disable encoder when not in use - more explicit than dpms off */
77640 void (*disable)(struct drm_encoder *encoder);
77641 -};
77642 +} __no_const;
77643
77644 /**
77645 * drm_connector_helper_funcs - helper operations for connectors
77646 diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
77647 index 012d58f..d0a0642 100644
77648 --- a/include/drm/i915_pciids.h
77649 +++ b/include/drm/i915_pciids.h
77650 @@ -37,7 +37,7 @@
77651 */
77652 #define INTEL_VGA_DEVICE(id, info) { \
77653 0x8086, id, \
77654 - ~0, ~0, \
77655 + PCI_ANY_ID, PCI_ANY_ID, \
77656 0x030000, 0xff0000, \
77657 (unsigned long) info }
77658
77659 diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
77660 index 72dcbe8..8db58d7 100644
77661 --- a/include/drm/ttm/ttm_memory.h
77662 +++ b/include/drm/ttm/ttm_memory.h
77663 @@ -48,7 +48,7 @@
77664
77665 struct ttm_mem_shrink {
77666 int (*do_shrink) (struct ttm_mem_shrink *);
77667 -};
77668 +} __no_const;
77669
77670 /**
77671 * struct ttm_mem_global - Global memory accounting structure.
77672 diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
77673 index 49a8284..9643967 100644
77674 --- a/include/drm/ttm/ttm_page_alloc.h
77675 +++ b/include/drm/ttm/ttm_page_alloc.h
77676 @@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
77677 */
77678 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
77679
77680 +struct device;
77681 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
77682 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
77683
77684 diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
77685 index 4b840e8..155d235 100644
77686 --- a/include/keys/asymmetric-subtype.h
77687 +++ b/include/keys/asymmetric-subtype.h
77688 @@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
77689 /* Verify the signature on a key of this subtype (optional) */
77690 int (*verify_signature)(const struct key *key,
77691 const struct public_key_signature *sig);
77692 -};
77693 +} __do_const;
77694
77695 /**
77696 * asymmetric_key_subtype - Get the subtype from an asymmetric key
77697 diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
77698 index c1da539..1dcec55 100644
77699 --- a/include/linux/atmdev.h
77700 +++ b/include/linux/atmdev.h
77701 @@ -28,7 +28,7 @@ struct compat_atm_iobuf {
77702 #endif
77703
77704 struct k_atm_aal_stats {
77705 -#define __HANDLE_ITEM(i) atomic_t i
77706 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
77707 __AAL_STAT_ITEMS
77708 #undef __HANDLE_ITEM
77709 };
77710 @@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
77711 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
77712 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
77713 struct module *owner;
77714 -};
77715 +} __do_const ;
77716
77717 struct atmphy_ops {
77718 int (*start)(struct atm_dev *dev);
77719 diff --git a/include/linux/audit.h b/include/linux/audit.h
77720 index 22cfddb..ab759e8 100644
77721 --- a/include/linux/audit.h
77722 +++ b/include/linux/audit.h
77723 @@ -210,7 +210,7 @@ static inline void audit_ptrace(struct task_struct *t)
77724 extern unsigned int audit_serial(void);
77725 extern int auditsc_get_stamp(struct audit_context *ctx,
77726 struct timespec *t, unsigned int *serial);
77727 -extern int audit_set_loginuid(kuid_t loginuid);
77728 +extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
77729
77730 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
77731 {
77732 diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
77733 index 61f29e5..e67c658 100644
77734 --- a/include/linux/binfmts.h
77735 +++ b/include/linux/binfmts.h
77736 @@ -44,7 +44,7 @@ struct linux_binprm {
77737 unsigned interp_flags;
77738 unsigned interp_data;
77739 unsigned long loader, exec;
77740 -};
77741 +} __randomize_layout;
77742
77743 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
77744 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
77745 @@ -73,8 +73,10 @@ struct linux_binfmt {
77746 int (*load_binary)(struct linux_binprm *);
77747 int (*load_shlib)(struct file *);
77748 int (*core_dump)(struct coredump_params *cprm);
77749 + void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
77750 + void (*handle_mmap)(struct file *);
77751 unsigned long min_coredump; /* minimal dump size */
77752 -};
77753 +} __do_const __randomize_layout;
77754
77755 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
77756
77757 diff --git a/include/linux/bitops.h b/include/linux/bitops.h
77758 index be5fd38..d71192a 100644
77759 --- a/include/linux/bitops.h
77760 +++ b/include/linux/bitops.h
77761 @@ -102,7 +102,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
77762 * @word: value to rotate
77763 * @shift: bits to roll
77764 */
77765 -static inline __u32 rol32(__u32 word, unsigned int shift)
77766 +static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
77767 {
77768 return (word << shift) | (word >> (32 - shift));
77769 }
77770 @@ -112,7 +112,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
77771 * @word: value to rotate
77772 * @shift: bits to roll
77773 */
77774 -static inline __u32 ror32(__u32 word, unsigned int shift)
77775 +static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
77776 {
77777 return (word >> shift) | (word << (32 - shift));
77778 }
77779 @@ -168,7 +168,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
77780 return (__s32)(value << shift) >> shift;
77781 }
77782
77783 -static inline unsigned fls_long(unsigned long l)
77784 +static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
77785 {
77786 if (sizeof(l) == 4)
77787 return fls(l);
77788 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
77789 index 0d84981..bb741c0 100644
77790 --- a/include/linux/blkdev.h
77791 +++ b/include/linux/blkdev.h
77792 @@ -1584,7 +1584,7 @@ struct block_device_operations {
77793 /* this callback is with swap_lock and sometimes page table lock held */
77794 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
77795 struct module *owner;
77796 -};
77797 +} __do_const;
77798
77799 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
77800 unsigned long);
77801 diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
77802 index afc1343..9735539 100644
77803 --- a/include/linux/blktrace_api.h
77804 +++ b/include/linux/blktrace_api.h
77805 @@ -25,7 +25,7 @@ struct blk_trace {
77806 struct dentry *dropped_file;
77807 struct dentry *msg_file;
77808 struct list_head running_list;
77809 - atomic_t dropped;
77810 + atomic_unchecked_t dropped;
77811 };
77812
77813 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
77814 diff --git a/include/linux/cache.h b/include/linux/cache.h
77815 index 17e7e82..1d7da26 100644
77816 --- a/include/linux/cache.h
77817 +++ b/include/linux/cache.h
77818 @@ -16,6 +16,14 @@
77819 #define __read_mostly
77820 #endif
77821
77822 +#ifndef __read_only
77823 +#ifdef CONFIG_PAX_KERNEXEC
77824 +#error KERNEXEC requires __read_only
77825 +#else
77826 +#define __read_only __read_mostly
77827 +#endif
77828 +#endif
77829 +
77830 #ifndef ____cacheline_aligned
77831 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
77832 #endif
77833 diff --git a/include/linux/capability.h b/include/linux/capability.h
77834 index 84b13ad..172cdee 100644
77835 --- a/include/linux/capability.h
77836 +++ b/include/linux/capability.h
77837 @@ -211,9 +211,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
77838 extern bool capable(int cap);
77839 extern bool ns_capable(struct user_namespace *ns, int cap);
77840 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
77841 +extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
77842 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
77843 +extern bool capable_nolog(int cap);
77844 +extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
77845
77846 /* audit system wants to get cap info from files as well */
77847 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
77848
77849 +extern int is_privileged_binary(const struct dentry *dentry);
77850 +
77851 #endif /* !_LINUX_CAPABILITY_H */
77852 diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
77853 index 8609d57..86e4d79 100644
77854 --- a/include/linux/cdrom.h
77855 +++ b/include/linux/cdrom.h
77856 @@ -87,7 +87,6 @@ struct cdrom_device_ops {
77857
77858 /* driver specifications */
77859 const int capability; /* capability flags */
77860 - int n_minors; /* number of active minor devices */
77861 /* handle uniform packets for scsi type devices (scsi,atapi) */
77862 int (*generic_packet) (struct cdrom_device_info *,
77863 struct packet_command *);
77864 diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
77865 index 4ce9056..86caac6 100644
77866 --- a/include/linux/cleancache.h
77867 +++ b/include/linux/cleancache.h
77868 @@ -31,7 +31,7 @@ struct cleancache_ops {
77869 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
77870 void (*invalidate_inode)(int, struct cleancache_filekey);
77871 void (*invalidate_fs)(int);
77872 -};
77873 +} __no_const;
77874
77875 extern struct cleancache_ops *
77876 cleancache_register_ops(struct cleancache_ops *ops);
77877 diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
77878 index 5119174..8e264f8 100644
77879 --- a/include/linux/clk-provider.h
77880 +++ b/include/linux/clk-provider.h
77881 @@ -174,6 +174,7 @@ struct clk_ops {
77882 void (*init)(struct clk_hw *hw);
77883 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
77884 };
77885 +typedef struct clk_ops __no_const clk_ops_no_const;
77886
77887 /**
77888 * struct clk_init_data - holds init data that's common to all clocks and is
77889 diff --git a/include/linux/compat.h b/include/linux/compat.h
77890 index e649426..a74047b 100644
77891 --- a/include/linux/compat.h
77892 +++ b/include/linux/compat.h
77893 @@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
77894 compat_size_t __user *len_ptr);
77895
77896 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
77897 -asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
77898 +asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
77899 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
77900 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
77901 compat_ssize_t msgsz, int msgflg);
77902 @@ -436,7 +436,7 @@ extern int compat_ptrace_request(struct task_struct *child,
77903 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
77904 compat_ulong_t addr, compat_ulong_t data);
77905 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
77906 - compat_long_t addr, compat_long_t data);
77907 + compat_ulong_t addr, compat_ulong_t data);
77908
77909 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
77910 /*
77911 diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
77912 index 2507fd2..55203f8 100644
77913 --- a/include/linux/compiler-gcc4.h
77914 +++ b/include/linux/compiler-gcc4.h
77915 @@ -39,9 +39,34 @@
77916 # define __compiletime_warning(message) __attribute__((warning(message)))
77917 # define __compiletime_error(message) __attribute__((error(message)))
77918 #endif /* __CHECKER__ */
77919 +
77920 +#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
77921 +#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
77922 +#define __bos0(ptr) __bos((ptr), 0)
77923 +#define __bos1(ptr) __bos((ptr), 1)
77924 #endif /* GCC_VERSION >= 40300 */
77925
77926 #if GCC_VERSION >= 40500
77927 +
77928 +#ifdef RANDSTRUCT_PLUGIN
77929 +#define __randomize_layout __attribute__((randomize_layout))
77930 +#define __no_randomize_layout __attribute__((no_randomize_layout))
77931 +#endif
77932 +
77933 +#ifdef CONSTIFY_PLUGIN
77934 +#define __no_const __attribute__((no_const))
77935 +#define __do_const __attribute__((do_const))
77936 +#endif
77937 +
77938 +#ifdef SIZE_OVERFLOW_PLUGIN
77939 +#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
77940 +#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
77941 +#endif
77942 +
77943 +#ifdef LATENT_ENTROPY_PLUGIN
77944 +#define __latent_entropy __attribute__((latent_entropy))
77945 +#endif
77946 +
77947 /*
77948 * Mark a position in code as unreachable. This can be used to
77949 * suppress control flow warnings after asm blocks that transfer
77950 diff --git a/include/linux/compiler.h b/include/linux/compiler.h
77951 index ee7239e..7c11769 100644
77952 --- a/include/linux/compiler.h
77953 +++ b/include/linux/compiler.h
77954 @@ -5,11 +5,14 @@
77955
77956 #ifdef __CHECKER__
77957 # define __user __attribute__((noderef, address_space(1)))
77958 +# define __force_user __force __user
77959 # define __kernel __attribute__((address_space(0)))
77960 +# define __force_kernel __force __kernel
77961 # define __safe __attribute__((safe))
77962 # define __force __attribute__((force))
77963 # define __nocast __attribute__((nocast))
77964 # define __iomem __attribute__((noderef, address_space(2)))
77965 +# define __force_iomem __force __iomem
77966 # define __must_hold(x) __attribute__((context(x,1,1)))
77967 # define __acquires(x) __attribute__((context(x,0,1)))
77968 # define __releases(x) __attribute__((context(x,1,0)))
77969 @@ -17,20 +20,37 @@
77970 # define __release(x) __context__(x,-1)
77971 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
77972 # define __percpu __attribute__((noderef, address_space(3)))
77973 +# define __force_percpu __force __percpu
77974 #ifdef CONFIG_SPARSE_RCU_POINTER
77975 # define __rcu __attribute__((noderef, address_space(4)))
77976 +# define __force_rcu __force __rcu
77977 #else
77978 # define __rcu
77979 +# define __force_rcu
77980 #endif
77981 extern void __chk_user_ptr(const volatile void __user *);
77982 extern void __chk_io_ptr(const volatile void __iomem *);
77983 #else
77984 -# define __user
77985 -# define __kernel
77986 +# ifdef CHECKER_PLUGIN
77987 +//# define __user
77988 +//# define __force_user
77989 +//# define __kernel
77990 +//# define __force_kernel
77991 +# else
77992 +# ifdef STRUCTLEAK_PLUGIN
77993 +# define __user __attribute__((user))
77994 +# else
77995 +# define __user
77996 +# endif
77997 +# define __force_user
77998 +# define __kernel
77999 +# define __force_kernel
78000 +# endif
78001 # define __safe
78002 # define __force
78003 # define __nocast
78004 # define __iomem
78005 +# define __force_iomem
78006 # define __chk_user_ptr(x) (void)0
78007 # define __chk_io_ptr(x) (void)0
78008 # define __builtin_warning(x, y...) (1)
78009 @@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
78010 # define __release(x) (void)0
78011 # define __cond_lock(x,c) (c)
78012 # define __percpu
78013 +# define __force_percpu
78014 # define __rcu
78015 +# define __force_rcu
78016 #endif
78017
78018 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
78019 @@ -286,6 +308,34 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
78020 # define __attribute_const__ /* unimplemented */
78021 #endif
78022
78023 +#ifndef __randomize_layout
78024 +# define __randomize_layout
78025 +#endif
78026 +
78027 +#ifndef __no_randomize_layout
78028 +# define __no_randomize_layout
78029 +#endif
78030 +
78031 +#ifndef __no_const
78032 +# define __no_const
78033 +#endif
78034 +
78035 +#ifndef __do_const
78036 +# define __do_const
78037 +#endif
78038 +
78039 +#ifndef __size_overflow
78040 +# define __size_overflow(...)
78041 +#endif
78042 +
78043 +#ifndef __intentional_overflow
78044 +# define __intentional_overflow(...)
78045 +#endif
78046 +
78047 +#ifndef __latent_entropy
78048 +# define __latent_entropy
78049 +#endif
78050 +
78051 /*
78052 * Tell gcc if a function is cold. The compiler will assume any path
78053 * directly leading to the call is unlikely.
78054 @@ -295,6 +345,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
78055 #define __cold
78056 #endif
78057
78058 +#ifndef __alloc_size
78059 +#define __alloc_size(...)
78060 +#endif
78061 +
78062 +#ifndef __bos
78063 +#define __bos(ptr, arg)
78064 +#endif
78065 +
78066 +#ifndef __bos0
78067 +#define __bos0(ptr)
78068 +#endif
78069 +
78070 +#ifndef __bos1
78071 +#define __bos1(ptr)
78072 +#endif
78073 +
78074 /* Simple shorthand for a section definition */
78075 #ifndef __section
78076 # define __section(S) __attribute__ ((__section__(#S)))
78077 @@ -369,7 +435,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
78078 * use is to mediate communication between process-level code and irq/NMI
78079 * handlers, all running on the same CPU.
78080 */
78081 -#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
78082 +#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
78083 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
78084
78085 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
78086 #ifdef CONFIG_KPROBES
78087 diff --git a/include/linux/completion.h b/include/linux/completion.h
78088 index 5d5aaae..0ea9b84 100644
78089 --- a/include/linux/completion.h
78090 +++ b/include/linux/completion.h
78091 @@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
78092
78093 extern void wait_for_completion(struct completion *);
78094 extern void wait_for_completion_io(struct completion *);
78095 -extern int wait_for_completion_interruptible(struct completion *x);
78096 -extern int wait_for_completion_killable(struct completion *x);
78097 +extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
78098 +extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
78099 extern unsigned long wait_for_completion_timeout(struct completion *x,
78100 - unsigned long timeout);
78101 + unsigned long timeout) __intentional_overflow(-1);
78102 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
78103 - unsigned long timeout);
78104 + unsigned long timeout) __intentional_overflow(-1);
78105 extern long wait_for_completion_interruptible_timeout(
78106 - struct completion *x, unsigned long timeout);
78107 + struct completion *x, unsigned long timeout) __intentional_overflow(-1);
78108 extern long wait_for_completion_killable_timeout(
78109 - struct completion *x, unsigned long timeout);
78110 + struct completion *x, unsigned long timeout) __intentional_overflow(-1);
78111 extern bool try_wait_for_completion(struct completion *x);
78112 extern bool completion_done(struct completion *x);
78113
78114 diff --git a/include/linux/configfs.h b/include/linux/configfs.h
78115 index 34025df..d94bbbc 100644
78116 --- a/include/linux/configfs.h
78117 +++ b/include/linux/configfs.h
78118 @@ -125,7 +125,7 @@ struct configfs_attribute {
78119 const char *ca_name;
78120 struct module *ca_owner;
78121 umode_t ca_mode;
78122 -};
78123 +} __do_const;
78124
78125 /*
78126 * Users often need to create attribute structures for their configurable
78127 diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
78128 index 5ae5100..b809662 100644
78129 --- a/include/linux/cpufreq.h
78130 +++ b/include/linux/cpufreq.h
78131 @@ -200,6 +200,7 @@ struct global_attr {
78132 ssize_t (*store)(struct kobject *a, struct attribute *b,
78133 const char *c, size_t count);
78134 };
78135 +typedef struct global_attr __no_const global_attr_no_const;
78136
78137 #define define_one_global_ro(_name) \
78138 static struct global_attr _name = \
78139 @@ -242,7 +243,7 @@ struct cpufreq_driver {
78140 bool boost_supported;
78141 bool boost_enabled;
78142 int (*set_boost) (int state);
78143 -};
78144 +} __do_const;
78145
78146 /* flags */
78147 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
78148 diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
78149 index b0238cb..db89e1e 100644
78150 --- a/include/linux/cpuidle.h
78151 +++ b/include/linux/cpuidle.h
78152 @@ -50,7 +50,8 @@ struct cpuidle_state {
78153 int index);
78154
78155 int (*enter_dead) (struct cpuidle_device *dev, int index);
78156 -};
78157 +} __do_const;
78158 +typedef struct cpuidle_state __no_const cpuidle_state_no_const;
78159
78160 /* Idle State Flags */
78161 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
78162 @@ -211,7 +212,7 @@ struct cpuidle_governor {
78163 void (*reflect) (struct cpuidle_device *dev, int index);
78164
78165 struct module *owner;
78166 -};
78167 +} __do_const;
78168
78169 #ifdef CONFIG_CPU_IDLE
78170 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
78171 diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
78172 index d08e4d2..95fad61 100644
78173 --- a/include/linux/cpumask.h
78174 +++ b/include/linux/cpumask.h
78175 @@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
78176 }
78177
78178 /* Valid inputs for n are -1 and 0. */
78179 -static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
78180 +static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
78181 {
78182 return n+1;
78183 }
78184
78185 -static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
78186 +static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
78187 {
78188 return n+1;
78189 }
78190
78191 -static inline unsigned int cpumask_next_and(int n,
78192 +static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
78193 const struct cpumask *srcp,
78194 const struct cpumask *andp)
78195 {
78196 @@ -167,7 +167,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
78197 *
78198 * Returns >= nr_cpu_ids if no further cpus set.
78199 */
78200 -static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
78201 +static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
78202 {
78203 /* -1 is a legal arg here. */
78204 if (n != -1)
78205 @@ -182,7 +182,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
78206 *
78207 * Returns >= nr_cpu_ids if no further cpus unset.
78208 */
78209 -static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
78210 +static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
78211 {
78212 /* -1 is a legal arg here. */
78213 if (n != -1)
78214 @@ -190,7 +190,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
78215 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
78216 }
78217
78218 -int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
78219 +int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
78220 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
78221
78222 /**
78223 diff --git a/include/linux/cred.h b/include/linux/cred.h
78224 index f61d6c8..d372d95 100644
78225 --- a/include/linux/cred.h
78226 +++ b/include/linux/cred.h
78227 @@ -35,7 +35,7 @@ struct group_info {
78228 int nblocks;
78229 kgid_t small_block[NGROUPS_SMALL];
78230 kgid_t *blocks[0];
78231 -};
78232 +} __randomize_layout;
78233
78234 /**
78235 * get_group_info - Get a reference to a group info structure
78236 @@ -136,7 +136,7 @@ struct cred {
78237 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
78238 struct group_info *group_info; /* supplementary groups for euid/fsgid */
78239 struct rcu_head rcu; /* RCU deletion hook */
78240 -};
78241 +} __randomize_layout;
78242
78243 extern void __put_cred(struct cred *);
78244 extern void exit_creds(struct task_struct *);
78245 @@ -194,6 +194,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
78246 static inline void validate_process_creds(void)
78247 {
78248 }
78249 +static inline void validate_task_creds(struct task_struct *task)
78250 +{
78251 +}
78252 #endif
78253
78254 /**
78255 @@ -322,6 +325,7 @@ static inline void put_cred(const struct cred *_cred)
78256
78257 #define task_uid(task) (task_cred_xxx((task), uid))
78258 #define task_euid(task) (task_cred_xxx((task), euid))
78259 +#define task_securebits(task) (task_cred_xxx((task), securebits))
78260
78261 #define current_cred_xxx(xxx) \
78262 ({ \
78263 diff --git a/include/linux/crypto.h b/include/linux/crypto.h
78264 index b92eadf..b4ecdc1 100644
78265 --- a/include/linux/crypto.h
78266 +++ b/include/linux/crypto.h
78267 @@ -373,7 +373,7 @@ struct cipher_tfm {
78268 const u8 *key, unsigned int keylen);
78269 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
78270 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
78271 -};
78272 +} __no_const;
78273
78274 struct hash_tfm {
78275 int (*init)(struct hash_desc *desc);
78276 @@ -394,13 +394,13 @@ struct compress_tfm {
78277 int (*cot_decompress)(struct crypto_tfm *tfm,
78278 const u8 *src, unsigned int slen,
78279 u8 *dst, unsigned int *dlen);
78280 -};
78281 +} __no_const;
78282
78283 struct rng_tfm {
78284 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
78285 unsigned int dlen);
78286 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
78287 -};
78288 +} __no_const;
78289
78290 #define crt_ablkcipher crt_u.ablkcipher
78291 #define crt_aead crt_u.aead
78292 diff --git a/include/linux/ctype.h b/include/linux/ctype.h
78293 index 653589e..4ef254a 100644
78294 --- a/include/linux/ctype.h
78295 +++ b/include/linux/ctype.h
78296 @@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
78297 * Fast implementation of tolower() for internal usage. Do not use in your
78298 * code.
78299 */
78300 -static inline char _tolower(const char c)
78301 +static inline unsigned char _tolower(const unsigned char c)
78302 {
78303 return c | 0x20;
78304 }
78305 diff --git a/include/linux/dcache.h b/include/linux/dcache.h
78306 index 3c7ec32..4ca97cc 100644
78307 --- a/include/linux/dcache.h
78308 +++ b/include/linux/dcache.h
78309 @@ -133,7 +133,7 @@ struct dentry {
78310 } d_u;
78311 struct list_head d_subdirs; /* our children */
78312 struct hlist_node d_alias; /* inode alias list */
78313 -};
78314 +} __randomize_layout;
78315
78316 /*
78317 * dentry->d_lock spinlock nesting subclasses:
78318 diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
78319 index 7925bf0..d5143d2 100644
78320 --- a/include/linux/decompress/mm.h
78321 +++ b/include/linux/decompress/mm.h
78322 @@ -77,7 +77,7 @@ static void free(void *where)
78323 * warnings when not needed (indeed large_malloc / large_free are not
78324 * needed by inflate */
78325
78326 -#define malloc(a) kmalloc(a, GFP_KERNEL)
78327 +#define malloc(a) kmalloc((a), GFP_KERNEL)
78328 #define free(a) kfree(a)
78329
78330 #define large_malloc(a) vmalloc(a)
78331 diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
78332 index d48dc00..211ee54 100644
78333 --- a/include/linux/devfreq.h
78334 +++ b/include/linux/devfreq.h
78335 @@ -114,7 +114,7 @@ struct devfreq_governor {
78336 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
78337 int (*event_handler)(struct devfreq *devfreq,
78338 unsigned int event, void *data);
78339 -};
78340 +} __do_const;
78341
78342 /**
78343 * struct devfreq - Device devfreq structure
78344 diff --git a/include/linux/device.h b/include/linux/device.h
78345 index d1d1c05..a90fdb0 100644
78346 --- a/include/linux/device.h
78347 +++ b/include/linux/device.h
78348 @@ -310,7 +310,7 @@ struct subsys_interface {
78349 struct list_head node;
78350 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
78351 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
78352 -};
78353 +} __do_const;
78354
78355 int subsys_interface_register(struct subsys_interface *sif);
78356 void subsys_interface_unregister(struct subsys_interface *sif);
78357 @@ -506,7 +506,7 @@ struct device_type {
78358 void (*release)(struct device *dev);
78359
78360 const struct dev_pm_ops *pm;
78361 -};
78362 +} __do_const;
78363
78364 /* interface for exporting device attributes */
78365 struct device_attribute {
78366 @@ -516,11 +516,12 @@ struct device_attribute {
78367 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
78368 const char *buf, size_t count);
78369 };
78370 +typedef struct device_attribute __no_const device_attribute_no_const;
78371
78372 struct dev_ext_attribute {
78373 struct device_attribute attr;
78374 void *var;
78375 -};
78376 +} __do_const;
78377
78378 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
78379 char *buf);
78380 diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
78381 index fd4aee2..1f28db9 100644
78382 --- a/include/linux/dma-mapping.h
78383 +++ b/include/linux/dma-mapping.h
78384 @@ -54,7 +54,7 @@ struct dma_map_ops {
78385 u64 (*get_required_mask)(struct device *dev);
78386 #endif
78387 int is_phys;
78388 -};
78389 +} __do_const;
78390
78391 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
78392
78393 diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
78394 index 72cb0dd..7fe9a4b 100644
78395 --- a/include/linux/dmaengine.h
78396 +++ b/include/linux/dmaengine.h
78397 @@ -1147,9 +1147,9 @@ struct dma_pinned_list {
78398 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
78399 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
78400
78401 -dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
78402 +dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
78403 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
78404 -dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
78405 +dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
78406 struct dma_pinned_list *pinned_list, struct page *page,
78407 unsigned int offset, size_t len);
78408
78409 diff --git a/include/linux/efi.h b/include/linux/efi.h
78410 index 6c100ff..e3289b4 100644
78411 --- a/include/linux/efi.h
78412 +++ b/include/linux/efi.h
78413 @@ -1009,6 +1009,7 @@ struct efivar_operations {
78414 efi_set_variable_t *set_variable;
78415 efi_query_variable_store_t *query_variable_store;
78416 };
78417 +typedef struct efivar_operations __no_const efivar_operations_no_const;
78418
78419 struct efivars {
78420 /*
78421 diff --git a/include/linux/elf.h b/include/linux/elf.h
78422 index 67a5fa7..b817372 100644
78423 --- a/include/linux/elf.h
78424 +++ b/include/linux/elf.h
78425 @@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
78426 #define elf_note elf32_note
78427 #define elf_addr_t Elf32_Off
78428 #define Elf_Half Elf32_Half
78429 +#define elf_dyn Elf32_Dyn
78430
78431 #else
78432
78433 @@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
78434 #define elf_note elf64_note
78435 #define elf_addr_t Elf64_Off
78436 #define Elf_Half Elf64_Half
78437 +#define elf_dyn Elf64_Dyn
78438
78439 #endif
78440
78441 diff --git a/include/linux/err.h b/include/linux/err.h
78442 index a729120..6ede2c9 100644
78443 --- a/include/linux/err.h
78444 +++ b/include/linux/err.h
78445 @@ -20,12 +20,12 @@
78446
78447 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
78448
78449 -static inline void * __must_check ERR_PTR(long error)
78450 +static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
78451 {
78452 return (void *) error;
78453 }
78454
78455 -static inline long __must_check PTR_ERR(__force const void *ptr)
78456 +static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
78457 {
78458 return (long) ptr;
78459 }
78460 diff --git a/include/linux/extcon.h b/include/linux/extcon.h
78461 index f488145..3b6b04e 100644
78462 --- a/include/linux/extcon.h
78463 +++ b/include/linux/extcon.h
78464 @@ -135,7 +135,7 @@ struct extcon_dev {
78465 /* /sys/class/extcon/.../mutually_exclusive/... */
78466 struct attribute_group attr_g_muex;
78467 struct attribute **attrs_muex;
78468 - struct device_attribute *d_attrs_muex;
78469 + device_attribute_no_const *d_attrs_muex;
78470 };
78471
78472 /**
78473 diff --git a/include/linux/fb.h b/include/linux/fb.h
78474 index fe6ac95..898d41d 100644
78475 --- a/include/linux/fb.h
78476 +++ b/include/linux/fb.h
78477 @@ -304,7 +304,7 @@ struct fb_ops {
78478 /* called at KDB enter and leave time to prepare the console */
78479 int (*fb_debug_enter)(struct fb_info *info);
78480 int (*fb_debug_leave)(struct fb_info *info);
78481 -};
78482 +} __do_const;
78483
78484 #ifdef CONFIG_FB_TILEBLITTING
78485 #define FB_TILE_CURSOR_NONE 0
78486 diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
78487 index 230f87b..1fd0485 100644
78488 --- a/include/linux/fdtable.h
78489 +++ b/include/linux/fdtable.h
78490 @@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
78491 void put_files_struct(struct files_struct *fs);
78492 void reset_files_struct(struct files_struct *);
78493 int unshare_files(struct files_struct **);
78494 -struct files_struct *dup_fd(struct files_struct *, int *);
78495 +struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
78496 void do_close_on_exec(struct files_struct *);
78497 int iterate_fd(struct files_struct *, unsigned,
78498 int (*)(const void *, struct file *, unsigned),
78499 diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
78500 index 8293262..2b3b8bd 100644
78501 --- a/include/linux/frontswap.h
78502 +++ b/include/linux/frontswap.h
78503 @@ -11,7 +11,7 @@ struct frontswap_ops {
78504 int (*load)(unsigned, pgoff_t, struct page *);
78505 void (*invalidate_page)(unsigned, pgoff_t);
78506 void (*invalidate_area)(unsigned);
78507 -};
78508 +} __no_const;
78509
78510 extern bool frontswap_enabled;
78511 extern struct frontswap_ops *
78512 diff --git a/include/linux/fs.h b/include/linux/fs.h
78513 index 8780312..425cc22 100644
78514 --- a/include/linux/fs.h
78515 +++ b/include/linux/fs.h
78516 @@ -398,7 +398,7 @@ struct address_space {
78517 spinlock_t private_lock; /* for use by the address_space */
78518 struct list_head private_list; /* ditto */
78519 void *private_data; /* ditto */
78520 -} __attribute__((aligned(sizeof(long))));
78521 +} __attribute__((aligned(sizeof(long)))) __randomize_layout;
78522 /*
78523 * On most architectures that alignment is already the case; but
78524 * must be enforced here for CRIS, to let the least significant bit
78525 @@ -441,7 +441,7 @@ struct block_device {
78526 int bd_fsfreeze_count;
78527 /* Mutex for freeze */
78528 struct mutex bd_fsfreeze_mutex;
78529 -};
78530 +} __randomize_layout;
78531
78532 /*
78533 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
78534 @@ -585,7 +585,7 @@ struct inode {
78535 #endif
78536
78537 void *i_private; /* fs or device private pointer */
78538 -};
78539 +} __randomize_layout;
78540
78541 static inline int inode_unhashed(struct inode *inode)
78542 {
78543 @@ -778,7 +778,7 @@ struct file {
78544 struct list_head f_tfile_llink;
78545 #endif /* #ifdef CONFIG_EPOLL */
78546 struct address_space *f_mapping;
78547 -} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
78548 +} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
78549
78550 struct file_handle {
78551 __u32 handle_bytes;
78552 @@ -906,7 +906,7 @@ struct file_lock {
78553 int state; /* state of grant or error if -ve */
78554 } afs;
78555 } fl_u;
78556 -};
78557 +} __randomize_layout;
78558
78559 /* The following constant reflects the upper bound of the file/locking space */
78560 #ifndef OFFSET_MAX
78561 @@ -1255,7 +1255,7 @@ struct super_block {
78562 struct list_lru s_dentry_lru ____cacheline_aligned_in_smp;
78563 struct list_lru s_inode_lru ____cacheline_aligned_in_smp;
78564 struct rcu_head rcu;
78565 -};
78566 +} __randomize_layout;
78567
78568 extern struct timespec current_fs_time(struct super_block *sb);
78569
78570 @@ -1477,7 +1477,8 @@ struct file_operations {
78571 long (*fallocate)(struct file *file, int mode, loff_t offset,
78572 loff_t len);
78573 int (*show_fdinfo)(struct seq_file *m, struct file *f);
78574 -};
78575 +} __do_const __randomize_layout;
78576 +typedef struct file_operations __no_const file_operations_no_const;
78577
78578 struct inode_operations {
78579 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
78580 @@ -2757,4 +2758,14 @@ static inline bool dir_relax(struct inode *inode)
78581 return !IS_DEADDIR(inode);
78582 }
78583
78584 +static inline bool is_sidechannel_device(const struct inode *inode)
78585 +{
78586 +#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
78587 + umode_t mode = inode->i_mode;
78588 + return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
78589 +#else
78590 + return false;
78591 +#endif
78592 +}
78593 +
78594 #endif /* _LINUX_FS_H */
78595 diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
78596 index 0efc3e6..fd23610 100644
78597 --- a/include/linux/fs_struct.h
78598 +++ b/include/linux/fs_struct.h
78599 @@ -6,13 +6,13 @@
78600 #include <linux/seqlock.h>
78601
78602 struct fs_struct {
78603 - int users;
78604 + atomic_t users;
78605 spinlock_t lock;
78606 seqcount_t seq;
78607 int umask;
78608 int in_exec;
78609 struct path root, pwd;
78610 -};
78611 +} __randomize_layout;
78612
78613 extern struct kmem_cache *fs_cachep;
78614
78615 diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
78616 index 7714849..a4a5c7a 100644
78617 --- a/include/linux/fscache-cache.h
78618 +++ b/include/linux/fscache-cache.h
78619 @@ -113,7 +113,7 @@ struct fscache_operation {
78620 fscache_operation_release_t release;
78621 };
78622
78623 -extern atomic_t fscache_op_debug_id;
78624 +extern atomic_unchecked_t fscache_op_debug_id;
78625 extern void fscache_op_work_func(struct work_struct *work);
78626
78627 extern void fscache_enqueue_operation(struct fscache_operation *);
78628 @@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
78629 INIT_WORK(&op->work, fscache_op_work_func);
78630 atomic_set(&op->usage, 1);
78631 op->state = FSCACHE_OP_ST_INITIALISED;
78632 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
78633 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
78634 op->processor = processor;
78635 op->release = release;
78636 INIT_LIST_HEAD(&op->pend_link);
78637 diff --git a/include/linux/fscache.h b/include/linux/fscache.h
78638 index 115bb81..e7b812b 100644
78639 --- a/include/linux/fscache.h
78640 +++ b/include/linux/fscache.h
78641 @@ -152,7 +152,7 @@ struct fscache_cookie_def {
78642 * - this is mandatory for any object that may have data
78643 */
78644 void (*now_uncached)(void *cookie_netfs_data);
78645 -};
78646 +} __do_const;
78647
78648 /*
78649 * fscache cached network filesystem type
78650 diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
78651 index 1c804b0..1432c2b 100644
78652 --- a/include/linux/fsnotify.h
78653 +++ b/include/linux/fsnotify.h
78654 @@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
78655 struct inode *inode = file_inode(file);
78656 __u32 mask = FS_ACCESS;
78657
78658 + if (is_sidechannel_device(inode))
78659 + return;
78660 +
78661 if (S_ISDIR(inode->i_mode))
78662 mask |= FS_ISDIR;
78663
78664 @@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
78665 struct inode *inode = file_inode(file);
78666 __u32 mask = FS_MODIFY;
78667
78668 + if (is_sidechannel_device(inode))
78669 + return;
78670 +
78671 if (S_ISDIR(inode->i_mode))
78672 mask |= FS_ISDIR;
78673
78674 @@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
78675 */
78676 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
78677 {
78678 - return kstrdup(name, GFP_KERNEL);
78679 + return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
78680 }
78681
78682 /*
78683 diff --git a/include/linux/genhd.h b/include/linux/genhd.h
78684 index 9f3c275..8bdff5d 100644
78685 --- a/include/linux/genhd.h
78686 +++ b/include/linux/genhd.h
78687 @@ -194,7 +194,7 @@ struct gendisk {
78688 struct kobject *slave_dir;
78689
78690 struct timer_rand_state *random;
78691 - atomic_t sync_io; /* RAID */
78692 + atomic_unchecked_t sync_io; /* RAID */
78693 struct disk_events *ev;
78694 #ifdef CONFIG_BLK_DEV_INTEGRITY
78695 struct blk_integrity *integrity;
78696 @@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
78697 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
78698
78699 /* drivers/char/random.c */
78700 -extern void add_disk_randomness(struct gendisk *disk);
78701 +extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
78702 extern void rand_initialize_disk(struct gendisk *disk);
78703
78704 static inline sector_t get_start_sect(struct block_device *bdev)
78705 diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
78706 index c0894dd..2fbf10c 100644
78707 --- a/include/linux/genl_magic_func.h
78708 +++ b/include/linux/genl_magic_func.h
78709 @@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
78710 },
78711
78712 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
78713 -static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
78714 +static struct genl_ops ZZZ_genl_ops[] = {
78715 #include GENL_MAGIC_INCLUDE_FILE
78716 };
78717
78718 diff --git a/include/linux/gfp.h b/include/linux/gfp.h
78719 index 39b81dc..819dc51 100644
78720 --- a/include/linux/gfp.h
78721 +++ b/include/linux/gfp.h
78722 @@ -36,6 +36,13 @@ struct vm_area_struct;
78723 #define ___GFP_NO_KSWAPD 0x400000u
78724 #define ___GFP_OTHER_NODE 0x800000u
78725 #define ___GFP_WRITE 0x1000000u
78726 +
78727 +#ifdef CONFIG_PAX_USERCOPY_SLABS
78728 +#define ___GFP_USERCOPY 0x2000000u
78729 +#else
78730 +#define ___GFP_USERCOPY 0
78731 +#endif
78732 +
78733 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
78734
78735 /*
78736 @@ -93,6 +100,7 @@ struct vm_area_struct;
78737 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
78738 #define __GFP_KMEMCG ((__force gfp_t)___GFP_KMEMCG) /* Allocation comes from a memcg-accounted resource */
78739 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
78740 +#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
78741
78742 /*
78743 * This may seem redundant, but it's a way of annotating false positives vs.
78744 @@ -100,7 +108,7 @@ struct vm_area_struct;
78745 */
78746 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
78747
78748 -#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
78749 +#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
78750 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
78751
78752 /* This equals 0, but use constants in case they ever change */
78753 @@ -158,6 +166,8 @@ struct vm_area_struct;
78754 /* 4GB DMA on some platforms */
78755 #define GFP_DMA32 __GFP_DMA32
78756
78757 +#define GFP_USERCOPY __GFP_USERCOPY
78758 +
78759 /* Convert GFP flags to their corresponding migrate type */
78760 static inline int allocflags_to_migratetype(gfp_t gfp_flags)
78761 {
78762 diff --git a/include/linux/gracl.h b/include/linux/gracl.h
78763 new file mode 100644
78764 index 0000000..edb2cb6
78765 --- /dev/null
78766 +++ b/include/linux/gracl.h
78767 @@ -0,0 +1,340 @@
78768 +#ifndef GR_ACL_H
78769 +#define GR_ACL_H
78770 +
78771 +#include <linux/grdefs.h>
78772 +#include <linux/resource.h>
78773 +#include <linux/capability.h>
78774 +#include <linux/dcache.h>
78775 +#include <asm/resource.h>
78776 +
78777 +/* Major status information */
78778 +
78779 +#define GR_VERSION "grsecurity 3.0"
78780 +#define GRSECURITY_VERSION 0x3000
78781 +
78782 +enum {
78783 + GR_SHUTDOWN = 0,
78784 + GR_ENABLE = 1,
78785 + GR_SPROLE = 2,
78786 + GR_OLDRELOAD = 3,
78787 + GR_SEGVMOD = 4,
78788 + GR_STATUS = 5,
78789 + GR_UNSPROLE = 6,
78790 + GR_PASSSET = 7,
78791 + GR_SPROLEPAM = 8,
78792 + GR_RELOAD = 9,
78793 +};
78794 +
78795 +/* Password setup definitions
78796 + * kernel/grhash.c */
78797 +enum {
78798 + GR_PW_LEN = 128,
78799 + GR_SALT_LEN = 16,
78800 + GR_SHA_LEN = 32,
78801 +};
78802 +
78803 +enum {
78804 + GR_SPROLE_LEN = 64,
78805 +};
78806 +
78807 +enum {
78808 + GR_NO_GLOB = 0,
78809 + GR_REG_GLOB,
78810 + GR_CREATE_GLOB
78811 +};
78812 +
78813 +#define GR_NLIMITS 32
78814 +
78815 +/* Begin Data Structures */
78816 +
78817 +struct sprole_pw {
78818 + unsigned char *rolename;
78819 + unsigned char salt[GR_SALT_LEN];
78820 + unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
78821 +};
78822 +
78823 +struct name_entry {
78824 + __u32 key;
78825 + ino_t inode;
78826 + dev_t device;
78827 + char *name;
78828 + __u16 len;
78829 + __u8 deleted;
78830 + struct name_entry *prev;
78831 + struct name_entry *next;
78832 +};
78833 +
78834 +struct inodev_entry {
78835 + struct name_entry *nentry;
78836 + struct inodev_entry *prev;
78837 + struct inodev_entry *next;
78838 +};
78839 +
78840 +struct acl_role_db {
78841 + struct acl_role_label **r_hash;
78842 + __u32 r_size;
78843 +};
78844 +
78845 +struct inodev_db {
78846 + struct inodev_entry **i_hash;
78847 + __u32 i_size;
78848 +};
78849 +
78850 +struct name_db {
78851 + struct name_entry **n_hash;
78852 + __u32 n_size;
78853 +};
78854 +
78855 +struct crash_uid {
78856 + uid_t uid;
78857 + unsigned long expires;
78858 +};
78859 +
78860 +struct gr_hash_struct {
78861 + void **table;
78862 + void **nametable;
78863 + void *first;
78864 + __u32 table_size;
78865 + __u32 used_size;
78866 + int type;
78867 +};
78868 +
78869 +/* Userspace Grsecurity ACL data structures */
78870 +
78871 +struct acl_subject_label {
78872 + char *filename;
78873 + ino_t inode;
78874 + dev_t device;
78875 + __u32 mode;
78876 + kernel_cap_t cap_mask;
78877 + kernel_cap_t cap_lower;
78878 + kernel_cap_t cap_invert_audit;
78879 +
78880 + struct rlimit res[GR_NLIMITS];
78881 + __u32 resmask;
78882 +
78883 + __u8 user_trans_type;
78884 + __u8 group_trans_type;
78885 + uid_t *user_transitions;
78886 + gid_t *group_transitions;
78887 + __u16 user_trans_num;
78888 + __u16 group_trans_num;
78889 +
78890 + __u32 sock_families[2];
78891 + __u32 ip_proto[8];
78892 + __u32 ip_type;
78893 + struct acl_ip_label **ips;
78894 + __u32 ip_num;
78895 + __u32 inaddr_any_override;
78896 +
78897 + __u32 crashes;
78898 + unsigned long expires;
78899 +
78900 + struct acl_subject_label *parent_subject;
78901 + struct gr_hash_struct *hash;
78902 + struct acl_subject_label *prev;
78903 + struct acl_subject_label *next;
78904 +
78905 + struct acl_object_label **obj_hash;
78906 + __u32 obj_hash_size;
78907 + __u16 pax_flags;
78908 +};
78909 +
78910 +struct role_allowed_ip {
78911 + __u32 addr;
78912 + __u32 netmask;
78913 +
78914 + struct role_allowed_ip *prev;
78915 + struct role_allowed_ip *next;
78916 +};
78917 +
78918 +struct role_transition {
78919 + char *rolename;
78920 +
78921 + struct role_transition *prev;
78922 + struct role_transition *next;
78923 +};
78924 +
78925 +struct acl_role_label {
78926 + char *rolename;
78927 + uid_t uidgid;
78928 + __u16 roletype;
78929 +
78930 + __u16 auth_attempts;
78931 + unsigned long expires;
78932 +
78933 + struct acl_subject_label *root_label;
78934 + struct gr_hash_struct *hash;
78935 +
78936 + struct acl_role_label *prev;
78937 + struct acl_role_label *next;
78938 +
78939 + struct role_transition *transitions;
78940 + struct role_allowed_ip *allowed_ips;
78941 + uid_t *domain_children;
78942 + __u16 domain_child_num;
78943 +
78944 + umode_t umask;
78945 +
78946 + struct acl_subject_label **subj_hash;
78947 + __u32 subj_hash_size;
78948 +};
78949 +
78950 +struct user_acl_role_db {
78951 + struct acl_role_label **r_table;
78952 + __u32 num_pointers; /* Number of allocations to track */
78953 + __u32 num_roles; /* Number of roles */
78954 + __u32 num_domain_children; /* Number of domain children */
78955 + __u32 num_subjects; /* Number of subjects */
78956 + __u32 num_objects; /* Number of objects */
78957 +};
78958 +
78959 +struct acl_object_label {
78960 + char *filename;
78961 + ino_t inode;
78962 + dev_t device;
78963 + __u32 mode;
78964 +
78965 + struct acl_subject_label *nested;
78966 + struct acl_object_label *globbed;
78967 +
78968 + /* next two structures not used */
78969 +
78970 + struct acl_object_label *prev;
78971 + struct acl_object_label *next;
78972 +};
78973 +
78974 +struct acl_ip_label {
78975 + char *iface;
78976 + __u32 addr;
78977 + __u32 netmask;
78978 + __u16 low, high;
78979 + __u8 mode;
78980 + __u32 type;
78981 + __u32 proto[8];
78982 +
78983 + /* next two structures not used */
78984 +
78985 + struct acl_ip_label *prev;
78986 + struct acl_ip_label *next;
78987 +};
78988 +
78989 +struct gr_arg {
78990 + struct user_acl_role_db role_db;
78991 + unsigned char pw[GR_PW_LEN];
78992 + unsigned char salt[GR_SALT_LEN];
78993 + unsigned char sum[GR_SHA_LEN];
78994 + unsigned char sp_role[GR_SPROLE_LEN];
78995 + struct sprole_pw *sprole_pws;
78996 + dev_t segv_device;
78997 + ino_t segv_inode;
78998 + uid_t segv_uid;
78999 + __u16 num_sprole_pws;
79000 + __u16 mode;
79001 +};
79002 +
79003 +struct gr_arg_wrapper {
79004 + struct gr_arg *arg;
79005 + __u32 version;
79006 + __u32 size;
79007 +};
79008 +
79009 +struct subject_map {
79010 + struct acl_subject_label *user;
79011 + struct acl_subject_label *kernel;
79012 + struct subject_map *prev;
79013 + struct subject_map *next;
79014 +};
79015 +
79016 +struct acl_subj_map_db {
79017 + struct subject_map **s_hash;
79018 + __u32 s_size;
79019 +};
79020 +
79021 +struct gr_policy_state {
79022 + struct sprole_pw **acl_special_roles;
79023 + __u16 num_sprole_pws;
79024 + struct acl_role_label *kernel_role;
79025 + struct acl_role_label *role_list;
79026 + struct acl_role_label *default_role;
79027 + struct acl_role_db acl_role_set;
79028 + struct acl_subj_map_db subj_map_set;
79029 + struct name_db name_set;
79030 + struct inodev_db inodev_set;
79031 +};
79032 +
79033 +struct gr_alloc_state {
79034 + unsigned long alloc_stack_next;
79035 + unsigned long alloc_stack_size;
79036 + void **alloc_stack;
79037 +};
79038 +
79039 +struct gr_reload_state {
79040 + struct gr_policy_state oldpolicy;
79041 + struct gr_alloc_state oldalloc;
79042 + struct gr_policy_state newpolicy;
79043 + struct gr_alloc_state newalloc;
79044 + struct gr_policy_state *oldpolicy_ptr;
79045 + struct gr_alloc_state *oldalloc_ptr;
79046 + unsigned char oldmode;
79047 +};
79048 +
79049 +/* End Data Structures Section */
79050 +
79051 +/* Hash functions generated by empirical testing by Brad Spengler
79052 + Makes good use of the low bits of the inode. Generally 0-1 times
79053 + in loop for successful match. 0-3 for unsuccessful match.
79054 + Shift/add algorithm with modulus of table size and an XOR*/
79055 +
79056 +static __inline__ unsigned int
79057 +gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
79058 +{
79059 + return ((((uid + type) << (16 + type)) ^ uid) % sz);
79060 +}
79061 +
79062 + static __inline__ unsigned int
79063 +gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
79064 +{
79065 + return ((const unsigned long)userp % sz);
79066 +}
79067 +
79068 +static __inline__ unsigned int
79069 +gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
79070 +{
79071 + return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
79072 +}
79073 +
79074 +static __inline__ unsigned int
79075 +gr_nhash(const char *name, const __u16 len, const unsigned int sz)
79076 +{
79077 + return full_name_hash((const unsigned char *)name, len) % sz;
79078 +}
79079 +
79080 +#define FOR_EACH_SUBJECT_START(role,subj,iter) \
79081 + subj = NULL; \
79082 + iter = 0; \
79083 + while (iter < role->subj_hash_size) { \
79084 + if (subj == NULL) \
79085 + subj = role->subj_hash[iter]; \
79086 + if (subj == NULL) { \
79087 + iter++; \
79088 + continue; \
79089 + }
79090 +
79091 +#define FOR_EACH_SUBJECT_END(subj,iter) \
79092 + subj = subj->next; \
79093 + if (subj == NULL) \
79094 + iter++; \
79095 + }
79096 +
79097 +
79098 +#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
79099 + subj = role->hash->first; \
79100 + while (subj != NULL) {
79101 +
79102 +#define FOR_EACH_NESTED_SUBJECT_END(subj) \
79103 + subj = subj->next; \
79104 + }
79105 +
79106 +#endif
79107 +
79108 diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
79109 new file mode 100644
79110 index 0000000..33ebd1f
79111 --- /dev/null
79112 +++ b/include/linux/gracl_compat.h
79113 @@ -0,0 +1,156 @@
79114 +#ifndef GR_ACL_COMPAT_H
79115 +#define GR_ACL_COMPAT_H
79116 +
79117 +#include <linux/resource.h>
79118 +#include <asm/resource.h>
79119 +
79120 +struct sprole_pw_compat {
79121 + compat_uptr_t rolename;
79122 + unsigned char salt[GR_SALT_LEN];
79123 + unsigned char sum[GR_SHA_LEN];
79124 +};
79125 +
79126 +struct gr_hash_struct_compat {
79127 + compat_uptr_t table;
79128 + compat_uptr_t nametable;
79129 + compat_uptr_t first;
79130 + __u32 table_size;
79131 + __u32 used_size;
79132 + int type;
79133 +};
79134 +
79135 +struct acl_subject_label_compat {
79136 + compat_uptr_t filename;
79137 + compat_ino_t inode;
79138 + __u32 device;
79139 + __u32 mode;
79140 + kernel_cap_t cap_mask;
79141 + kernel_cap_t cap_lower;
79142 + kernel_cap_t cap_invert_audit;
79143 +
79144 + struct compat_rlimit res[GR_NLIMITS];
79145 + __u32 resmask;
79146 +
79147 + __u8 user_trans_type;
79148 + __u8 group_trans_type;
79149 + compat_uptr_t user_transitions;
79150 + compat_uptr_t group_transitions;
79151 + __u16 user_trans_num;
79152 + __u16 group_trans_num;
79153 +
79154 + __u32 sock_families[2];
79155 + __u32 ip_proto[8];
79156 + __u32 ip_type;
79157 + compat_uptr_t ips;
79158 + __u32 ip_num;
79159 + __u32 inaddr_any_override;
79160 +
79161 + __u32 crashes;
79162 + compat_ulong_t expires;
79163 +
79164 + compat_uptr_t parent_subject;
79165 + compat_uptr_t hash;
79166 + compat_uptr_t prev;
79167 + compat_uptr_t next;
79168 +
79169 + compat_uptr_t obj_hash;
79170 + __u32 obj_hash_size;
79171 + __u16 pax_flags;
79172 +};
79173 +
79174 +struct role_allowed_ip_compat {
79175 + __u32 addr;
79176 + __u32 netmask;
79177 +
79178 + compat_uptr_t prev;
79179 + compat_uptr_t next;
79180 +};
79181 +
79182 +struct role_transition_compat {
79183 + compat_uptr_t rolename;
79184 +
79185 + compat_uptr_t prev;
79186 + compat_uptr_t next;
79187 +};
79188 +
79189 +struct acl_role_label_compat {
79190 + compat_uptr_t rolename;
79191 + uid_t uidgid;
79192 + __u16 roletype;
79193 +
79194 + __u16 auth_attempts;
79195 + compat_ulong_t expires;
79196 +
79197 + compat_uptr_t root_label;
79198 + compat_uptr_t hash;
79199 +
79200 + compat_uptr_t prev;
79201 + compat_uptr_t next;
79202 +
79203 + compat_uptr_t transitions;
79204 + compat_uptr_t allowed_ips;
79205 + compat_uptr_t domain_children;
79206 + __u16 domain_child_num;
79207 +
79208 + umode_t umask;
79209 +
79210 + compat_uptr_t subj_hash;
79211 + __u32 subj_hash_size;
79212 +};
79213 +
79214 +struct user_acl_role_db_compat {
79215 + compat_uptr_t r_table;
79216 + __u32 num_pointers;
79217 + __u32 num_roles;
79218 + __u32 num_domain_children;
79219 + __u32 num_subjects;
79220 + __u32 num_objects;
79221 +};
79222 +
79223 +struct acl_object_label_compat {
79224 + compat_uptr_t filename;
79225 + compat_ino_t inode;
79226 + __u32 device;
79227 + __u32 mode;
79228 +
79229 + compat_uptr_t nested;
79230 + compat_uptr_t globbed;
79231 +
79232 + compat_uptr_t prev;
79233 + compat_uptr_t next;
79234 +};
79235 +
79236 +struct acl_ip_label_compat {
79237 + compat_uptr_t iface;
79238 + __u32 addr;
79239 + __u32 netmask;
79240 + __u16 low, high;
79241 + __u8 mode;
79242 + __u32 type;
79243 + __u32 proto[8];
79244 +
79245 + compat_uptr_t prev;
79246 + compat_uptr_t next;
79247 +};
79248 +
79249 +struct gr_arg_compat {
79250 + struct user_acl_role_db_compat role_db;
79251 + unsigned char pw[GR_PW_LEN];
79252 + unsigned char salt[GR_SALT_LEN];
79253 + unsigned char sum[GR_SHA_LEN];
79254 + unsigned char sp_role[GR_SPROLE_LEN];
79255 + compat_uptr_t sprole_pws;
79256 + __u32 segv_device;
79257 + compat_ino_t segv_inode;
79258 + uid_t segv_uid;
79259 + __u16 num_sprole_pws;
79260 + __u16 mode;
79261 +};
79262 +
79263 +struct gr_arg_wrapper_compat {
79264 + compat_uptr_t arg;
79265 + __u32 version;
79266 + __u32 size;
79267 +};
79268 +
79269 +#endif
79270 diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
79271 new file mode 100644
79272 index 0000000..323ecf2
79273 --- /dev/null
79274 +++ b/include/linux/gralloc.h
79275 @@ -0,0 +1,9 @@
79276 +#ifndef __GRALLOC_H
79277 +#define __GRALLOC_H
79278 +
79279 +void acl_free_all(void);
79280 +int acl_alloc_stack_init(unsigned long size);
79281 +void *acl_alloc(unsigned long len);
79282 +void *acl_alloc_num(unsigned long num, unsigned long len);
79283 +
79284 +#endif
79285 diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
79286 new file mode 100644
79287 index 0000000..be66033
79288 --- /dev/null
79289 +++ b/include/linux/grdefs.h
79290 @@ -0,0 +1,140 @@
79291 +#ifndef GRDEFS_H
79292 +#define GRDEFS_H
79293 +
79294 +/* Begin grsecurity status declarations */
79295 +
79296 +enum {
79297 + GR_READY = 0x01,
79298 + GR_STATUS_INIT = 0x00 // disabled state
79299 +};
79300 +
79301 +/* Begin ACL declarations */
79302 +
79303 +/* Role flags */
79304 +
79305 +enum {
79306 + GR_ROLE_USER = 0x0001,
79307 + GR_ROLE_GROUP = 0x0002,
79308 + GR_ROLE_DEFAULT = 0x0004,
79309 + GR_ROLE_SPECIAL = 0x0008,
79310 + GR_ROLE_AUTH = 0x0010,
79311 + GR_ROLE_NOPW = 0x0020,
79312 + GR_ROLE_GOD = 0x0040,
79313 + GR_ROLE_LEARN = 0x0080,
79314 + GR_ROLE_TPE = 0x0100,
79315 + GR_ROLE_DOMAIN = 0x0200,
79316 + GR_ROLE_PAM = 0x0400,
79317 + GR_ROLE_PERSIST = 0x0800
79318 +};
79319 +
79320 +/* ACL Subject and Object mode flags */
79321 +enum {
79322 + GR_DELETED = 0x80000000
79323 +};
79324 +
79325 +/* ACL Object-only mode flags */
79326 +enum {
79327 + GR_READ = 0x00000001,
79328 + GR_APPEND = 0x00000002,
79329 + GR_WRITE = 0x00000004,
79330 + GR_EXEC = 0x00000008,
79331 + GR_FIND = 0x00000010,
79332 + GR_INHERIT = 0x00000020,
79333 + GR_SETID = 0x00000040,
79334 + GR_CREATE = 0x00000080,
79335 + GR_DELETE = 0x00000100,
79336 + GR_LINK = 0x00000200,
79337 + GR_AUDIT_READ = 0x00000400,
79338 + GR_AUDIT_APPEND = 0x00000800,
79339 + GR_AUDIT_WRITE = 0x00001000,
79340 + GR_AUDIT_EXEC = 0x00002000,
79341 + GR_AUDIT_FIND = 0x00004000,
79342 + GR_AUDIT_INHERIT= 0x00008000,
79343 + GR_AUDIT_SETID = 0x00010000,
79344 + GR_AUDIT_CREATE = 0x00020000,
79345 + GR_AUDIT_DELETE = 0x00040000,
79346 + GR_AUDIT_LINK = 0x00080000,
79347 + GR_PTRACERD = 0x00100000,
79348 + GR_NOPTRACE = 0x00200000,
79349 + GR_SUPPRESS = 0x00400000,
79350 + GR_NOLEARN = 0x00800000,
79351 + GR_INIT_TRANSFER= 0x01000000
79352 +};
79353 +
79354 +#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
79355 + GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
79356 + GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
79357 +
79358 +/* ACL subject-only mode flags */
79359 +enum {
79360 + GR_KILL = 0x00000001,
79361 + GR_VIEW = 0x00000002,
79362 + GR_PROTECTED = 0x00000004,
79363 + GR_LEARN = 0x00000008,
79364 + GR_OVERRIDE = 0x00000010,
79365 + /* just a placeholder, this mode is only used in userspace */
79366 + GR_DUMMY = 0x00000020,
79367 + GR_PROTSHM = 0x00000040,
79368 + GR_KILLPROC = 0x00000080,
79369 + GR_KILLIPPROC = 0x00000100,
79370 + /* just a placeholder, this mode is only used in userspace */
79371 + GR_NOTROJAN = 0x00000200,
79372 + GR_PROTPROCFD = 0x00000400,
79373 + GR_PROCACCT = 0x00000800,
79374 + GR_RELAXPTRACE = 0x00001000,
79375 + //GR_NESTED = 0x00002000,
79376 + GR_INHERITLEARN = 0x00004000,
79377 + GR_PROCFIND = 0x00008000,
79378 + GR_POVERRIDE = 0x00010000,
79379 + GR_KERNELAUTH = 0x00020000,
79380 + GR_ATSECURE = 0x00040000,
79381 + GR_SHMEXEC = 0x00080000
79382 +};
79383 +
79384 +enum {
79385 + GR_PAX_ENABLE_SEGMEXEC = 0x0001,
79386 + GR_PAX_ENABLE_PAGEEXEC = 0x0002,
79387 + GR_PAX_ENABLE_MPROTECT = 0x0004,
79388 + GR_PAX_ENABLE_RANDMMAP = 0x0008,
79389 + GR_PAX_ENABLE_EMUTRAMP = 0x0010,
79390 + GR_PAX_DISABLE_SEGMEXEC = 0x0100,
79391 + GR_PAX_DISABLE_PAGEEXEC = 0x0200,
79392 + GR_PAX_DISABLE_MPROTECT = 0x0400,
79393 + GR_PAX_DISABLE_RANDMMAP = 0x0800,
79394 + GR_PAX_DISABLE_EMUTRAMP = 0x1000,
79395 +};
79396 +
79397 +enum {
79398 + GR_ID_USER = 0x01,
79399 + GR_ID_GROUP = 0x02,
79400 +};
79401 +
79402 +enum {
79403 + GR_ID_ALLOW = 0x01,
79404 + GR_ID_DENY = 0x02,
79405 +};
79406 +
79407 +#define GR_CRASH_RES 31
79408 +#define GR_UIDTABLE_MAX 500
79409 +
79410 +/* begin resource learning section */
79411 +enum {
79412 + GR_RLIM_CPU_BUMP = 60,
79413 + GR_RLIM_FSIZE_BUMP = 50000,
79414 + GR_RLIM_DATA_BUMP = 10000,
79415 + GR_RLIM_STACK_BUMP = 1000,
79416 + GR_RLIM_CORE_BUMP = 10000,
79417 + GR_RLIM_RSS_BUMP = 500000,
79418 + GR_RLIM_NPROC_BUMP = 1,
79419 + GR_RLIM_NOFILE_BUMP = 5,
79420 + GR_RLIM_MEMLOCK_BUMP = 50000,
79421 + GR_RLIM_AS_BUMP = 500000,
79422 + GR_RLIM_LOCKS_BUMP = 2,
79423 + GR_RLIM_SIGPENDING_BUMP = 5,
79424 + GR_RLIM_MSGQUEUE_BUMP = 10000,
79425 + GR_RLIM_NICE_BUMP = 1,
79426 + GR_RLIM_RTPRIO_BUMP = 1,
79427 + GR_RLIM_RTTIME_BUMP = 1000000
79428 +};
79429 +
79430 +#endif
79431 diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
79432 new file mode 100644
79433 index 0000000..d25522e
79434 --- /dev/null
79435 +++ b/include/linux/grinternal.h
79436 @@ -0,0 +1,229 @@
79437 +#ifndef __GRINTERNAL_H
79438 +#define __GRINTERNAL_H
79439 +
79440 +#ifdef CONFIG_GRKERNSEC
79441 +
79442 +#include <linux/fs.h>
79443 +#include <linux/mnt_namespace.h>
79444 +#include <linux/nsproxy.h>
79445 +#include <linux/gracl.h>
79446 +#include <linux/grdefs.h>
79447 +#include <linux/grmsg.h>
79448 +
79449 +void gr_add_learn_entry(const char *fmt, ...)
79450 + __attribute__ ((format (printf, 1, 2)));
79451 +__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
79452 + const struct vfsmount *mnt);
79453 +__u32 gr_check_create(const struct dentry *new_dentry,
79454 + const struct dentry *parent,
79455 + const struct vfsmount *mnt, const __u32 mode);
79456 +int gr_check_protected_task(const struct task_struct *task);
79457 +__u32 to_gr_audit(const __u32 reqmode);
79458 +int gr_set_acls(const int type);
79459 +int gr_acl_is_enabled(void);
79460 +char gr_roletype_to_char(void);
79461 +
79462 +void gr_handle_alertkill(struct task_struct *task);
79463 +char *gr_to_filename(const struct dentry *dentry,
79464 + const struct vfsmount *mnt);
79465 +char *gr_to_filename1(const struct dentry *dentry,
79466 + const struct vfsmount *mnt);
79467 +char *gr_to_filename2(const struct dentry *dentry,
79468 + const struct vfsmount *mnt);
79469 +char *gr_to_filename3(const struct dentry *dentry,
79470 + const struct vfsmount *mnt);
79471 +
79472 +extern int grsec_enable_ptrace_readexec;
79473 +extern int grsec_enable_harden_ptrace;
79474 +extern int grsec_enable_link;
79475 +extern int grsec_enable_fifo;
79476 +extern int grsec_enable_execve;
79477 +extern int grsec_enable_shm;
79478 +extern int grsec_enable_execlog;
79479 +extern int grsec_enable_signal;
79480 +extern int grsec_enable_audit_ptrace;
79481 +extern int grsec_enable_forkfail;
79482 +extern int grsec_enable_time;
79483 +extern int grsec_enable_rofs;
79484 +extern int grsec_deny_new_usb;
79485 +extern int grsec_enable_chroot_shmat;
79486 +extern int grsec_enable_chroot_mount;
79487 +extern int grsec_enable_chroot_double;
79488 +extern int grsec_enable_chroot_pivot;
79489 +extern int grsec_enable_chroot_chdir;
79490 +extern int grsec_enable_chroot_chmod;
79491 +extern int grsec_enable_chroot_mknod;
79492 +extern int grsec_enable_chroot_fchdir;
79493 +extern int grsec_enable_chroot_nice;
79494 +extern int grsec_enable_chroot_execlog;
79495 +extern int grsec_enable_chroot_caps;
79496 +extern int grsec_enable_chroot_sysctl;
79497 +extern int grsec_enable_chroot_unix;
79498 +extern int grsec_enable_symlinkown;
79499 +extern kgid_t grsec_symlinkown_gid;
79500 +extern int grsec_enable_tpe;
79501 +extern kgid_t grsec_tpe_gid;
79502 +extern int grsec_enable_tpe_all;
79503 +extern int grsec_enable_tpe_invert;
79504 +extern int grsec_enable_socket_all;
79505 +extern kgid_t grsec_socket_all_gid;
79506 +extern int grsec_enable_socket_client;
79507 +extern kgid_t grsec_socket_client_gid;
79508 +extern int grsec_enable_socket_server;
79509 +extern kgid_t grsec_socket_server_gid;
79510 +extern kgid_t grsec_audit_gid;
79511 +extern int grsec_enable_group;
79512 +extern int grsec_enable_log_rwxmaps;
79513 +extern int grsec_enable_mount;
79514 +extern int grsec_enable_chdir;
79515 +extern int grsec_resource_logging;
79516 +extern int grsec_enable_blackhole;
79517 +extern int grsec_lastack_retries;
79518 +extern int grsec_enable_brute;
79519 +extern int grsec_enable_harden_ipc;
79520 +extern int grsec_lock;
79521 +
79522 +extern spinlock_t grsec_alert_lock;
79523 +extern unsigned long grsec_alert_wtime;
79524 +extern unsigned long grsec_alert_fyet;
79525 +
79526 +extern spinlock_t grsec_audit_lock;
79527 +
79528 +extern rwlock_t grsec_exec_file_lock;
79529 +
79530 +#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
79531 + gr_to_filename2((tsk)->exec_file->f_path.dentry, \
79532 + (tsk)->exec_file->f_path.mnt) : "/")
79533 +
79534 +#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
79535 + gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
79536 + (tsk)->real_parent->exec_file->f_path.mnt) : "/")
79537 +
79538 +#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
79539 + gr_to_filename((tsk)->exec_file->f_path.dentry, \
79540 + (tsk)->exec_file->f_path.mnt) : "/")
79541 +
79542 +#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
79543 + gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
79544 + (tsk)->real_parent->exec_file->f_path.mnt) : "/")
79545 +
79546 +#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
79547 +
79548 +#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
79549 +
79550 +static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
79551 +{
79552 + if (file1 && file2) {
79553 + const struct inode *inode1 = file1->f_path.dentry->d_inode;
79554 + const struct inode *inode2 = file2->f_path.dentry->d_inode;
79555 + if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
79556 + return true;
79557 + }
79558 +
79559 + return false;
79560 +}
79561 +
79562 +#define GR_CHROOT_CAPS {{ \
79563 + CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
79564 + CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
79565 + CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
79566 + CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
79567 + CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
79568 + CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
79569 + CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
79570 +
79571 +#define security_learn(normal_msg,args...) \
79572 +({ \
79573 + read_lock(&grsec_exec_file_lock); \
79574 + gr_add_learn_entry(normal_msg "\n", ## args); \
79575 + read_unlock(&grsec_exec_file_lock); \
79576 +})
79577 +
79578 +enum {
79579 + GR_DO_AUDIT,
79580 + GR_DONT_AUDIT,
79581 + /* used for non-audit messages that we shouldn't kill the task on */
79582 + GR_DONT_AUDIT_GOOD
79583 +};
79584 +
79585 +enum {
79586 + GR_TTYSNIFF,
79587 + GR_RBAC,
79588 + GR_RBAC_STR,
79589 + GR_STR_RBAC,
79590 + GR_RBAC_MODE2,
79591 + GR_RBAC_MODE3,
79592 + GR_FILENAME,
79593 + GR_SYSCTL_HIDDEN,
79594 + GR_NOARGS,
79595 + GR_ONE_INT,
79596 + GR_ONE_INT_TWO_STR,
79597 + GR_ONE_STR,
79598 + GR_STR_INT,
79599 + GR_TWO_STR_INT,
79600 + GR_TWO_INT,
79601 + GR_TWO_U64,
79602 + GR_THREE_INT,
79603 + GR_FIVE_INT_TWO_STR,
79604 + GR_TWO_STR,
79605 + GR_THREE_STR,
79606 + GR_FOUR_STR,
79607 + GR_STR_FILENAME,
79608 + GR_FILENAME_STR,
79609 + GR_FILENAME_TWO_INT,
79610 + GR_FILENAME_TWO_INT_STR,
79611 + GR_TEXTREL,
79612 + GR_PTRACE,
79613 + GR_RESOURCE,
79614 + GR_CAP,
79615 + GR_SIG,
79616 + GR_SIG2,
79617 + GR_CRASH1,
79618 + GR_CRASH2,
79619 + GR_PSACCT,
79620 + GR_RWXMAP,
79621 + GR_RWXMAPVMA
79622 +};
79623 +
79624 +#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
79625 +#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
79626 +#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
79627 +#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
79628 +#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
79629 +#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
79630 +#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)
79631 +#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
79632 +#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
79633 +#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
79634 +#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
79635 +#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
79636 +#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
79637 +#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
79638 +#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
79639 +#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
79640 +#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)
79641 +#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
79642 +#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
79643 +#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
79644 +#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
79645 +#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
79646 +#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
79647 +#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
79648 +#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)
79649 +#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
79650 +#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
79651 +#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
79652 +#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
79653 +#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
79654 +#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
79655 +#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
79656 +#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
79657 +#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)
79658 +#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
79659 +#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
79660 +
79661 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
79662 +
79663 +#endif
79664 +
79665 +#endif
79666 diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
79667 new file mode 100644
79668 index 0000000..b02ba9d
79669 --- /dev/null
79670 +++ b/include/linux/grmsg.h
79671 @@ -0,0 +1,117 @@
79672 +#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"
79673 +#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"
79674 +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
79675 +#define GR_STOPMOD_MSG "denied modification of module state by "
79676 +#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
79677 +#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
79678 +#define GR_IOPERM_MSG "denied use of ioperm() by "
79679 +#define GR_IOPL_MSG "denied use of iopl() by "
79680 +#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
79681 +#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
79682 +#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
79683 +#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
79684 +#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
79685 +#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"
79686 +#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"
79687 +#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
79688 +#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
79689 +#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
79690 +#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
79691 +#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
79692 +#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
79693 +#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
79694 +#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
79695 +#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
79696 +#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
79697 +#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
79698 +#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
79699 +#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
79700 +#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
79701 +#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
79702 +#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
79703 +#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
79704 +#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
79705 +#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
79706 +#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
79707 +#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
79708 +#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
79709 +#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
79710 +#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
79711 +#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
79712 +#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
79713 +#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
79714 +#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
79715 +#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
79716 +#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
79717 +#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
79718 +#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
79719 +#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
79720 +#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
79721 +#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
79722 +#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
79723 +#define GR_INITF_ACL_MSG "init_variables() failed %s by "
79724 +#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"
79725 +#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
79726 +#define GR_SHUTS_ACL_MSG "shutdown auth success for "
79727 +#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
79728 +#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
79729 +#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
79730 +#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
79731 +#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
79732 +#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
79733 +#define GR_ENABLEF_ACL_MSG "unable to load %s for "
79734 +#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
79735 +#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
79736 +#define GR_RELOADF_ACL_MSG "failed reload of %s for "
79737 +#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
79738 +#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
79739 +#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
79740 +#define GR_SPROLEF_ACL_MSG "special role %s failure for "
79741 +#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
79742 +#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
79743 +#define GR_INVMODE_ACL_MSG "invalid mode %d by "
79744 +#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
79745 +#define GR_FAILFORK_MSG "failed fork with errno %s by "
79746 +#define GR_NICE_CHROOT_MSG "denied priority change by "
79747 +#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
79748 +#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
79749 +#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
79750 +#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
79751 +#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
79752 +#define GR_TIME_MSG "time set by "
79753 +#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
79754 +#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
79755 +#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
79756 +#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
79757 +#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
79758 +#define GR_BIND_MSG "denied bind() by "
79759 +#define GR_CONNECT_MSG "denied connect() by "
79760 +#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
79761 +#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
79762 +#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"
79763 +#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
79764 +#define GR_CAP_ACL_MSG "use of %s denied for "
79765 +#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
79766 +#define GR_CAP_ACL_MSG2 "use of %s permitted for "
79767 +#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
79768 +#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
79769 +#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
79770 +#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
79771 +#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
79772 +#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
79773 +#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
79774 +#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
79775 +#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
79776 +#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
79777 +#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
79778 +#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
79779 +#define GR_VM86_MSG "denied use of vm86 by "
79780 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
79781 +#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
79782 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
79783 +#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
79784 +#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
79785 +#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 "
79786 +#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 "
79787 +#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
79788 +#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
79789 diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
79790 new file mode 100644
79791 index 0000000..13ac2e2
79792 --- /dev/null
79793 +++ b/include/linux/grsecurity.h
79794 @@ -0,0 +1,249 @@
79795 +#ifndef GR_SECURITY_H
79796 +#define GR_SECURITY_H
79797 +#include <linux/fs.h>
79798 +#include <linux/fs_struct.h>
79799 +#include <linux/binfmts.h>
79800 +#include <linux/gracl.h>
79801 +
79802 +/* notify of brain-dead configs */
79803 +#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
79804 +#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
79805 +#endif
79806 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
79807 +#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
79808 +#endif
79809 +#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
79810 +#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
79811 +#endif
79812 +#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
79813 +#error "CONFIG_PAX enabled, but no PaX options are enabled."
79814 +#endif
79815 +
79816 +int gr_handle_new_usb(void);
79817 +
79818 +void gr_handle_brute_attach(int dumpable);
79819 +void gr_handle_brute_check(void);
79820 +void gr_handle_kernel_exploit(void);
79821 +
79822 +char gr_roletype_to_char(void);
79823 +
79824 +int gr_proc_is_restricted(void);
79825 +
79826 +int gr_acl_enable_at_secure(void);
79827 +
79828 +int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
79829 +int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
79830 +
79831 +void gr_del_task_from_ip_table(struct task_struct *p);
79832 +
79833 +int gr_pid_is_chrooted(struct task_struct *p);
79834 +int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
79835 +int gr_handle_chroot_nice(void);
79836 +int gr_handle_chroot_sysctl(const int op);
79837 +int gr_handle_chroot_setpriority(struct task_struct *p,
79838 + const int niceval);
79839 +int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
79840 +int gr_chroot_fhandle(void);
79841 +int gr_handle_chroot_chroot(const struct dentry *dentry,
79842 + const struct vfsmount *mnt);
79843 +void gr_handle_chroot_chdir(const struct path *path);
79844 +int gr_handle_chroot_chmod(const struct dentry *dentry,
79845 + const struct vfsmount *mnt, const int mode);
79846 +int gr_handle_chroot_mknod(const struct dentry *dentry,
79847 + const struct vfsmount *mnt, const int mode);
79848 +int gr_handle_chroot_mount(const struct dentry *dentry,
79849 + const struct vfsmount *mnt,
79850 + const char *dev_name);
79851 +int gr_handle_chroot_pivot(void);
79852 +int gr_handle_chroot_unix(const pid_t pid);
79853 +
79854 +int gr_handle_rawio(const struct inode *inode);
79855 +
79856 +void gr_handle_ioperm(void);
79857 +void gr_handle_iopl(void);
79858 +void gr_handle_msr_write(void);
79859 +
79860 +umode_t gr_acl_umask(void);
79861 +
79862 +int gr_tpe_allow(const struct file *file);
79863 +
79864 +void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
79865 +void gr_clear_chroot_entries(struct task_struct *task);
79866 +
79867 +void gr_log_forkfail(const int retval);
79868 +void gr_log_timechange(void);
79869 +void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
79870 +void gr_log_chdir(const struct dentry *dentry,
79871 + const struct vfsmount *mnt);
79872 +void gr_log_chroot_exec(const struct dentry *dentry,
79873 + const struct vfsmount *mnt);
79874 +void gr_log_remount(const char *devname, const int retval);
79875 +void gr_log_unmount(const char *devname, const int retval);
79876 +void gr_log_mount(const char *from, const char *to, const int retval);
79877 +void gr_log_textrel(struct vm_area_struct *vma);
79878 +void gr_log_ptgnustack(struct file *file);
79879 +void gr_log_rwxmmap(struct file *file);
79880 +void gr_log_rwxmprotect(struct vm_area_struct *vma);
79881 +
79882 +int gr_handle_follow_link(const struct inode *parent,
79883 + const struct inode *inode,
79884 + const struct dentry *dentry,
79885 + const struct vfsmount *mnt);
79886 +int gr_handle_fifo(const struct dentry *dentry,
79887 + const struct vfsmount *mnt,
79888 + const struct dentry *dir, const int flag,
79889 + const int acc_mode);
79890 +int gr_handle_hardlink(const struct dentry *dentry,
79891 + const struct vfsmount *mnt,
79892 + struct inode *inode,
79893 + const int mode, const struct filename *to);
79894 +
79895 +int gr_is_capable(const int cap);
79896 +int gr_is_capable_nolog(const int cap);
79897 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
79898 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
79899 +
79900 +void gr_copy_label(struct task_struct *tsk);
79901 +void gr_handle_crash(struct task_struct *task, const int sig);
79902 +int gr_handle_signal(const struct task_struct *p, const int sig);
79903 +int gr_check_crash_uid(const kuid_t uid);
79904 +int gr_check_protected_task(const struct task_struct *task);
79905 +int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
79906 +int gr_acl_handle_mmap(const struct file *file,
79907 + const unsigned long prot);
79908 +int gr_acl_handle_mprotect(const struct file *file,
79909 + const unsigned long prot);
79910 +int gr_check_hidden_task(const struct task_struct *tsk);
79911 +__u32 gr_acl_handle_truncate(const struct dentry *dentry,
79912 + const struct vfsmount *mnt);
79913 +__u32 gr_acl_handle_utime(const struct dentry *dentry,
79914 + const struct vfsmount *mnt);
79915 +__u32 gr_acl_handle_access(const struct dentry *dentry,
79916 + const struct vfsmount *mnt, const int fmode);
79917 +__u32 gr_acl_handle_chmod(const struct dentry *dentry,
79918 + const struct vfsmount *mnt, umode_t *mode);
79919 +__u32 gr_acl_handle_chown(const struct dentry *dentry,
79920 + const struct vfsmount *mnt);
79921 +__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
79922 + const struct vfsmount *mnt);
79923 +__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
79924 + const struct vfsmount *mnt);
79925 +int gr_handle_ptrace(struct task_struct *task, const long request);
79926 +int gr_handle_proc_ptrace(struct task_struct *task);
79927 +__u32 gr_acl_handle_execve(const struct dentry *dentry,
79928 + const struct vfsmount *mnt);
79929 +int gr_check_crash_exec(const struct file *filp);
79930 +int gr_acl_is_enabled(void);
79931 +void gr_set_role_label(struct task_struct *task, const kuid_t uid,
79932 + const kgid_t gid);
79933 +int gr_set_proc_label(const struct dentry *dentry,
79934 + const struct vfsmount *mnt,
79935 + const int unsafe_flags);
79936 +__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
79937 + const struct vfsmount *mnt);
79938 +__u32 gr_acl_handle_open(const struct dentry *dentry,
79939 + const struct vfsmount *mnt, int acc_mode);
79940 +__u32 gr_acl_handle_creat(const struct dentry *dentry,
79941 + const struct dentry *p_dentry,
79942 + const struct vfsmount *p_mnt,
79943 + int open_flags, int acc_mode, const int imode);
79944 +void gr_handle_create(const struct dentry *dentry,
79945 + const struct vfsmount *mnt);
79946 +void gr_handle_proc_create(const struct dentry *dentry,
79947 + const struct inode *inode);
79948 +__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
79949 + const struct dentry *parent_dentry,
79950 + const struct vfsmount *parent_mnt,
79951 + const int mode);
79952 +__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
79953 + const struct dentry *parent_dentry,
79954 + const struct vfsmount *parent_mnt);
79955 +__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
79956 + const struct vfsmount *mnt);
79957 +void gr_handle_delete(const ino_t ino, const dev_t dev);
79958 +__u32 gr_acl_handle_unlink(const struct dentry *dentry,
79959 + const struct vfsmount *mnt);
79960 +__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
79961 + const struct dentry *parent_dentry,
79962 + const struct vfsmount *parent_mnt,
79963 + const struct filename *from);
79964 +__u32 gr_acl_handle_link(const struct dentry *new_dentry,
79965 + const struct dentry *parent_dentry,
79966 + const struct vfsmount *parent_mnt,
79967 + const struct dentry *old_dentry,
79968 + const struct vfsmount *old_mnt, const struct filename *to);
79969 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
79970 +int gr_acl_handle_rename(struct dentry *new_dentry,
79971 + struct dentry *parent_dentry,
79972 + const struct vfsmount *parent_mnt,
79973 + struct dentry *old_dentry,
79974 + struct inode *old_parent_inode,
79975 + struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
79976 +void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
79977 + struct dentry *old_dentry,
79978 + struct dentry *new_dentry,
79979 + struct vfsmount *mnt, const __u8 replace, unsigned int flags);
79980 +__u32 gr_check_link(const struct dentry *new_dentry,
79981 + const struct dentry *parent_dentry,
79982 + const struct vfsmount *parent_mnt,
79983 + const struct dentry *old_dentry,
79984 + const struct vfsmount *old_mnt);
79985 +int gr_acl_handle_filldir(const struct file *file, const char *name,
79986 + const unsigned int namelen, const ino_t ino);
79987 +
79988 +__u32 gr_acl_handle_unix(const struct dentry *dentry,
79989 + const struct vfsmount *mnt);
79990 +void gr_acl_handle_exit(void);
79991 +void gr_acl_handle_psacct(struct task_struct *task, const long code);
79992 +int gr_acl_handle_procpidmem(const struct task_struct *task);
79993 +int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
79994 +int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
79995 +void gr_audit_ptrace(struct task_struct *task);
79996 +dev_t gr_get_dev_from_dentry(struct dentry *dentry);
79997 +void gr_put_exec_file(struct task_struct *task);
79998 +
79999 +int gr_ptrace_readexec(struct file *file, int unsafe_flags);
80000 +
80001 +#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
80002 +extern void gr_learn_resource(const struct task_struct *task, const int res,
80003 + const unsigned long wanted, const int gt);
80004 +#else
80005 +static inline void gr_learn_resource(const struct task_struct *task, const int res,
80006 + const unsigned long wanted, const int gt)
80007 +{
80008 +}
80009 +#endif
80010 +
80011 +#ifdef CONFIG_GRKERNSEC_RESLOG
80012 +extern void gr_log_resource(const struct task_struct *task, const int res,
80013 + const unsigned long wanted, const int gt);
80014 +#else
80015 +static inline void gr_log_resource(const struct task_struct *task, const int res,
80016 + const unsigned long wanted, const int gt)
80017 +{
80018 +}
80019 +#endif
80020 +
80021 +#ifdef CONFIG_GRKERNSEC
80022 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
80023 +void gr_handle_vm86(void);
80024 +void gr_handle_mem_readwrite(u64 from, u64 to);
80025 +
80026 +void gr_log_badprocpid(const char *entry);
80027 +
80028 +extern int grsec_enable_dmesg;
80029 +extern int grsec_disable_privio;
80030 +
80031 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80032 +extern kgid_t grsec_proc_gid;
80033 +#endif
80034 +
80035 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
80036 +extern int grsec_enable_chroot_findtask;
80037 +#endif
80038 +#ifdef CONFIG_GRKERNSEC_SETXID
80039 +extern int grsec_enable_setxid;
80040 +#endif
80041 +#endif
80042 +
80043 +#endif
80044 diff --git a/include/linux/grsock.h b/include/linux/grsock.h
80045 new file mode 100644
80046 index 0000000..e7ffaaf
80047 --- /dev/null
80048 +++ b/include/linux/grsock.h
80049 @@ -0,0 +1,19 @@
80050 +#ifndef __GRSOCK_H
80051 +#define __GRSOCK_H
80052 +
80053 +extern void gr_attach_curr_ip(const struct sock *sk);
80054 +extern int gr_handle_sock_all(const int family, const int type,
80055 + const int protocol);
80056 +extern int gr_handle_sock_server(const struct sockaddr *sck);
80057 +extern int gr_handle_sock_server_other(const struct sock *sck);
80058 +extern int gr_handle_sock_client(const struct sockaddr *sck);
80059 +extern int gr_search_connect(struct socket * sock,
80060 + struct sockaddr_in * addr);
80061 +extern int gr_search_bind(struct socket * sock,
80062 + struct sockaddr_in * addr);
80063 +extern int gr_search_listen(struct socket * sock);
80064 +extern int gr_search_accept(struct socket * sock);
80065 +extern int gr_search_socket(const int domain, const int type,
80066 + const int protocol);
80067 +
80068 +#endif
80069 diff --git a/include/linux/hash.h b/include/linux/hash.h
80070 index bd1754c..8240892 100644
80071 --- a/include/linux/hash.h
80072 +++ b/include/linux/hash.h
80073 @@ -83,7 +83,7 @@ static inline u32 hash32_ptr(const void *ptr)
80074 struct fast_hash_ops {
80075 u32 (*hash)(const void *data, u32 len, u32 seed);
80076 u32 (*hash2)(const u32 *data, u32 len, u32 seed);
80077 -};
80078 +} __no_const;
80079
80080 /**
80081 * arch_fast_hash - Caclulates a hash over a given buffer that can have
80082 diff --git a/include/linux/highmem.h b/include/linux/highmem.h
80083 index 7fb31da..08b5114 100644
80084 --- a/include/linux/highmem.h
80085 +++ b/include/linux/highmem.h
80086 @@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
80087 kunmap_atomic(kaddr);
80088 }
80089
80090 +static inline void sanitize_highpage(struct page *page)
80091 +{
80092 + void *kaddr;
80093 + unsigned long flags;
80094 +
80095 + local_irq_save(flags);
80096 + kaddr = kmap_atomic(page);
80097 + clear_page(kaddr);
80098 + kunmap_atomic(kaddr);
80099 + local_irq_restore(flags);
80100 +}
80101 +
80102 static inline void zero_user_segments(struct page *page,
80103 unsigned start1, unsigned end1,
80104 unsigned start2, unsigned end2)
80105 diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
80106 index 1c7b89a..7dda400 100644
80107 --- a/include/linux/hwmon-sysfs.h
80108 +++ b/include/linux/hwmon-sysfs.h
80109 @@ -25,7 +25,8 @@
80110 struct sensor_device_attribute{
80111 struct device_attribute dev_attr;
80112 int index;
80113 -};
80114 +} __do_const;
80115 +typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
80116 #define to_sensor_dev_attr(_dev_attr) \
80117 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
80118
80119 @@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
80120 struct device_attribute dev_attr;
80121 u8 index;
80122 u8 nr;
80123 -};
80124 +} __do_const;
80125 +typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
80126 #define to_sensor_dev_attr_2(_dev_attr) \
80127 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
80128
80129 diff --git a/include/linux/i2c.h b/include/linux/i2c.h
80130 index b556e0a..c10a515 100644
80131 --- a/include/linux/i2c.h
80132 +++ b/include/linux/i2c.h
80133 @@ -378,6 +378,7 @@ struct i2c_algorithm {
80134 /* To determine what the adapter supports */
80135 u32 (*functionality) (struct i2c_adapter *);
80136 };
80137 +typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
80138
80139 /**
80140 * struct i2c_bus_recovery_info - I2C bus recovery information
80141 diff --git a/include/linux/i2o.h b/include/linux/i2o.h
80142 index d23c3c2..eb63c81 100644
80143 --- a/include/linux/i2o.h
80144 +++ b/include/linux/i2o.h
80145 @@ -565,7 +565,7 @@ struct i2o_controller {
80146 struct i2o_device *exec; /* Executive */
80147 #if BITS_PER_LONG == 64
80148 spinlock_t context_list_lock; /* lock for context_list */
80149 - atomic_t context_list_counter; /* needed for unique contexts */
80150 + atomic_unchecked_t context_list_counter; /* needed for unique contexts */
80151 struct list_head context_list; /* list of context id's
80152 and pointers */
80153 #endif
80154 diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
80155 index aff7ad8..3942bbd 100644
80156 --- a/include/linux/if_pppox.h
80157 +++ b/include/linux/if_pppox.h
80158 @@ -76,7 +76,7 @@ struct pppox_proto {
80159 int (*ioctl)(struct socket *sock, unsigned int cmd,
80160 unsigned long arg);
80161 struct module *owner;
80162 -};
80163 +} __do_const;
80164
80165 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
80166 extern void unregister_pppox_proto(int proto_num);
80167 diff --git a/include/linux/init.h b/include/linux/init.h
80168 index a3ba270..a1b6604 100644
80169 --- a/include/linux/init.h
80170 +++ b/include/linux/init.h
80171 @@ -37,9 +37,17 @@
80172 * section.
80173 */
80174
80175 +#define add_init_latent_entropy __latent_entropy
80176 +
80177 +#ifdef CONFIG_MEMORY_HOTPLUG
80178 +#define add_meminit_latent_entropy
80179 +#else
80180 +#define add_meminit_latent_entropy __latent_entropy
80181 +#endif
80182 +
80183 /* These are for everybody (although not all archs will actually
80184 discard it in modules) */
80185 -#define __init __section(.init.text) __cold notrace
80186 +#define __init __section(.init.text) __cold notrace add_init_latent_entropy
80187 #define __initdata __section(.init.data)
80188 #define __initconst __constsection(.init.rodata)
80189 #define __exitdata __section(.exit.data)
80190 @@ -100,7 +108,7 @@
80191 #define __cpuexitconst
80192
80193 /* Used for MEMORY_HOTPLUG */
80194 -#define __meminit __section(.meminit.text) __cold notrace
80195 +#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
80196 #define __meminitdata __section(.meminit.data)
80197 #define __meminitconst __constsection(.meminit.rodata)
80198 #define __memexit __section(.memexit.text) __exitused __cold notrace
80199 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
80200 index 6df7f9f..d0bf699 100644
80201 --- a/include/linux/init_task.h
80202 +++ b/include/linux/init_task.h
80203 @@ -156,6 +156,12 @@ extern struct task_group root_task_group;
80204
80205 #define INIT_TASK_COMM "swapper"
80206
80207 +#ifdef CONFIG_X86
80208 +#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
80209 +#else
80210 +#define INIT_TASK_THREAD_INFO
80211 +#endif
80212 +
80213 #ifdef CONFIG_RT_MUTEXES
80214 # define INIT_RT_MUTEXES(tsk) \
80215 .pi_waiters = RB_ROOT, \
80216 @@ -203,6 +209,7 @@ extern struct task_group root_task_group;
80217 RCU_POINTER_INITIALIZER(cred, &init_cred), \
80218 .comm = INIT_TASK_COMM, \
80219 .thread = INIT_THREAD, \
80220 + INIT_TASK_THREAD_INFO \
80221 .fs = &init_fs, \
80222 .files = &init_files, \
80223 .signal = &init_signals, \
80224 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
80225 index 051c850..431f83a 100644
80226 --- a/include/linux/interrupt.h
80227 +++ b/include/linux/interrupt.h
80228 @@ -412,8 +412,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
80229
80230 struct softirq_action
80231 {
80232 - void (*action)(struct softirq_action *);
80233 -};
80234 + void (*action)(void);
80235 +} __no_const;
80236
80237 asmlinkage void do_softirq(void);
80238 asmlinkage void __do_softirq(void);
80239 @@ -427,7 +427,7 @@ static inline void do_softirq_own_stack(void)
80240 }
80241 #endif
80242
80243 -extern void open_softirq(int nr, void (*action)(struct softirq_action *));
80244 +extern void open_softirq(int nr, void (*action)(void));
80245 extern void softirq_init(void);
80246 extern void __raise_softirq_irqoff(unsigned int nr);
80247
80248 diff --git a/include/linux/iommu.h b/include/linux/iommu.h
80249 index b96a5b2..2732d1c 100644
80250 --- a/include/linux/iommu.h
80251 +++ b/include/linux/iommu.h
80252 @@ -131,7 +131,7 @@ struct iommu_ops {
80253 u32 (*domain_get_windows)(struct iommu_domain *domain);
80254
80255 unsigned long pgsize_bitmap;
80256 -};
80257 +} __do_const;
80258
80259 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
80260 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
80261 diff --git a/include/linux/ioport.h b/include/linux/ioport.h
80262 index 5e3a906..3131d0f 100644
80263 --- a/include/linux/ioport.h
80264 +++ b/include/linux/ioport.h
80265 @@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
80266 int adjust_resource(struct resource *res, resource_size_t start,
80267 resource_size_t size);
80268 resource_size_t resource_alignment(struct resource *res);
80269 -static inline resource_size_t resource_size(const struct resource *res)
80270 +static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
80271 {
80272 return res->end - res->start + 1;
80273 }
80274 diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
80275 index 35e7eca..6afb7ad 100644
80276 --- a/include/linux/ipc_namespace.h
80277 +++ b/include/linux/ipc_namespace.h
80278 @@ -69,7 +69,7 @@ struct ipc_namespace {
80279 struct user_namespace *user_ns;
80280
80281 unsigned int proc_inum;
80282 -};
80283 +} __randomize_layout;
80284
80285 extern struct ipc_namespace init_ipc_ns;
80286 extern atomic_t nr_ipc_ns;
80287 diff --git a/include/linux/irq.h b/include/linux/irq.h
80288 index 5c57efb..965a62b 100644
80289 --- a/include/linux/irq.h
80290 +++ b/include/linux/irq.h
80291 @@ -344,7 +344,8 @@ struct irq_chip {
80292 void (*irq_release_resources)(struct irq_data *data);
80293
80294 unsigned long flags;
80295 -};
80296 +} __do_const;
80297 +typedef struct irq_chip __no_const irq_chip_no_const;
80298
80299 /*
80300 * irq_chip specific flags
80301 diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
80302 index 7ed92d0..589abf5 100644
80303 --- a/include/linux/irqchip/arm-gic.h
80304 +++ b/include/linux/irqchip/arm-gic.h
80305 @@ -73,9 +73,11 @@
80306
80307 #ifndef __ASSEMBLY__
80308
80309 +#include <linux/irq.h>
80310 +
80311 struct device_node;
80312
80313 -extern struct irq_chip gic_arch_extn;
80314 +extern irq_chip_no_const gic_arch_extn;
80315
80316 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
80317 u32 offset, struct device_node *);
80318 diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
80319 index 1f44466..b481806 100644
80320 --- a/include/linux/jiffies.h
80321 +++ b/include/linux/jiffies.h
80322 @@ -292,20 +292,20 @@ extern unsigned long preset_lpj;
80323 /*
80324 * Convert various time units to each other:
80325 */
80326 -extern unsigned int jiffies_to_msecs(const unsigned long j);
80327 -extern unsigned int jiffies_to_usecs(const unsigned long j);
80328 +extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
80329 +extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
80330
80331 -static inline u64 jiffies_to_nsecs(const unsigned long j)
80332 +static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
80333 {
80334 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
80335 }
80336
80337 -extern unsigned long msecs_to_jiffies(const unsigned int m);
80338 -extern unsigned long usecs_to_jiffies(const unsigned int u);
80339 +extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
80340 +extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
80341 extern unsigned long timespec_to_jiffies(const struct timespec *value);
80342 extern void jiffies_to_timespec(const unsigned long jiffies,
80343 - struct timespec *value);
80344 -extern unsigned long timeval_to_jiffies(const struct timeval *value);
80345 + struct timespec *value) __intentional_overflow(-1);
80346 +extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
80347 extern void jiffies_to_timeval(const unsigned long jiffies,
80348 struct timeval *value);
80349
80350 diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
80351 index 6883e19..e854fcb 100644
80352 --- a/include/linux/kallsyms.h
80353 +++ b/include/linux/kallsyms.h
80354 @@ -15,7 +15,8 @@
80355
80356 struct module;
80357
80358 -#ifdef CONFIG_KALLSYMS
80359 +#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
80360 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80361 /* Lookup the address for a symbol. Returns 0 if not found. */
80362 unsigned long kallsyms_lookup_name(const char *name);
80363
80364 @@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
80365 /* Stupid that this does nothing, but I didn't create this mess. */
80366 #define __print_symbol(fmt, addr)
80367 #endif /*CONFIG_KALLSYMS*/
80368 +#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
80369 + arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
80370 +extern unsigned long kallsyms_lookup_name(const char *name);
80371 +extern void __print_symbol(const char *fmt, unsigned long address);
80372 +extern int sprint_backtrace(char *buffer, unsigned long address);
80373 +extern int sprint_symbol(char *buffer, unsigned long address);
80374 +extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
80375 +const char *kallsyms_lookup(unsigned long addr,
80376 + unsigned long *symbolsize,
80377 + unsigned long *offset,
80378 + char **modname, char *namebuf);
80379 +extern int kallsyms_lookup_size_offset(unsigned long addr,
80380 + unsigned long *symbolsize,
80381 + unsigned long *offset);
80382 +#endif
80383
80384 /* This macro allows us to keep printk typechecking */
80385 static __printf(1, 2)
80386 diff --git a/include/linux/key-type.h b/include/linux/key-type.h
80387 index a74c3a8..28d3f21 100644
80388 --- a/include/linux/key-type.h
80389 +++ b/include/linux/key-type.h
80390 @@ -131,7 +131,7 @@ struct key_type {
80391 /* internal fields */
80392 struct list_head link; /* link in types list */
80393 struct lock_class_key lock_class; /* key->sem lock class */
80394 -};
80395 +} __do_const;
80396
80397 extern struct key_type key_type_keyring;
80398
80399 diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
80400 index 6b06d37..c134867 100644
80401 --- a/include/linux/kgdb.h
80402 +++ b/include/linux/kgdb.h
80403 @@ -52,7 +52,7 @@ extern int kgdb_connected;
80404 extern int kgdb_io_module_registered;
80405
80406 extern atomic_t kgdb_setting_breakpoint;
80407 -extern atomic_t kgdb_cpu_doing_single_step;
80408 +extern atomic_unchecked_t kgdb_cpu_doing_single_step;
80409
80410 extern struct task_struct *kgdb_usethread;
80411 extern struct task_struct *kgdb_contthread;
80412 @@ -254,7 +254,7 @@ struct kgdb_arch {
80413 void (*correct_hw_break)(void);
80414
80415 void (*enable_nmi)(bool on);
80416 -};
80417 +} __do_const;
80418
80419 /**
80420 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
80421 @@ -279,7 +279,7 @@ struct kgdb_io {
80422 void (*pre_exception) (void);
80423 void (*post_exception) (void);
80424 int is_console;
80425 -};
80426 +} __do_const;
80427
80428 extern struct kgdb_arch arch_kgdb_ops;
80429
80430 diff --git a/include/linux/kmod.h b/include/linux/kmod.h
80431 index 0555cc6..40116ce 100644
80432 --- a/include/linux/kmod.h
80433 +++ b/include/linux/kmod.h
80434 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
80435 * usually useless though. */
80436 extern __printf(2, 3)
80437 int __request_module(bool wait, const char *name, ...);
80438 +extern __printf(3, 4)
80439 +int ___request_module(bool wait, char *param_name, const char *name, ...);
80440 #define request_module(mod...) __request_module(true, mod)
80441 #define request_module_nowait(mod...) __request_module(false, mod)
80442 #define try_then_request_module(x, mod...) \
80443 @@ -57,6 +59,9 @@ struct subprocess_info {
80444 struct work_struct work;
80445 struct completion *complete;
80446 char *path;
80447 +#ifdef CONFIG_GRKERNSEC
80448 + char *origpath;
80449 +#endif
80450 char **argv;
80451 char **envp;
80452 int wait;
80453 diff --git a/include/linux/kobject.h b/include/linux/kobject.h
80454 index f896a33..f2eb10f 100644
80455 --- a/include/linux/kobject.h
80456 +++ b/include/linux/kobject.h
80457 @@ -116,7 +116,7 @@ struct kobj_type {
80458 struct attribute **default_attrs;
80459 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
80460 const void *(*namespace)(struct kobject *kobj);
80461 -};
80462 +} __do_const;
80463
80464 struct kobj_uevent_env {
80465 char *argv[3];
80466 @@ -140,6 +140,7 @@ struct kobj_attribute {
80467 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
80468 const char *buf, size_t count);
80469 };
80470 +typedef struct kobj_attribute __no_const kobj_attribute_no_const;
80471
80472 extern const struct sysfs_ops kobj_sysfs_ops;
80473
80474 @@ -167,7 +168,7 @@ struct kset {
80475 spinlock_t list_lock;
80476 struct kobject kobj;
80477 const struct kset_uevent_ops *uevent_ops;
80478 -};
80479 +} __randomize_layout;
80480
80481 extern void kset_init(struct kset *kset);
80482 extern int __must_check kset_register(struct kset *kset);
80483 diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
80484 index df32d25..fb52e27 100644
80485 --- a/include/linux/kobject_ns.h
80486 +++ b/include/linux/kobject_ns.h
80487 @@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
80488 const void *(*netlink_ns)(struct sock *sk);
80489 const void *(*initial_ns)(void);
80490 void (*drop_ns)(void *);
80491 -};
80492 +} __do_const;
80493
80494 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
80495 int kobj_ns_type_registered(enum kobj_ns_type type);
80496 diff --git a/include/linux/kref.h b/include/linux/kref.h
80497 index 484604d..0f6c5b6 100644
80498 --- a/include/linux/kref.h
80499 +++ b/include/linux/kref.h
80500 @@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
80501 static inline int kref_sub(struct kref *kref, unsigned int count,
80502 void (*release)(struct kref *kref))
80503 {
80504 - WARN_ON(release == NULL);
80505 + BUG_ON(release == NULL);
80506
80507 if (atomic_sub_and_test((int) count, &kref->refcount)) {
80508 release(kref);
80509 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
80510 index 7d21cf9..bc0c81f 100644
80511 --- a/include/linux/kvm_host.h
80512 +++ b/include/linux/kvm_host.h
80513 @@ -466,7 +466,7 @@ static inline void kvm_irqfd_exit(void)
80514 {
80515 }
80516 #endif
80517 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
80518 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
80519 struct module *module);
80520 void kvm_exit(void);
80521
80522 @@ -632,7 +632,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
80523 struct kvm_guest_debug *dbg);
80524 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
80525
80526 -int kvm_arch_init(void *opaque);
80527 +int kvm_arch_init(const void *opaque);
80528 void kvm_arch_exit(void);
80529
80530 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
80531 diff --git a/include/linux/libata.h b/include/linux/libata.h
80532 index 5ab4e3a..2fe237b 100644
80533 --- a/include/linux/libata.h
80534 +++ b/include/linux/libata.h
80535 @@ -975,7 +975,7 @@ struct ata_port_operations {
80536 * fields must be pointers.
80537 */
80538 const struct ata_port_operations *inherits;
80539 -};
80540 +} __do_const;
80541
80542 struct ata_port_info {
80543 unsigned long flags;
80544 diff --git a/include/linux/linkage.h b/include/linux/linkage.h
80545 index a6a42dd..6c5ebce 100644
80546 --- a/include/linux/linkage.h
80547 +++ b/include/linux/linkage.h
80548 @@ -36,6 +36,7 @@
80549 #endif
80550
80551 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
80552 +#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
80553 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
80554
80555 /*
80556 diff --git a/include/linux/list.h b/include/linux/list.h
80557 index ef95941..82db65a 100644
80558 --- a/include/linux/list.h
80559 +++ b/include/linux/list.h
80560 @@ -112,6 +112,19 @@ extern void __list_del_entry(struct list_head *entry);
80561 extern void list_del(struct list_head *entry);
80562 #endif
80563
80564 +extern void __pax_list_add(struct list_head *new,
80565 + struct list_head *prev,
80566 + struct list_head *next);
80567 +static inline void pax_list_add(struct list_head *new, struct list_head *head)
80568 +{
80569 + __pax_list_add(new, head, head->next);
80570 +}
80571 +static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
80572 +{
80573 + __pax_list_add(new, head->prev, head);
80574 +}
80575 +extern void pax_list_del(struct list_head *entry);
80576 +
80577 /**
80578 * list_replace - replace old entry by new one
80579 * @old : the element to be replaced
80580 @@ -145,6 +158,8 @@ static inline void list_del_init(struct list_head *entry)
80581 INIT_LIST_HEAD(entry);
80582 }
80583
80584 +extern void pax_list_del_init(struct list_head *entry);
80585 +
80586 /**
80587 * list_move - delete from one list and add as another's head
80588 * @list: the entry to move
80589 diff --git a/include/linux/math64.h b/include/linux/math64.h
80590 index c45c089..298841c 100644
80591 --- a/include/linux/math64.h
80592 +++ b/include/linux/math64.h
80593 @@ -15,7 +15,7 @@
80594 * This is commonly provided by 32bit archs to provide an optimized 64bit
80595 * divide.
80596 */
80597 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
80598 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
80599 {
80600 *remainder = dividend % divisor;
80601 return dividend / divisor;
80602 @@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
80603 /**
80604 * div64_u64 - unsigned 64bit divide with 64bit divisor
80605 */
80606 -static inline u64 div64_u64(u64 dividend, u64 divisor)
80607 +static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
80608 {
80609 return dividend / divisor;
80610 }
80611 @@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
80612 #define div64_ul(x, y) div_u64((x), (y))
80613
80614 #ifndef div_u64_rem
80615 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
80616 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
80617 {
80618 *remainder = do_div(dividend, divisor);
80619 return dividend;
80620 @@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
80621 #endif
80622
80623 #ifndef div64_u64
80624 -extern u64 div64_u64(u64 dividend, u64 divisor);
80625 +extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
80626 #endif
80627
80628 #ifndef div64_s64
80629 @@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
80630 * divide.
80631 */
80632 #ifndef div_u64
80633 -static inline u64 div_u64(u64 dividend, u32 divisor)
80634 +static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
80635 {
80636 u32 remainder;
80637 return div_u64_rem(dividend, divisor, &remainder);
80638 diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
80639 index f230a97..714c006 100644
80640 --- a/include/linux/mempolicy.h
80641 +++ b/include/linux/mempolicy.h
80642 @@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
80643 }
80644
80645 #define vma_policy(vma) ((vma)->vm_policy)
80646 +static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
80647 +{
80648 + vma->vm_policy = pol;
80649 +}
80650
80651 static inline void mpol_get(struct mempolicy *pol)
80652 {
80653 @@ -228,6 +232,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
80654 }
80655
80656 #define vma_policy(vma) NULL
80657 +static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
80658 +{
80659 +}
80660
80661 static inline int
80662 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
80663 diff --git a/include/linux/mm.h b/include/linux/mm.h
80664 index d677706..673408c 100644
80665 --- a/include/linux/mm.h
80666 +++ b/include/linux/mm.h
80667 @@ -127,6 +127,11 @@ extern unsigned int kobjsize(const void *objp);
80668 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
80669 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
80670 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
80671 +
80672 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
80673 +#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
80674 +#endif
80675 +
80676 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
80677
80678 #ifdef CONFIG_MEM_SOFT_DIRTY
80679 @@ -237,8 +242,8 @@ struct vm_operations_struct {
80680 /* called by access_process_vm when get_user_pages() fails, typically
80681 * for use by special VMAs that can switch between memory and hardware
80682 */
80683 - int (*access)(struct vm_area_struct *vma, unsigned long addr,
80684 - void *buf, int len, int write);
80685 + ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
80686 + void *buf, size_t len, int write);
80687 #ifdef CONFIG_NUMA
80688 /*
80689 * set_policy() op must add a reference to any non-NULL @new mempolicy
80690 @@ -268,6 +273,7 @@ struct vm_operations_struct {
80691 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
80692 unsigned long size, pgoff_t pgoff);
80693 };
80694 +typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
80695
80696 struct mmu_gather;
80697 struct inode;
80698 @@ -1133,8 +1139,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
80699 unsigned long *pfn);
80700 int follow_phys(struct vm_area_struct *vma, unsigned long address,
80701 unsigned int flags, unsigned long *prot, resource_size_t *phys);
80702 -int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
80703 - void *buf, int len, int write);
80704 +ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
80705 + void *buf, size_t len, int write);
80706
80707 static inline void unmap_shared_mapping_range(struct address_space *mapping,
80708 loff_t const holebegin, loff_t const holelen)
80709 @@ -1173,9 +1179,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
80710 }
80711 #endif
80712
80713 -extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
80714 -extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
80715 - void *buf, int len, int write);
80716 +extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
80717 +extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
80718 + void *buf, size_t len, int write);
80719
80720 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
80721 unsigned long start, unsigned long nr_pages,
80722 @@ -1208,34 +1214,6 @@ int set_page_dirty_lock(struct page *page);
80723 int clear_page_dirty_for_io(struct page *page);
80724 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
80725
80726 -/* Is the vma a continuation of the stack vma above it? */
80727 -static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
80728 -{
80729 - return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
80730 -}
80731 -
80732 -static inline int stack_guard_page_start(struct vm_area_struct *vma,
80733 - unsigned long addr)
80734 -{
80735 - return (vma->vm_flags & VM_GROWSDOWN) &&
80736 - (vma->vm_start == addr) &&
80737 - !vma_growsdown(vma->vm_prev, addr);
80738 -}
80739 -
80740 -/* Is the vma a continuation of the stack vma below it? */
80741 -static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
80742 -{
80743 - return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
80744 -}
80745 -
80746 -static inline int stack_guard_page_end(struct vm_area_struct *vma,
80747 - unsigned long addr)
80748 -{
80749 - return (vma->vm_flags & VM_GROWSUP) &&
80750 - (vma->vm_end == addr) &&
80751 - !vma_growsup(vma->vm_next, addr);
80752 -}
80753 -
80754 extern pid_t
80755 vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
80756
80757 @@ -1335,6 +1313,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
80758 }
80759 #endif
80760
80761 +#ifdef CONFIG_MMU
80762 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
80763 +#else
80764 +static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
80765 +{
80766 + return __pgprot(0);
80767 +}
80768 +#endif
80769 +
80770 int vma_wants_writenotify(struct vm_area_struct *vma);
80771
80772 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
80773 @@ -1353,8 +1340,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
80774 {
80775 return 0;
80776 }
80777 +
80778 +static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
80779 + unsigned long address)
80780 +{
80781 + return 0;
80782 +}
80783 #else
80784 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
80785 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
80786 #endif
80787
80788 #ifdef __PAGETABLE_PMD_FOLDED
80789 @@ -1363,8 +1357,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
80790 {
80791 return 0;
80792 }
80793 +
80794 +static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
80795 + unsigned long address)
80796 +{
80797 + return 0;
80798 +}
80799 #else
80800 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
80801 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
80802 #endif
80803
80804 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
80805 @@ -1382,11 +1383,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
80806 NULL: pud_offset(pgd, address);
80807 }
80808
80809 +static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
80810 +{
80811 + return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
80812 + NULL: pud_offset(pgd, address);
80813 +}
80814 +
80815 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
80816 {
80817 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
80818 NULL: pmd_offset(pud, address);
80819 }
80820 +
80821 +static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
80822 +{
80823 + return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
80824 + NULL: pmd_offset(pud, address);
80825 +}
80826 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
80827
80828 #if USE_SPLIT_PTE_PTLOCKS
80829 @@ -1783,7 +1796,7 @@ extern int install_special_mapping(struct mm_struct *mm,
80830 unsigned long addr, unsigned long len,
80831 unsigned long flags, struct page **pages);
80832
80833 -extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
80834 +extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
80835
80836 extern unsigned long mmap_region(struct file *file, unsigned long addr,
80837 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
80838 @@ -1791,6 +1804,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
80839 unsigned long len, unsigned long prot, unsigned long flags,
80840 unsigned long pgoff, unsigned long *populate);
80841 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
80842 +extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
80843
80844 #ifdef CONFIG_MMU
80845 extern int __mm_populate(unsigned long addr, unsigned long len,
80846 @@ -1819,10 +1833,11 @@ struct vm_unmapped_area_info {
80847 unsigned long high_limit;
80848 unsigned long align_mask;
80849 unsigned long align_offset;
80850 + unsigned long threadstack_offset;
80851 };
80852
80853 -extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
80854 -extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
80855 +extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
80856 +extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
80857
80858 /*
80859 * Search for an unmapped address range.
80860 @@ -1834,7 +1849,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
80861 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
80862 */
80863 static inline unsigned long
80864 -vm_unmapped_area(struct vm_unmapped_area_info *info)
80865 +vm_unmapped_area(const struct vm_unmapped_area_info *info)
80866 {
80867 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
80868 return unmapped_area(info);
80869 @@ -1896,6 +1911,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
80870 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
80871 struct vm_area_struct **pprev);
80872
80873 +extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
80874 +extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
80875 +extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
80876 +
80877 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
80878 NULL if none. Assume start_addr < end_addr. */
80879 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
80880 @@ -1924,15 +1943,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
80881 return vma;
80882 }
80883
80884 -#ifdef CONFIG_MMU
80885 -pgprot_t vm_get_page_prot(unsigned long vm_flags);
80886 -#else
80887 -static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
80888 -{
80889 - return __pgprot(0);
80890 -}
80891 -#endif
80892 -
80893 #ifdef CONFIG_NUMA_BALANCING
80894 unsigned long change_prot_numa(struct vm_area_struct *vma,
80895 unsigned long start, unsigned long end);
80896 @@ -1984,6 +1994,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
80897 static inline void vm_stat_account(struct mm_struct *mm,
80898 unsigned long flags, struct file *file, long pages)
80899 {
80900 +
80901 +#ifdef CONFIG_PAX_RANDMMAP
80902 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
80903 +#endif
80904 +
80905 mm->total_vm += pages;
80906 }
80907 #endif /* CONFIG_PROC_FS */
80908 @@ -2065,7 +2080,7 @@ extern int unpoison_memory(unsigned long pfn);
80909 extern int sysctl_memory_failure_early_kill;
80910 extern int sysctl_memory_failure_recovery;
80911 extern void shake_page(struct page *p, int access);
80912 -extern atomic_long_t num_poisoned_pages;
80913 +extern atomic_long_unchecked_t num_poisoned_pages;
80914 extern int soft_offline_page(struct page *page, int flags);
80915
80916 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
80917 @@ -2100,5 +2115,11 @@ void __init setup_nr_node_ids(void);
80918 static inline void setup_nr_node_ids(void) {}
80919 #endif
80920
80921 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
80922 +extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
80923 +#else
80924 +static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
80925 +#endif
80926 +
80927 #endif /* __KERNEL__ */
80928 #endif /* _LINUX_MM_H */
80929 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
80930 index 8967e20..61f7900 100644
80931 --- a/include/linux/mm_types.h
80932 +++ b/include/linux/mm_types.h
80933 @@ -308,7 +308,9 @@ struct vm_area_struct {
80934 #ifdef CONFIG_NUMA
80935 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
80936 #endif
80937 -};
80938 +
80939 + struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
80940 +} __randomize_layout;
80941
80942 struct core_thread {
80943 struct task_struct *task;
80944 @@ -454,7 +456,25 @@ struct mm_struct {
80945 bool tlb_flush_pending;
80946 #endif
80947 struct uprobes_state uprobes_state;
80948 -};
80949 +
80950 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
80951 + unsigned long pax_flags;
80952 +#endif
80953 +
80954 +#ifdef CONFIG_PAX_DLRESOLVE
80955 + unsigned long call_dl_resolve;
80956 +#endif
80957 +
80958 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
80959 + unsigned long call_syscall;
80960 +#endif
80961 +
80962 +#ifdef CONFIG_PAX_ASLR
80963 + unsigned long delta_mmap; /* randomized offset */
80964 + unsigned long delta_stack; /* randomized offset */
80965 +#endif
80966 +
80967 +} __randomize_layout;
80968
80969 static inline void mm_init_cpumask(struct mm_struct *mm)
80970 {
80971 diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
80972 index c5d5278..f0b68c8 100644
80973 --- a/include/linux/mmiotrace.h
80974 +++ b/include/linux/mmiotrace.h
80975 @@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
80976 /* Called from ioremap.c */
80977 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
80978 void __iomem *addr);
80979 -extern void mmiotrace_iounmap(volatile void __iomem *addr);
80980 +extern void mmiotrace_iounmap(const volatile void __iomem *addr);
80981
80982 /* For anyone to insert markers. Remember trailing newline. */
80983 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
80984 @@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
80985 {
80986 }
80987
80988 -static inline void mmiotrace_iounmap(volatile void __iomem *addr)
80989 +static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
80990 {
80991 }
80992
80993 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
80994 index 835aa3d..676b387 100644
80995 --- a/include/linux/mmzone.h
80996 +++ b/include/linux/mmzone.h
80997 @@ -406,7 +406,7 @@ struct zone {
80998 unsigned long flags; /* zone flags, see below */
80999
81000 /* Zone statistics */
81001 - atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
81002 + atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
81003
81004 /*
81005 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
81006 diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
81007 index 44eeef0..a92d3f9 100644
81008 --- a/include/linux/mod_devicetable.h
81009 +++ b/include/linux/mod_devicetable.h
81010 @@ -139,7 +139,7 @@ struct usb_device_id {
81011 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
81012 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
81013
81014 -#define HID_ANY_ID (~0)
81015 +#define HID_ANY_ID (~0U)
81016 #define HID_BUS_ANY 0xffff
81017 #define HID_GROUP_ANY 0x0000
81018
81019 @@ -475,7 +475,7 @@ struct dmi_system_id {
81020 const char *ident;
81021 struct dmi_strmatch matches[4];
81022 void *driver_data;
81023 -};
81024 +} __do_const;
81025 /*
81026 * struct dmi_device_id appears during expansion of
81027 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
81028 diff --git a/include/linux/module.h b/include/linux/module.h
81029 index f520a76..5f898ef 100644
81030 --- a/include/linux/module.h
81031 +++ b/include/linux/module.h
81032 @@ -17,9 +17,11 @@
81033 #include <linux/moduleparam.h>
81034 #include <linux/jump_label.h>
81035 #include <linux/export.h>
81036 +#include <linux/fs.h>
81037
81038 #include <linux/percpu.h>
81039 #include <asm/module.h>
81040 +#include <asm/pgtable.h>
81041
81042 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
81043 #define MODULE_SIG_STRING "~Module signature appended~\n"
81044 @@ -42,7 +44,7 @@ struct module_kobject {
81045 struct kobject *drivers_dir;
81046 struct module_param_attrs *mp;
81047 struct completion *kobj_completion;
81048 -};
81049 +} __randomize_layout;
81050
81051 struct module_attribute {
81052 struct attribute attr;
81053 @@ -54,12 +56,13 @@ struct module_attribute {
81054 int (*test)(struct module *);
81055 void (*free)(struct module *);
81056 };
81057 +typedef struct module_attribute __no_const module_attribute_no_const;
81058
81059 struct module_version_attribute {
81060 struct module_attribute mattr;
81061 const char *module_name;
81062 const char *version;
81063 -} __attribute__ ((__aligned__(sizeof(void *))));
81064 +} __do_const __attribute__ ((__aligned__(sizeof(void *))));
81065
81066 extern ssize_t __modver_version_show(struct module_attribute *,
81067 struct module_kobject *, char *);
81068 @@ -235,7 +238,7 @@ struct module {
81069
81070 /* Sysfs stuff. */
81071 struct module_kobject mkobj;
81072 - struct module_attribute *modinfo_attrs;
81073 + module_attribute_no_const *modinfo_attrs;
81074 const char *version;
81075 const char *srcversion;
81076 struct kobject *holders_dir;
81077 @@ -284,19 +287,16 @@ struct module {
81078 int (*init)(void);
81079
81080 /* If this is non-NULL, vfree after init() returns */
81081 - void *module_init;
81082 + void *module_init_rx, *module_init_rw;
81083
81084 /* Here is the actual code + data, vfree'd on unload. */
81085 - void *module_core;
81086 + void *module_core_rx, *module_core_rw;
81087
81088 /* Here are the sizes of the init and core sections */
81089 - unsigned int init_size, core_size;
81090 + unsigned int init_size_rw, core_size_rw;
81091
81092 /* The size of the executable code in each section. */
81093 - unsigned int init_text_size, core_text_size;
81094 -
81095 - /* Size of RO sections of the module (text+rodata) */
81096 - unsigned int init_ro_size, core_ro_size;
81097 + unsigned int init_size_rx, core_size_rx;
81098
81099 /* Arch-specific module values */
81100 struct mod_arch_specific arch;
81101 @@ -352,6 +352,10 @@ struct module {
81102 #ifdef CONFIG_EVENT_TRACING
81103 struct ftrace_event_call **trace_events;
81104 unsigned int num_trace_events;
81105 + struct file_operations trace_id;
81106 + struct file_operations trace_enable;
81107 + struct file_operations trace_format;
81108 + struct file_operations trace_filter;
81109 #endif
81110 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
81111 unsigned int num_ftrace_callsites;
81112 @@ -375,7 +379,7 @@ struct module {
81113 ctor_fn_t *ctors;
81114 unsigned int num_ctors;
81115 #endif
81116 -};
81117 +} __randomize_layout;
81118 #ifndef MODULE_ARCH_INIT
81119 #define MODULE_ARCH_INIT {}
81120 #endif
81121 @@ -396,16 +400,46 @@ bool is_module_address(unsigned long addr);
81122 bool is_module_percpu_address(unsigned long addr);
81123 bool is_module_text_address(unsigned long addr);
81124
81125 +static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
81126 +{
81127 +
81128 +#ifdef CONFIG_PAX_KERNEXEC
81129 + if (ktla_ktva(addr) >= (unsigned long)start &&
81130 + ktla_ktva(addr) < (unsigned long)start + size)
81131 + return 1;
81132 +#endif
81133 +
81134 + return ((void *)addr >= start && (void *)addr < start + size);
81135 +}
81136 +
81137 +static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
81138 +{
81139 + return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
81140 +}
81141 +
81142 +static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
81143 +{
81144 + return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
81145 +}
81146 +
81147 +static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
81148 +{
81149 + return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
81150 +}
81151 +
81152 +static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
81153 +{
81154 + return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
81155 +}
81156 +
81157 static inline int within_module_core(unsigned long addr, const struct module *mod)
81158 {
81159 - return (unsigned long)mod->module_core <= addr &&
81160 - addr < (unsigned long)mod->module_core + mod->core_size;
81161 + return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
81162 }
81163
81164 static inline int within_module_init(unsigned long addr, const struct module *mod)
81165 {
81166 - return (unsigned long)mod->module_init <= addr &&
81167 - addr < (unsigned long)mod->module_init + mod->init_size;
81168 + return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
81169 }
81170
81171 /* Search for module by name: must hold module_mutex. */
81172 diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
81173 index 560ca53..ef621ef 100644
81174 --- a/include/linux/moduleloader.h
81175 +++ b/include/linux/moduleloader.h
81176 @@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
81177 sections. Returns NULL on failure. */
81178 void *module_alloc(unsigned long size);
81179
81180 +#ifdef CONFIG_PAX_KERNEXEC
81181 +void *module_alloc_exec(unsigned long size);
81182 +#else
81183 +#define module_alloc_exec(x) module_alloc(x)
81184 +#endif
81185 +
81186 /* Free memory returned from module_alloc. */
81187 void module_free(struct module *mod, void *module_region);
81188
81189 +#ifdef CONFIG_PAX_KERNEXEC
81190 +void module_free_exec(struct module *mod, void *module_region);
81191 +#else
81192 +#define module_free_exec(x, y) module_free((x), (y))
81193 +#endif
81194 +
81195 /*
81196 * Apply the given relocation to the (simplified) ELF. Return -error
81197 * or 0.
81198 @@ -45,7 +57,9 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
81199 unsigned int relsec,
81200 struct module *me)
81201 {
81202 +#ifdef CONFIG_MODULES
81203 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
81204 +#endif
81205 return -ENOEXEC;
81206 }
81207 #endif
81208 @@ -67,7 +81,9 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
81209 unsigned int relsec,
81210 struct module *me)
81211 {
81212 +#ifdef CONFIG_MODULES
81213 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
81214 +#endif
81215 return -ENOEXEC;
81216 }
81217 #endif
81218 diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
81219 index 204a677..e9b486a 100644
81220 --- a/include/linux/moduleparam.h
81221 +++ b/include/linux/moduleparam.h
81222 @@ -293,7 +293,7 @@ static inline void __kernel_param_unlock(void)
81223 * @len is usually just sizeof(string).
81224 */
81225 #define module_param_string(name, string, len, perm) \
81226 - static const struct kparam_string __param_string_##name \
81227 + static const struct kparam_string __param_string_##name __used \
81228 = { len, string }; \
81229 __module_param_call(MODULE_PARAM_PREFIX, name, \
81230 &param_ops_string, \
81231 @@ -432,7 +432,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
81232 */
81233 #define module_param_array_named(name, array, type, nump, perm) \
81234 param_check_##type(name, &(array)[0]); \
81235 - static const struct kparam_array __param_arr_##name \
81236 + static const struct kparam_array __param_arr_##name __used \
81237 = { .max = ARRAY_SIZE(array), .num = nump, \
81238 .ops = &param_ops_##type, \
81239 .elemsize = sizeof(array[0]), .elem = array }; \
81240 diff --git a/include/linux/mount.h b/include/linux/mount.h
81241 index 839bac2..a96b37c 100644
81242 --- a/include/linux/mount.h
81243 +++ b/include/linux/mount.h
81244 @@ -59,7 +59,7 @@ struct vfsmount {
81245 struct dentry *mnt_root; /* root of the mounted tree */
81246 struct super_block *mnt_sb; /* pointer to superblock */
81247 int mnt_flags;
81248 -};
81249 +} __randomize_layout;
81250
81251 struct file; /* forward dec */
81252
81253 diff --git a/include/linux/namei.h b/include/linux/namei.h
81254 index 492de72..1bddcd4 100644
81255 --- a/include/linux/namei.h
81256 +++ b/include/linux/namei.h
81257 @@ -19,7 +19,7 @@ struct nameidata {
81258 unsigned seq, m_seq;
81259 int last_type;
81260 unsigned depth;
81261 - char *saved_names[MAX_NESTED_LINKS + 1];
81262 + const char *saved_names[MAX_NESTED_LINKS + 1];
81263 };
81264
81265 /*
81266 @@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
81267
81268 extern void nd_jump_link(struct nameidata *nd, struct path *path);
81269
81270 -static inline void nd_set_link(struct nameidata *nd, char *path)
81271 +static inline void nd_set_link(struct nameidata *nd, const char *path)
81272 {
81273 nd->saved_names[nd->depth] = path;
81274 }
81275
81276 -static inline char *nd_get_link(struct nameidata *nd)
81277 +static inline const char *nd_get_link(const struct nameidata *nd)
81278 {
81279 return nd->saved_names[nd->depth];
81280 }
81281 diff --git a/include/linux/net.h b/include/linux/net.h
81282 index 17d8339..81656c0 100644
81283 --- a/include/linux/net.h
81284 +++ b/include/linux/net.h
81285 @@ -192,7 +192,7 @@ struct net_proto_family {
81286 int (*create)(struct net *net, struct socket *sock,
81287 int protocol, int kern);
81288 struct module *owner;
81289 -};
81290 +} __do_const;
81291
81292 struct iovec;
81293 struct kvec;
81294 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
81295 index b42d07b..7f45ae2 100644
81296 --- a/include/linux/netdevice.h
81297 +++ b/include/linux/netdevice.h
81298 @@ -1146,6 +1146,7 @@ struct net_device_ops {
81299 void *priv);
81300 int (*ndo_get_lock_subclass)(struct net_device *dev);
81301 };
81302 +typedef struct net_device_ops __no_const net_device_ops_no_const;
81303
81304 /**
81305 * enum net_device_priv_flags - &struct net_device priv_flags
81306 @@ -1313,11 +1314,11 @@ struct net_device {
81307 struct net_device_stats stats;
81308
81309 /* dropped packets by core network, Do not use this in drivers */
81310 - atomic_long_t rx_dropped;
81311 - atomic_long_t tx_dropped;
81312 + atomic_long_unchecked_t rx_dropped;
81313 + atomic_long_unchecked_t tx_dropped;
81314
81315 /* Stats to monitor carrier on<->off transitions */
81316 - atomic_t carrier_changes;
81317 + atomic_unchecked_t carrier_changes;
81318
81319 #ifdef CONFIG_WIRELESS_EXT
81320 /* List of functions to handle Wireless Extensions (instead of ioctl).
81321 diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
81322 index 2077489..a15e561 100644
81323 --- a/include/linux/netfilter.h
81324 +++ b/include/linux/netfilter.h
81325 @@ -84,7 +84,7 @@ struct nf_sockopt_ops {
81326 #endif
81327 /* Use the module struct to lock set/get code in place */
81328 struct module *owner;
81329 -};
81330 +} __do_const;
81331
81332 /* Function to register/unregister hook points. */
81333 int nf_register_hook(struct nf_hook_ops *reg);
81334 diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
81335 index e955d47..04a5338 100644
81336 --- a/include/linux/netfilter/nfnetlink.h
81337 +++ b/include/linux/netfilter/nfnetlink.h
81338 @@ -19,7 +19,7 @@ struct nfnl_callback {
81339 const struct nlattr * const cda[]);
81340 const struct nla_policy *policy; /* netlink attribute policy */
81341 const u_int16_t attr_count; /* number of nlattr's */
81342 -};
81343 +} __do_const;
81344
81345 struct nfnetlink_subsystem {
81346 const char *name;
81347 diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
81348 new file mode 100644
81349 index 0000000..33f4af8
81350 --- /dev/null
81351 +++ b/include/linux/netfilter/xt_gradm.h
81352 @@ -0,0 +1,9 @@
81353 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
81354 +#define _LINUX_NETFILTER_XT_GRADM_H 1
81355 +
81356 +struct xt_gradm_mtinfo {
81357 + __u16 flags;
81358 + __u16 invflags;
81359 +};
81360 +
81361 +#endif
81362 diff --git a/include/linux/nls.h b/include/linux/nls.h
81363 index 520681b..1d67ed2 100644
81364 --- a/include/linux/nls.h
81365 +++ b/include/linux/nls.h
81366 @@ -31,7 +31,7 @@ struct nls_table {
81367 const unsigned char *charset2upper;
81368 struct module *owner;
81369 struct nls_table *next;
81370 -};
81371 +} __do_const;
81372
81373 /* this value hold the maximum octet of charset */
81374 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
81375 diff --git a/include/linux/notifier.h b/include/linux/notifier.h
81376 index d14a4c3..a078786 100644
81377 --- a/include/linux/notifier.h
81378 +++ b/include/linux/notifier.h
81379 @@ -54,7 +54,8 @@ struct notifier_block {
81380 notifier_fn_t notifier_call;
81381 struct notifier_block __rcu *next;
81382 int priority;
81383 -};
81384 +} __do_const;
81385 +typedef struct notifier_block __no_const notifier_block_no_const;
81386
81387 struct atomic_notifier_head {
81388 spinlock_t lock;
81389 diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
81390 index b2a0f15..4d7da32 100644
81391 --- a/include/linux/oprofile.h
81392 +++ b/include/linux/oprofile.h
81393 @@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
81394 int oprofilefs_create_ro_ulong(struct dentry * root,
81395 char const * name, ulong * val);
81396
81397 -/** Create a file for read-only access to an atomic_t. */
81398 +/** Create a file for read-only access to an atomic_unchecked_t. */
81399 int oprofilefs_create_ro_atomic(struct dentry * root,
81400 - char const * name, atomic_t * val);
81401 + char const * name, atomic_unchecked_t * val);
81402
81403 /** create a directory */
81404 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
81405 diff --git a/include/linux/padata.h b/include/linux/padata.h
81406 index 4386946..f50c615 100644
81407 --- a/include/linux/padata.h
81408 +++ b/include/linux/padata.h
81409 @@ -129,7 +129,7 @@ struct parallel_data {
81410 struct padata_serial_queue __percpu *squeue;
81411 atomic_t reorder_objects;
81412 atomic_t refcnt;
81413 - atomic_t seq_nr;
81414 + atomic_unchecked_t seq_nr;
81415 struct padata_cpumask cpumask;
81416 spinlock_t lock ____cacheline_aligned;
81417 unsigned int processed;
81418 diff --git a/include/linux/path.h b/include/linux/path.h
81419 index d137218..be0c176 100644
81420 --- a/include/linux/path.h
81421 +++ b/include/linux/path.h
81422 @@ -1,13 +1,15 @@
81423 #ifndef _LINUX_PATH_H
81424 #define _LINUX_PATH_H
81425
81426 +#include <linux/compiler.h>
81427 +
81428 struct dentry;
81429 struct vfsmount;
81430
81431 struct path {
81432 struct vfsmount *mnt;
81433 struct dentry *dentry;
81434 -};
81435 +} __randomize_layout;
81436
81437 extern void path_get(const struct path *);
81438 extern void path_put(const struct path *);
81439 diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
81440 index 5f2e559..7d59314 100644
81441 --- a/include/linux/pci_hotplug.h
81442 +++ b/include/linux/pci_hotplug.h
81443 @@ -71,7 +71,8 @@ struct hotplug_slot_ops {
81444 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
81445 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
81446 int (*reset_slot) (struct hotplug_slot *slot, int probe);
81447 -};
81448 +} __do_const;
81449 +typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
81450
81451 /**
81452 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
81453 diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
81454 index 3ef6ea1..ed1a248 100644
81455 --- a/include/linux/perf_event.h
81456 +++ b/include/linux/perf_event.h
81457 @@ -328,8 +328,8 @@ struct perf_event {
81458
81459 enum perf_event_active_state state;
81460 unsigned int attach_state;
81461 - local64_t count;
81462 - atomic64_t child_count;
81463 + local64_t count; /* PaX: fix it one day */
81464 + atomic64_unchecked_t child_count;
81465
81466 /*
81467 * These are the total time in nanoseconds that the event
81468 @@ -380,8 +380,8 @@ struct perf_event {
81469 * These accumulate total time (in nanoseconds) that children
81470 * events have been enabled and running, respectively.
81471 */
81472 - atomic64_t child_total_time_enabled;
81473 - atomic64_t child_total_time_running;
81474 + atomic64_unchecked_t child_total_time_enabled;
81475 + atomic64_unchecked_t child_total_time_running;
81476
81477 /*
81478 * Protect attach/detach and child_list:
81479 @@ -710,7 +710,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
81480 entry->ip[entry->nr++] = ip;
81481 }
81482
81483 -extern int sysctl_perf_event_paranoid;
81484 +extern int sysctl_perf_event_legitimately_concerned;
81485 extern int sysctl_perf_event_mlock;
81486 extern int sysctl_perf_event_sample_rate;
81487 extern int sysctl_perf_cpu_time_max_percent;
81488 @@ -725,19 +725,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
81489 loff_t *ppos);
81490
81491
81492 +static inline bool perf_paranoid_any(void)
81493 +{
81494 + return sysctl_perf_event_legitimately_concerned > 2;
81495 +}
81496 +
81497 static inline bool perf_paranoid_tracepoint_raw(void)
81498 {
81499 - return sysctl_perf_event_paranoid > -1;
81500 + return sysctl_perf_event_legitimately_concerned > -1;
81501 }
81502
81503 static inline bool perf_paranoid_cpu(void)
81504 {
81505 - return sysctl_perf_event_paranoid > 0;
81506 + return sysctl_perf_event_legitimately_concerned > 0;
81507 }
81508
81509 static inline bool perf_paranoid_kernel(void)
81510 {
81511 - return sysctl_perf_event_paranoid > 1;
81512 + return sysctl_perf_event_legitimately_concerned > 1;
81513 }
81514
81515 extern void perf_event_init(void);
81516 @@ -867,7 +872,7 @@ struct perf_pmu_events_attr {
81517 struct device_attribute attr;
81518 u64 id;
81519 const char *event_str;
81520 -};
81521 +} __do_const;
81522
81523 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
81524 static struct perf_pmu_events_attr _var = { \
81525 diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
81526 index 7246ef3..1539ea4 100644
81527 --- a/include/linux/pid_namespace.h
81528 +++ b/include/linux/pid_namespace.h
81529 @@ -43,7 +43,7 @@ struct pid_namespace {
81530 int hide_pid;
81531 int reboot; /* group exit code if this pidns was rebooted */
81532 unsigned int proc_inum;
81533 -};
81534 +} __randomize_layout;
81535
81536 extern struct pid_namespace init_pid_ns;
81537
81538 diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
81539 index eb8b8ac..62649e1 100644
81540 --- a/include/linux/pipe_fs_i.h
81541 +++ b/include/linux/pipe_fs_i.h
81542 @@ -47,10 +47,10 @@ struct pipe_inode_info {
81543 struct mutex mutex;
81544 wait_queue_head_t wait;
81545 unsigned int nrbufs, curbuf, buffers;
81546 - unsigned int readers;
81547 - unsigned int writers;
81548 - unsigned int files;
81549 - unsigned int waiting_writers;
81550 + atomic_t readers;
81551 + atomic_t writers;
81552 + atomic_t files;
81553 + atomic_t waiting_writers;
81554 unsigned int r_counter;
81555 unsigned int w_counter;
81556 struct page *tmp_page;
81557 diff --git a/include/linux/pm.h b/include/linux/pm.h
81558 index d915d03..0531037 100644
81559 --- a/include/linux/pm.h
81560 +++ b/include/linux/pm.h
81561 @@ -600,6 +600,7 @@ extern int dev_pm_put_subsys_data(struct device *dev);
81562 struct dev_pm_domain {
81563 struct dev_pm_ops ops;
81564 };
81565 +typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
81566
81567 /*
81568 * The PM_EVENT_ messages are also used by drivers implementing the legacy
81569 diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
81570 index 7c1d252..0e7061d 100644
81571 --- a/include/linux/pm_domain.h
81572 +++ b/include/linux/pm_domain.h
81573 @@ -44,11 +44,11 @@ struct gpd_dev_ops {
81574 int (*thaw_early)(struct device *dev);
81575 int (*thaw)(struct device *dev);
81576 bool (*active_wakeup)(struct device *dev);
81577 -};
81578 +} __no_const;
81579
81580 struct gpd_cpu_data {
81581 unsigned int saved_exit_latency;
81582 - struct cpuidle_state *idle_state;
81583 + cpuidle_state_no_const *idle_state;
81584 };
81585
81586 struct generic_pm_domain {
81587 diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
81588 index 2a5897a..4f9af63 100644
81589 --- a/include/linux/pm_runtime.h
81590 +++ b/include/linux/pm_runtime.h
81591 @@ -113,7 +113,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
81592
81593 static inline void pm_runtime_mark_last_busy(struct device *dev)
81594 {
81595 - ACCESS_ONCE(dev->power.last_busy) = jiffies;
81596 + ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
81597 }
81598
81599 #else /* !CONFIG_PM_RUNTIME */
81600 diff --git a/include/linux/pnp.h b/include/linux/pnp.h
81601 index 195aafc..49a7bc2 100644
81602 --- a/include/linux/pnp.h
81603 +++ b/include/linux/pnp.h
81604 @@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
81605 struct pnp_fixup {
81606 char id[7];
81607 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
81608 -};
81609 +} __do_const;
81610
81611 /* config parameters */
81612 #define PNP_CONFIG_NORMAL 0x0001
81613 diff --git a/include/linux/poison.h b/include/linux/poison.h
81614 index 2110a81..13a11bb 100644
81615 --- a/include/linux/poison.h
81616 +++ b/include/linux/poison.h
81617 @@ -19,8 +19,8 @@
81618 * under normal circumstances, used to verify that nobody uses
81619 * non-initialized list entries.
81620 */
81621 -#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
81622 -#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
81623 +#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
81624 +#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
81625
81626 /********** include/linux/timer.h **********/
81627 /*
81628 diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
81629 index d8b187c3..9a9257a 100644
81630 --- a/include/linux/power/smartreflex.h
81631 +++ b/include/linux/power/smartreflex.h
81632 @@ -238,7 +238,7 @@ struct omap_sr_class_data {
81633 int (*notify)(struct omap_sr *sr, u32 status);
81634 u8 notify_flags;
81635 u8 class_type;
81636 -};
81637 +} __do_const;
81638
81639 /**
81640 * struct omap_sr_nvalue_table - Smartreflex n-target value info
81641 diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
81642 index 4ea1d37..80f4b33 100644
81643 --- a/include/linux/ppp-comp.h
81644 +++ b/include/linux/ppp-comp.h
81645 @@ -84,7 +84,7 @@ struct compressor {
81646 struct module *owner;
81647 /* Extra skb space needed by the compressor algorithm */
81648 unsigned int comp_extra;
81649 -};
81650 +} __do_const;
81651
81652 /*
81653 * The return value from decompress routine is the length of the
81654 diff --git a/include/linux/preempt.h b/include/linux/preempt.h
81655 index de83b4e..c4b997d 100644
81656 --- a/include/linux/preempt.h
81657 +++ b/include/linux/preempt.h
81658 @@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
81659 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
81660 #endif
81661
81662 +#define raw_preempt_count_add(val) __preempt_count_add(val)
81663 +#define raw_preempt_count_sub(val) __preempt_count_sub(val)
81664 +
81665 #define __preempt_count_inc() __preempt_count_add(1)
81666 #define __preempt_count_dec() __preempt_count_sub(1)
81667
81668 #define preempt_count_inc() preempt_count_add(1)
81669 +#define raw_preempt_count_inc() raw_preempt_count_add(1)
81670 #define preempt_count_dec() preempt_count_sub(1)
81671 +#define raw_preempt_count_dec() raw_preempt_count_sub(1)
81672
81673 #ifdef CONFIG_PREEMPT_COUNT
81674
81675 @@ -41,6 +46,12 @@ do { \
81676 barrier(); \
81677 } while (0)
81678
81679 +#define raw_preempt_disable() \
81680 +do { \
81681 + raw_preempt_count_inc(); \
81682 + barrier(); \
81683 +} while (0)
81684 +
81685 #define sched_preempt_enable_no_resched() \
81686 do { \
81687 barrier(); \
81688 @@ -49,6 +60,12 @@ do { \
81689
81690 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
81691
81692 +#define raw_preempt_enable_no_resched() \
81693 +do { \
81694 + barrier(); \
81695 + raw_preempt_count_dec(); \
81696 +} while (0)
81697 +
81698 #ifdef CONFIG_PREEMPT
81699 #define preempt_enable() \
81700 do { \
81701 @@ -113,8 +130,10 @@ do { \
81702 * region.
81703 */
81704 #define preempt_disable() barrier()
81705 +#define raw_preempt_disable() barrier()
81706 #define sched_preempt_enable_no_resched() barrier()
81707 #define preempt_enable_no_resched() barrier()
81708 +#define raw_preempt_enable_no_resched() barrier()
81709 #define preempt_enable() barrier()
81710 #define preempt_check_resched() do { } while (0)
81711
81712 @@ -128,11 +147,13 @@ do { \
81713 /*
81714 * Modules have no business playing preemption tricks.
81715 */
81716 +#ifndef CONFIG_PAX_KERNEXEC
81717 #undef sched_preempt_enable_no_resched
81718 #undef preempt_enable_no_resched
81719 #undef preempt_enable_no_resched_notrace
81720 #undef preempt_check_resched
81721 #endif
81722 +#endif
81723
81724 #define preempt_set_need_resched() \
81725 do { \
81726 diff --git a/include/linux/printk.h b/include/linux/printk.h
81727 index 8752f75..2b80c0f 100644
81728 --- a/include/linux/printk.h
81729 +++ b/include/linux/printk.h
81730 @@ -110,6 +110,8 @@ static inline __printf(1, 2) __cold
81731 void early_printk(const char *s, ...) { }
81732 #endif
81733
81734 +extern int kptr_restrict;
81735 +
81736 #ifdef CONFIG_PRINTK
81737 asmlinkage __printf(5, 0)
81738 int vprintk_emit(int facility, int level,
81739 @@ -144,7 +146,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
81740
81741 extern int printk_delay_msec;
81742 extern int dmesg_restrict;
81743 -extern int kptr_restrict;
81744
81745 extern void wake_up_klogd(void);
81746
81747 diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
81748 index 608e60a..79cfb18 100644
81749 --- a/include/linux/proc_fs.h
81750 +++ b/include/linux/proc_fs.h
81751 @@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
81752 extern struct proc_dir_entry *proc_symlink(const char *,
81753 struct proc_dir_entry *, const char *);
81754 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
81755 +extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
81756 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
81757 struct proc_dir_entry *, void *);
81758 +extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
81759 + struct proc_dir_entry *, void *);
81760 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
81761 struct proc_dir_entry *);
81762
81763 @@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
81764 return proc_create_data(name, mode, parent, proc_fops, NULL);
81765 }
81766
81767 +static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
81768 + struct proc_dir_entry *parent, const struct file_operations *proc_fops)
81769 +{
81770 +#ifdef CONFIG_GRKERNSEC_PROC_USER
81771 + return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
81772 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81773 + return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
81774 +#else
81775 + return proc_create_data(name, mode, parent, proc_fops, NULL);
81776 +#endif
81777 +}
81778 +
81779 +
81780 extern void proc_set_size(struct proc_dir_entry *, loff_t);
81781 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
81782 extern void *PDE_DATA(const struct inode *);
81783 @@ -52,8 +68,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
81784 struct proc_dir_entry *parent,const char *dest) { return NULL;}
81785 static inline struct proc_dir_entry *proc_mkdir(const char *name,
81786 struct proc_dir_entry *parent) {return NULL;}
81787 +static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
81788 + struct proc_dir_entry *parent) { return NULL; }
81789 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
81790 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
81791 +static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
81792 + umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
81793 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
81794 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
81795 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
81796 @@ -73,7 +93,7 @@ static inline int remove_proc_subtree(const char *name, struct proc_dir_entry *p
81797 static inline struct proc_dir_entry *proc_net_mkdir(
81798 struct net *net, const char *name, struct proc_dir_entry *parent)
81799 {
81800 - return proc_mkdir_data(name, 0, parent, net);
81801 + return proc_mkdir_data_restrict(name, 0, parent, net);
81802 }
81803
81804 #endif /* _LINUX_PROC_FS_H */
81805 diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
81806 index 34a1e10..70f6bde 100644
81807 --- a/include/linux/proc_ns.h
81808 +++ b/include/linux/proc_ns.h
81809 @@ -14,7 +14,7 @@ struct proc_ns_operations {
81810 void (*put)(void *ns);
81811 int (*install)(struct nsproxy *nsproxy, void *ns);
81812 unsigned int (*inum)(void *ns);
81813 -};
81814 +} __do_const __randomize_layout;
81815
81816 struct proc_ns {
81817 void *ns;
81818 diff --git a/include/linux/quota.h b/include/linux/quota.h
81819 index cc7494a..1e27036 100644
81820 --- a/include/linux/quota.h
81821 +++ b/include/linux/quota.h
81822 @@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
81823
81824 extern bool qid_eq(struct kqid left, struct kqid right);
81825 extern bool qid_lt(struct kqid left, struct kqid right);
81826 -extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
81827 +extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
81828 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
81829 extern bool qid_valid(struct kqid qid);
81830
81831 diff --git a/include/linux/random.h b/include/linux/random.h
81832 index 57fbbff..2331f3f 100644
81833 --- a/include/linux/random.h
81834 +++ b/include/linux/random.h
81835 @@ -9,9 +9,19 @@
81836 #include <uapi/linux/random.h>
81837
81838 extern void add_device_randomness(const void *, unsigned int);
81839 +
81840 +static inline void add_latent_entropy(void)
81841 +{
81842 +
81843 +#ifdef LATENT_ENTROPY_PLUGIN
81844 + add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
81845 +#endif
81846 +
81847 +}
81848 +
81849 extern void add_input_randomness(unsigned int type, unsigned int code,
81850 - unsigned int value);
81851 -extern void add_interrupt_randomness(int irq, int irq_flags);
81852 + unsigned int value) __latent_entropy;
81853 +extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
81854
81855 extern void get_random_bytes(void *buf, int nbytes);
81856 extern void get_random_bytes_arch(void *buf, int nbytes);
81857 @@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
81858 extern const struct file_operations random_fops, urandom_fops;
81859 #endif
81860
81861 -unsigned int get_random_int(void);
81862 +unsigned int __intentional_overflow(-1) get_random_int(void);
81863 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
81864
81865 -u32 prandom_u32(void);
81866 +u32 prandom_u32(void) __intentional_overflow(-1);
81867 void prandom_bytes(void *buf, int nbytes);
81868 void prandom_seed(u32 seed);
81869 void prandom_reseed_late(void);
81870 @@ -37,6 +47,11 @@ struct rnd_state {
81871 u32 prandom_u32_state(struct rnd_state *state);
81872 void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);
81873
81874 +static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
81875 +{
81876 + return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
81877 +}
81878 +
81879 /**
81880 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
81881 * @ep_ro: right open interval endpoint
81882 diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
81883 index fea49b5..2ac22bb 100644
81884 --- a/include/linux/rbtree_augmented.h
81885 +++ b/include/linux/rbtree_augmented.h
81886 @@ -80,7 +80,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
81887 old->rbaugmented = rbcompute(old); \
81888 } \
81889 rbstatic const struct rb_augment_callbacks rbname = { \
81890 - rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
81891 + .propagate = rbname ## _propagate, \
81892 + .copy = rbname ## _copy, \
81893 + .rotate = rbname ## _rotate \
81894 };
81895
81896
81897 diff --git a/include/linux/rculist.h b/include/linux/rculist.h
81898 index 8183b46..a388711 100644
81899 --- a/include/linux/rculist.h
81900 +++ b/include/linux/rculist.h
81901 @@ -29,8 +29,8 @@
81902 */
81903 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
81904 {
81905 - ACCESS_ONCE(list->next) = list;
81906 - ACCESS_ONCE(list->prev) = list;
81907 + ACCESS_ONCE_RW(list->next) = list;
81908 + ACCESS_ONCE_RW(list->prev) = list;
81909 }
81910
81911 /*
81912 @@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
81913 struct list_head *prev, struct list_head *next);
81914 #endif
81915
81916 +void __pax_list_add_rcu(struct list_head *new,
81917 + struct list_head *prev, struct list_head *next);
81918 +
81919 /**
81920 * list_add_rcu - add a new entry to rcu-protected list
81921 * @new: new entry to be added
81922 @@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
81923 __list_add_rcu(new, head, head->next);
81924 }
81925
81926 +static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
81927 +{
81928 + __pax_list_add_rcu(new, head, head->next);
81929 +}
81930 +
81931 /**
81932 * list_add_tail_rcu - add a new entry to rcu-protected list
81933 * @new: new entry to be added
81934 @@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
81935 __list_add_rcu(new, head->prev, head);
81936 }
81937
81938 +static inline void pax_list_add_tail_rcu(struct list_head *new,
81939 + struct list_head *head)
81940 +{
81941 + __pax_list_add_rcu(new, head->prev, head);
81942 +}
81943 +
81944 /**
81945 * list_del_rcu - deletes entry from list without re-initialization
81946 * @entry: the element to delete from the list.
81947 @@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
81948 entry->prev = LIST_POISON2;
81949 }
81950
81951 +extern void pax_list_del_rcu(struct list_head *entry);
81952 +
81953 /**
81954 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
81955 * @n: the element to delete from the hash list.
81956 diff --git a/include/linux/reboot.h b/include/linux/reboot.h
81957 index 48bf152..d38b785 100644
81958 --- a/include/linux/reboot.h
81959 +++ b/include/linux/reboot.h
81960 @@ -44,9 +44,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
81961 */
81962
81963 extern void migrate_to_reboot_cpu(void);
81964 -extern void machine_restart(char *cmd);
81965 -extern void machine_halt(void);
81966 -extern void machine_power_off(void);
81967 +extern void machine_restart(char *cmd) __noreturn;
81968 +extern void machine_halt(void) __noreturn;
81969 +extern void machine_power_off(void) __noreturn;
81970
81971 extern void machine_shutdown(void);
81972 struct pt_regs;
81973 @@ -57,9 +57,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
81974 */
81975
81976 extern void kernel_restart_prepare(char *cmd);
81977 -extern void kernel_restart(char *cmd);
81978 -extern void kernel_halt(void);
81979 -extern void kernel_power_off(void);
81980 +extern void kernel_restart(char *cmd) __noreturn;
81981 +extern void kernel_halt(void) __noreturn;
81982 +extern void kernel_power_off(void) __noreturn;
81983
81984 extern int C_A_D; /* for sysctl */
81985 void ctrl_alt_del(void);
81986 @@ -73,7 +73,7 @@ extern int orderly_poweroff(bool force);
81987 * Emergency restart, callable from an interrupt handler.
81988 */
81989
81990 -extern void emergency_restart(void);
81991 +extern void emergency_restart(void) __noreturn;
81992 #include <asm/emergency-restart.h>
81993
81994 #endif /* _LINUX_REBOOT_H */
81995 diff --git a/include/linux/regset.h b/include/linux/regset.h
81996 index 8e0c9fe..ac4d221 100644
81997 --- a/include/linux/regset.h
81998 +++ b/include/linux/regset.h
81999 @@ -161,7 +161,8 @@ struct user_regset {
82000 unsigned int align;
82001 unsigned int bias;
82002 unsigned int core_note_type;
82003 -};
82004 +} __do_const;
82005 +typedef struct user_regset __no_const user_regset_no_const;
82006
82007 /**
82008 * struct user_regset_view - available regsets
82009 diff --git a/include/linux/relay.h b/include/linux/relay.h
82010 index d7c8359..818daf5 100644
82011 --- a/include/linux/relay.h
82012 +++ b/include/linux/relay.h
82013 @@ -157,7 +157,7 @@ struct rchan_callbacks
82014 * The callback should return 0 if successful, negative if not.
82015 */
82016 int (*remove_buf_file)(struct dentry *dentry);
82017 -};
82018 +} __no_const;
82019
82020 /*
82021 * CONFIG_RELAY kernel API, kernel/relay.c
82022 diff --git a/include/linux/rio.h b/include/linux/rio.h
82023 index 6bda06f..bf39a9b 100644
82024 --- a/include/linux/rio.h
82025 +++ b/include/linux/rio.h
82026 @@ -358,7 +358,7 @@ struct rio_ops {
82027 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
82028 u64 rstart, u32 size, u32 flags);
82029 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
82030 -};
82031 +} __no_const;
82032
82033 #define RIO_RESOURCE_MEM 0x00000100
82034 #define RIO_RESOURCE_DOORBELL 0x00000200
82035 diff --git a/include/linux/rmap.h b/include/linux/rmap.h
82036 index b66c211..13d2915 100644
82037 --- a/include/linux/rmap.h
82038 +++ b/include/linux/rmap.h
82039 @@ -145,8 +145,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
82040 void anon_vma_init(void); /* create anon_vma_cachep */
82041 int anon_vma_prepare(struct vm_area_struct *);
82042 void unlink_anon_vmas(struct vm_area_struct *);
82043 -int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
82044 -int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
82045 +int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
82046 +int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
82047
82048 static inline void anon_vma_merge(struct vm_area_struct *vma,
82049 struct vm_area_struct *next)
82050 diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
82051 index a964f72..b475afb 100644
82052 --- a/include/linux/scatterlist.h
82053 +++ b/include/linux/scatterlist.h
82054 @@ -1,6 +1,7 @@
82055 #ifndef _LINUX_SCATTERLIST_H
82056 #define _LINUX_SCATTERLIST_H
82057
82058 +#include <linux/sched.h>
82059 #include <linux/string.h>
82060 #include <linux/bug.h>
82061 #include <linux/mm.h>
82062 @@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
82063 #ifdef CONFIG_DEBUG_SG
82064 BUG_ON(!virt_addr_valid(buf));
82065 #endif
82066 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
82067 + if (object_starts_on_stack(buf)) {
82068 + void *adjbuf = buf - current->stack + current->lowmem_stack;
82069 + sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
82070 + } else
82071 +#endif
82072 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
82073 }
82074
82075 diff --git a/include/linux/sched.h b/include/linux/sched.h
82076 index 221b2bd..e2e5f82 100644
82077 --- a/include/linux/sched.h
82078 +++ b/include/linux/sched.h
82079 @@ -131,6 +131,7 @@ struct fs_struct;
82080 struct perf_event_context;
82081 struct blk_plug;
82082 struct filename;
82083 +struct linux_binprm;
82084
82085 #define VMACACHE_BITS 2
82086 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
82087 @@ -380,7 +381,7 @@ extern char __sched_text_start[], __sched_text_end[];
82088 extern int in_sched_functions(unsigned long addr);
82089
82090 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
82091 -extern signed long schedule_timeout(signed long timeout);
82092 +extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
82093 extern signed long schedule_timeout_interruptible(signed long timeout);
82094 extern signed long schedule_timeout_killable(signed long timeout);
82095 extern signed long schedule_timeout_uninterruptible(signed long timeout);
82096 @@ -391,6 +392,19 @@ struct nsproxy;
82097 struct user_namespace;
82098
82099 #ifdef CONFIG_MMU
82100 +
82101 +#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
82102 +extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
82103 +#else
82104 +static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
82105 +{
82106 + return 0;
82107 +}
82108 +#endif
82109 +
82110 +extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
82111 +extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
82112 +
82113 extern void arch_pick_mmap_layout(struct mm_struct *mm);
82114 extern unsigned long
82115 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
82116 @@ -688,6 +702,17 @@ struct signal_struct {
82117 #ifdef CONFIG_TASKSTATS
82118 struct taskstats *stats;
82119 #endif
82120 +
82121 +#ifdef CONFIG_GRKERNSEC
82122 + u32 curr_ip;
82123 + u32 saved_ip;
82124 + u32 gr_saddr;
82125 + u32 gr_daddr;
82126 + u16 gr_sport;
82127 + u16 gr_dport;
82128 + u8 used_accept:1;
82129 +#endif
82130 +
82131 #ifdef CONFIG_AUDIT
82132 unsigned audit_tty;
82133 unsigned audit_tty_log_passwd;
82134 @@ -714,7 +739,7 @@ struct signal_struct {
82135 struct mutex cred_guard_mutex; /* guard against foreign influences on
82136 * credential calculations
82137 * (notably. ptrace) */
82138 -};
82139 +} __randomize_layout;
82140
82141 /*
82142 * Bits in flags field of signal_struct.
82143 @@ -768,6 +793,14 @@ struct user_struct {
82144 struct key *session_keyring; /* UID's default session keyring */
82145 #endif
82146
82147 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
82148 + unsigned char kernel_banned;
82149 +#endif
82150 +#ifdef CONFIG_GRKERNSEC_BRUTE
82151 + unsigned char suid_banned;
82152 + unsigned long suid_ban_expires;
82153 +#endif
82154 +
82155 /* Hash table maintenance information */
82156 struct hlist_node uidhash_node;
82157 kuid_t uid;
82158 @@ -775,7 +808,7 @@ struct user_struct {
82159 #ifdef CONFIG_PERF_EVENTS
82160 atomic_long_t locked_vm;
82161 #endif
82162 -};
82163 +} __randomize_layout;
82164
82165 extern int uids_sysfs_init(void);
82166
82167 @@ -1179,6 +1212,9 @@ enum perf_event_task_context {
82168 struct task_struct {
82169 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
82170 void *stack;
82171 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
82172 + void *lowmem_stack;
82173 +#endif
82174 atomic_t usage;
82175 unsigned int flags; /* per process flags, defined below */
82176 unsigned int ptrace;
82177 @@ -1304,8 +1340,8 @@ struct task_struct {
82178 struct list_head thread_node;
82179
82180 struct completion *vfork_done; /* for vfork() */
82181 - int __user *set_child_tid; /* CLONE_CHILD_SETTID */
82182 - int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
82183 + pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
82184 + pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
82185
82186 cputime_t utime, stime, utimescaled, stimescaled;
82187 cputime_t gtime;
82188 @@ -1330,11 +1366,6 @@ struct task_struct {
82189 struct task_cputime cputime_expires;
82190 struct list_head cpu_timers[3];
82191
82192 -/* process credentials */
82193 - const struct cred __rcu *real_cred; /* objective and real subjective task
82194 - * credentials (COW) */
82195 - const struct cred __rcu *cred; /* effective (overridable) subjective task
82196 - * credentials (COW) */
82197 char comm[TASK_COMM_LEN]; /* executable name excluding path
82198 - access with [gs]et_task_comm (which lock
82199 it with task_lock())
82200 @@ -1351,6 +1382,10 @@ struct task_struct {
82201 #endif
82202 /* CPU-specific state of this task */
82203 struct thread_struct thread;
82204 +/* thread_info moved to task_struct */
82205 +#ifdef CONFIG_X86
82206 + struct thread_info tinfo;
82207 +#endif
82208 /* filesystem information */
82209 struct fs_struct *fs;
82210 /* open file information */
82211 @@ -1427,6 +1462,10 @@ struct task_struct {
82212 gfp_t lockdep_reclaim_gfp;
82213 #endif
82214
82215 +/* process credentials */
82216 + const struct cred __rcu *real_cred; /* objective and real subjective task
82217 + * credentials (COW) */
82218 +
82219 /* journalling filesystem info */
82220 void *journal_info;
82221
82222 @@ -1465,6 +1504,10 @@ struct task_struct {
82223 /* cg_list protected by css_set_lock and tsk->alloc_lock */
82224 struct list_head cg_list;
82225 #endif
82226 +
82227 + const struct cred __rcu *cred; /* effective (overridable) subjective task
82228 + * credentials (COW) */
82229 +
82230 #ifdef CONFIG_FUTEX
82231 struct robust_list_head __user *robust_list;
82232 #ifdef CONFIG_COMPAT
82233 @@ -1610,7 +1653,78 @@ struct task_struct {
82234 unsigned int sequential_io;
82235 unsigned int sequential_io_avg;
82236 #endif
82237 -};
82238 +
82239 +#ifdef CONFIG_GRKERNSEC
82240 + /* grsecurity */
82241 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
82242 + u64 exec_id;
82243 +#endif
82244 +#ifdef CONFIG_GRKERNSEC_SETXID
82245 + const struct cred *delayed_cred;
82246 +#endif
82247 + struct dentry *gr_chroot_dentry;
82248 + struct acl_subject_label *acl;
82249 + struct acl_subject_label *tmpacl;
82250 + struct acl_role_label *role;
82251 + struct file *exec_file;
82252 + unsigned long brute_expires;
82253 + u16 acl_role_id;
82254 + u8 inherited;
82255 + /* is this the task that authenticated to the special role */
82256 + u8 acl_sp_role;
82257 + u8 is_writable;
82258 + u8 brute;
82259 + u8 gr_is_chrooted;
82260 +#endif
82261 +
82262 +} __randomize_layout;
82263 +
82264 +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
82265 +#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
82266 +#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
82267 +#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
82268 +/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
82269 +#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
82270 +
82271 +#ifdef CONFIG_PAX_SOFTMODE
82272 +extern int pax_softmode;
82273 +#endif
82274 +
82275 +extern int pax_check_flags(unsigned long *);
82276 +#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
82277 +
82278 +/* if tsk != current then task_lock must be held on it */
82279 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
82280 +static inline unsigned long pax_get_flags(struct task_struct *tsk)
82281 +{
82282 + if (likely(tsk->mm))
82283 + return tsk->mm->pax_flags;
82284 + else
82285 + return 0UL;
82286 +}
82287 +
82288 +/* if tsk != current then task_lock must be held on it */
82289 +static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
82290 +{
82291 + if (likely(tsk->mm)) {
82292 + tsk->mm->pax_flags = flags;
82293 + return 0;
82294 + }
82295 + return -EINVAL;
82296 +}
82297 +#endif
82298 +
82299 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
82300 +extern void pax_set_initial_flags(struct linux_binprm *bprm);
82301 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
82302 +extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
82303 +#endif
82304 +
82305 +struct path;
82306 +extern char *pax_get_path(const struct path *path, char *buf, int buflen);
82307 +extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
82308 +extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
82309 +extern void pax_report_refcount_overflow(struct pt_regs *regs);
82310
82311 /* Future-safe accessor for struct task_struct's cpus_allowed. */
82312 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
82313 @@ -1692,7 +1806,7 @@ struct pid_namespace;
82314 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
82315 struct pid_namespace *ns);
82316
82317 -static inline pid_t task_pid_nr(struct task_struct *tsk)
82318 +static inline pid_t task_pid_nr(const struct task_struct *tsk)
82319 {
82320 return tsk->pid;
82321 }
82322 @@ -2039,6 +2153,25 @@ extern u64 sched_clock_cpu(int cpu);
82323
82324 extern void sched_clock_init(void);
82325
82326 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
82327 +static inline void populate_stack(void)
82328 +{
82329 + struct task_struct *curtask = current;
82330 + int c;
82331 + int *ptr = curtask->stack;
82332 + int *end = curtask->stack + THREAD_SIZE;
82333 +
82334 + while (ptr < end) {
82335 + c = *(volatile int *)ptr;
82336 + ptr += PAGE_SIZE/sizeof(int);
82337 + }
82338 +}
82339 +#else
82340 +static inline void populate_stack(void)
82341 +{
82342 +}
82343 +#endif
82344 +
82345 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
82346 static inline void sched_clock_tick(void)
82347 {
82348 @@ -2172,7 +2305,9 @@ void yield(void);
82349 extern struct exec_domain default_exec_domain;
82350
82351 union thread_union {
82352 +#ifndef CONFIG_X86
82353 struct thread_info thread_info;
82354 +#endif
82355 unsigned long stack[THREAD_SIZE/sizeof(long)];
82356 };
82357
82358 @@ -2205,6 +2340,7 @@ extern struct pid_namespace init_pid_ns;
82359 */
82360
82361 extern struct task_struct *find_task_by_vpid(pid_t nr);
82362 +extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
82363 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
82364 struct pid_namespace *ns);
82365
82366 @@ -2367,7 +2503,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
82367 extern void exit_itimers(struct signal_struct *);
82368 extern void flush_itimer_signals(void);
82369
82370 -extern void do_group_exit(int);
82371 +extern __noreturn void do_group_exit(int);
82372
82373 extern int allow_signal(int);
82374 extern int disallow_signal(int);
82375 @@ -2568,9 +2704,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
82376
82377 #endif
82378
82379 -static inline int object_is_on_stack(void *obj)
82380 +static inline int object_starts_on_stack(const void *obj)
82381 {
82382 - void *stack = task_stack_page(current);
82383 + const void *stack = task_stack_page(current);
82384
82385 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
82386 }
82387 diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
82388 index 8045a55..c959cd5 100644
82389 --- a/include/linux/sched/sysctl.h
82390 +++ b/include/linux/sched/sysctl.h
82391 @@ -30,6 +30,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
82392 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
82393
82394 extern int sysctl_max_map_count;
82395 +extern unsigned long sysctl_heap_stack_gap;
82396
82397 extern unsigned int sysctl_sched_latency;
82398 extern unsigned int sysctl_sched_min_granularity;
82399 diff --git a/include/linux/security.h b/include/linux/security.h
82400 index 6478ce3..5e6ad6e 100644
82401 --- a/include/linux/security.h
82402 +++ b/include/linux/security.h
82403 @@ -27,6 +27,7 @@
82404 #include <linux/slab.h>
82405 #include <linux/err.h>
82406 #include <linux/string.h>
82407 +#include <linux/grsecurity.h>
82408
82409 struct linux_binprm;
82410 struct cred;
82411 @@ -116,8 +117,6 @@ struct seq_file;
82412
82413 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
82414
82415 -void reset_security_ops(void);
82416 -
82417 #ifdef CONFIG_MMU
82418 extern unsigned long mmap_min_addr;
82419 extern unsigned long dac_mmap_min_addr;
82420 @@ -1719,7 +1718,7 @@ struct security_operations {
82421 struct audit_context *actx);
82422 void (*audit_rule_free) (void *lsmrule);
82423 #endif /* CONFIG_AUDIT */
82424 -};
82425 +} __randomize_layout;
82426
82427 /* prototypes */
82428 extern int security_init(void);
82429 diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
82430 index dc368b8..e895209 100644
82431 --- a/include/linux/semaphore.h
82432 +++ b/include/linux/semaphore.h
82433 @@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
82434 }
82435
82436 extern void down(struct semaphore *sem);
82437 -extern int __must_check down_interruptible(struct semaphore *sem);
82438 +extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
82439 extern int __must_check down_killable(struct semaphore *sem);
82440 extern int __must_check down_trylock(struct semaphore *sem);
82441 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
82442 diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
82443 index 52e0097..383f21d 100644
82444 --- a/include/linux/seq_file.h
82445 +++ b/include/linux/seq_file.h
82446 @@ -27,6 +27,9 @@ struct seq_file {
82447 struct mutex lock;
82448 const struct seq_operations *op;
82449 int poll_event;
82450 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
82451 + u64 exec_id;
82452 +#endif
82453 #ifdef CONFIG_USER_NS
82454 struct user_namespace *user_ns;
82455 #endif
82456 @@ -39,6 +42,7 @@ struct seq_operations {
82457 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
82458 int (*show) (struct seq_file *m, void *v);
82459 };
82460 +typedef struct seq_operations __no_const seq_operations_no_const;
82461
82462 #define SEQ_SKIP 1
82463
82464 @@ -96,6 +100,7 @@ void seq_pad(struct seq_file *m, char c);
82465
82466 char *mangle_path(char *s, const char *p, const char *esc);
82467 int seq_open(struct file *, const struct seq_operations *);
82468 +int seq_open_restrict(struct file *, const struct seq_operations *);
82469 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
82470 loff_t seq_lseek(struct file *, loff_t, int);
82471 int seq_release(struct inode *, struct file *);
82472 @@ -138,6 +143,7 @@ static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
82473 }
82474
82475 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
82476 +int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
82477 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
82478 int single_release(struct inode *, struct file *);
82479 void *__seq_open_private(struct file *, const struct seq_operations *, int);
82480 diff --git a/include/linux/shm.h b/include/linux/shm.h
82481 index 1e2cd2e..0288750 100644
82482 --- a/include/linux/shm.h
82483 +++ b/include/linux/shm.h
82484 @@ -21,6 +21,10 @@ struct shmid_kernel /* private to the kernel */
82485
82486 /* The task created the shm object. NULL if the task is dead. */
82487 struct task_struct *shm_creator;
82488 +#ifdef CONFIG_GRKERNSEC
82489 + time_t shm_createtime;
82490 + pid_t shm_lapid;
82491 +#endif
82492 };
82493
82494 /* shm_mode upper byte flags */
82495 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
82496 index 08074a8..e2ae280 100644
82497 --- a/include/linux/skbuff.h
82498 +++ b/include/linux/skbuff.h
82499 @@ -717,7 +717,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
82500 struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
82501 int node);
82502 struct sk_buff *build_skb(void *data, unsigned int frag_size);
82503 -static inline struct sk_buff *alloc_skb(unsigned int size,
82504 +static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
82505 gfp_t priority)
82506 {
82507 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
82508 @@ -1825,7 +1825,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
82509 return skb->inner_transport_header - skb->inner_network_header;
82510 }
82511
82512 -static inline int skb_network_offset(const struct sk_buff *skb)
82513 +static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
82514 {
82515 return skb_network_header(skb) - skb->data;
82516 }
82517 @@ -1885,7 +1885,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
82518 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
82519 */
82520 #ifndef NET_SKB_PAD
82521 -#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
82522 +#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
82523 #endif
82524
82525 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
82526 @@ -2484,7 +2484,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
82527 int *err);
82528 unsigned int datagram_poll(struct file *file, struct socket *sock,
82529 struct poll_table_struct *wait);
82530 -int skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
82531 +int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
82532 struct iovec *to, int size);
82533 int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen,
82534 struct iovec *iov);
82535 @@ -2776,6 +2776,9 @@ static inline void nf_reset(struct sk_buff *skb)
82536 nf_bridge_put(skb->nf_bridge);
82537 skb->nf_bridge = NULL;
82538 #endif
82539 +#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
82540 + skb->nf_trace = 0;
82541 +#endif
82542 }
82543
82544 static inline void nf_reset_trace(struct sk_buff *skb)
82545 diff --git a/include/linux/slab.h b/include/linux/slab.h
82546 index 307bfbe..a999cf3 100644
82547 --- a/include/linux/slab.h
82548 +++ b/include/linux/slab.h
82549 @@ -14,15 +14,29 @@
82550 #include <linux/gfp.h>
82551 #include <linux/types.h>
82552 #include <linux/workqueue.h>
82553 -
82554 +#include <linux/err.h>
82555
82556 /*
82557 * Flags to pass to kmem_cache_create().
82558 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
82559 */
82560 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
82561 +
82562 +#ifdef CONFIG_PAX_USERCOPY_SLABS
82563 +#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
82564 +#else
82565 +#define SLAB_USERCOPY 0x00000000UL
82566 +#endif
82567 +
82568 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
82569 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
82570 +
82571 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
82572 +#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
82573 +#else
82574 +#define SLAB_NO_SANITIZE 0x00000000UL
82575 +#endif
82576 +
82577 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
82578 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
82579 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
82580 @@ -98,10 +112,13 @@
82581 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
82582 * Both make kfree a no-op.
82583 */
82584 -#define ZERO_SIZE_PTR ((void *)16)
82585 +#define ZERO_SIZE_PTR \
82586 +({ \
82587 + BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
82588 + (void *)(-MAX_ERRNO-1L); \
82589 +})
82590
82591 -#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
82592 - (unsigned long)ZERO_SIZE_PTR)
82593 +#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
82594
82595 #include <linux/kmemleak.h>
82596
82597 @@ -142,6 +159,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
82598 void kfree(const void *);
82599 void kzfree(const void *);
82600 size_t ksize(const void *);
82601 +const char *check_heap_object(const void *ptr, unsigned long n);
82602 +bool is_usercopy_object(const void *ptr);
82603
82604 /*
82605 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
82606 @@ -174,7 +193,7 @@ struct kmem_cache {
82607 unsigned int align; /* Alignment as calculated */
82608 unsigned long flags; /* Active flags on the slab */
82609 const char *name; /* Slab name for sysfs */
82610 - int refcount; /* Use counter */
82611 + atomic_t refcount; /* Use counter */
82612 void (*ctor)(void *); /* Called on object slot creation */
82613 struct list_head list; /* List of all slab caches on the system */
82614 };
82615 @@ -259,6 +278,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
82616 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
82617 #endif
82618
82619 +#ifdef CONFIG_PAX_USERCOPY_SLABS
82620 +extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
82621 +#endif
82622 +
82623 /*
82624 * Figure out which kmalloc slab an allocation of a certain size
82625 * belongs to.
82626 @@ -267,7 +290,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
82627 * 2 = 120 .. 192 bytes
82628 * n = 2^(n-1) .. 2^n -1
82629 */
82630 -static __always_inline int kmalloc_index(size_t size)
82631 +static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
82632 {
82633 if (!size)
82634 return 0;
82635 @@ -310,11 +333,11 @@ static __always_inline int kmalloc_index(size_t size)
82636 }
82637 #endif /* !CONFIG_SLOB */
82638
82639 -void *__kmalloc(size_t size, gfp_t flags);
82640 +void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
82641 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
82642
82643 #ifdef CONFIG_NUMA
82644 -void *__kmalloc_node(size_t size, gfp_t flags, int node);
82645 +void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
82646 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
82647 #else
82648 static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
82649 diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
82650 index 8235dfb..47ce586 100644
82651 --- a/include/linux/slab_def.h
82652 +++ b/include/linux/slab_def.h
82653 @@ -38,7 +38,7 @@ struct kmem_cache {
82654 /* 4) cache creation/removal */
82655 const char *name;
82656 struct list_head list;
82657 - int refcount;
82658 + atomic_t refcount;
82659 int object_size;
82660 int align;
82661
82662 @@ -54,10 +54,14 @@ struct kmem_cache {
82663 unsigned long node_allocs;
82664 unsigned long node_frees;
82665 unsigned long node_overflow;
82666 - atomic_t allochit;
82667 - atomic_t allocmiss;
82668 - atomic_t freehit;
82669 - atomic_t freemiss;
82670 + atomic_unchecked_t allochit;
82671 + atomic_unchecked_t allocmiss;
82672 + atomic_unchecked_t freehit;
82673 + atomic_unchecked_t freemiss;
82674 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
82675 + atomic_unchecked_t sanitized;
82676 + atomic_unchecked_t not_sanitized;
82677 +#endif
82678
82679 /*
82680 * If debugging is enabled, then the allocator can add additional
82681 diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
82682 index d82abd4..408c3a0 100644
82683 --- a/include/linux/slub_def.h
82684 +++ b/include/linux/slub_def.h
82685 @@ -74,7 +74,7 @@ struct kmem_cache {
82686 struct kmem_cache_order_objects max;
82687 struct kmem_cache_order_objects min;
82688 gfp_t allocflags; /* gfp flags to use on each alloc */
82689 - int refcount; /* Refcount for slab cache destroy */
82690 + atomic_t refcount; /* Refcount for slab cache destroy */
82691 void (*ctor)(void *);
82692 int inuse; /* Offset to metadata */
82693 int align; /* Alignment */
82694 diff --git a/include/linux/smp.h b/include/linux/smp.h
82695 index 633f5ed..6c3dc3f 100644
82696 --- a/include/linux/smp.h
82697 +++ b/include/linux/smp.h
82698 @@ -176,7 +176,9 @@ static inline void kick_all_cpus_sync(void) { }
82699 #endif
82700
82701 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
82702 +#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
82703 #define put_cpu() preempt_enable()
82704 +#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
82705
82706 /*
82707 * Callback to arch code if there's nosmp or maxcpus=0 on the
82708 diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
82709 index 46cca4c..3323536 100644
82710 --- a/include/linux/sock_diag.h
82711 +++ b/include/linux/sock_diag.h
82712 @@ -11,7 +11,7 @@ struct sock;
82713 struct sock_diag_handler {
82714 __u8 family;
82715 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
82716 -};
82717 +} __do_const;
82718
82719 int sock_diag_register(const struct sock_diag_handler *h);
82720 void sock_diag_unregister(const struct sock_diag_handler *h);
82721 diff --git a/include/linux/sonet.h b/include/linux/sonet.h
82722 index 680f9a3..f13aeb0 100644
82723 --- a/include/linux/sonet.h
82724 +++ b/include/linux/sonet.h
82725 @@ -7,7 +7,7 @@
82726 #include <uapi/linux/sonet.h>
82727
82728 struct k_sonet_stats {
82729 -#define __HANDLE_ITEM(i) atomic_t i
82730 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
82731 __SONET_ITEMS
82732 #undef __HANDLE_ITEM
82733 };
82734 diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
82735 index 07d8e53..dc934c9 100644
82736 --- a/include/linux/sunrpc/addr.h
82737 +++ b/include/linux/sunrpc/addr.h
82738 @@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
82739 {
82740 switch (sap->sa_family) {
82741 case AF_INET:
82742 - return ntohs(((struct sockaddr_in *)sap)->sin_port);
82743 + return ntohs(((const struct sockaddr_in *)sap)->sin_port);
82744 case AF_INET6:
82745 - return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
82746 + return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
82747 }
82748 return 0;
82749 }
82750 @@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
82751 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
82752 const struct sockaddr *src)
82753 {
82754 - const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
82755 + const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
82756 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
82757
82758 dsin->sin_family = ssin->sin_family;
82759 @@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
82760 if (sa->sa_family != AF_INET6)
82761 return 0;
82762
82763 - return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
82764 + return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
82765 }
82766
82767 #endif /* _LINUX_SUNRPC_ADDR_H */
82768 diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
82769 index 70736b9..37f33db 100644
82770 --- a/include/linux/sunrpc/clnt.h
82771 +++ b/include/linux/sunrpc/clnt.h
82772 @@ -97,7 +97,7 @@ struct rpc_procinfo {
82773 unsigned int p_timer; /* Which RTT timer to use */
82774 u32 p_statidx; /* Which procedure to account */
82775 const char * p_name; /* name of procedure */
82776 -};
82777 +} __do_const;
82778
82779 #ifdef __KERNEL__
82780
82781 diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
82782 index 04e7632..2e2a8a3 100644
82783 --- a/include/linux/sunrpc/svc.h
82784 +++ b/include/linux/sunrpc/svc.h
82785 @@ -412,7 +412,7 @@ struct svc_procedure {
82786 unsigned int pc_count; /* call count */
82787 unsigned int pc_cachetype; /* cache info (NFS) */
82788 unsigned int pc_xdrressize; /* maximum size of XDR reply */
82789 -};
82790 +} __do_const;
82791
82792 /*
82793 * Function prototypes.
82794 diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
82795 index 0b8e3e6..33e0a01 100644
82796 --- a/include/linux/sunrpc/svc_rdma.h
82797 +++ b/include/linux/sunrpc/svc_rdma.h
82798 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
82799 extern unsigned int svcrdma_max_requests;
82800 extern unsigned int svcrdma_max_req_size;
82801
82802 -extern atomic_t rdma_stat_recv;
82803 -extern atomic_t rdma_stat_read;
82804 -extern atomic_t rdma_stat_write;
82805 -extern atomic_t rdma_stat_sq_starve;
82806 -extern atomic_t rdma_stat_rq_starve;
82807 -extern atomic_t rdma_stat_rq_poll;
82808 -extern atomic_t rdma_stat_rq_prod;
82809 -extern atomic_t rdma_stat_sq_poll;
82810 -extern atomic_t rdma_stat_sq_prod;
82811 +extern atomic_unchecked_t rdma_stat_recv;
82812 +extern atomic_unchecked_t rdma_stat_read;
82813 +extern atomic_unchecked_t rdma_stat_write;
82814 +extern atomic_unchecked_t rdma_stat_sq_starve;
82815 +extern atomic_unchecked_t rdma_stat_rq_starve;
82816 +extern atomic_unchecked_t rdma_stat_rq_poll;
82817 +extern atomic_unchecked_t rdma_stat_rq_prod;
82818 +extern atomic_unchecked_t rdma_stat_sq_poll;
82819 +extern atomic_unchecked_t rdma_stat_sq_prod;
82820
82821 #define RPCRDMA_VERSION 1
82822
82823 diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
82824 index 8d71d65..f79586e 100644
82825 --- a/include/linux/sunrpc/svcauth.h
82826 +++ b/include/linux/sunrpc/svcauth.h
82827 @@ -120,7 +120,7 @@ struct auth_ops {
82828 int (*release)(struct svc_rqst *rq);
82829 void (*domain_release)(struct auth_domain *);
82830 int (*set_client)(struct svc_rqst *rq);
82831 -};
82832 +} __do_const;
82833
82834 #define SVC_GARBAGE 1
82835 #define SVC_SYSERR 2
82836 diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
82837 index a5ffd32..0935dea 100644
82838 --- a/include/linux/swiotlb.h
82839 +++ b/include/linux/swiotlb.h
82840 @@ -60,7 +60,8 @@ extern void
82841
82842 extern void
82843 swiotlb_free_coherent(struct device *hwdev, size_t size,
82844 - void *vaddr, dma_addr_t dma_handle);
82845 + void *vaddr, dma_addr_t dma_handle,
82846 + struct dma_attrs *attrs);
82847
82848 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
82849 unsigned long offset, size_t size,
82850 diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
82851 index a4a0588..752870e 100644
82852 --- a/include/linux/syscalls.h
82853 +++ b/include/linux/syscalls.h
82854 @@ -98,10 +98,16 @@ struct sigaltstack;
82855 #define __MAP(n,...) __MAP##n(__VA_ARGS__)
82856
82857 #define __SC_DECL(t, a) t a
82858 +#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))
82859 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
82860 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
82861 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
82862 -#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
82863 +#define __SC_LONG(t, a) __typeof( \
82864 + __builtin_choose_expr( \
82865 + sizeof(t) > sizeof(int), \
82866 + (t) 0, \
82867 + __builtin_choose_expr(__TYPE_IS_U(t), 0UL, 0L) \
82868 + )) a
82869 #define __SC_CAST(t, a) (t) a
82870 #define __SC_ARGS(t, a) a
82871 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
82872 @@ -379,11 +385,11 @@ asmlinkage long sys_sync(void);
82873 asmlinkage long sys_fsync(unsigned int fd);
82874 asmlinkage long sys_fdatasync(unsigned int fd);
82875 asmlinkage long sys_bdflush(int func, long data);
82876 -asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
82877 - char __user *type, unsigned long flags,
82878 +asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
82879 + const char __user *type, unsigned long flags,
82880 void __user *data);
82881 -asmlinkage long sys_umount(char __user *name, int flags);
82882 -asmlinkage long sys_oldumount(char __user *name);
82883 +asmlinkage long sys_umount(const char __user *name, int flags);
82884 +asmlinkage long sys_oldumount(const char __user *name);
82885 asmlinkage long sys_truncate(const char __user *path, long length);
82886 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
82887 asmlinkage long sys_stat(const char __user *filename,
82888 @@ -595,7 +601,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
82889 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
82890 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
82891 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
82892 - struct sockaddr __user *, int);
82893 + struct sockaddr __user *, int) __intentional_overflow(0);
82894 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
82895 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
82896 unsigned int vlen, unsigned flags);
82897 diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
82898 index 27b3b0b..e093dd9 100644
82899 --- a/include/linux/syscore_ops.h
82900 +++ b/include/linux/syscore_ops.h
82901 @@ -16,7 +16,7 @@ struct syscore_ops {
82902 int (*suspend)(void);
82903 void (*resume)(void);
82904 void (*shutdown)(void);
82905 -};
82906 +} __do_const;
82907
82908 extern void register_syscore_ops(struct syscore_ops *ops);
82909 extern void unregister_syscore_ops(struct syscore_ops *ops);
82910 diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
82911 index 14a8ff2..fa95f3a 100644
82912 --- a/include/linux/sysctl.h
82913 +++ b/include/linux/sysctl.h
82914 @@ -34,13 +34,13 @@ struct ctl_table_root;
82915 struct ctl_table_header;
82916 struct ctl_dir;
82917
82918 -typedef struct ctl_table ctl_table;
82919 -
82920 typedef int proc_handler (struct ctl_table *ctl, int write,
82921 void __user *buffer, size_t *lenp, loff_t *ppos);
82922
82923 extern int proc_dostring(struct ctl_table *, int,
82924 void __user *, size_t *, loff_t *);
82925 +extern int proc_dostring_modpriv(struct ctl_table *, int,
82926 + void __user *, size_t *, loff_t *);
82927 extern int proc_dointvec(struct ctl_table *, int,
82928 void __user *, size_t *, loff_t *);
82929 extern int proc_dointvec_minmax(struct ctl_table *, int,
82930 @@ -115,7 +115,9 @@ struct ctl_table
82931 struct ctl_table_poll *poll;
82932 void *extra1;
82933 void *extra2;
82934 -};
82935 +} __do_const __randomize_layout;
82936 +typedef struct ctl_table __no_const ctl_table_no_const;
82937 +typedef struct ctl_table ctl_table;
82938
82939 struct ctl_node {
82940 struct rb_node node;
82941 diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
82942 index 5ffaa34..fe3e31c 100644
82943 --- a/include/linux/sysfs.h
82944 +++ b/include/linux/sysfs.h
82945 @@ -34,7 +34,8 @@ struct attribute {
82946 struct lock_class_key *key;
82947 struct lock_class_key skey;
82948 #endif
82949 -};
82950 +} __do_const;
82951 +typedef struct attribute __no_const attribute_no_const;
82952
82953 /**
82954 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
82955 @@ -63,7 +64,8 @@ struct attribute_group {
82956 struct attribute *, int);
82957 struct attribute **attrs;
82958 struct bin_attribute **bin_attrs;
82959 -};
82960 +} __do_const;
82961 +typedef struct attribute_group __no_const attribute_group_no_const;
82962
82963 /**
82964 * Use these macros to make defining attributes easier. See include/linux/device.h
82965 @@ -128,7 +130,8 @@ struct bin_attribute {
82966 char *, loff_t, size_t);
82967 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
82968 struct vm_area_struct *vma);
82969 -};
82970 +} __do_const;
82971 +typedef struct bin_attribute __no_const bin_attribute_no_const;
82972
82973 /**
82974 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
82975 diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
82976 index 387fa7d..3fcde6b 100644
82977 --- a/include/linux/sysrq.h
82978 +++ b/include/linux/sysrq.h
82979 @@ -16,6 +16,7 @@
82980
82981 #include <linux/errno.h>
82982 #include <linux/types.h>
82983 +#include <linux/compiler.h>
82984
82985 /* Possible values of bitmask for enabling sysrq functions */
82986 /* 0x0001 is reserved for enable everything */
82987 @@ -33,7 +34,7 @@ struct sysrq_key_op {
82988 char *help_msg;
82989 char *action_msg;
82990 int enable_mask;
82991 -};
82992 +} __do_const;
82993
82994 #ifdef CONFIG_MAGIC_SYSRQ
82995
82996 diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
82997 index fddbe20..a0e76ab 100644
82998 --- a/include/linux/thread_info.h
82999 +++ b/include/linux/thread_info.h
83000 @@ -161,6 +161,13 @@ static inline bool test_and_clear_restore_sigmask(void)
83001 #error "no set_restore_sigmask() provided and default one won't work"
83002 #endif
83003
83004 +extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
83005 +
83006 +static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
83007 +{
83008 + __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
83009 +}
83010 +
83011 #endif /* __KERNEL__ */
83012
83013 #endif /* _LINUX_THREAD_INFO_H */
83014 diff --git a/include/linux/tty.h b/include/linux/tty.h
83015 index 1c3316a..ae83b9f 100644
83016 --- a/include/linux/tty.h
83017 +++ b/include/linux/tty.h
83018 @@ -202,7 +202,7 @@ struct tty_port {
83019 const struct tty_port_operations *ops; /* Port operations */
83020 spinlock_t lock; /* Lock protecting tty field */
83021 int blocked_open; /* Waiting to open */
83022 - int count; /* Usage count */
83023 + atomic_t count; /* Usage count */
83024 wait_queue_head_t open_wait; /* Open waiters */
83025 wait_queue_head_t close_wait; /* Close waiters */
83026 wait_queue_head_t delta_msr_wait; /* Modem status change */
83027 @@ -284,7 +284,7 @@ struct tty_struct {
83028 /* If the tty has a pending do_SAK, queue it here - akpm */
83029 struct work_struct SAK_work;
83030 struct tty_port *port;
83031 -};
83032 +} __randomize_layout;
83033
83034 /* Each of a tty's open files has private_data pointing to tty_file_private */
83035 struct tty_file_private {
83036 @@ -550,7 +550,7 @@ extern int tty_port_open(struct tty_port *port,
83037 struct tty_struct *tty, struct file *filp);
83038 static inline int tty_port_users(struct tty_port *port)
83039 {
83040 - return port->count + port->blocked_open;
83041 + return atomic_read(&port->count) + port->blocked_open;
83042 }
83043
83044 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
83045 diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
83046 index 756a609..89db85e 100644
83047 --- a/include/linux/tty_driver.h
83048 +++ b/include/linux/tty_driver.h
83049 @@ -285,7 +285,7 @@ struct tty_operations {
83050 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
83051 #endif
83052 const struct file_operations *proc_fops;
83053 -};
83054 +} __do_const __randomize_layout;
83055
83056 struct tty_driver {
83057 int magic; /* magic number for this structure */
83058 @@ -319,7 +319,7 @@ struct tty_driver {
83059
83060 const struct tty_operations *ops;
83061 struct list_head tty_drivers;
83062 -};
83063 +} __randomize_layout;
83064
83065 extern struct list_head tty_drivers;
83066
83067 diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
83068 index add26da..22c00bef 100644
83069 --- a/include/linux/tty_ldisc.h
83070 +++ b/include/linux/tty_ldisc.h
83071 @@ -212,7 +212,7 @@ struct tty_ldisc_ops {
83072
83073 struct module *owner;
83074
83075 - int refcount;
83076 + atomic_t refcount;
83077 };
83078
83079 struct tty_ldisc {
83080 diff --git a/include/linux/types.h b/include/linux/types.h
83081 index 4d118ba..c3ee9bf 100644
83082 --- a/include/linux/types.h
83083 +++ b/include/linux/types.h
83084 @@ -176,10 +176,26 @@ typedef struct {
83085 int counter;
83086 } atomic_t;
83087
83088 +#ifdef CONFIG_PAX_REFCOUNT
83089 +typedef struct {
83090 + int counter;
83091 +} atomic_unchecked_t;
83092 +#else
83093 +typedef atomic_t atomic_unchecked_t;
83094 +#endif
83095 +
83096 #ifdef CONFIG_64BIT
83097 typedef struct {
83098 long counter;
83099 } atomic64_t;
83100 +
83101 +#ifdef CONFIG_PAX_REFCOUNT
83102 +typedef struct {
83103 + long counter;
83104 +} atomic64_unchecked_t;
83105 +#else
83106 +typedef atomic64_t atomic64_unchecked_t;
83107 +#endif
83108 #endif
83109
83110 struct list_head {
83111 diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
83112 index ecd3319..8a36ded 100644
83113 --- a/include/linux/uaccess.h
83114 +++ b/include/linux/uaccess.h
83115 @@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
83116 long ret; \
83117 mm_segment_t old_fs = get_fs(); \
83118 \
83119 - set_fs(KERNEL_DS); \
83120 pagefault_disable(); \
83121 - ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
83122 - pagefault_enable(); \
83123 + set_fs(KERNEL_DS); \
83124 + ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
83125 set_fs(old_fs); \
83126 + pagefault_enable(); \
83127 ret; \
83128 })
83129
83130 diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
83131 index 2d1f9b6..d7a9fce 100644
83132 --- a/include/linux/uidgid.h
83133 +++ b/include/linux/uidgid.h
83134 @@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
83135
83136 #endif /* CONFIG_USER_NS */
83137
83138 +#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
83139 +#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
83140 +#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
83141 +#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
83142 +
83143 #endif /* _LINUX_UIDGID_H */
83144 diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
83145 index 99c1b4d..562e6f3 100644
83146 --- a/include/linux/unaligned/access_ok.h
83147 +++ b/include/linux/unaligned/access_ok.h
83148 @@ -4,34 +4,34 @@
83149 #include <linux/kernel.h>
83150 #include <asm/byteorder.h>
83151
83152 -static inline u16 get_unaligned_le16(const void *p)
83153 +static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
83154 {
83155 - return le16_to_cpup((__le16 *)p);
83156 + return le16_to_cpup((const __le16 *)p);
83157 }
83158
83159 -static inline u32 get_unaligned_le32(const void *p)
83160 +static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
83161 {
83162 - return le32_to_cpup((__le32 *)p);
83163 + return le32_to_cpup((const __le32 *)p);
83164 }
83165
83166 -static inline u64 get_unaligned_le64(const void *p)
83167 +static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
83168 {
83169 - return le64_to_cpup((__le64 *)p);
83170 + return le64_to_cpup((const __le64 *)p);
83171 }
83172
83173 -static inline u16 get_unaligned_be16(const void *p)
83174 +static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
83175 {
83176 - return be16_to_cpup((__be16 *)p);
83177 + return be16_to_cpup((const __be16 *)p);
83178 }
83179
83180 -static inline u32 get_unaligned_be32(const void *p)
83181 +static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
83182 {
83183 - return be32_to_cpup((__be32 *)p);
83184 + return be32_to_cpup((const __be32 *)p);
83185 }
83186
83187 -static inline u64 get_unaligned_be64(const void *p)
83188 +static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
83189 {
83190 - return be64_to_cpup((__be64 *)p);
83191 + return be64_to_cpup((const __be64 *)p);
83192 }
83193
83194 static inline void put_unaligned_le16(u16 val, void *p)
83195 diff --git a/include/linux/usb.h b/include/linux/usb.h
83196 index 6b7ec37..4428419 100644
83197 --- a/include/linux/usb.h
83198 +++ b/include/linux/usb.h
83199 @@ -569,7 +569,7 @@ struct usb_device {
83200 int maxchild;
83201
83202 u32 quirks;
83203 - atomic_t urbnum;
83204 + atomic_unchecked_t urbnum;
83205
83206 unsigned long active_duration;
83207
83208 @@ -1653,7 +1653,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
83209
83210 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
83211 __u8 request, __u8 requesttype, __u16 value, __u16 index,
83212 - void *data, __u16 size, int timeout);
83213 + void *data, __u16 size, int timeout) __intentional_overflow(-1);
83214 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
83215 void *data, int len, int *actual_length, int timeout);
83216 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
83217 diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
83218 index e452ba6..78f8e80 100644
83219 --- a/include/linux/usb/renesas_usbhs.h
83220 +++ b/include/linux/usb/renesas_usbhs.h
83221 @@ -39,7 +39,7 @@ enum {
83222 */
83223 struct renesas_usbhs_driver_callback {
83224 int (*notify_hotplug)(struct platform_device *pdev);
83225 -};
83226 +} __no_const;
83227
83228 /*
83229 * callback functions for platform
83230 diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
83231 index 4836ba3..603f6ee 100644
83232 --- a/include/linux/user_namespace.h
83233 +++ b/include/linux/user_namespace.h
83234 @@ -33,7 +33,7 @@ struct user_namespace {
83235 struct key *persistent_keyring_register;
83236 struct rw_semaphore persistent_keyring_register_sem;
83237 #endif
83238 -};
83239 +} __randomize_layout;
83240
83241 extern struct user_namespace init_user_ns;
83242
83243 diff --git a/include/linux/utsname.h b/include/linux/utsname.h
83244 index 239e277..22a5cf5 100644
83245 --- a/include/linux/utsname.h
83246 +++ b/include/linux/utsname.h
83247 @@ -24,7 +24,7 @@ struct uts_namespace {
83248 struct new_utsname name;
83249 struct user_namespace *user_ns;
83250 unsigned int proc_inum;
83251 -};
83252 +} __randomize_layout;
83253 extern struct uts_namespace init_uts_ns;
83254
83255 #ifdef CONFIG_UTS_NS
83256 diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
83257 index 6f8fbcf..4efc177 100644
83258 --- a/include/linux/vermagic.h
83259 +++ b/include/linux/vermagic.h
83260 @@ -25,9 +25,42 @@
83261 #define MODULE_ARCH_VERMAGIC ""
83262 #endif
83263
83264 +#ifdef CONFIG_PAX_REFCOUNT
83265 +#define MODULE_PAX_REFCOUNT "REFCOUNT "
83266 +#else
83267 +#define MODULE_PAX_REFCOUNT ""
83268 +#endif
83269 +
83270 +#ifdef CONSTIFY_PLUGIN
83271 +#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
83272 +#else
83273 +#define MODULE_CONSTIFY_PLUGIN ""
83274 +#endif
83275 +
83276 +#ifdef STACKLEAK_PLUGIN
83277 +#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
83278 +#else
83279 +#define MODULE_STACKLEAK_PLUGIN ""
83280 +#endif
83281 +
83282 +#ifdef RANDSTRUCT_PLUGIN
83283 +#include <generated/randomize_layout_hash.h>
83284 +#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
83285 +#else
83286 +#define MODULE_RANDSTRUCT_PLUGIN
83287 +#endif
83288 +
83289 +#ifdef CONFIG_GRKERNSEC
83290 +#define MODULE_GRSEC "GRSEC "
83291 +#else
83292 +#define MODULE_GRSEC ""
83293 +#endif
83294 +
83295 #define VERMAGIC_STRING \
83296 UTS_RELEASE " " \
83297 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
83298 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
83299 - MODULE_ARCH_VERMAGIC
83300 + MODULE_ARCH_VERMAGIC \
83301 + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
83302 + MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
83303
83304 diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
83305 index 502073a..a7de024 100644
83306 --- a/include/linux/vga_switcheroo.h
83307 +++ b/include/linux/vga_switcheroo.h
83308 @@ -63,8 +63,8 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
83309
83310 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
83311
83312 -int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
83313 -int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
83314 +int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
83315 +int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
83316 #else
83317
83318 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
83319 @@ -81,8 +81,8 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
83320
83321 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
83322
83323 -static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
83324 -static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
83325 +static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
83326 +static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
83327
83328 #endif
83329 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
83330 diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
83331 index 4b8a891..e9a2863 100644
83332 --- a/include/linux/vmalloc.h
83333 +++ b/include/linux/vmalloc.h
83334 @@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
83335 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
83336 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
83337 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
83338 +
83339 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
83340 +#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
83341 +#endif
83342 +
83343 /* bits [20..32] reserved for arch specific ioremap internals */
83344
83345 /*
83346 @@ -82,6 +87,10 @@ extern void *vmap(struct page **pages, unsigned int count,
83347 unsigned long flags, pgprot_t prot);
83348 extern void vunmap(const void *addr);
83349
83350 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
83351 +extern void unmap_process_stacks(struct task_struct *task);
83352 +#endif
83353 +
83354 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
83355 unsigned long uaddr, void *kaddr,
83356 unsigned long size);
83357 @@ -142,7 +151,7 @@ extern void free_vm_area(struct vm_struct *area);
83358
83359 /* for /dev/kmem */
83360 extern long vread(char *buf, char *addr, unsigned long count);
83361 -extern long vwrite(char *buf, char *addr, unsigned long count);
83362 +extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
83363
83364 /*
83365 * Internals. Dont't use..
83366 diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
83367 index 45c9cd1..20bd0bf 100644
83368 --- a/include/linux/vmstat.h
83369 +++ b/include/linux/vmstat.h
83370 @@ -102,18 +102,18 @@ static inline void vm_events_fold_cpu(int cpu)
83371 /*
83372 * Zone based page accounting with per cpu differentials.
83373 */
83374 -extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83375 +extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83376
83377 static inline void zone_page_state_add(long x, struct zone *zone,
83378 enum zone_stat_item item)
83379 {
83380 - atomic_long_add(x, &zone->vm_stat[item]);
83381 - atomic_long_add(x, &vm_stat[item]);
83382 + atomic_long_add_unchecked(x, &zone->vm_stat[item]);
83383 + atomic_long_add_unchecked(x, &vm_stat[item]);
83384 }
83385
83386 -static inline unsigned long global_page_state(enum zone_stat_item item)
83387 +static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
83388 {
83389 - long x = atomic_long_read(&vm_stat[item]);
83390 + long x = atomic_long_read_unchecked(&vm_stat[item]);
83391 #ifdef CONFIG_SMP
83392 if (x < 0)
83393 x = 0;
83394 @@ -121,10 +121,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
83395 return x;
83396 }
83397
83398 -static inline unsigned long zone_page_state(struct zone *zone,
83399 +static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
83400 enum zone_stat_item item)
83401 {
83402 - long x = atomic_long_read(&zone->vm_stat[item]);
83403 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
83404 #ifdef CONFIG_SMP
83405 if (x < 0)
83406 x = 0;
83407 @@ -141,7 +141,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
83408 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
83409 enum zone_stat_item item)
83410 {
83411 - long x = atomic_long_read(&zone->vm_stat[item]);
83412 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
83413
83414 #ifdef CONFIG_SMP
83415 int cpu;
83416 @@ -228,14 +228,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
83417
83418 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
83419 {
83420 - atomic_long_inc(&zone->vm_stat[item]);
83421 - atomic_long_inc(&vm_stat[item]);
83422 + atomic_long_inc_unchecked(&zone->vm_stat[item]);
83423 + atomic_long_inc_unchecked(&vm_stat[item]);
83424 }
83425
83426 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
83427 {
83428 - atomic_long_dec(&zone->vm_stat[item]);
83429 - atomic_long_dec(&vm_stat[item]);
83430 + atomic_long_dec_unchecked(&zone->vm_stat[item]);
83431 + atomic_long_dec_unchecked(&vm_stat[item]);
83432 }
83433
83434 static inline void __inc_zone_page_state(struct page *page,
83435 diff --git a/include/linux/xattr.h b/include/linux/xattr.h
83436 index 91b0a68..0e9adf6 100644
83437 --- a/include/linux/xattr.h
83438 +++ b/include/linux/xattr.h
83439 @@ -28,7 +28,7 @@ struct xattr_handler {
83440 size_t size, int handler_flags);
83441 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
83442 size_t size, int flags, int handler_flags);
83443 -};
83444 +} __do_const;
83445
83446 struct xattr {
83447 const char *name;
83448 @@ -37,6 +37,9 @@ struct xattr {
83449 };
83450
83451 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
83452 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
83453 +ssize_t pax_getxattr(struct dentry *, void *, size_t);
83454 +#endif
83455 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
83456 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
83457 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
83458 diff --git a/include/linux/zlib.h b/include/linux/zlib.h
83459 index 9c5a6b4..09c9438 100644
83460 --- a/include/linux/zlib.h
83461 +++ b/include/linux/zlib.h
83462 @@ -31,6 +31,7 @@
83463 #define _ZLIB_H
83464
83465 #include <linux/zconf.h>
83466 +#include <linux/compiler.h>
83467
83468 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
83469 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
83470 @@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
83471
83472 /* basic functions */
83473
83474 -extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
83475 +extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
83476 /*
83477 Returns the number of bytes that needs to be allocated for a per-
83478 stream workspace with the specified parameters. A pointer to this
83479 diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
83480 index eec6e46..82d5641 100644
83481 --- a/include/media/v4l2-dev.h
83482 +++ b/include/media/v4l2-dev.h
83483 @@ -77,7 +77,7 @@ struct v4l2_file_operations {
83484 int (*mmap) (struct file *, struct vm_area_struct *);
83485 int (*open) (struct file *);
83486 int (*release) (struct file *);
83487 -};
83488 +} __do_const;
83489
83490 /*
83491 * Newer version of video_device, handled by videodev2.c
83492 diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
83493 index c9b1593..a572459 100644
83494 --- a/include/media/v4l2-device.h
83495 +++ b/include/media/v4l2-device.h
83496 @@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
83497 this function returns 0. If the name ends with a digit (e.g. cx18),
83498 then the name will be set to cx18-0 since cx180 looks really odd. */
83499 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
83500 - atomic_t *instance);
83501 + atomic_unchecked_t *instance);
83502
83503 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
83504 Since the parent disappears this ensures that v4l2_dev doesn't have an
83505 diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
83506 index d9fa68f..45c88d1 100644
83507 --- a/include/net/9p/transport.h
83508 +++ b/include/net/9p/transport.h
83509 @@ -63,7 +63,7 @@ struct p9_trans_module {
83510 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
83511 int (*zc_request)(struct p9_client *, struct p9_req_t *,
83512 char *, char *, int , int, int, int);
83513 -};
83514 +} __do_const;
83515
83516 void v9fs_register_trans(struct p9_trans_module *m);
83517 void v9fs_unregister_trans(struct p9_trans_module *m);
83518 diff --git a/include/net/af_unix.h b/include/net/af_unix.h
83519 index a175ba4..196eb82 100644
83520 --- a/include/net/af_unix.h
83521 +++ b/include/net/af_unix.h
83522 @@ -36,7 +36,7 @@ struct unix_skb_parms {
83523 u32 secid; /* Security ID */
83524 #endif
83525 u32 consumed;
83526 -};
83527 +} __randomize_layout;
83528
83529 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
83530 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
83531 diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
83532 index 4abdcb2..945c5cc 100644
83533 --- a/include/net/bluetooth/l2cap.h
83534 +++ b/include/net/bluetooth/l2cap.h
83535 @@ -601,7 +601,7 @@ struct l2cap_ops {
83536 long (*get_sndtimeo) (struct l2cap_chan *chan);
83537 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
83538 unsigned long len, int nb);
83539 -};
83540 +} __do_const;
83541
83542 struct l2cap_conn {
83543 struct hci_conn *hcon;
83544 diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
83545 index f2ae33d..c457cf0 100644
83546 --- a/include/net/caif/cfctrl.h
83547 +++ b/include/net/caif/cfctrl.h
83548 @@ -52,7 +52,7 @@ struct cfctrl_rsp {
83549 void (*radioset_rsp)(void);
83550 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
83551 struct cflayer *client_layer);
83552 -};
83553 +} __no_const;
83554
83555 /* Link Setup Parameters for CAIF-Links. */
83556 struct cfctrl_link_param {
83557 @@ -101,8 +101,8 @@ struct cfctrl_request_info {
83558 struct cfctrl {
83559 struct cfsrvl serv;
83560 struct cfctrl_rsp res;
83561 - atomic_t req_seq_no;
83562 - atomic_t rsp_seq_no;
83563 + atomic_unchecked_t req_seq_no;
83564 + atomic_unchecked_t rsp_seq_no;
83565 struct list_head list;
83566 /* Protects from simultaneous access to first_req list */
83567 spinlock_t info_list_lock;
83568 diff --git a/include/net/flow.h b/include/net/flow.h
83569 index 8109a15..504466d 100644
83570 --- a/include/net/flow.h
83571 +++ b/include/net/flow.h
83572 @@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
83573
83574 void flow_cache_flush(struct net *net);
83575 void flow_cache_flush_deferred(struct net *net);
83576 -extern atomic_t flow_cache_genid;
83577 +extern atomic_unchecked_t flow_cache_genid;
83578
83579 #endif
83580 diff --git a/include/net/genetlink.h b/include/net/genetlink.h
83581 index 93695f0..766d71c 100644
83582 --- a/include/net/genetlink.h
83583 +++ b/include/net/genetlink.h
83584 @@ -120,7 +120,7 @@ struct genl_ops {
83585 u8 cmd;
83586 u8 internal_flags;
83587 u8 flags;
83588 -};
83589 +} __do_const;
83590
83591 int __genl_register_family(struct genl_family *family);
83592
83593 diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
83594 index 734d9b5..48a9a4b 100644
83595 --- a/include/net/gro_cells.h
83596 +++ b/include/net/gro_cells.h
83597 @@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
83598 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
83599
83600 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
83601 - atomic_long_inc(&dev->rx_dropped);
83602 + atomic_long_inc_unchecked(&dev->rx_dropped);
83603 kfree_skb(skb);
83604 return;
83605 }
83606 diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
83607 index 7a43138..bc76865 100644
83608 --- a/include/net/inet_connection_sock.h
83609 +++ b/include/net/inet_connection_sock.h
83610 @@ -62,7 +62,7 @@ struct inet_connection_sock_af_ops {
83611 void (*addr2sockaddr)(struct sock *sk, struct sockaddr *);
83612 int (*bind_conflict)(const struct sock *sk,
83613 const struct inet_bind_bucket *tb, bool relax);
83614 -};
83615 +} __do_const;
83616
83617 /** inet_connection_sock - INET connection oriented sock
83618 *
83619 diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
83620 index 058271b..1a44af7 100644
83621 --- a/include/net/inetpeer.h
83622 +++ b/include/net/inetpeer.h
83623 @@ -47,8 +47,8 @@ struct inet_peer {
83624 */
83625 union {
83626 struct {
83627 - atomic_t rid; /* Frag reception counter */
83628 - atomic_t ip_id_count; /* IP ID for the next packet */
83629 + atomic_unchecked_t rid; /* Frag reception counter */
83630 + atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
83631 };
83632 struct rcu_head rcu;
83633 struct inet_peer *gc_next;
83634 @@ -179,7 +179,7 @@ static inline int inet_getid(struct inet_peer *p, int more)
83635 {
83636 more++;
83637 inet_peer_refcheck(p);
83638 - return atomic_add_return(more, &p->ip_id_count) - more;
83639 + return atomic_add_return_unchecked(more, &p->ip_id_count) - more;
83640 }
83641
83642 #endif /* _NET_INETPEER_H */
83643 diff --git a/include/net/ip.h b/include/net/ip.h
83644 index 3ec2b0f..72435b6 100644
83645 --- a/include/net/ip.h
83646 +++ b/include/net/ip.h
83647 @@ -220,7 +220,7 @@ static inline void snmp_mib_free(void __percpu *ptr[SNMP_ARRAY_SZ])
83648
83649 void inet_get_local_port_range(struct net *net, int *low, int *high);
83650
83651 -extern unsigned long *sysctl_local_reserved_ports;
83652 +extern unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
83653 static inline int inet_is_reserved_local_port(int port)
83654 {
83655 return test_bit(port, sysctl_local_reserved_ports);
83656 diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
83657 index 9922093..a1755d6 100644
83658 --- a/include/net/ip_fib.h
83659 +++ b/include/net/ip_fib.h
83660 @@ -169,7 +169,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
83661
83662 #define FIB_RES_SADDR(net, res) \
83663 ((FIB_RES_NH(res).nh_saddr_genid == \
83664 - atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
83665 + atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
83666 FIB_RES_NH(res).nh_saddr : \
83667 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
83668 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
83669 diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
83670 index 5679d92..2e7a690 100644
83671 --- a/include/net/ip_vs.h
83672 +++ b/include/net/ip_vs.h
83673 @@ -558,7 +558,7 @@ struct ip_vs_conn {
83674 struct ip_vs_conn *control; /* Master control connection */
83675 atomic_t n_control; /* Number of controlled ones */
83676 struct ip_vs_dest *dest; /* real server */
83677 - atomic_t in_pkts; /* incoming packet counter */
83678 + atomic_unchecked_t in_pkts; /* incoming packet counter */
83679
83680 /* packet transmitter for different forwarding methods. If it
83681 mangles the packet, it must return NF_DROP or better NF_STOLEN,
83682 @@ -705,7 +705,7 @@ struct ip_vs_dest {
83683 __be16 port; /* port number of the server */
83684 union nf_inet_addr addr; /* IP address of the server */
83685 volatile unsigned int flags; /* dest status flags */
83686 - atomic_t conn_flags; /* flags to copy to conn */
83687 + atomic_unchecked_t conn_flags; /* flags to copy to conn */
83688 atomic_t weight; /* server weight */
83689
83690 atomic_t refcnt; /* reference counter */
83691 @@ -960,11 +960,11 @@ struct netns_ipvs {
83692 /* ip_vs_lblc */
83693 int sysctl_lblc_expiration;
83694 struct ctl_table_header *lblc_ctl_header;
83695 - struct ctl_table *lblc_ctl_table;
83696 + ctl_table_no_const *lblc_ctl_table;
83697 /* ip_vs_lblcr */
83698 int sysctl_lblcr_expiration;
83699 struct ctl_table_header *lblcr_ctl_header;
83700 - struct ctl_table *lblcr_ctl_table;
83701 + ctl_table_no_const *lblcr_ctl_table;
83702 /* ip_vs_est */
83703 struct list_head est_list; /* estimator list */
83704 spinlock_t est_lock;
83705 diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
83706 index 8d4f588..2e37ad2 100644
83707 --- a/include/net/irda/ircomm_tty.h
83708 +++ b/include/net/irda/ircomm_tty.h
83709 @@ -33,6 +33,7 @@
83710 #include <linux/termios.h>
83711 #include <linux/timer.h>
83712 #include <linux/tty.h> /* struct tty_struct */
83713 +#include <asm/local.h>
83714
83715 #include <net/irda/irias_object.h>
83716 #include <net/irda/ircomm_core.h>
83717 diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
83718 index 714cc9a..ea05f3e 100644
83719 --- a/include/net/iucv/af_iucv.h
83720 +++ b/include/net/iucv/af_iucv.h
83721 @@ -149,7 +149,7 @@ struct iucv_skb_cb {
83722 struct iucv_sock_list {
83723 struct hlist_head head;
83724 rwlock_t lock;
83725 - atomic_t autobind_name;
83726 + atomic_unchecked_t autobind_name;
83727 };
83728
83729 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
83730 diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
83731 index f3be818..bf46196 100644
83732 --- a/include/net/llc_c_ac.h
83733 +++ b/include/net/llc_c_ac.h
83734 @@ -87,7 +87,7 @@
83735 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
83736 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
83737
83738 -typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
83739 +typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
83740
83741 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
83742 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
83743 diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
83744 index 3948cf1..83b28c4 100644
83745 --- a/include/net/llc_c_ev.h
83746 +++ b/include/net/llc_c_ev.h
83747 @@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
83748 return (struct llc_conn_state_ev *)skb->cb;
83749 }
83750
83751 -typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
83752 -typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
83753 +typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
83754 +typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
83755
83756 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
83757 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
83758 diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
83759 index 0e79cfb..f46db31 100644
83760 --- a/include/net/llc_c_st.h
83761 +++ b/include/net/llc_c_st.h
83762 @@ -37,7 +37,7 @@ struct llc_conn_state_trans {
83763 u8 next_state;
83764 llc_conn_ev_qfyr_t *ev_qualifiers;
83765 llc_conn_action_t *ev_actions;
83766 -};
83767 +} __do_const;
83768
83769 struct llc_conn_state {
83770 u8 current_state;
83771 diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
83772 index a61b98c..aade1eb 100644
83773 --- a/include/net/llc_s_ac.h
83774 +++ b/include/net/llc_s_ac.h
83775 @@ -23,7 +23,7 @@
83776 #define SAP_ACT_TEST_IND 9
83777
83778 /* All action functions must look like this */
83779 -typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
83780 +typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
83781
83782 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
83783 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
83784 diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
83785 index 567c681..cd73ac02 100644
83786 --- a/include/net/llc_s_st.h
83787 +++ b/include/net/llc_s_st.h
83788 @@ -20,7 +20,7 @@ struct llc_sap_state_trans {
83789 llc_sap_ev_t ev;
83790 u8 next_state;
83791 llc_sap_action_t *ev_actions;
83792 -};
83793 +} __do_const;
83794
83795 struct llc_sap_state {
83796 u8 curr_state;
83797 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
83798 index 8248e39..7610eec 100644
83799 --- a/include/net/mac80211.h
83800 +++ b/include/net/mac80211.h
83801 @@ -4467,7 +4467,7 @@ struct rate_control_ops {
83802 void (*add_sta_debugfs)(void *priv, void *priv_sta,
83803 struct dentry *dir);
83804 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
83805 -};
83806 +} __do_const;
83807
83808 static inline int rate_supported(struct ieee80211_sta *sta,
83809 enum ieee80211_band band,
83810 diff --git a/include/net/neighbour.h b/include/net/neighbour.h
83811 index 7277caf..fd095bc 100644
83812 --- a/include/net/neighbour.h
83813 +++ b/include/net/neighbour.h
83814 @@ -163,7 +163,7 @@ struct neigh_ops {
83815 void (*error_report)(struct neighbour *, struct sk_buff *);
83816 int (*output)(struct neighbour *, struct sk_buff *);
83817 int (*connected_output)(struct neighbour *, struct sk_buff *);
83818 -};
83819 +} __do_const;
83820
83821 struct pneigh_entry {
83822 struct pneigh_entry *next;
83823 @@ -203,7 +203,6 @@ struct neigh_table {
83824 void (*proxy_redo)(struct sk_buff *skb);
83825 char *id;
83826 struct neigh_parms parms;
83827 - /* HACK. gc_* should follow parms without a gap! */
83828 int gc_interval;
83829 int gc_thresh1;
83830 int gc_thresh2;
83831 @@ -218,7 +217,7 @@ struct neigh_table {
83832 struct neigh_statistics __percpu *stats;
83833 struct neigh_hash_table __rcu *nht;
83834 struct pneigh_entry **phash_buckets;
83835 -};
83836 +} __randomize_layout;
83837
83838 static inline int neigh_parms_family(struct neigh_parms *p)
83839 {
83840 diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
83841 index 5f9eb26..85699c4 100644
83842 --- a/include/net/net_namespace.h
83843 +++ b/include/net/net_namespace.h
83844 @@ -129,8 +129,8 @@ struct net {
83845 struct netns_ipvs *ipvs;
83846 #endif
83847 struct sock *diag_nlsk;
83848 - atomic_t fnhe_genid;
83849 -};
83850 + atomic_unchecked_t fnhe_genid;
83851 +} __randomize_layout;
83852
83853 #include <linux/seq_file_net.h>
83854
83855 @@ -286,7 +286,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
83856 #define __net_init __init
83857 #define __net_exit __exit_refok
83858 #define __net_initdata __initdata
83859 +#ifdef CONSTIFY_PLUGIN
83860 #define __net_initconst __initconst
83861 +#else
83862 +#define __net_initconst __initdata
83863 +#endif
83864 #endif
83865
83866 struct pernet_operations {
83867 @@ -296,7 +300,7 @@ struct pernet_operations {
83868 void (*exit_batch)(struct list_head *net_exit_list);
83869 int *id;
83870 size_t size;
83871 -};
83872 +} __do_const;
83873
83874 /*
83875 * Use these carefully. If you implement a network device and it
83876 @@ -344,23 +348,23 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
83877
83878 static inline int rt_genid_ipv4(struct net *net)
83879 {
83880 - return atomic_read(&net->ipv4.rt_genid);
83881 + return atomic_read_unchecked(&net->ipv4.rt_genid);
83882 }
83883
83884 static inline void rt_genid_bump_ipv4(struct net *net)
83885 {
83886 - atomic_inc(&net->ipv4.rt_genid);
83887 + atomic_inc_unchecked(&net->ipv4.rt_genid);
83888 }
83889
83890 #if IS_ENABLED(CONFIG_IPV6)
83891 static inline int rt_genid_ipv6(struct net *net)
83892 {
83893 - return atomic_read(&net->ipv6.rt_genid);
83894 + return atomic_read_unchecked(&net->ipv6.rt_genid);
83895 }
83896
83897 static inline void rt_genid_bump_ipv6(struct net *net)
83898 {
83899 - atomic_inc(&net->ipv6.rt_genid);
83900 + atomic_inc_unchecked(&net->ipv6.rt_genid);
83901 }
83902 #else
83903 static inline int rt_genid_ipv6(struct net *net)
83904 @@ -382,12 +386,12 @@ static inline void rt_genid_bump_all(struct net *net)
83905
83906 static inline int fnhe_genid(struct net *net)
83907 {
83908 - return atomic_read(&net->fnhe_genid);
83909 + return atomic_read_unchecked(&net->fnhe_genid);
83910 }
83911
83912 static inline void fnhe_genid_bump(struct net *net)
83913 {
83914 - atomic_inc(&net->fnhe_genid);
83915 + atomic_inc_unchecked(&net->fnhe_genid);
83916 }
83917
83918 #endif /* __NET_NET_NAMESPACE_H */
83919 diff --git a/include/net/netdma.h b/include/net/netdma.h
83920 index 8ba8ce2..99b7fff 100644
83921 --- a/include/net/netdma.h
83922 +++ b/include/net/netdma.h
83923 @@ -24,7 +24,7 @@
83924 #include <linux/dmaengine.h>
83925 #include <linux/skbuff.h>
83926
83927 -int dma_skb_copy_datagram_iovec(struct dma_chan* chan,
83928 +int __intentional_overflow(3,5) dma_skb_copy_datagram_iovec(struct dma_chan* chan,
83929 struct sk_buff *skb, int offset, struct iovec *to,
83930 size_t len, struct dma_pinned_list *pinned_list);
83931
83932 diff --git a/include/net/netlink.h b/include/net/netlink.h
83933 index 2b47eaa..6d5bcc2 100644
83934 --- a/include/net/netlink.h
83935 +++ b/include/net/netlink.h
83936 @@ -521,7 +521,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
83937 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
83938 {
83939 if (mark)
83940 - skb_trim(skb, (unsigned char *) mark - skb->data);
83941 + skb_trim(skb, (const unsigned char *) mark - skb->data);
83942 }
83943
83944 /**
83945 diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
83946 index 773cce3..6a11852 100644
83947 --- a/include/net/netns/conntrack.h
83948 +++ b/include/net/netns/conntrack.h
83949 @@ -13,10 +13,10 @@ struct nf_conntrack_ecache;
83950 struct nf_proto_net {
83951 #ifdef CONFIG_SYSCTL
83952 struct ctl_table_header *ctl_table_header;
83953 - struct ctl_table *ctl_table;
83954 + ctl_table_no_const *ctl_table;
83955 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
83956 struct ctl_table_header *ctl_compat_header;
83957 - struct ctl_table *ctl_compat_table;
83958 + ctl_table_no_const *ctl_compat_table;
83959 #endif
83960 #endif
83961 unsigned int users;
83962 @@ -59,7 +59,7 @@ struct nf_ip_net {
83963 struct nf_icmp_net icmpv6;
83964 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
83965 struct ctl_table_header *ctl_table_header;
83966 - struct ctl_table *ctl_table;
83967 + ctl_table_no_const *ctl_table;
83968 #endif
83969 };
83970
83971 diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
83972 index b2704fd0..421d717 100644
83973 --- a/include/net/netns/ipv4.h
83974 +++ b/include/net/netns/ipv4.h
83975 @@ -79,7 +79,7 @@ struct netns_ipv4 {
83976
83977 struct ping_group_range ping_group_range;
83978
83979 - atomic_t dev_addr_genid;
83980 + atomic_unchecked_t dev_addr_genid;
83981
83982 #ifdef CONFIG_IP_MROUTE
83983 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
83984 @@ -89,6 +89,6 @@ struct netns_ipv4 {
83985 struct fib_rules_ops *mr_rules_ops;
83986 #endif
83987 #endif
83988 - atomic_t rt_genid;
83989 + atomic_unchecked_t rt_genid;
83990 };
83991 #endif
83992 diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
83993 index 21edaf1..4c5faae 100644
83994 --- a/include/net/netns/ipv6.h
83995 +++ b/include/net/netns/ipv6.h
83996 @@ -73,8 +73,8 @@ struct netns_ipv6 {
83997 struct fib_rules_ops *mr6_rules_ops;
83998 #endif
83999 #endif
84000 - atomic_t dev_addr_genid;
84001 - atomic_t rt_genid;
84002 + atomic_unchecked_t dev_addr_genid;
84003 + atomic_unchecked_t rt_genid;
84004 };
84005
84006 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
84007 diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
84008 index 3492434..209f58c 100644
84009 --- a/include/net/netns/xfrm.h
84010 +++ b/include/net/netns/xfrm.h
84011 @@ -64,7 +64,7 @@ struct netns_xfrm {
84012
84013 /* flow cache part */
84014 struct flow_cache flow_cache_global;
84015 - atomic_t flow_cache_genid;
84016 + atomic_unchecked_t flow_cache_genid;
84017 struct list_head flow_cache_gc_list;
84018 spinlock_t flow_cache_gc_lock;
84019 struct work_struct flow_cache_gc_work;
84020 diff --git a/include/net/ping.h b/include/net/ping.h
84021 index 026479b..d9b2829 100644
84022 --- a/include/net/ping.h
84023 +++ b/include/net/ping.h
84024 @@ -54,7 +54,7 @@ struct ping_iter_state {
84025
84026 extern struct proto ping_prot;
84027 #if IS_ENABLED(CONFIG_IPV6)
84028 -extern struct pingv6_ops pingv6_ops;
84029 +extern struct pingv6_ops *pingv6_ops;
84030 #endif
84031
84032 struct pingfakehdr {
84033 diff --git a/include/net/protocol.h b/include/net/protocol.h
84034 index a7e986b..dc67bce 100644
84035 --- a/include/net/protocol.h
84036 +++ b/include/net/protocol.h
84037 @@ -49,7 +49,7 @@ struct net_protocol {
84038 * socket lookup?
84039 */
84040 icmp_strict_tag_validation:1;
84041 -};
84042 +} __do_const;
84043
84044 #if IS_ENABLED(CONFIG_IPV6)
84045 struct inet6_protocol {
84046 @@ -62,7 +62,7 @@ struct inet6_protocol {
84047 u8 type, u8 code, int offset,
84048 __be32 info);
84049 unsigned int flags; /* INET6_PROTO_xxx */
84050 -};
84051 +} __do_const;
84052
84053 #define INET6_PROTO_NOPOLICY 0x1
84054 #define INET6_PROTO_FINAL 0x2
84055 diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
84056 index 72240e5..8c14bef 100644
84057 --- a/include/net/rtnetlink.h
84058 +++ b/include/net/rtnetlink.h
84059 @@ -93,7 +93,7 @@ struct rtnl_link_ops {
84060 int (*fill_slave_info)(struct sk_buff *skb,
84061 const struct net_device *dev,
84062 const struct net_device *slave_dev);
84063 -};
84064 +} __do_const;
84065
84066 int __rtnl_link_register(struct rtnl_link_ops *ops);
84067 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
84068 diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
84069 index 4a5b9a3..ca27d73 100644
84070 --- a/include/net/sctp/checksum.h
84071 +++ b/include/net/sctp/checksum.h
84072 @@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
84073 unsigned int offset)
84074 {
84075 struct sctphdr *sh = sctp_hdr(skb);
84076 - __le32 ret, old = sh->checksum;
84077 - const struct skb_checksum_ops ops = {
84078 + __le32 ret, old = sh->checksum;
84079 + static const struct skb_checksum_ops ops = {
84080 .update = sctp_csum_update,
84081 .combine = sctp_csum_combine,
84082 };
84083 diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
84084 index 7f4eeb3..37e8fe1 100644
84085 --- a/include/net/sctp/sm.h
84086 +++ b/include/net/sctp/sm.h
84087 @@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
84088 typedef struct {
84089 sctp_state_fn_t *fn;
84090 const char *name;
84091 -} sctp_sm_table_entry_t;
84092 +} __do_const sctp_sm_table_entry_t;
84093
84094 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
84095 * currently in use.
84096 @@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
84097 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
84098
84099 /* Extern declarations for major data structures. */
84100 -extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
84101 +extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
84102
84103
84104 /* Get the size of a DATA chunk payload. */
84105 diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
84106 index 0dfcc92..7967849 100644
84107 --- a/include/net/sctp/structs.h
84108 +++ b/include/net/sctp/structs.h
84109 @@ -507,7 +507,7 @@ struct sctp_pf {
84110 struct sctp_association *asoc);
84111 void (*addr_v4map) (struct sctp_sock *, union sctp_addr *);
84112 struct sctp_af *af;
84113 -};
84114 +} __do_const;
84115
84116
84117 /* Structure to track chunk fragments that have been acked, but peer
84118 diff --git a/include/net/sock.h b/include/net/sock.h
84119 index 21569cf..dd60300 100644
84120 --- a/include/net/sock.h
84121 +++ b/include/net/sock.h
84122 @@ -348,7 +348,7 @@ struct sock {
84123 unsigned int sk_napi_id;
84124 unsigned int sk_ll_usec;
84125 #endif
84126 - atomic_t sk_drops;
84127 + atomic_unchecked_t sk_drops;
84128 int sk_rcvbuf;
84129
84130 struct sk_filter __rcu *sk_filter;
84131 @@ -1036,7 +1036,7 @@ struct proto {
84132 void (*destroy_cgroup)(struct mem_cgroup *memcg);
84133 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
84134 #endif
84135 -};
84136 +} __randomize_layout;
84137
84138 /*
84139 * Bits in struct cg_proto.flags
84140 @@ -1223,7 +1223,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
84141 return ret >> PAGE_SHIFT;
84142 }
84143
84144 -static inline long
84145 +static inline long __intentional_overflow(-1)
84146 sk_memory_allocated(const struct sock *sk)
84147 {
84148 struct proto *prot = sk->sk_prot;
84149 @@ -1368,7 +1368,7 @@ struct sock_iocb {
84150 struct scm_cookie *scm;
84151 struct msghdr *msg, async_msg;
84152 struct kiocb *kiocb;
84153 -};
84154 +} __randomize_layout;
84155
84156 static inline struct sock_iocb *kiocb_to_siocb(struct kiocb *iocb)
84157 {
84158 @@ -1728,8 +1728,8 @@ sk_dst_get(struct sock *sk)
84159
84160 rcu_read_lock();
84161 dst = rcu_dereference(sk->sk_dst_cache);
84162 - if (dst)
84163 - dst_hold(dst);
84164 + if (dst && !atomic_inc_not_zero(&dst->__refcnt))
84165 + dst = NULL;
84166 rcu_read_unlock();
84167 return dst;
84168 }
84169 @@ -1803,7 +1803,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
84170 }
84171
84172 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
84173 - char __user *from, char *to,
84174 + char __user *from, unsigned char *to,
84175 int copy, int offset)
84176 {
84177 if (skb->ip_summed == CHECKSUM_NONE) {
84178 @@ -2065,7 +2065,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
84179 }
84180 }
84181
84182 -struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
84183 +struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
84184
84185 /**
84186 * sk_page_frag - return an appropriate page_frag
84187 diff --git a/include/net/tcp.h b/include/net/tcp.h
84188 index 87d8774..cf214f8 100644
84189 --- a/include/net/tcp.h
84190 +++ b/include/net/tcp.h
84191 @@ -541,7 +541,7 @@ void tcp_retransmit_timer(struct sock *sk);
84192 void tcp_xmit_retransmit_queue(struct sock *);
84193 void tcp_simple_retransmit(struct sock *);
84194 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
84195 -int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
84196 +int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
84197
84198 void tcp_send_probe0(struct sock *);
84199 void tcp_send_partial(struct sock *);
84200 @@ -715,8 +715,8 @@ struct tcp_skb_cb {
84201 struct inet6_skb_parm h6;
84202 #endif
84203 } header; /* For incoming frames */
84204 - __u32 seq; /* Starting sequence number */
84205 - __u32 end_seq; /* SEQ + FIN + SYN + datalen */
84206 + __u32 seq __intentional_overflow(0); /* Starting sequence number */
84207 + __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
84208 __u32 when; /* used to compute rtt's */
84209 __u8 tcp_flags; /* TCP header flags. (tcp[13]) */
84210
84211 @@ -730,7 +730,7 @@ struct tcp_skb_cb {
84212
84213 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
84214 /* 1 byte hole */
84215 - __u32 ack_seq; /* Sequence number ACK'd */
84216 + __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
84217 };
84218
84219 #define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
84220 diff --git a/include/net/xfrm.h b/include/net/xfrm.h
84221 index 116e9c7..3070537 100644
84222 --- a/include/net/xfrm.h
84223 +++ b/include/net/xfrm.h
84224 @@ -285,7 +285,6 @@ struct xfrm_dst;
84225 struct xfrm_policy_afinfo {
84226 unsigned short family;
84227 struct dst_ops *dst_ops;
84228 - void (*garbage_collect)(struct net *net);
84229 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
84230 const xfrm_address_t *saddr,
84231 const xfrm_address_t *daddr);
84232 @@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
84233 struct net_device *dev,
84234 const struct flowi *fl);
84235 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
84236 -};
84237 +} __do_const;
84238
84239 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
84240 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
84241 @@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
84242 int (*transport_finish)(struct sk_buff *skb,
84243 int async);
84244 void (*local_error)(struct sk_buff *skb, u32 mtu);
84245 -};
84246 +} __do_const;
84247
84248 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
84249 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
84250 @@ -437,7 +436,7 @@ struct xfrm_mode {
84251 struct module *owner;
84252 unsigned int encap;
84253 int flags;
84254 -};
84255 +} __do_const;
84256
84257 /* Flags for xfrm_mode. */
84258 enum {
84259 @@ -534,7 +533,7 @@ struct xfrm_policy {
84260 struct timer_list timer;
84261
84262 struct flow_cache_object flo;
84263 - atomic_t genid;
84264 + atomic_unchecked_t genid;
84265 u32 priority;
84266 u32 index;
84267 struct xfrm_mark mark;
84268 @@ -1180,6 +1179,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
84269 }
84270
84271 void xfrm_garbage_collect(struct net *net);
84272 +void xfrm_garbage_collect_deferred(struct net *net);
84273
84274 #else
84275
84276 @@ -1218,6 +1218,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
84277 static inline void xfrm_garbage_collect(struct net *net)
84278 {
84279 }
84280 +static inline void xfrm_garbage_collect_deferred(struct net *net)
84281 +{
84282 +}
84283 #endif
84284
84285 static __inline__
84286 diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
84287 index 1017e0b..227aa4d 100644
84288 --- a/include/rdma/iw_cm.h
84289 +++ b/include/rdma/iw_cm.h
84290 @@ -122,7 +122,7 @@ struct iw_cm_verbs {
84291 int backlog);
84292
84293 int (*destroy_listen)(struct iw_cm_id *cm_id);
84294 -};
84295 +} __no_const;
84296
84297 /**
84298 * iw_create_cm_id - Create an IW CM identifier.
84299 diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
84300 index 52beadf..598734c 100644
84301 --- a/include/scsi/libfc.h
84302 +++ b/include/scsi/libfc.h
84303 @@ -771,6 +771,7 @@ struct libfc_function_template {
84304 */
84305 void (*disc_stop_final) (struct fc_lport *);
84306 };
84307 +typedef struct libfc_function_template __no_const libfc_function_template_no_const;
84308
84309 /**
84310 * struct fc_disc - Discovery context
84311 @@ -875,7 +876,7 @@ struct fc_lport {
84312 struct fc_vport *vport;
84313
84314 /* Operational Information */
84315 - struct libfc_function_template tt;
84316 + libfc_function_template_no_const tt;
84317 u8 link_up;
84318 u8 qfull;
84319 enum fc_lport_state state;
84320 diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
84321 index 27ab310..60dc245 100644
84322 --- a/include/scsi/scsi_device.h
84323 +++ b/include/scsi/scsi_device.h
84324 @@ -187,9 +187,9 @@ struct scsi_device {
84325 unsigned int max_device_blocked; /* what device_blocked counts down from */
84326 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
84327
84328 - atomic_t iorequest_cnt;
84329 - atomic_t iodone_cnt;
84330 - atomic_t ioerr_cnt;
84331 + atomic_unchecked_t iorequest_cnt;
84332 + atomic_unchecked_t iodone_cnt;
84333 + atomic_unchecked_t ioerr_cnt;
84334
84335 struct device sdev_gendev,
84336 sdev_dev;
84337 diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
84338 index 8c79980..723f6f9 100644
84339 --- a/include/scsi/scsi_transport_fc.h
84340 +++ b/include/scsi/scsi_transport_fc.h
84341 @@ -752,7 +752,8 @@ struct fc_function_template {
84342 unsigned long show_host_system_hostname:1;
84343
84344 unsigned long disable_target_scan:1;
84345 -};
84346 +} __do_const;
84347 +typedef struct fc_function_template __no_const fc_function_template_no_const;
84348
84349
84350 /**
84351 diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
84352 index ae6c3b8..fd748ac 100644
84353 --- a/include/sound/compress_driver.h
84354 +++ b/include/sound/compress_driver.h
84355 @@ -128,7 +128,7 @@ struct snd_compr_ops {
84356 struct snd_compr_caps *caps);
84357 int (*get_codec_caps) (struct snd_compr_stream *stream,
84358 struct snd_compr_codec_caps *codec);
84359 -};
84360 +} __no_const;
84361
84362 /**
84363 * struct snd_compr: Compressed device
84364 diff --git a/include/sound/soc.h b/include/sound/soc.h
84365 index 0b83168..d67280a 100644
84366 --- a/include/sound/soc.h
84367 +++ b/include/sound/soc.h
84368 @@ -782,7 +782,7 @@ struct snd_soc_codec_driver {
84369 /* probe ordering - for components with runtime dependencies */
84370 int probe_order;
84371 int remove_order;
84372 -};
84373 +} __do_const;
84374
84375 /* SoC platform interface */
84376 struct snd_soc_platform_driver {
84377 @@ -828,7 +828,7 @@ struct snd_soc_platform_driver {
84378 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
84379 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
84380 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
84381 -};
84382 +} __do_const;
84383
84384 struct snd_soc_platform {
84385 const char *name;
84386 diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
84387 index 9ec9864..e2ee1ee 100644
84388 --- a/include/target/target_core_base.h
84389 +++ b/include/target/target_core_base.h
84390 @@ -761,7 +761,7 @@ struct se_device {
84391 atomic_long_t write_bytes;
84392 /* Active commands on this virtual SE device */
84393 atomic_t simple_cmds;
84394 - atomic_t dev_ordered_id;
84395 + atomic_unchecked_t dev_ordered_id;
84396 atomic_t dev_ordered_sync;
84397 atomic_t dev_qf_count;
84398 int export_count;
84399 diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
84400 new file mode 100644
84401 index 0000000..fb634b7
84402 --- /dev/null
84403 +++ b/include/trace/events/fs.h
84404 @@ -0,0 +1,53 @@
84405 +#undef TRACE_SYSTEM
84406 +#define TRACE_SYSTEM fs
84407 +
84408 +#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
84409 +#define _TRACE_FS_H
84410 +
84411 +#include <linux/fs.h>
84412 +#include <linux/tracepoint.h>
84413 +
84414 +TRACE_EVENT(do_sys_open,
84415 +
84416 + TP_PROTO(const char *filename, int flags, int mode),
84417 +
84418 + TP_ARGS(filename, flags, mode),
84419 +
84420 + TP_STRUCT__entry(
84421 + __string( filename, filename )
84422 + __field( int, flags )
84423 + __field( int, mode )
84424 + ),
84425 +
84426 + TP_fast_assign(
84427 + __assign_str(filename, filename);
84428 + __entry->flags = flags;
84429 + __entry->mode = mode;
84430 + ),
84431 +
84432 + TP_printk("\"%s\" %x %o",
84433 + __get_str(filename), __entry->flags, __entry->mode)
84434 +);
84435 +
84436 +TRACE_EVENT(open_exec,
84437 +
84438 + TP_PROTO(const char *filename),
84439 +
84440 + TP_ARGS(filename),
84441 +
84442 + TP_STRUCT__entry(
84443 + __string( filename, filename )
84444 + ),
84445 +
84446 + TP_fast_assign(
84447 + __assign_str(filename, filename);
84448 + ),
84449 +
84450 + TP_printk("\"%s\"",
84451 + __get_str(filename))
84452 +);
84453 +
84454 +#endif /* _TRACE_FS_H */
84455 +
84456 +/* This part must be outside protection */
84457 +#include <trace/define_trace.h>
84458 diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
84459 index 1c09820..7f5ec79 100644
84460 --- a/include/trace/events/irq.h
84461 +++ b/include/trace/events/irq.h
84462 @@ -36,7 +36,7 @@ struct softirq_action;
84463 */
84464 TRACE_EVENT(irq_handler_entry,
84465
84466 - TP_PROTO(int irq, struct irqaction *action),
84467 + TP_PROTO(int irq, const struct irqaction *action),
84468
84469 TP_ARGS(irq, action),
84470
84471 @@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
84472 */
84473 TRACE_EVENT(irq_handler_exit,
84474
84475 - TP_PROTO(int irq, struct irqaction *action, int ret),
84476 + TP_PROTO(int irq, const struct irqaction *action, int ret),
84477
84478 TP_ARGS(irq, action, ret),
84479
84480 diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
84481 index 7caf44c..23c6f27 100644
84482 --- a/include/uapi/linux/a.out.h
84483 +++ b/include/uapi/linux/a.out.h
84484 @@ -39,6 +39,14 @@ enum machine_type {
84485 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
84486 };
84487
84488 +/* Constants for the N_FLAGS field */
84489 +#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
84490 +#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
84491 +#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
84492 +#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
84493 +/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
84494 +#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
84495 +
84496 #if !defined (N_MAGIC)
84497 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
84498 #endif
84499 diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
84500 index 22b6ad3..aeba37e 100644
84501 --- a/include/uapi/linux/bcache.h
84502 +++ b/include/uapi/linux/bcache.h
84503 @@ -5,6 +5,7 @@
84504 * Bcache on disk data structures
84505 */
84506
84507 +#include <linux/compiler.h>
84508 #include <asm/types.h>
84509
84510 #define BITMASK(name, type, field, offset, size) \
84511 @@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
84512 /* Btree keys - all units are in sectors */
84513
84514 struct bkey {
84515 - __u64 high;
84516 - __u64 low;
84517 + __u64 high __intentional_overflow(-1);
84518 + __u64 low __intentional_overflow(-1);
84519 __u64 ptr[];
84520 };
84521
84522 diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
84523 index d876736..ccce5c0 100644
84524 --- a/include/uapi/linux/byteorder/little_endian.h
84525 +++ b/include/uapi/linux/byteorder/little_endian.h
84526 @@ -42,51 +42,51 @@
84527
84528 static inline __le64 __cpu_to_le64p(const __u64 *p)
84529 {
84530 - return (__force __le64)*p;
84531 + return (__force const __le64)*p;
84532 }
84533 -static inline __u64 __le64_to_cpup(const __le64 *p)
84534 +static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
84535 {
84536 - return (__force __u64)*p;
84537 + return (__force const __u64)*p;
84538 }
84539 static inline __le32 __cpu_to_le32p(const __u32 *p)
84540 {
84541 - return (__force __le32)*p;
84542 + return (__force const __le32)*p;
84543 }
84544 static inline __u32 __le32_to_cpup(const __le32 *p)
84545 {
84546 - return (__force __u32)*p;
84547 + return (__force const __u32)*p;
84548 }
84549 static inline __le16 __cpu_to_le16p(const __u16 *p)
84550 {
84551 - return (__force __le16)*p;
84552 + return (__force const __le16)*p;
84553 }
84554 static inline __u16 __le16_to_cpup(const __le16 *p)
84555 {
84556 - return (__force __u16)*p;
84557 + return (__force const __u16)*p;
84558 }
84559 static inline __be64 __cpu_to_be64p(const __u64 *p)
84560 {
84561 - return (__force __be64)__swab64p(p);
84562 + return (__force const __be64)__swab64p(p);
84563 }
84564 static inline __u64 __be64_to_cpup(const __be64 *p)
84565 {
84566 - return __swab64p((__u64 *)p);
84567 + return __swab64p((const __u64 *)p);
84568 }
84569 static inline __be32 __cpu_to_be32p(const __u32 *p)
84570 {
84571 - return (__force __be32)__swab32p(p);
84572 + return (__force const __be32)__swab32p(p);
84573 }
84574 -static inline __u32 __be32_to_cpup(const __be32 *p)
84575 +static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
84576 {
84577 - return __swab32p((__u32 *)p);
84578 + return __swab32p((const __u32 *)p);
84579 }
84580 static inline __be16 __cpu_to_be16p(const __u16 *p)
84581 {
84582 - return (__force __be16)__swab16p(p);
84583 + return (__force const __be16)__swab16p(p);
84584 }
84585 static inline __u16 __be16_to_cpup(const __be16 *p)
84586 {
84587 - return __swab16p((__u16 *)p);
84588 + return __swab16p((const __u16 *)p);
84589 }
84590 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
84591 #define __le64_to_cpus(x) do { (void)(x); } while (0)
84592 diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
84593 index ef6103b..d4e65dd 100644
84594 --- a/include/uapi/linux/elf.h
84595 +++ b/include/uapi/linux/elf.h
84596 @@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
84597 #define PT_GNU_EH_FRAME 0x6474e550
84598
84599 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
84600 +#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
84601 +
84602 +#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
84603 +
84604 +/* Constants for the e_flags field */
84605 +#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
84606 +#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
84607 +#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
84608 +#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
84609 +/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
84610 +#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
84611
84612 /*
84613 * Extended Numbering
84614 @@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
84615 #define DT_DEBUG 21
84616 #define DT_TEXTREL 22
84617 #define DT_JMPREL 23
84618 +#define DT_FLAGS 30
84619 + #define DF_TEXTREL 0x00000004
84620 #define DT_ENCODING 32
84621 #define OLD_DT_LOOS 0x60000000
84622 #define DT_LOOS 0x6000000d
84623 @@ -240,6 +253,19 @@ typedef struct elf64_hdr {
84624 #define PF_W 0x2
84625 #define PF_X 0x1
84626
84627 +#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
84628 +#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
84629 +#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
84630 +#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
84631 +#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
84632 +#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
84633 +/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
84634 +/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
84635 +#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
84636 +#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
84637 +#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
84638 +#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
84639 +
84640 typedef struct elf32_phdr{
84641 Elf32_Word p_type;
84642 Elf32_Off p_offset;
84643 @@ -332,6 +358,8 @@ typedef struct elf64_shdr {
84644 #define EI_OSABI 7
84645 #define EI_PAD 8
84646
84647 +#define EI_PAX 14
84648 +
84649 #define ELFMAG0 0x7f /* EI_MAG */
84650 #define ELFMAG1 'E'
84651 #define ELFMAG2 'L'
84652 diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
84653 index aa169c4..6a2771d 100644
84654 --- a/include/uapi/linux/personality.h
84655 +++ b/include/uapi/linux/personality.h
84656 @@ -30,6 +30,7 @@ enum {
84657 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
84658 ADDR_NO_RANDOMIZE | \
84659 ADDR_COMPAT_LAYOUT | \
84660 + ADDR_LIMIT_3GB | \
84661 MMAP_PAGE_ZERO)
84662
84663 /*
84664 diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
84665 index 7530e74..e714828 100644
84666 --- a/include/uapi/linux/screen_info.h
84667 +++ b/include/uapi/linux/screen_info.h
84668 @@ -43,7 +43,8 @@ struct screen_info {
84669 __u16 pages; /* 0x32 */
84670 __u16 vesa_attributes; /* 0x34 */
84671 __u32 capabilities; /* 0x36 */
84672 - __u8 _reserved[6]; /* 0x3a */
84673 + __u16 vesapm_size; /* 0x3a */
84674 + __u8 _reserved[4]; /* 0x3c */
84675 } __attribute__((packed));
84676
84677 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
84678 diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
84679 index 0e011eb..82681b1 100644
84680 --- a/include/uapi/linux/swab.h
84681 +++ b/include/uapi/linux/swab.h
84682 @@ -43,7 +43,7 @@
84683 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
84684 */
84685
84686 -static inline __attribute_const__ __u16 __fswab16(__u16 val)
84687 +static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
84688 {
84689 #ifdef __HAVE_BUILTIN_BSWAP16__
84690 return __builtin_bswap16(val);
84691 @@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
84692 #endif
84693 }
84694
84695 -static inline __attribute_const__ __u32 __fswab32(__u32 val)
84696 +static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
84697 {
84698 #ifdef __HAVE_BUILTIN_BSWAP32__
84699 return __builtin_bswap32(val);
84700 @@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
84701 #endif
84702 }
84703
84704 -static inline __attribute_const__ __u64 __fswab64(__u64 val)
84705 +static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
84706 {
84707 #ifdef __HAVE_BUILTIN_BSWAP64__
84708 return __builtin_bswap64(val);
84709 diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
84710 index 6d67213..552fdd9 100644
84711 --- a/include/uapi/linux/sysctl.h
84712 +++ b/include/uapi/linux/sysctl.h
84713 @@ -155,8 +155,6 @@ enum
84714 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
84715 };
84716
84717 -
84718 -
84719 /* CTL_VM names: */
84720 enum
84721 {
84722 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
84723 index ea468ee..4d367a5 100644
84724 --- a/include/uapi/linux/videodev2.h
84725 +++ b/include/uapi/linux/videodev2.h
84726 @@ -1248,7 +1248,7 @@ struct v4l2_ext_control {
84727 union {
84728 __s32 value;
84729 __s64 value64;
84730 - char *string;
84731 + char __user *string;
84732 };
84733 } __attribute__ ((packed));
84734
84735 diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
84736 index c38355c..17a57bc 100644
84737 --- a/include/uapi/linux/xattr.h
84738 +++ b/include/uapi/linux/xattr.h
84739 @@ -73,5 +73,9 @@
84740 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
84741 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
84742
84743 +/* User namespace */
84744 +#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
84745 +#define XATTR_PAX_FLAGS_SUFFIX "flags"
84746 +#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
84747
84748 #endif /* _UAPI_LINUX_XATTR_H */
84749 diff --git a/include/video/udlfb.h b/include/video/udlfb.h
84750 index f9466fa..f4e2b81 100644
84751 --- a/include/video/udlfb.h
84752 +++ b/include/video/udlfb.h
84753 @@ -53,10 +53,10 @@ struct dlfb_data {
84754 u32 pseudo_palette[256];
84755 int blank_mode; /*one of FB_BLANK_ */
84756 /* blit-only rendering path metrics, exposed through sysfs */
84757 - atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
84758 - atomic_t bytes_identical; /* saved effort with backbuffer comparison */
84759 - atomic_t bytes_sent; /* to usb, after compression including overhead */
84760 - atomic_t cpu_kcycles_used; /* transpired during pixel processing */
84761 + atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
84762 + atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
84763 + atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
84764 + atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
84765 };
84766
84767 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
84768 diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
84769 index 30f5362..8ed8ac9 100644
84770 --- a/include/video/uvesafb.h
84771 +++ b/include/video/uvesafb.h
84772 @@ -122,6 +122,7 @@ struct uvesafb_par {
84773 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
84774 u8 pmi_setpal; /* PMI for palette changes */
84775 u16 *pmi_base; /* protected mode interface location */
84776 + u8 *pmi_code; /* protected mode code location */
84777 void *pmi_start;
84778 void *pmi_pal;
84779 u8 *vbe_state_orig; /*
84780 diff --git a/init/Kconfig b/init/Kconfig
84781 index 9d3585b..ad45d34 100644
84782 --- a/init/Kconfig
84783 +++ b/init/Kconfig
84784 @@ -1093,6 +1093,7 @@ endif # CGROUPS
84785
84786 config CHECKPOINT_RESTORE
84787 bool "Checkpoint/restore support" if EXPERT
84788 + depends on !GRKERNSEC
84789 default n
84790 help
84791 Enables additional kernel features in a sake of checkpoint/restore.
84792 @@ -1570,7 +1571,7 @@ config SLUB_DEBUG
84793
84794 config COMPAT_BRK
84795 bool "Disable heap randomization"
84796 - default y
84797 + default n
84798 help
84799 Randomizing heap placement makes heap exploits harder, but it
84800 also breaks ancient binaries (including anything libc5 based).
84801 @@ -1858,7 +1859,7 @@ config INIT_ALL_POSSIBLE
84802 config STOP_MACHINE
84803 bool
84804 default y
84805 - depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
84806 + depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
84807 help
84808 Need stop_machine() primitive.
84809
84810 diff --git a/init/Makefile b/init/Makefile
84811 index 7bc47ee..6da2dc7 100644
84812 --- a/init/Makefile
84813 +++ b/init/Makefile
84814 @@ -2,6 +2,9 @@
84815 # Makefile for the linux kernel.
84816 #
84817
84818 +ccflags-y := $(GCC_PLUGINS_CFLAGS)
84819 +asflags-y := $(GCC_PLUGINS_AFLAGS)
84820 +
84821 obj-y := main.o version.o mounts.o
84822 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
84823 obj-y += noinitramfs.o
84824 diff --git a/init/do_mounts.c b/init/do_mounts.c
84825 index 82f2288..ea1430a 100644
84826 --- a/init/do_mounts.c
84827 +++ b/init/do_mounts.c
84828 @@ -359,11 +359,11 @@ static void __init get_fs_names(char *page)
84829 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
84830 {
84831 struct super_block *s;
84832 - int err = sys_mount(name, "/root", fs, flags, data);
84833 + int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
84834 if (err)
84835 return err;
84836
84837 - sys_chdir("/root");
84838 + sys_chdir((const char __force_user *)"/root");
84839 s = current->fs->pwd.dentry->d_sb;
84840 ROOT_DEV = s->s_dev;
84841 printk(KERN_INFO
84842 @@ -484,18 +484,18 @@ void __init change_floppy(char *fmt, ...)
84843 va_start(args, fmt);
84844 vsprintf(buf, fmt, args);
84845 va_end(args);
84846 - fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
84847 + fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
84848 if (fd >= 0) {
84849 sys_ioctl(fd, FDEJECT, 0);
84850 sys_close(fd);
84851 }
84852 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
84853 - fd = sys_open("/dev/console", O_RDWR, 0);
84854 + fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
84855 if (fd >= 0) {
84856 sys_ioctl(fd, TCGETS, (long)&termios);
84857 termios.c_lflag &= ~ICANON;
84858 sys_ioctl(fd, TCSETSF, (long)&termios);
84859 - sys_read(fd, &c, 1);
84860 + sys_read(fd, (char __user *)&c, 1);
84861 termios.c_lflag |= ICANON;
84862 sys_ioctl(fd, TCSETSF, (long)&termios);
84863 sys_close(fd);
84864 @@ -589,8 +589,8 @@ void __init prepare_namespace(void)
84865 mount_root();
84866 out:
84867 devtmpfs_mount("dev");
84868 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
84869 - sys_chroot(".");
84870 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
84871 + sys_chroot((const char __force_user *)".");
84872 }
84873
84874 static bool is_tmpfs;
84875 diff --git a/init/do_mounts.h b/init/do_mounts.h
84876 index f5b978a..69dbfe8 100644
84877 --- a/init/do_mounts.h
84878 +++ b/init/do_mounts.h
84879 @@ -15,15 +15,15 @@ extern int root_mountflags;
84880
84881 static inline int create_dev(char *name, dev_t dev)
84882 {
84883 - sys_unlink(name);
84884 - return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
84885 + sys_unlink((char __force_user *)name);
84886 + return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
84887 }
84888
84889 #if BITS_PER_LONG == 32
84890 static inline u32 bstat(char *name)
84891 {
84892 struct stat64 stat;
84893 - if (sys_stat64(name, &stat) != 0)
84894 + if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
84895 return 0;
84896 if (!S_ISBLK(stat.st_mode))
84897 return 0;
84898 @@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
84899 static inline u32 bstat(char *name)
84900 {
84901 struct stat stat;
84902 - if (sys_newstat(name, &stat) != 0)
84903 + if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
84904 return 0;
84905 if (!S_ISBLK(stat.st_mode))
84906 return 0;
84907 diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
84908 index 3e0878e..8a9d7a0 100644
84909 --- a/init/do_mounts_initrd.c
84910 +++ b/init/do_mounts_initrd.c
84911 @@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
84912 {
84913 sys_unshare(CLONE_FS | CLONE_FILES);
84914 /* stdin/stdout/stderr for /linuxrc */
84915 - sys_open("/dev/console", O_RDWR, 0);
84916 + sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
84917 sys_dup(0);
84918 sys_dup(0);
84919 /* move initrd over / and chdir/chroot in initrd root */
84920 - sys_chdir("/root");
84921 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
84922 - sys_chroot(".");
84923 + sys_chdir((const char __force_user *)"/root");
84924 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
84925 + sys_chroot((const char __force_user *)".");
84926 sys_setsid();
84927 return 0;
84928 }
84929 @@ -59,8 +59,8 @@ static void __init handle_initrd(void)
84930 create_dev("/dev/root.old", Root_RAM0);
84931 /* mount initrd on rootfs' /root */
84932 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
84933 - sys_mkdir("/old", 0700);
84934 - sys_chdir("/old");
84935 + sys_mkdir((const char __force_user *)"/old", 0700);
84936 + sys_chdir((const char __force_user *)"/old");
84937
84938 /* try loading default modules from initrd */
84939 load_default_modules();
84940 @@ -80,31 +80,31 @@ static void __init handle_initrd(void)
84941 current->flags &= ~PF_FREEZER_SKIP;
84942
84943 /* move initrd to rootfs' /old */
84944 - sys_mount("..", ".", NULL, MS_MOVE, NULL);
84945 + sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
84946 /* switch root and cwd back to / of rootfs */
84947 - sys_chroot("..");
84948 + sys_chroot((const char __force_user *)"..");
84949
84950 if (new_decode_dev(real_root_dev) == Root_RAM0) {
84951 - sys_chdir("/old");
84952 + sys_chdir((const char __force_user *)"/old");
84953 return;
84954 }
84955
84956 - sys_chdir("/");
84957 + sys_chdir((const char __force_user *)"/");
84958 ROOT_DEV = new_decode_dev(real_root_dev);
84959 mount_root();
84960
84961 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
84962 - error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
84963 + error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
84964 if (!error)
84965 printk("okay\n");
84966 else {
84967 - int fd = sys_open("/dev/root.old", O_RDWR, 0);
84968 + int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
84969 if (error == -ENOENT)
84970 printk("/initrd does not exist. Ignored.\n");
84971 else
84972 printk("failed\n");
84973 printk(KERN_NOTICE "Unmounting old root\n");
84974 - sys_umount("/old", MNT_DETACH);
84975 + sys_umount((char __force_user *)"/old", MNT_DETACH);
84976 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
84977 if (fd < 0) {
84978 error = fd;
84979 @@ -127,11 +127,11 @@ int __init initrd_load(void)
84980 * mounted in the normal path.
84981 */
84982 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
84983 - sys_unlink("/initrd.image");
84984 + sys_unlink((const char __force_user *)"/initrd.image");
84985 handle_initrd();
84986 return 1;
84987 }
84988 }
84989 - sys_unlink("/initrd.image");
84990 + sys_unlink((const char __force_user *)"/initrd.image");
84991 return 0;
84992 }
84993 diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
84994 index 8cb6db5..d729f50 100644
84995 --- a/init/do_mounts_md.c
84996 +++ b/init/do_mounts_md.c
84997 @@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
84998 partitioned ? "_d" : "", minor,
84999 md_setup_args[ent].device_names);
85000
85001 - fd = sys_open(name, 0, 0);
85002 + fd = sys_open((char __force_user *)name, 0, 0);
85003 if (fd < 0) {
85004 printk(KERN_ERR "md: open failed - cannot start "
85005 "array %s\n", name);
85006 @@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
85007 * array without it
85008 */
85009 sys_close(fd);
85010 - fd = sys_open(name, 0, 0);
85011 + fd = sys_open((char __force_user *)name, 0, 0);
85012 sys_ioctl(fd, BLKRRPART, 0);
85013 }
85014 sys_close(fd);
85015 @@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
85016
85017 wait_for_device_probe();
85018
85019 - fd = sys_open("/dev/md0", 0, 0);
85020 + fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
85021 if (fd >= 0) {
85022 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
85023 sys_close(fd);
85024 diff --git a/init/init_task.c b/init/init_task.c
85025 index ba0a7f36..2bcf1d5 100644
85026 --- a/init/init_task.c
85027 +++ b/init/init_task.c
85028 @@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
85029 * Initial thread structure. Alignment of this is handled by a special
85030 * linker map entry.
85031 */
85032 +#ifdef CONFIG_X86
85033 +union thread_union init_thread_union __init_task_data;
85034 +#else
85035 union thread_union init_thread_union __init_task_data =
85036 { INIT_THREAD_INFO(init_task) };
85037 +#endif
85038 diff --git a/init/initramfs.c b/init/initramfs.c
85039 index a8497fa..35b3c90 100644
85040 --- a/init/initramfs.c
85041 +++ b/init/initramfs.c
85042 @@ -84,7 +84,7 @@ static void __init free_hash(void)
85043 }
85044 }
85045
85046 -static long __init do_utime(char *filename, time_t mtime)
85047 +static long __init do_utime(char __force_user *filename, time_t mtime)
85048 {
85049 struct timespec t[2];
85050
85051 @@ -119,7 +119,7 @@ static void __init dir_utime(void)
85052 struct dir_entry *de, *tmp;
85053 list_for_each_entry_safe(de, tmp, &dir_list, list) {
85054 list_del(&de->list);
85055 - do_utime(de->name, de->mtime);
85056 + do_utime((char __force_user *)de->name, de->mtime);
85057 kfree(de->name);
85058 kfree(de);
85059 }
85060 @@ -281,7 +281,7 @@ static int __init maybe_link(void)
85061 if (nlink >= 2) {
85062 char *old = find_link(major, minor, ino, mode, collected);
85063 if (old)
85064 - return (sys_link(old, collected) < 0) ? -1 : 1;
85065 + return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
85066 }
85067 return 0;
85068 }
85069 @@ -290,11 +290,11 @@ static void __init clean_path(char *path, umode_t mode)
85070 {
85071 struct stat st;
85072
85073 - if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
85074 + if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
85075 if (S_ISDIR(st.st_mode))
85076 - sys_rmdir(path);
85077 + sys_rmdir((char __force_user *)path);
85078 else
85079 - sys_unlink(path);
85080 + sys_unlink((char __force_user *)path);
85081 }
85082 }
85083
85084 @@ -315,7 +315,7 @@ static int __init do_name(void)
85085 int openflags = O_WRONLY|O_CREAT;
85086 if (ml != 1)
85087 openflags |= O_TRUNC;
85088 - wfd = sys_open(collected, openflags, mode);
85089 + wfd = sys_open((char __force_user *)collected, openflags, mode);
85090
85091 if (wfd >= 0) {
85092 sys_fchown(wfd, uid, gid);
85093 @@ -327,17 +327,17 @@ static int __init do_name(void)
85094 }
85095 }
85096 } else if (S_ISDIR(mode)) {
85097 - sys_mkdir(collected, mode);
85098 - sys_chown(collected, uid, gid);
85099 - sys_chmod(collected, mode);
85100 + sys_mkdir((char __force_user *)collected, mode);
85101 + sys_chown((char __force_user *)collected, uid, gid);
85102 + sys_chmod((char __force_user *)collected, mode);
85103 dir_add(collected, mtime);
85104 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
85105 S_ISFIFO(mode) || S_ISSOCK(mode)) {
85106 if (maybe_link() == 0) {
85107 - sys_mknod(collected, mode, rdev);
85108 - sys_chown(collected, uid, gid);
85109 - sys_chmod(collected, mode);
85110 - do_utime(collected, mtime);
85111 + sys_mknod((char __force_user *)collected, mode, rdev);
85112 + sys_chown((char __force_user *)collected, uid, gid);
85113 + sys_chmod((char __force_user *)collected, mode);
85114 + do_utime((char __force_user *)collected, mtime);
85115 }
85116 }
85117 return 0;
85118 @@ -346,15 +346,15 @@ static int __init do_name(void)
85119 static int __init do_copy(void)
85120 {
85121 if (count >= body_len) {
85122 - sys_write(wfd, victim, body_len);
85123 + sys_write(wfd, (char __force_user *)victim, body_len);
85124 sys_close(wfd);
85125 - do_utime(vcollected, mtime);
85126 + do_utime((char __force_user *)vcollected, mtime);
85127 kfree(vcollected);
85128 eat(body_len);
85129 state = SkipIt;
85130 return 0;
85131 } else {
85132 - sys_write(wfd, victim, count);
85133 + sys_write(wfd, (char __force_user *)victim, count);
85134 body_len -= count;
85135 eat(count);
85136 return 1;
85137 @@ -365,9 +365,9 @@ static int __init do_symlink(void)
85138 {
85139 collected[N_ALIGN(name_len) + body_len] = '\0';
85140 clean_path(collected, 0);
85141 - sys_symlink(collected + N_ALIGN(name_len), collected);
85142 - sys_lchown(collected, uid, gid);
85143 - do_utime(collected, mtime);
85144 + sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
85145 + sys_lchown((char __force_user *)collected, uid, gid);
85146 + do_utime((char __force_user *)collected, mtime);
85147 state = SkipIt;
85148 next_state = Reset;
85149 return 0;
85150 diff --git a/init/main.c b/init/main.c
85151 index 48655ce..d0113e4 100644
85152 --- a/init/main.c
85153 +++ b/init/main.c
85154 @@ -97,6 +97,8 @@ extern void radix_tree_init(void);
85155 static inline void mark_rodata_ro(void) { }
85156 #endif
85157
85158 +extern void grsecurity_init(void);
85159 +
85160 /*
85161 * Debug helper: via this flag we know that we are in 'early bootup code'
85162 * where only the boot processor is running with IRQ disabled. This means
85163 @@ -158,6 +160,75 @@ static int __init set_reset_devices(char *str)
85164
85165 __setup("reset_devices", set_reset_devices);
85166
85167 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
85168 +kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
85169 +static int __init setup_grsec_proc_gid(char *str)
85170 +{
85171 + grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
85172 + return 1;
85173 +}
85174 +__setup("grsec_proc_gid=", setup_grsec_proc_gid);
85175 +#endif
85176 +
85177 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
85178 +unsigned long pax_user_shadow_base __read_only;
85179 +EXPORT_SYMBOL(pax_user_shadow_base);
85180 +extern char pax_enter_kernel_user[];
85181 +extern char pax_exit_kernel_user[];
85182 +#endif
85183 +
85184 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
85185 +static int __init setup_pax_nouderef(char *str)
85186 +{
85187 +#ifdef CONFIG_X86_32
85188 + unsigned int cpu;
85189 + struct desc_struct *gdt;
85190 +
85191 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
85192 + gdt = get_cpu_gdt_table(cpu);
85193 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
85194 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
85195 + gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
85196 + gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
85197 + }
85198 + loadsegment(ds, __KERNEL_DS);
85199 + loadsegment(es, __KERNEL_DS);
85200 + loadsegment(ss, __KERNEL_DS);
85201 +#else
85202 + memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
85203 + memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
85204 + clone_pgd_mask = ~(pgdval_t)0UL;
85205 + pax_user_shadow_base = 0UL;
85206 + setup_clear_cpu_cap(X86_FEATURE_PCID);
85207 + setup_clear_cpu_cap(X86_FEATURE_INVPCID);
85208 +#endif
85209 +
85210 + return 0;
85211 +}
85212 +early_param("pax_nouderef", setup_pax_nouderef);
85213 +
85214 +#ifdef CONFIG_X86_64
85215 +static int __init setup_pax_weakuderef(char *str)
85216 +{
85217 + if (clone_pgd_mask != ~(pgdval_t)0UL)
85218 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
85219 + return 1;
85220 +}
85221 +__setup("pax_weakuderef", setup_pax_weakuderef);
85222 +#endif
85223 +#endif
85224 +
85225 +#ifdef CONFIG_PAX_SOFTMODE
85226 +int pax_softmode;
85227 +
85228 +static int __init setup_pax_softmode(char *str)
85229 +{
85230 + get_option(&str, &pax_softmode);
85231 + return 1;
85232 +}
85233 +__setup("pax_softmode=", setup_pax_softmode);
85234 +#endif
85235 +
85236 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
85237 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
85238 static const char *panic_later, *panic_param;
85239 @@ -688,25 +759,24 @@ int __init_or_module do_one_initcall(initcall_t fn)
85240 {
85241 int count = preempt_count();
85242 int ret;
85243 - char msgbuf[64];
85244 + const char *msg1 = "", *msg2 = "";
85245
85246 if (initcall_debug)
85247 ret = do_one_initcall_debug(fn);
85248 else
85249 ret = fn();
85250
85251 - msgbuf[0] = 0;
85252 -
85253 if (preempt_count() != count) {
85254 - sprintf(msgbuf, "preemption imbalance ");
85255 + msg1 = " preemption imbalance";
85256 preempt_count_set(count);
85257 }
85258 if (irqs_disabled()) {
85259 - strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
85260 + msg2 = " disabled interrupts";
85261 local_irq_enable();
85262 }
85263 - WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
85264 + WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
85265
85266 + add_latent_entropy();
85267 return ret;
85268 }
85269
85270 @@ -813,8 +883,8 @@ static int run_init_process(const char *init_filename)
85271 {
85272 argv_init[0] = init_filename;
85273 return do_execve(getname_kernel(init_filename),
85274 - (const char __user *const __user *)argv_init,
85275 - (const char __user *const __user *)envp_init);
85276 + (const char __user *const __force_user *)argv_init,
85277 + (const char __user *const __force_user *)envp_init);
85278 }
85279
85280 static int try_to_run_init_process(const char *init_filename)
85281 @@ -831,6 +901,10 @@ static int try_to_run_init_process(const char *init_filename)
85282 return ret;
85283 }
85284
85285 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
85286 +extern int gr_init_ran;
85287 +#endif
85288 +
85289 static noinline void __init kernel_init_freeable(void);
85290
85291 static int __ref kernel_init(void *unused)
85292 @@ -855,6 +929,11 @@ static int __ref kernel_init(void *unused)
85293 ramdisk_execute_command, ret);
85294 }
85295
85296 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
85297 + /* if no initrd was used, be extra sure we enforce chroot restrictions */
85298 + gr_init_ran = 1;
85299 +#endif
85300 +
85301 /*
85302 * We try each of these until one succeeds.
85303 *
85304 @@ -910,7 +989,7 @@ static noinline void __init kernel_init_freeable(void)
85305 do_basic_setup();
85306
85307 /* Open the /dev/console on the rootfs, this should never fail */
85308 - if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
85309 + if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
85310 pr_err("Warning: unable to open an initial console.\n");
85311
85312 (void) sys_dup(0);
85313 @@ -923,11 +1002,13 @@ static noinline void __init kernel_init_freeable(void)
85314 if (!ramdisk_execute_command)
85315 ramdisk_execute_command = "/init";
85316
85317 - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
85318 + if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
85319 ramdisk_execute_command = NULL;
85320 prepare_namespace();
85321 }
85322
85323 + grsecurity_init();
85324 +
85325 /*
85326 * Ok, we have completed the initial bootup, and
85327 * we're essentially up and running. Get rid of the
85328 diff --git a/ipc/compat.c b/ipc/compat.c
85329 index 45d035d..e4a7f99 100644
85330 --- a/ipc/compat.c
85331 +++ b/ipc/compat.c
85332 @@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
85333 COMPAT_SHMLBA);
85334 if (err < 0)
85335 return err;
85336 - return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
85337 + return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
85338 }
85339 case SHMDT:
85340 return sys_shmdt(compat_ptr(ptr));
85341 diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
85342 index 998d31b..30c24df 100644
85343 --- a/ipc/ipc_sysctl.c
85344 +++ b/ipc/ipc_sysctl.c
85345 @@ -30,7 +30,7 @@ static void *get_ipc(ctl_table *table)
85346 static int proc_ipc_dointvec(ctl_table *table, int write,
85347 void __user *buffer, size_t *lenp, loff_t *ppos)
85348 {
85349 - struct ctl_table ipc_table;
85350 + ctl_table_no_const ipc_table;
85351
85352 memcpy(&ipc_table, table, sizeof(ipc_table));
85353 ipc_table.data = get_ipc(table);
85354 @@ -41,7 +41,7 @@ static int proc_ipc_dointvec(ctl_table *table, int write,
85355 static int proc_ipc_dointvec_minmax(ctl_table *table, int write,
85356 void __user *buffer, size_t *lenp, loff_t *ppos)
85357 {
85358 - struct ctl_table ipc_table;
85359 + ctl_table_no_const ipc_table;
85360
85361 memcpy(&ipc_table, table, sizeof(ipc_table));
85362 ipc_table.data = get_ipc(table);
85363 @@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(ctl_table *table, int write,
85364 static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
85365 void __user *buffer, size_t *lenp, loff_t *ppos)
85366 {
85367 - struct ctl_table ipc_table;
85368 + ctl_table_no_const ipc_table;
85369 size_t lenp_bef = *lenp;
85370 int rc;
85371
85372 @@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
85373 static int proc_ipc_doulongvec_minmax(ctl_table *table, int write,
85374 void __user *buffer, size_t *lenp, loff_t *ppos)
85375 {
85376 - struct ctl_table ipc_table;
85377 + ctl_table_no_const ipc_table;
85378 memcpy(&ipc_table, table, sizeof(ipc_table));
85379 ipc_table.data = get_ipc(table);
85380
85381 @@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
85382 static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write,
85383 void __user *buffer, size_t *lenp, loff_t *ppos)
85384 {
85385 - struct ctl_table ipc_table;
85386 + ctl_table_no_const ipc_table;
85387 size_t lenp_bef = *lenp;
85388 int oldval;
85389 int rc;
85390 diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
85391 index 5bb8bfe..a38ec05 100644
85392 --- a/ipc/mq_sysctl.c
85393 +++ b/ipc/mq_sysctl.c
85394 @@ -25,7 +25,7 @@ static void *get_mq(ctl_table *table)
85395 static int proc_mq_dointvec(ctl_table *table, int write,
85396 void __user *buffer, size_t *lenp, loff_t *ppos)
85397 {
85398 - struct ctl_table mq_table;
85399 + ctl_table_no_const mq_table;
85400 memcpy(&mq_table, table, sizeof(mq_table));
85401 mq_table.data = get_mq(table);
85402
85403 @@ -35,7 +35,7 @@ static int proc_mq_dointvec(ctl_table *table, int write,
85404 static int proc_mq_dointvec_minmax(ctl_table *table, int write,
85405 void __user *buffer, size_t *lenp, loff_t *ppos)
85406 {
85407 - struct ctl_table mq_table;
85408 + ctl_table_no_const mq_table;
85409 memcpy(&mq_table, table, sizeof(mq_table));
85410 mq_table.data = get_mq(table);
85411
85412 diff --git a/ipc/mqueue.c b/ipc/mqueue.c
85413 index 4fcf39a..d3cc2ec 100644
85414 --- a/ipc/mqueue.c
85415 +++ b/ipc/mqueue.c
85416 @@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
85417 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
85418 info->attr.mq_msgsize);
85419
85420 + gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
85421 spin_lock(&mq_lock);
85422 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
85423 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
85424 diff --git a/ipc/msg.c b/ipc/msg.c
85425 index 6498531..b0ff3c8 100644
85426 --- a/ipc/msg.c
85427 +++ b/ipc/msg.c
85428 @@ -303,18 +303,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
85429 return security_msg_queue_associate(msq, msgflg);
85430 }
85431
85432 +static struct ipc_ops msg_ops = {
85433 + .getnew = newque,
85434 + .associate = msg_security,
85435 + .more_checks = NULL
85436 +};
85437 +
85438 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
85439 {
85440 struct ipc_namespace *ns;
85441 - struct ipc_ops msg_ops;
85442 struct ipc_params msg_params;
85443
85444 ns = current->nsproxy->ipc_ns;
85445
85446 - msg_ops.getnew = newque;
85447 - msg_ops.associate = msg_security;
85448 - msg_ops.more_checks = NULL;
85449 -
85450 msg_params.key = key;
85451 msg_params.flg = msgflg;
85452
85453 diff --git a/ipc/sem.c b/ipc/sem.c
85454 index bee5554..e9af81dd 100644
85455 --- a/ipc/sem.c
85456 +++ b/ipc/sem.c
85457 @@ -561,10 +561,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
85458 return 0;
85459 }
85460
85461 +static struct ipc_ops sem_ops = {
85462 + .getnew = newary,
85463 + .associate = sem_security,
85464 + .more_checks = sem_more_checks
85465 +};
85466 +
85467 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
85468 {
85469 struct ipc_namespace *ns;
85470 - struct ipc_ops sem_ops;
85471 struct ipc_params sem_params;
85472
85473 ns = current->nsproxy->ipc_ns;
85474 @@ -572,10 +577,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
85475 if (nsems < 0 || nsems > ns->sc_semmsl)
85476 return -EINVAL;
85477
85478 - sem_ops.getnew = newary;
85479 - sem_ops.associate = sem_security;
85480 - sem_ops.more_checks = sem_more_checks;
85481 -
85482 sem_params.key = key;
85483 sem_params.flg = semflg;
85484 sem_params.u.nsems = nsems;
85485 diff --git a/ipc/shm.c b/ipc/shm.c
85486 index 7645961..afc7f02 100644
85487 --- a/ipc/shm.c
85488 +++ b/ipc/shm.c
85489 @@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
85490 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
85491 #endif
85492
85493 +#ifdef CONFIG_GRKERNSEC
85494 +extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
85495 + const time_t shm_createtime, const kuid_t cuid,
85496 + const int shmid);
85497 +extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
85498 + const time_t shm_createtime);
85499 +#endif
85500 +
85501 void shm_init_ns(struct ipc_namespace *ns)
85502 {
85503 ns->shm_ctlmax = SHMMAX;
85504 @@ -553,6 +561,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
85505 shp->shm_lprid = 0;
85506 shp->shm_atim = shp->shm_dtim = 0;
85507 shp->shm_ctim = get_seconds();
85508 +#ifdef CONFIG_GRKERNSEC
85509 + {
85510 + struct timespec timeval;
85511 + do_posix_clock_monotonic_gettime(&timeval);
85512 +
85513 + shp->shm_createtime = timeval.tv_sec;
85514 + }
85515 +#endif
85516 shp->shm_segsz = size;
85517 shp->shm_nattch = 0;
85518 shp->shm_file = file;
85519 @@ -606,18 +622,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
85520 return 0;
85521 }
85522
85523 +static struct ipc_ops shm_ops = {
85524 + .getnew = newseg,
85525 + .associate = shm_security,
85526 + .more_checks = shm_more_checks
85527 +};
85528 +
85529 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
85530 {
85531 struct ipc_namespace *ns;
85532 - struct ipc_ops shm_ops;
85533 struct ipc_params shm_params;
85534
85535 ns = current->nsproxy->ipc_ns;
85536
85537 - shm_ops.getnew = newseg;
85538 - shm_ops.associate = shm_security;
85539 - shm_ops.more_checks = shm_more_checks;
85540 -
85541 shm_params.key = key;
85542 shm_params.flg = shmflg;
85543 shm_params.u.size = size;
85544 @@ -1088,6 +1105,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
85545 f_mode = FMODE_READ | FMODE_WRITE;
85546 }
85547 if (shmflg & SHM_EXEC) {
85548 +
85549 +#ifdef CONFIG_PAX_MPROTECT
85550 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
85551 + goto out;
85552 +#endif
85553 +
85554 prot |= PROT_EXEC;
85555 acc_mode |= S_IXUGO;
85556 }
85557 @@ -1112,6 +1135,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
85558 if (err)
85559 goto out_unlock;
85560
85561 +#ifdef CONFIG_GRKERNSEC
85562 + if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
85563 + shp->shm_perm.cuid, shmid) ||
85564 + !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
85565 + err = -EACCES;
85566 + goto out_unlock;
85567 + }
85568 +#endif
85569 +
85570 ipc_lock_object(&shp->shm_perm);
85571
85572 /* check if shm_destroy() is tearing down shp */
85573 @@ -1124,6 +1156,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
85574 path = shp->shm_file->f_path;
85575 path_get(&path);
85576 shp->shm_nattch++;
85577 +#ifdef CONFIG_GRKERNSEC
85578 + shp->shm_lapid = current->pid;
85579 +#endif
85580 size = i_size_read(path.dentry->d_inode);
85581 ipc_unlock_object(&shp->shm_perm);
85582 rcu_read_unlock();
85583 diff --git a/ipc/util.c b/ipc/util.c
85584 index 2eb0d1e..0308564 100644
85585 --- a/ipc/util.c
85586 +++ b/ipc/util.c
85587 @@ -71,6 +71,8 @@ struct ipc_proc_iface {
85588 int (*show)(struct seq_file *, void *);
85589 };
85590
85591 +extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
85592 +
85593 static void ipc_memory_notifier(struct work_struct *work)
85594 {
85595 ipcns_notify(IPCNS_MEMCHANGED);
85596 @@ -537,6 +539,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
85597 granted_mode >>= 6;
85598 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
85599 granted_mode >>= 3;
85600 +
85601 + if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
85602 + return -1;
85603 +
85604 /* is there some bit set in requested_mode but not in granted_mode? */
85605 if ((requested_mode & ~granted_mode & 0007) &&
85606 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
85607 diff --git a/kernel/acct.c b/kernel/acct.c
85608 index 8d6e145..33e0b1e 100644
85609 --- a/kernel/acct.c
85610 +++ b/kernel/acct.c
85611 @@ -556,7 +556,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
85612 */
85613 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
85614 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
85615 - file->f_op->write(file, (char *)&ac,
85616 + file->f_op->write(file, (char __force_user *)&ac,
85617 sizeof(acct_t), &file->f_pos);
85618 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
85619 set_fs(fs);
85620 diff --git a/kernel/audit.c b/kernel/audit.c
85621 index 47845c5..bd9dd5b 100644
85622 --- a/kernel/audit.c
85623 +++ b/kernel/audit.c
85624 @@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
85625 3) suppressed due to audit_rate_limit
85626 4) suppressed due to audit_backlog_limit
85627 */
85628 -static atomic_t audit_lost = ATOMIC_INIT(0);
85629 +static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
85630
85631 /* The netlink socket. */
85632 static struct sock *audit_sock;
85633 @@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
85634 unsigned long now;
85635 int print;
85636
85637 - atomic_inc(&audit_lost);
85638 + atomic_inc_unchecked(&audit_lost);
85639
85640 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
85641
85642 @@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
85643 if (print) {
85644 if (printk_ratelimit())
85645 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
85646 - atomic_read(&audit_lost),
85647 + atomic_read_unchecked(&audit_lost),
85648 audit_rate_limit,
85649 audit_backlog_limit);
85650 audit_panic(message);
85651 @@ -808,7 +808,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
85652 s.pid = audit_pid;
85653 s.rate_limit = audit_rate_limit;
85654 s.backlog_limit = audit_backlog_limit;
85655 - s.lost = atomic_read(&audit_lost);
85656 + s.lost = atomic_read_unchecked(&audit_lost);
85657 s.backlog = skb_queue_len(&audit_skb_queue);
85658 s.version = AUDIT_VERSION_LATEST;
85659 s.backlog_wait_time = audit_backlog_wait_time;
85660 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
85661 index 21eae3c..66db239 100644
85662 --- a/kernel/auditsc.c
85663 +++ b/kernel/auditsc.c
85664 @@ -2023,7 +2023,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
85665 }
85666
85667 /* global counter which is incremented every time something logs in */
85668 -static atomic_t session_id = ATOMIC_INIT(0);
85669 +static atomic_unchecked_t session_id = ATOMIC_INIT(0);
85670
85671 static int audit_set_loginuid_perm(kuid_t loginuid)
85672 {
85673 @@ -2090,7 +2090,7 @@ int audit_set_loginuid(kuid_t loginuid)
85674
85675 /* are we setting or clearing? */
85676 if (uid_valid(loginuid))
85677 - sessionid = (unsigned int)atomic_inc_return(&session_id);
85678 + sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
85679
85680 task->sessionid = sessionid;
85681 task->loginuid = loginuid;
85682 diff --git a/kernel/capability.c b/kernel/capability.c
85683 index 24663b3..b926ae1 100644
85684 --- a/kernel/capability.c
85685 +++ b/kernel/capability.c
85686 @@ -193,6 +193,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
85687 * before modification is attempted and the application
85688 * fails.
85689 */
85690 + if (tocopy > ARRAY_SIZE(kdata))
85691 + return -EFAULT;
85692 +
85693 if (copy_to_user(dataptr, kdata, tocopy
85694 * sizeof(struct __user_cap_data_struct))) {
85695 return -EFAULT;
85696 @@ -294,10 +297,11 @@ bool has_ns_capability(struct task_struct *t,
85697 int ret;
85698
85699 rcu_read_lock();
85700 - ret = security_capable(__task_cred(t), ns, cap);
85701 + ret = security_capable(__task_cred(t), ns, cap) == 0 &&
85702 + gr_task_is_capable(t, __task_cred(t), cap);
85703 rcu_read_unlock();
85704
85705 - return (ret == 0);
85706 + return ret;
85707 }
85708
85709 /**
85710 @@ -334,10 +338,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
85711 int ret;
85712
85713 rcu_read_lock();
85714 - ret = security_capable_noaudit(__task_cred(t), ns, cap);
85715 + ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
85716 rcu_read_unlock();
85717
85718 - return (ret == 0);
85719 + return ret;
85720 }
85721
85722 /**
85723 @@ -375,7 +379,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
85724 BUG();
85725 }
85726
85727 - if (security_capable(current_cred(), ns, cap) == 0) {
85728 + if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
85729 current->flags |= PF_SUPERPRIV;
85730 return true;
85731 }
85732 @@ -383,6 +387,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
85733 }
85734 EXPORT_SYMBOL(ns_capable);
85735
85736 +bool ns_capable_nolog(struct user_namespace *ns, int cap)
85737 +{
85738 + if (unlikely(!cap_valid(cap))) {
85739 + printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
85740 + BUG();
85741 + }
85742 +
85743 + if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
85744 + current->flags |= PF_SUPERPRIV;
85745 + return true;
85746 + }
85747 + return false;
85748 +}
85749 +EXPORT_SYMBOL(ns_capable_nolog);
85750 +
85751 /**
85752 * file_ns_capable - Determine if the file's opener had a capability in effect
85753 * @file: The file we want to check
85754 @@ -423,6 +442,12 @@ bool capable(int cap)
85755 }
85756 EXPORT_SYMBOL(capable);
85757
85758 +bool capable_nolog(int cap)
85759 +{
85760 + return ns_capable_nolog(&init_user_ns, cap);
85761 +}
85762 +EXPORT_SYMBOL(capable_nolog);
85763 +
85764 /**
85765 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
85766 * @inode: The inode in question
85767 @@ -440,3 +465,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
85768 kgid_has_mapping(ns, inode->i_gid);
85769 }
85770 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
85771 +
85772 +bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
85773 +{
85774 + struct user_namespace *ns = current_user_ns();
85775 +
85776 + return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
85777 + kgid_has_mapping(ns, inode->i_gid);
85778 +}
85779 +EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
85780 diff --git a/kernel/cgroup.c b/kernel/cgroup.c
85781 index ceee0c5..d6f81dd 100644
85782 --- a/kernel/cgroup.c
85783 +++ b/kernel/cgroup.c
85784 @@ -4757,7 +4757,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
85785 struct task_struct *task;
85786 int count = 0;
85787
85788 - seq_printf(seq, "css_set %p\n", cset);
85789 + seq_printf(seq, "css_set %pK\n", cset);
85790
85791 list_for_each_entry(task, &cset->tasks, cg_list) {
85792 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
85793 diff --git a/kernel/compat.c b/kernel/compat.c
85794 index e40b043..3da8f51 100644
85795 --- a/kernel/compat.c
85796 +++ b/kernel/compat.c
85797 @@ -13,6 +13,7 @@
85798
85799 #include <linux/linkage.h>
85800 #include <linux/compat.h>
85801 +#include <linux/module.h>
85802 #include <linux/errno.h>
85803 #include <linux/time.h>
85804 #include <linux/signal.h>
85805 @@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
85806 mm_segment_t oldfs;
85807 long ret;
85808
85809 - restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
85810 + restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
85811 oldfs = get_fs();
85812 set_fs(KERNEL_DS);
85813 ret = hrtimer_nanosleep_restart(restart);
85814 @@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
85815 oldfs = get_fs();
85816 set_fs(KERNEL_DS);
85817 ret = hrtimer_nanosleep(&tu,
85818 - rmtp ? (struct timespec __user *)&rmt : NULL,
85819 + rmtp ? (struct timespec __force_user *)&rmt : NULL,
85820 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
85821 set_fs(oldfs);
85822
85823 @@ -361,7 +362,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
85824 mm_segment_t old_fs = get_fs();
85825
85826 set_fs(KERNEL_DS);
85827 - ret = sys_sigpending((old_sigset_t __user *) &s);
85828 + ret = sys_sigpending((old_sigset_t __force_user *) &s);
85829 set_fs(old_fs);
85830 if (ret == 0)
85831 ret = put_user(s, set);
85832 @@ -451,7 +452,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
85833 mm_segment_t old_fs = get_fs();
85834
85835 set_fs(KERNEL_DS);
85836 - ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
85837 + ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
85838 set_fs(old_fs);
85839
85840 if (!ret) {
85841 @@ -533,8 +534,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
85842 set_fs (KERNEL_DS);
85843 ret = sys_wait4(pid,
85844 (stat_addr ?
85845 - (unsigned int __user *) &status : NULL),
85846 - options, (struct rusage __user *) &r);
85847 + (unsigned int __force_user *) &status : NULL),
85848 + options, (struct rusage __force_user *) &r);
85849 set_fs (old_fs);
85850
85851 if (ret > 0) {
85852 @@ -560,8 +561,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
85853 memset(&info, 0, sizeof(info));
85854
85855 set_fs(KERNEL_DS);
85856 - ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
85857 - uru ? (struct rusage __user *)&ru : NULL);
85858 + ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
85859 + uru ? (struct rusage __force_user *)&ru : NULL);
85860 set_fs(old_fs);
85861
85862 if ((ret < 0) || (info.si_signo == 0))
85863 @@ -695,8 +696,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
85864 oldfs = get_fs();
85865 set_fs(KERNEL_DS);
85866 err = sys_timer_settime(timer_id, flags,
85867 - (struct itimerspec __user *) &newts,
85868 - (struct itimerspec __user *) &oldts);
85869 + (struct itimerspec __force_user *) &newts,
85870 + (struct itimerspec __force_user *) &oldts);
85871 set_fs(oldfs);
85872 if (!err && old && put_compat_itimerspec(old, &oldts))
85873 return -EFAULT;
85874 @@ -713,7 +714,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
85875 oldfs = get_fs();
85876 set_fs(KERNEL_DS);
85877 err = sys_timer_gettime(timer_id,
85878 - (struct itimerspec __user *) &ts);
85879 + (struct itimerspec __force_user *) &ts);
85880 set_fs(oldfs);
85881 if (!err && put_compat_itimerspec(setting, &ts))
85882 return -EFAULT;
85883 @@ -732,7 +733,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
85884 oldfs = get_fs();
85885 set_fs(KERNEL_DS);
85886 err = sys_clock_settime(which_clock,
85887 - (struct timespec __user *) &ts);
85888 + (struct timespec __force_user *) &ts);
85889 set_fs(oldfs);
85890 return err;
85891 }
85892 @@ -747,7 +748,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
85893 oldfs = get_fs();
85894 set_fs(KERNEL_DS);
85895 err = sys_clock_gettime(which_clock,
85896 - (struct timespec __user *) &ts);
85897 + (struct timespec __force_user *) &ts);
85898 set_fs(oldfs);
85899 if (!err && compat_put_timespec(&ts, tp))
85900 return -EFAULT;
85901 @@ -767,7 +768,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
85902
85903 oldfs = get_fs();
85904 set_fs(KERNEL_DS);
85905 - ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
85906 + ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
85907 set_fs(oldfs);
85908
85909 err = compat_put_timex(utp, &txc);
85910 @@ -787,7 +788,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
85911 oldfs = get_fs();
85912 set_fs(KERNEL_DS);
85913 err = sys_clock_getres(which_clock,
85914 - (struct timespec __user *) &ts);
85915 + (struct timespec __force_user *) &ts);
85916 set_fs(oldfs);
85917 if (!err && tp && compat_put_timespec(&ts, tp))
85918 return -EFAULT;
85919 @@ -801,7 +802,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
85920 struct timespec tu;
85921 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
85922
85923 - restart->nanosleep.rmtp = (struct timespec __user *) &tu;
85924 + restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
85925 oldfs = get_fs();
85926 set_fs(KERNEL_DS);
85927 err = clock_nanosleep_restart(restart);
85928 @@ -833,8 +834,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
85929 oldfs = get_fs();
85930 set_fs(KERNEL_DS);
85931 err = sys_clock_nanosleep(which_clock, flags,
85932 - (struct timespec __user *) &in,
85933 - (struct timespec __user *) &out);
85934 + (struct timespec __force_user *) &in,
85935 + (struct timespec __force_user *) &out);
85936 set_fs(oldfs);
85937
85938 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
85939 @@ -1128,7 +1129,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
85940 mm_segment_t old_fs = get_fs();
85941
85942 set_fs(KERNEL_DS);
85943 - ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
85944 + ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
85945 set_fs(old_fs);
85946 if (compat_put_timespec(&t, interval))
85947 return -EFAULT;
85948 diff --git a/kernel/configs.c b/kernel/configs.c
85949 index c18b1f1..b9a0132 100644
85950 --- a/kernel/configs.c
85951 +++ b/kernel/configs.c
85952 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
85953 struct proc_dir_entry *entry;
85954
85955 /* create the current config file */
85956 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
85957 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
85958 + entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
85959 + &ikconfig_file_ops);
85960 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
85961 + entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
85962 + &ikconfig_file_ops);
85963 +#endif
85964 +#else
85965 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
85966 &ikconfig_file_ops);
85967 +#endif
85968 +
85969 if (!entry)
85970 return -ENOMEM;
85971
85972 diff --git a/kernel/cred.c b/kernel/cred.c
85973 index e0573a4..26c0fd3 100644
85974 --- a/kernel/cred.c
85975 +++ b/kernel/cred.c
85976 @@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
85977 validate_creds(cred);
85978 alter_cred_subscribers(cred, -1);
85979 put_cred(cred);
85980 +
85981 +#ifdef CONFIG_GRKERNSEC_SETXID
85982 + cred = (struct cred *) tsk->delayed_cred;
85983 + if (cred != NULL) {
85984 + tsk->delayed_cred = NULL;
85985 + validate_creds(cred);
85986 + alter_cred_subscribers(cred, -1);
85987 + put_cred(cred);
85988 + }
85989 +#endif
85990 }
85991
85992 /**
85993 @@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
85994 * Always returns 0 thus allowing this function to be tail-called at the end
85995 * of, say, sys_setgid().
85996 */
85997 -int commit_creds(struct cred *new)
85998 +static int __commit_creds(struct cred *new)
85999 {
86000 struct task_struct *task = current;
86001 const struct cred *old = task->real_cred;
86002 @@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
86003
86004 get_cred(new); /* we will require a ref for the subj creds too */
86005
86006 + gr_set_role_label(task, new->uid, new->gid);
86007 +
86008 /* dumpability changes */
86009 if (!uid_eq(old->euid, new->euid) ||
86010 !gid_eq(old->egid, new->egid) ||
86011 @@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
86012 put_cred(old);
86013 return 0;
86014 }
86015 +#ifdef CONFIG_GRKERNSEC_SETXID
86016 +extern int set_user(struct cred *new);
86017 +
86018 +void gr_delayed_cred_worker(void)
86019 +{
86020 + const struct cred *new = current->delayed_cred;
86021 + struct cred *ncred;
86022 +
86023 + current->delayed_cred = NULL;
86024 +
86025 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
86026 + // from doing get_cred on it when queueing this
86027 + put_cred(new);
86028 + return;
86029 + } else if (new == NULL)
86030 + return;
86031 +
86032 + ncred = prepare_creds();
86033 + if (!ncred)
86034 + goto die;
86035 + // uids
86036 + ncred->uid = new->uid;
86037 + ncred->euid = new->euid;
86038 + ncred->suid = new->suid;
86039 + ncred->fsuid = new->fsuid;
86040 + // gids
86041 + ncred->gid = new->gid;
86042 + ncred->egid = new->egid;
86043 + ncred->sgid = new->sgid;
86044 + ncred->fsgid = new->fsgid;
86045 + // groups
86046 + set_groups(ncred, new->group_info);
86047 + // caps
86048 + ncred->securebits = new->securebits;
86049 + ncred->cap_inheritable = new->cap_inheritable;
86050 + ncred->cap_permitted = new->cap_permitted;
86051 + ncred->cap_effective = new->cap_effective;
86052 + ncred->cap_bset = new->cap_bset;
86053 +
86054 + if (set_user(ncred)) {
86055 + abort_creds(ncred);
86056 + goto die;
86057 + }
86058 +
86059 + // from doing get_cred on it when queueing this
86060 + put_cred(new);
86061 +
86062 + __commit_creds(ncred);
86063 + return;
86064 +die:
86065 + // from doing get_cred on it when queueing this
86066 + put_cred(new);
86067 + do_group_exit(SIGKILL);
86068 +}
86069 +#endif
86070 +
86071 +int commit_creds(struct cred *new)
86072 +{
86073 +#ifdef CONFIG_GRKERNSEC_SETXID
86074 + int ret;
86075 + int schedule_it = 0;
86076 + struct task_struct *t;
86077 + unsigned oldsecurebits = current_cred()->securebits;
86078 +
86079 + /* we won't get called with tasklist_lock held for writing
86080 + and interrupts disabled as the cred struct in that case is
86081 + init_cred
86082 + */
86083 + if (grsec_enable_setxid && !current_is_single_threaded() &&
86084 + uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
86085 + !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
86086 + schedule_it = 1;
86087 + }
86088 + ret = __commit_creds(new);
86089 + if (schedule_it) {
86090 + rcu_read_lock();
86091 + read_lock(&tasklist_lock);
86092 + for (t = next_thread(current); t != current;
86093 + t = next_thread(t)) {
86094 + /* we'll check if the thread has uid 0 in
86095 + * the delayed worker routine
86096 + */
86097 + if (task_securebits(t) == oldsecurebits &&
86098 + t->delayed_cred == NULL) {
86099 + t->delayed_cred = get_cred(new);
86100 + set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
86101 + set_tsk_need_resched(t);
86102 + }
86103 + }
86104 + read_unlock(&tasklist_lock);
86105 + rcu_read_unlock();
86106 + }
86107 +
86108 + return ret;
86109 +#else
86110 + return __commit_creds(new);
86111 +#endif
86112 +}
86113 +
86114 EXPORT_SYMBOL(commit_creds);
86115
86116 /**
86117 diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
86118 index 2956c8d..cfe1e2e 100644
86119 --- a/kernel/debug/debug_core.c
86120 +++ b/kernel/debug/debug_core.c
86121 @@ -124,7 +124,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
86122 */
86123 static atomic_t masters_in_kgdb;
86124 static atomic_t slaves_in_kgdb;
86125 -static atomic_t kgdb_break_tasklet_var;
86126 +static atomic_unchecked_t kgdb_break_tasklet_var;
86127 atomic_t kgdb_setting_breakpoint;
86128
86129 struct task_struct *kgdb_usethread;
86130 @@ -134,7 +134,7 @@ int kgdb_single_step;
86131 static pid_t kgdb_sstep_pid;
86132
86133 /* to keep track of the CPU which is doing the single stepping*/
86134 -atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
86135 +atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
86136
86137 /*
86138 * If you are debugging a problem where roundup (the collection of
86139 @@ -549,7 +549,7 @@ return_normal:
86140 * kernel will only try for the value of sstep_tries before
86141 * giving up and continuing on.
86142 */
86143 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
86144 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
86145 (kgdb_info[cpu].task &&
86146 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
86147 atomic_set(&kgdb_active, -1);
86148 @@ -647,8 +647,8 @@ cpu_master_loop:
86149 }
86150
86151 kgdb_restore:
86152 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
86153 - int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
86154 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
86155 + int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
86156 if (kgdb_info[sstep_cpu].task)
86157 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
86158 else
86159 @@ -925,18 +925,18 @@ static void kgdb_unregister_callbacks(void)
86160 static void kgdb_tasklet_bpt(unsigned long ing)
86161 {
86162 kgdb_breakpoint();
86163 - atomic_set(&kgdb_break_tasklet_var, 0);
86164 + atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
86165 }
86166
86167 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
86168
86169 void kgdb_schedule_breakpoint(void)
86170 {
86171 - if (atomic_read(&kgdb_break_tasklet_var) ||
86172 + if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
86173 atomic_read(&kgdb_active) != -1 ||
86174 atomic_read(&kgdb_setting_breakpoint))
86175 return;
86176 - atomic_inc(&kgdb_break_tasklet_var);
86177 + atomic_inc_unchecked(&kgdb_break_tasklet_var);
86178 tasklet_schedule(&kgdb_tasklet_breakpoint);
86179 }
86180 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
86181 diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
86182 index 0b097c8..11dd5c5 100644
86183 --- a/kernel/debug/kdb/kdb_main.c
86184 +++ b/kernel/debug/kdb/kdb_main.c
86185 @@ -1977,7 +1977,7 @@ static int kdb_lsmod(int argc, const char **argv)
86186 continue;
86187
86188 kdb_printf("%-20s%8u 0x%p ", mod->name,
86189 - mod->core_size, (void *)mod);
86190 + mod->core_size_rx + mod->core_size_rw, (void *)mod);
86191 #ifdef CONFIG_MODULE_UNLOAD
86192 kdb_printf("%4ld ", module_refcount(mod));
86193 #endif
86194 @@ -1987,7 +1987,7 @@ static int kdb_lsmod(int argc, const char **argv)
86195 kdb_printf(" (Loading)");
86196 else
86197 kdb_printf(" (Live)");
86198 - kdb_printf(" 0x%p", mod->module_core);
86199 + kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
86200
86201 #ifdef CONFIG_MODULE_UNLOAD
86202 {
86203 diff --git a/kernel/events/core.c b/kernel/events/core.c
86204 index 440eefc..0909f02 100644
86205 --- a/kernel/events/core.c
86206 +++ b/kernel/events/core.c
86207 @@ -158,8 +158,15 @@ static struct srcu_struct pmus_srcu;
86208 * 0 - disallow raw tracepoint access for unpriv
86209 * 1 - disallow cpu events for unpriv
86210 * 2 - disallow kernel profiling for unpriv
86211 + * 3 - disallow all unpriv perf event use
86212 */
86213 -int sysctl_perf_event_paranoid __read_mostly = 1;
86214 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
86215 +int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
86216 +#elif defined(CONFIG_GRKERNSEC_HIDESYM)
86217 +int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
86218 +#else
86219 +int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
86220 +#endif
86221
86222 /* Minimum for 512 kiB + 1 user control page */
86223 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
86224 @@ -185,7 +192,7 @@ void update_perf_cpu_limits(void)
86225
86226 tmp *= sysctl_perf_cpu_time_max_percent;
86227 do_div(tmp, 100);
86228 - ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
86229 + ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
86230 }
86231
86232 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
86233 @@ -291,7 +298,7 @@ void perf_sample_event_took(u64 sample_len_ns)
86234 }
86235 }
86236
86237 -static atomic64_t perf_event_id;
86238 +static atomic64_unchecked_t perf_event_id;
86239
86240 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
86241 enum event_type_t event_type);
86242 @@ -3002,7 +3009,7 @@ static void __perf_event_read(void *info)
86243
86244 static inline u64 perf_event_count(struct perf_event *event)
86245 {
86246 - return local64_read(&event->count) + atomic64_read(&event->child_count);
86247 + return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
86248 }
86249
86250 static u64 perf_event_read(struct perf_event *event)
86251 @@ -3361,9 +3368,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
86252 mutex_lock(&event->child_mutex);
86253 total += perf_event_read(event);
86254 *enabled += event->total_time_enabled +
86255 - atomic64_read(&event->child_total_time_enabled);
86256 + atomic64_read_unchecked(&event->child_total_time_enabled);
86257 *running += event->total_time_running +
86258 - atomic64_read(&event->child_total_time_running);
86259 + atomic64_read_unchecked(&event->child_total_time_running);
86260
86261 list_for_each_entry(child, &event->child_list, child_list) {
86262 total += perf_event_read(child);
86263 @@ -3792,10 +3799,10 @@ void perf_event_update_userpage(struct perf_event *event)
86264 userpg->offset -= local64_read(&event->hw.prev_count);
86265
86266 userpg->time_enabled = enabled +
86267 - atomic64_read(&event->child_total_time_enabled);
86268 + atomic64_read_unchecked(&event->child_total_time_enabled);
86269
86270 userpg->time_running = running +
86271 - atomic64_read(&event->child_total_time_running);
86272 + atomic64_read_unchecked(&event->child_total_time_running);
86273
86274 arch_perf_update_userpage(userpg, now);
86275
86276 @@ -4359,7 +4366,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
86277
86278 /* Data. */
86279 sp = perf_user_stack_pointer(regs);
86280 - rem = __output_copy_user(handle, (void *) sp, dump_size);
86281 + rem = __output_copy_user(handle, (void __user *) sp, dump_size);
86282 dyn_size = dump_size - rem;
86283
86284 perf_output_skip(handle, rem);
86285 @@ -4450,11 +4457,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
86286 values[n++] = perf_event_count(event);
86287 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
86288 values[n++] = enabled +
86289 - atomic64_read(&event->child_total_time_enabled);
86290 + atomic64_read_unchecked(&event->child_total_time_enabled);
86291 }
86292 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
86293 values[n++] = running +
86294 - atomic64_read(&event->child_total_time_running);
86295 + atomic64_read_unchecked(&event->child_total_time_running);
86296 }
86297 if (read_format & PERF_FORMAT_ID)
86298 values[n++] = primary_event_id(event);
86299 @@ -6733,7 +6740,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
86300 event->parent = parent_event;
86301
86302 event->ns = get_pid_ns(task_active_pid_ns(current));
86303 - event->id = atomic64_inc_return(&perf_event_id);
86304 + event->id = atomic64_inc_return_unchecked(&perf_event_id);
86305
86306 event->state = PERF_EVENT_STATE_INACTIVE;
86307
86308 @@ -7015,6 +7022,11 @@ SYSCALL_DEFINE5(perf_event_open,
86309 if (flags & ~PERF_FLAG_ALL)
86310 return -EINVAL;
86311
86312 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
86313 + if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
86314 + return -EACCES;
86315 +#endif
86316 +
86317 err = perf_copy_attr(attr_uptr, &attr);
86318 if (err)
86319 return err;
86320 @@ -7353,10 +7365,10 @@ static void sync_child_event(struct perf_event *child_event,
86321 /*
86322 * Add back the child's count to the parent's count:
86323 */
86324 - atomic64_add(child_val, &parent_event->child_count);
86325 - atomic64_add(child_event->total_time_enabled,
86326 + atomic64_add_unchecked(child_val, &parent_event->child_count);
86327 + atomic64_add_unchecked(child_event->total_time_enabled,
86328 &parent_event->child_total_time_enabled);
86329 - atomic64_add(child_event->total_time_running,
86330 + atomic64_add_unchecked(child_event->total_time_running,
86331 &parent_event->child_total_time_running);
86332
86333 /*
86334 diff --git a/kernel/events/internal.h b/kernel/events/internal.h
86335 index 569b2187..19940d9 100644
86336 --- a/kernel/events/internal.h
86337 +++ b/kernel/events/internal.h
86338 @@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
86339 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
86340 }
86341
86342 -#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
86343 +#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
86344 static inline unsigned long \
86345 func_name(struct perf_output_handle *handle, \
86346 - const void *buf, unsigned long len) \
86347 + const void user *buf, unsigned long len) \
86348 { \
86349 unsigned long size, written; \
86350 \
86351 @@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
86352 return 0;
86353 }
86354
86355 -DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
86356 +DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
86357
86358 static inline unsigned long
86359 memcpy_skip(void *dst, const void *src, unsigned long n)
86360 @@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
86361 return 0;
86362 }
86363
86364 -DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
86365 +DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
86366
86367 #ifndef arch_perf_out_copy_user
86368 #define arch_perf_out_copy_user arch_perf_out_copy_user
86369 @@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
86370 }
86371 #endif
86372
86373 -DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
86374 +DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
86375
86376 /* Callchain handling */
86377 extern struct perf_callchain_entry *
86378 diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
86379 index 04709b6..d330828 100644
86380 --- a/kernel/events/uprobes.c
86381 +++ b/kernel/events/uprobes.c
86382 @@ -1666,7 +1666,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
86383 {
86384 struct page *page;
86385 uprobe_opcode_t opcode;
86386 - int result;
86387 + long result;
86388
86389 pagefault_disable();
86390 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
86391 diff --git a/kernel/exit.c b/kernel/exit.c
86392 index 6ed6a1d..edecb0e 100644
86393 --- a/kernel/exit.c
86394 +++ b/kernel/exit.c
86395 @@ -173,6 +173,10 @@ void release_task(struct task_struct * p)
86396 struct task_struct *leader;
86397 int zap_leader;
86398 repeat:
86399 +#ifdef CONFIG_NET
86400 + gr_del_task_from_ip_table(p);
86401 +#endif
86402 +
86403 /* don't need to get the RCU readlock here - the process is dead and
86404 * can't be modifying its own credentials. But shut RCU-lockdep up */
86405 rcu_read_lock();
86406 @@ -330,7 +334,7 @@ int allow_signal(int sig)
86407 * know it'll be handled, so that they don't get converted to
86408 * SIGKILL or just silently dropped.
86409 */
86410 - current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
86411 + current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
86412 recalc_sigpending();
86413 spin_unlock_irq(&current->sighand->siglock);
86414 return 0;
86415 @@ -699,6 +703,8 @@ void do_exit(long code)
86416 struct task_struct *tsk = current;
86417 int group_dead;
86418
86419 + set_fs(USER_DS);
86420 +
86421 profile_task_exit(tsk);
86422
86423 WARN_ON(blk_needs_flush_plug(tsk));
86424 @@ -715,7 +721,6 @@ void do_exit(long code)
86425 * mm_release()->clear_child_tid() from writing to a user-controlled
86426 * kernel address.
86427 */
86428 - set_fs(USER_DS);
86429
86430 ptrace_event(PTRACE_EVENT_EXIT, code);
86431
86432 @@ -774,6 +779,9 @@ void do_exit(long code)
86433 tsk->exit_code = code;
86434 taskstats_exit(tsk, group_dead);
86435
86436 + gr_acl_handle_psacct(tsk, code);
86437 + gr_acl_handle_exit();
86438 +
86439 exit_mm(tsk);
86440
86441 if (group_dead)
86442 @@ -893,7 +901,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
86443 * Take down every thread in the group. This is called by fatal signals
86444 * as well as by sys_exit_group (below).
86445 */
86446 -void
86447 +__noreturn void
86448 do_group_exit(int exit_code)
86449 {
86450 struct signal_struct *sig = current->signal;
86451 diff --git a/kernel/fork.c b/kernel/fork.c
86452 index 68b9226..0700bf6 100644
86453 --- a/kernel/fork.c
86454 +++ b/kernel/fork.c
86455 @@ -183,6 +183,48 @@ void thread_info_cache_init(void)
86456 # endif
86457 #endif
86458
86459 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
86460 +static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
86461 + int node, void **lowmem_stack)
86462 +{
86463 + struct page *pages[THREAD_SIZE / PAGE_SIZE];
86464 + void *ret = NULL;
86465 + unsigned int i;
86466 +
86467 + *lowmem_stack = alloc_thread_info_node(tsk, node);
86468 + if (*lowmem_stack == NULL)
86469 + goto out;
86470 +
86471 + for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
86472 + pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
86473 +
86474 + /* use VM_IOREMAP to gain THREAD_SIZE alignment */
86475 + ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
86476 + if (ret == NULL) {
86477 + free_thread_info(*lowmem_stack);
86478 + *lowmem_stack = NULL;
86479 + }
86480 +
86481 +out:
86482 + return ret;
86483 +}
86484 +
86485 +static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
86486 +{
86487 + unmap_process_stacks(tsk);
86488 +}
86489 +#else
86490 +static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
86491 + int node, void **lowmem_stack)
86492 +{
86493 + return alloc_thread_info_node(tsk, node);
86494 +}
86495 +static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
86496 +{
86497 + free_thread_info(ti);
86498 +}
86499 +#endif
86500 +
86501 /* SLAB cache for signal_struct structures (tsk->signal) */
86502 static struct kmem_cache *signal_cachep;
86503
86504 @@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
86505 /* SLAB cache for mm_struct structures (tsk->mm) */
86506 static struct kmem_cache *mm_cachep;
86507
86508 -static void account_kernel_stack(struct thread_info *ti, int account)
86509 +static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
86510 {
86511 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
86512 + struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
86513 +#else
86514 struct zone *zone = page_zone(virt_to_page(ti));
86515 +#endif
86516
86517 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
86518 }
86519
86520 void free_task(struct task_struct *tsk)
86521 {
86522 - account_kernel_stack(tsk->stack, -1);
86523 + account_kernel_stack(tsk, tsk->stack, -1);
86524 arch_release_thread_info(tsk->stack);
86525 - free_thread_info(tsk->stack);
86526 + gr_free_thread_info(tsk, tsk->stack);
86527 rt_mutex_debug_task_free(tsk);
86528 ftrace_graph_exit_task(tsk);
86529 put_seccomp_filter(tsk);
86530 @@ -299,6 +345,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
86531 struct task_struct *tsk;
86532 struct thread_info *ti;
86533 unsigned long *stackend;
86534 + void *lowmem_stack;
86535 int node = tsk_fork_get_node(orig);
86536 int err;
86537
86538 @@ -306,7 +353,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
86539 if (!tsk)
86540 return NULL;
86541
86542 - ti = alloc_thread_info_node(tsk, node);
86543 + ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
86544 if (!ti)
86545 goto free_tsk;
86546
86547 @@ -315,6 +362,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
86548 goto free_ti;
86549
86550 tsk->stack = ti;
86551 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
86552 + tsk->lowmem_stack = lowmem_stack;
86553 +#endif
86554
86555 setup_thread_stack(tsk, orig);
86556 clear_user_return_notifier(tsk);
86557 @@ -323,7 +373,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
86558 *stackend = STACK_END_MAGIC; /* for overflow detection */
86559
86560 #ifdef CONFIG_CC_STACKPROTECTOR
86561 - tsk->stack_canary = get_random_int();
86562 + tsk->stack_canary = pax_get_random_long();
86563 #endif
86564
86565 /*
86566 @@ -337,24 +387,92 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
86567 tsk->splice_pipe = NULL;
86568 tsk->task_frag.page = NULL;
86569
86570 - account_kernel_stack(ti, 1);
86571 + account_kernel_stack(tsk, ti, 1);
86572
86573 return tsk;
86574
86575 free_ti:
86576 - free_thread_info(ti);
86577 + gr_free_thread_info(tsk, ti);
86578 free_tsk:
86579 free_task_struct(tsk);
86580 return NULL;
86581 }
86582
86583 #ifdef CONFIG_MMU
86584 -static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
86585 +static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
86586 +{
86587 + struct vm_area_struct *tmp;
86588 + unsigned long charge;
86589 + struct file *file;
86590 + int retval;
86591 +
86592 + charge = 0;
86593 + if (mpnt->vm_flags & VM_ACCOUNT) {
86594 + unsigned long len = vma_pages(mpnt);
86595 +
86596 + if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
86597 + goto fail_nomem;
86598 + charge = len;
86599 + }
86600 + tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
86601 + if (!tmp)
86602 + goto fail_nomem;
86603 + *tmp = *mpnt;
86604 + tmp->vm_mm = mm;
86605 + INIT_LIST_HEAD(&tmp->anon_vma_chain);
86606 + retval = vma_dup_policy(mpnt, tmp);
86607 + if (retval)
86608 + goto fail_nomem_policy;
86609 + if (anon_vma_fork(tmp, mpnt))
86610 + goto fail_nomem_anon_vma_fork;
86611 + tmp->vm_flags &= ~VM_LOCKED;
86612 + tmp->vm_next = tmp->vm_prev = NULL;
86613 + tmp->vm_mirror = NULL;
86614 + file = tmp->vm_file;
86615 + if (file) {
86616 + struct inode *inode = file_inode(file);
86617 + struct address_space *mapping = file->f_mapping;
86618 +
86619 + get_file(file);
86620 + if (tmp->vm_flags & VM_DENYWRITE)
86621 + atomic_dec(&inode->i_writecount);
86622 + mutex_lock(&mapping->i_mmap_mutex);
86623 + if (tmp->vm_flags & VM_SHARED)
86624 + mapping->i_mmap_writable++;
86625 + flush_dcache_mmap_lock(mapping);
86626 + /* insert tmp into the share list, just after mpnt */
86627 + if (unlikely(tmp->vm_flags & VM_NONLINEAR))
86628 + vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
86629 + else
86630 + vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
86631 + flush_dcache_mmap_unlock(mapping);
86632 + mutex_unlock(&mapping->i_mmap_mutex);
86633 + }
86634 +
86635 + /*
86636 + * Clear hugetlb-related page reserves for children. This only
86637 + * affects MAP_PRIVATE mappings. Faults generated by the child
86638 + * are not guaranteed to succeed, even if read-only
86639 + */
86640 + if (is_vm_hugetlb_page(tmp))
86641 + reset_vma_resv_huge_pages(tmp);
86642 +
86643 + return tmp;
86644 +
86645 +fail_nomem_anon_vma_fork:
86646 + mpol_put(vma_policy(tmp));
86647 +fail_nomem_policy:
86648 + kmem_cache_free(vm_area_cachep, tmp);
86649 +fail_nomem:
86650 + vm_unacct_memory(charge);
86651 + return NULL;
86652 +}
86653 +
86654 +static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
86655 {
86656 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
86657 struct rb_node **rb_link, *rb_parent;
86658 int retval;
86659 - unsigned long charge;
86660
86661 uprobe_start_dup_mmap();
86662 down_write(&oldmm->mmap_sem);
86663 @@ -383,55 +501,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
86664
86665 prev = NULL;
86666 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
86667 - struct file *file;
86668 -
86669 if (mpnt->vm_flags & VM_DONTCOPY) {
86670 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
86671 -vma_pages(mpnt));
86672 continue;
86673 }
86674 - charge = 0;
86675 - if (mpnt->vm_flags & VM_ACCOUNT) {
86676 - unsigned long len = vma_pages(mpnt);
86677 -
86678 - if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
86679 - goto fail_nomem;
86680 - charge = len;
86681 - }
86682 - tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
86683 - if (!tmp)
86684 - goto fail_nomem;
86685 - *tmp = *mpnt;
86686 - INIT_LIST_HEAD(&tmp->anon_vma_chain);
86687 - retval = vma_dup_policy(mpnt, tmp);
86688 - if (retval)
86689 - goto fail_nomem_policy;
86690 - tmp->vm_mm = mm;
86691 - if (anon_vma_fork(tmp, mpnt))
86692 - goto fail_nomem_anon_vma_fork;
86693 - tmp->vm_flags &= ~VM_LOCKED;
86694 - tmp->vm_next = tmp->vm_prev = NULL;
86695 - file = tmp->vm_file;
86696 - if (file) {
86697 - struct inode *inode = file_inode(file);
86698 - struct address_space *mapping = file->f_mapping;
86699 -
86700 - get_file(file);
86701 - if (tmp->vm_flags & VM_DENYWRITE)
86702 - atomic_dec(&inode->i_writecount);
86703 - mutex_lock(&mapping->i_mmap_mutex);
86704 - if (tmp->vm_flags & VM_SHARED)
86705 - mapping->i_mmap_writable++;
86706 - flush_dcache_mmap_lock(mapping);
86707 - /* insert tmp into the share list, just after mpnt */
86708 - if (unlikely(tmp->vm_flags & VM_NONLINEAR))
86709 - vma_nonlinear_insert(tmp,
86710 - &mapping->i_mmap_nonlinear);
86711 - else
86712 - vma_interval_tree_insert_after(tmp, mpnt,
86713 - &mapping->i_mmap);
86714 - flush_dcache_mmap_unlock(mapping);
86715 - mutex_unlock(&mapping->i_mmap_mutex);
86716 + tmp = dup_vma(mm, oldmm, mpnt);
86717 + if (!tmp) {
86718 + retval = -ENOMEM;
86719 + goto out;
86720 }
86721
86722 /*
86723 @@ -463,6 +541,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
86724 if (retval)
86725 goto out;
86726 }
86727 +
86728 +#ifdef CONFIG_PAX_SEGMEXEC
86729 + if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
86730 + struct vm_area_struct *mpnt_m;
86731 +
86732 + for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
86733 + BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
86734 +
86735 + if (!mpnt->vm_mirror)
86736 + continue;
86737 +
86738 + if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
86739 + BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
86740 + mpnt->vm_mirror = mpnt_m;
86741 + } else {
86742 + BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
86743 + mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
86744 + mpnt_m->vm_mirror->vm_mirror = mpnt_m;
86745 + mpnt->vm_mirror->vm_mirror = mpnt;
86746 + }
86747 + }
86748 + BUG_ON(mpnt_m);
86749 + }
86750 +#endif
86751 +
86752 /* a new mm has just been created */
86753 arch_dup_mmap(oldmm, mm);
86754 retval = 0;
86755 @@ -472,14 +575,6 @@ out:
86756 up_write(&oldmm->mmap_sem);
86757 uprobe_end_dup_mmap();
86758 return retval;
86759 -fail_nomem_anon_vma_fork:
86760 - mpol_put(vma_policy(tmp));
86761 -fail_nomem_policy:
86762 - kmem_cache_free(vm_area_cachep, tmp);
86763 -fail_nomem:
86764 - retval = -ENOMEM;
86765 - vm_unacct_memory(charge);
86766 - goto out;
86767 }
86768
86769 static inline int mm_alloc_pgd(struct mm_struct *mm)
86770 @@ -698,8 +793,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
86771 return ERR_PTR(err);
86772
86773 mm = get_task_mm(task);
86774 - if (mm && mm != current->mm &&
86775 - !ptrace_may_access(task, mode)) {
86776 + if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
86777 + (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
86778 mmput(mm);
86779 mm = ERR_PTR(-EACCES);
86780 }
86781 @@ -918,13 +1013,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
86782 spin_unlock(&fs->lock);
86783 return -EAGAIN;
86784 }
86785 - fs->users++;
86786 + atomic_inc(&fs->users);
86787 spin_unlock(&fs->lock);
86788 return 0;
86789 }
86790 tsk->fs = copy_fs_struct(fs);
86791 if (!tsk->fs)
86792 return -ENOMEM;
86793 + /* Carry through gr_chroot_dentry and is_chrooted instead
86794 + of recomputing it here. Already copied when the task struct
86795 + is duplicated. This allows pivot_root to not be treated as
86796 + a chroot
86797 + */
86798 + //gr_set_chroot_entries(tsk, &tsk->fs->root);
86799 +
86800 return 0;
86801 }
86802
86803 @@ -1133,7 +1235,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
86804 * parts of the process environment (as per the clone
86805 * flags). The actual kick-off is left to the caller.
86806 */
86807 -static struct task_struct *copy_process(unsigned long clone_flags,
86808 +static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
86809 unsigned long stack_start,
86810 unsigned long stack_size,
86811 int __user *child_tidptr,
86812 @@ -1205,6 +1307,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
86813 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
86814 #endif
86815 retval = -EAGAIN;
86816 +
86817 + gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
86818 +
86819 if (atomic_read(&p->real_cred->user->processes) >=
86820 task_rlimit(p, RLIMIT_NPROC)) {
86821 if (p->real_cred->user != INIT_USER &&
86822 @@ -1452,6 +1557,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
86823 goto bad_fork_free_pid;
86824 }
86825
86826 + /* synchronizes with gr_set_acls()
86827 + we need to call this past the point of no return for fork()
86828 + */
86829 + gr_copy_label(p);
86830 +
86831 if (likely(p->pid)) {
86832 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
86833
86834 @@ -1541,6 +1651,8 @@ bad_fork_cleanup_count:
86835 bad_fork_free:
86836 free_task(p);
86837 fork_out:
86838 + gr_log_forkfail(retval);
86839 +
86840 return ERR_PTR(retval);
86841 }
86842
86843 @@ -1602,6 +1714,7 @@ long do_fork(unsigned long clone_flags,
86844
86845 p = copy_process(clone_flags, stack_start, stack_size,
86846 child_tidptr, NULL, trace);
86847 + add_latent_entropy();
86848 /*
86849 * Do this prior waking up the new thread - the thread pointer
86850 * might get invalid after that point, if the thread exits quickly.
86851 @@ -1618,6 +1731,8 @@ long do_fork(unsigned long clone_flags,
86852 if (clone_flags & CLONE_PARENT_SETTID)
86853 put_user(nr, parent_tidptr);
86854
86855 + gr_handle_brute_check();
86856 +
86857 if (clone_flags & CLONE_VFORK) {
86858 p->vfork_done = &vfork;
86859 init_completion(&vfork);
86860 @@ -1736,7 +1851,7 @@ void __init proc_caches_init(void)
86861 mm_cachep = kmem_cache_create("mm_struct",
86862 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
86863 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
86864 - vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
86865 + vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
86866 mmap_init();
86867 nsproxy_cache_init();
86868 }
86869 @@ -1776,7 +1891,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
86870 return 0;
86871
86872 /* don't need lock here; in the worst case we'll do useless copy */
86873 - if (fs->users == 1)
86874 + if (atomic_read(&fs->users) == 1)
86875 return 0;
86876
86877 *new_fsp = copy_fs_struct(fs);
86878 @@ -1883,7 +1998,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
86879 fs = current->fs;
86880 spin_lock(&fs->lock);
86881 current->fs = new_fs;
86882 - if (--fs->users)
86883 + gr_set_chroot_entries(current, &current->fs->root);
86884 + if (atomic_dec_return(&fs->users))
86885 new_fs = NULL;
86886 else
86887 new_fs = fs;
86888 diff --git a/kernel/futex.c b/kernel/futex.c
86889 index de938d2..c566038 100644
86890 --- a/kernel/futex.c
86891 +++ b/kernel/futex.c
86892 @@ -202,7 +202,7 @@ struct futex_pi_state {
86893 atomic_t refcount;
86894
86895 union futex_key key;
86896 -};
86897 +} __randomize_layout;
86898
86899 /**
86900 * struct futex_q - The hashed futex queue entry, one per waiting task
86901 @@ -236,7 +236,7 @@ struct futex_q {
86902 struct rt_mutex_waiter *rt_waiter;
86903 union futex_key *requeue_pi_key;
86904 u32 bitset;
86905 -};
86906 +} __randomize_layout;
86907
86908 static const struct futex_q futex_q_init = {
86909 /* list gets initialized in queue_me()*/
86910 @@ -394,6 +394,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
86911 struct page *page, *page_head;
86912 int err, ro = 0;
86913
86914 +#ifdef CONFIG_PAX_SEGMEXEC
86915 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
86916 + return -EFAULT;
86917 +#endif
86918 +
86919 /*
86920 * The futex address must be "naturally" aligned.
86921 */
86922 @@ -593,7 +598,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
86923
86924 static int get_futex_value_locked(u32 *dest, u32 __user *from)
86925 {
86926 - int ret;
86927 + unsigned long ret;
86928
86929 pagefault_disable();
86930 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
86931 @@ -3033,6 +3038,7 @@ static void __init futex_detect_cmpxchg(void)
86932 {
86933 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
86934 u32 curval;
86935 + mm_segment_t oldfs;
86936
86937 /*
86938 * This will fail and we want it. Some arch implementations do
86939 @@ -3044,8 +3050,11 @@ static void __init futex_detect_cmpxchg(void)
86940 * implementation, the non-functional ones will return
86941 * -ENOSYS.
86942 */
86943 + oldfs = get_fs();
86944 + set_fs(USER_DS);
86945 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
86946 futex_cmpxchg_enabled = 1;
86947 + set_fs(oldfs);
86948 #endif
86949 }
86950
86951 diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
86952 index 55c8c93..9ba7ad6 100644
86953 --- a/kernel/futex_compat.c
86954 +++ b/kernel/futex_compat.c
86955 @@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
86956 return 0;
86957 }
86958
86959 -static void __user *futex_uaddr(struct robust_list __user *entry,
86960 +static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
86961 compat_long_t futex_offset)
86962 {
86963 compat_uptr_t base = ptr_to_compat(entry);
86964 diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
86965 index f45b75b..bfac6d5 100644
86966 --- a/kernel/gcov/base.c
86967 +++ b/kernel/gcov/base.c
86968 @@ -108,11 +108,6 @@ void gcov_enable_events(void)
86969 }
86970
86971 #ifdef CONFIG_MODULES
86972 -static inline int within(void *addr, void *start, unsigned long size)
86973 -{
86974 - return ((addr >= start) && (addr < start + size));
86975 -}
86976 -
86977 /* Update list and generate events when modules are unloaded. */
86978 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
86979 void *data)
86980 @@ -127,7 +122,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
86981
86982 /* Remove entries located in module from linked list. */
86983 while ((info = gcov_info_next(info))) {
86984 - if (within(info, mod->module_core, mod->core_size)) {
86985 + if (within_module_core_rw((unsigned long)info, mod)) {
86986 gcov_info_unlink(prev, info);
86987 if (gcov_events_enabled)
86988 gcov_event(GCOV_REMOVE, info);
86989 diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
86990 index e0501fe..312edd6 100644
86991 --- a/kernel/hrtimer.c
86992 +++ b/kernel/hrtimer.c
86993 @@ -1448,7 +1448,7 @@ void hrtimer_peek_ahead_timers(void)
86994 local_irq_restore(flags);
86995 }
86996
86997 -static void run_hrtimer_softirq(struct softirq_action *h)
86998 +static __latent_entropy void run_hrtimer_softirq(void)
86999 {
87000 hrtimer_peek_ahead_timers();
87001 }
87002 diff --git a/kernel/irq_work.c b/kernel/irq_work.c
87003 index a82170e..5b01e7f 100644
87004 --- a/kernel/irq_work.c
87005 +++ b/kernel/irq_work.c
87006 @@ -191,12 +191,13 @@ static int irq_work_cpu_notify(struct notifier_block *self,
87007 return NOTIFY_OK;
87008 }
87009
87010 -static struct notifier_block cpu_notify;
87011 +static struct notifier_block cpu_notify = {
87012 + .notifier_call = irq_work_cpu_notify,
87013 + .priority = 0,
87014 +};
87015
87016 static __init int irq_work_init_cpu_notifier(void)
87017 {
87018 - cpu_notify.notifier_call = irq_work_cpu_notify;
87019 - cpu_notify.priority = 0;
87020 register_cpu_notifier(&cpu_notify);
87021 return 0;
87022 }
87023 diff --git a/kernel/jump_label.c b/kernel/jump_label.c
87024 index 9019f15..9a3c42e 100644
87025 --- a/kernel/jump_label.c
87026 +++ b/kernel/jump_label.c
87027 @@ -14,6 +14,7 @@
87028 #include <linux/err.h>
87029 #include <linux/static_key.h>
87030 #include <linux/jump_label_ratelimit.h>
87031 +#include <linux/mm.h>
87032
87033 #ifdef HAVE_JUMP_LABEL
87034
87035 @@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
87036
87037 size = (((unsigned long)stop - (unsigned long)start)
87038 / sizeof(struct jump_entry));
87039 + pax_open_kernel();
87040 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
87041 + pax_close_kernel();
87042 }
87043
87044 static void jump_label_update(struct static_key *key, int enable);
87045 @@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
87046 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
87047 struct jump_entry *iter;
87048
87049 + pax_open_kernel();
87050 for (iter = iter_start; iter < iter_stop; iter++) {
87051 if (within_module_init(iter->code, mod))
87052 iter->code = 0;
87053 }
87054 + pax_close_kernel();
87055 }
87056
87057 static int
87058 diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
87059 index cb0cf37..b69e161 100644
87060 --- a/kernel/kallsyms.c
87061 +++ b/kernel/kallsyms.c
87062 @@ -11,6 +11,9 @@
87063 * Changed the compression method from stem compression to "table lookup"
87064 * compression (see scripts/kallsyms.c for a more complete description)
87065 */
87066 +#ifdef CONFIG_GRKERNSEC_HIDESYM
87067 +#define __INCLUDED_BY_HIDESYM 1
87068 +#endif
87069 #include <linux/kallsyms.h>
87070 #include <linux/module.h>
87071 #include <linux/init.h>
87072 @@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
87073
87074 static inline int is_kernel_inittext(unsigned long addr)
87075 {
87076 + if (system_state != SYSTEM_BOOTING)
87077 + return 0;
87078 +
87079 if (addr >= (unsigned long)_sinittext
87080 && addr <= (unsigned long)_einittext)
87081 return 1;
87082 return 0;
87083 }
87084
87085 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
87086 +#ifdef CONFIG_MODULES
87087 +static inline int is_module_text(unsigned long addr)
87088 +{
87089 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
87090 + return 1;
87091 +
87092 + addr = ktla_ktva(addr);
87093 + return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
87094 +}
87095 +#else
87096 +static inline int is_module_text(unsigned long addr)
87097 +{
87098 + return 0;
87099 +}
87100 +#endif
87101 +#endif
87102 +
87103 static inline int is_kernel_text(unsigned long addr)
87104 {
87105 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
87106 @@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
87107
87108 static inline int is_kernel(unsigned long addr)
87109 {
87110 +
87111 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
87112 + if (is_kernel_text(addr) || is_kernel_inittext(addr))
87113 + return 1;
87114 +
87115 + if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
87116 +#else
87117 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
87118 +#endif
87119 +
87120 return 1;
87121 return in_gate_area_no_mm(addr);
87122 }
87123
87124 static int is_ksym_addr(unsigned long addr)
87125 {
87126 +
87127 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
87128 + if (is_module_text(addr))
87129 + return 0;
87130 +#endif
87131 +
87132 if (all_var)
87133 return is_kernel(addr);
87134
87135 @@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
87136
87137 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
87138 {
87139 - iter->name[0] = '\0';
87140 iter->nameoff = get_symbol_offset(new_pos);
87141 iter->pos = new_pos;
87142 }
87143 @@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
87144 {
87145 struct kallsym_iter *iter = m->private;
87146
87147 +#ifdef CONFIG_GRKERNSEC_HIDESYM
87148 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
87149 + return 0;
87150 +#endif
87151 +
87152 /* Some debugging symbols have no name. Ignore them. */
87153 if (!iter->name[0])
87154 return 0;
87155 @@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
87156 */
87157 type = iter->exported ? toupper(iter->type) :
87158 tolower(iter->type);
87159 +
87160 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
87161 type, iter->name, iter->module_name);
87162 } else
87163 @@ -567,7 +611,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
87164 struct kallsym_iter *iter;
87165 int ret;
87166
87167 - iter = kmalloc(sizeof(*iter), GFP_KERNEL);
87168 + iter = kzalloc(sizeof(*iter), GFP_KERNEL);
87169 if (!iter)
87170 return -ENOMEM;
87171 reset_iter(iter, 0);
87172 diff --git a/kernel/kcmp.c b/kernel/kcmp.c
87173 index e30ac0f..3528cac 100644
87174 --- a/kernel/kcmp.c
87175 +++ b/kernel/kcmp.c
87176 @@ -99,6 +99,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
87177 struct task_struct *task1, *task2;
87178 int ret;
87179
87180 +#ifdef CONFIG_GRKERNSEC
87181 + return -ENOSYS;
87182 +#endif
87183 +
87184 rcu_read_lock();
87185
87186 /*
87187 diff --git a/kernel/kexec.c b/kernel/kexec.c
87188 index 28c5706..bfc8388 100644
87189 --- a/kernel/kexec.c
87190 +++ b/kernel/kexec.c
87191 @@ -1046,7 +1046,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
87192 compat_ulong_t, flags)
87193 {
87194 struct compat_kexec_segment in;
87195 - struct kexec_segment out, __user *ksegments;
87196 + struct kexec_segment out;
87197 + struct kexec_segment __user *ksegments;
87198 unsigned long i, result;
87199
87200 /* Don't allow clients that don't understand the native
87201 diff --git a/kernel/kmod.c b/kernel/kmod.c
87202 index 6b375af..eaff670 100644
87203 --- a/kernel/kmod.c
87204 +++ b/kernel/kmod.c
87205 @@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
87206 kfree(info->argv);
87207 }
87208
87209 -static int call_modprobe(char *module_name, int wait)
87210 +static int call_modprobe(char *module_name, char *module_param, int wait)
87211 {
87212 struct subprocess_info *info;
87213 static char *envp[] = {
87214 @@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
87215 NULL
87216 };
87217
87218 - char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
87219 + char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
87220 if (!argv)
87221 goto out;
87222
87223 @@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
87224 argv[1] = "-q";
87225 argv[2] = "--";
87226 argv[3] = module_name; /* check free_modprobe_argv() */
87227 - argv[4] = NULL;
87228 + argv[4] = module_param;
87229 + argv[5] = NULL;
87230
87231 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
87232 NULL, free_modprobe_argv, NULL);
87233 @@ -129,9 +130,8 @@ out:
87234 * If module auto-loading support is disabled then this function
87235 * becomes a no-operation.
87236 */
87237 -int __request_module(bool wait, const char *fmt, ...)
87238 +static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
87239 {
87240 - va_list args;
87241 char module_name[MODULE_NAME_LEN];
87242 unsigned int max_modprobes;
87243 int ret;
87244 @@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
87245 if (!modprobe_path[0])
87246 return 0;
87247
87248 - va_start(args, fmt);
87249 - ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
87250 - va_end(args);
87251 + ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
87252 if (ret >= MODULE_NAME_LEN)
87253 return -ENAMETOOLONG;
87254
87255 @@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
87256 if (ret)
87257 return ret;
87258
87259 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
87260 + if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
87261 + /* hack to workaround consolekit/udisks stupidity */
87262 + read_lock(&tasklist_lock);
87263 + if (!strcmp(current->comm, "mount") &&
87264 + current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
87265 + read_unlock(&tasklist_lock);
87266 + printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
87267 + return -EPERM;
87268 + }
87269 + read_unlock(&tasklist_lock);
87270 + }
87271 +#endif
87272 +
87273 /* If modprobe needs a service that is in a module, we get a recursive
87274 * loop. Limit the number of running kmod threads to max_threads/2 or
87275 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
87276 @@ -188,11 +200,52 @@ int __request_module(bool wait, const char *fmt, ...)
87277
87278 trace_module_request(module_name, wait, _RET_IP_);
87279
87280 - ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
87281 + ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
87282
87283 atomic_dec(&kmod_concurrent);
87284 return ret;
87285 }
87286 +
87287 +int ___request_module(bool wait, char *module_param, const char *fmt, ...)
87288 +{
87289 + va_list args;
87290 + int ret;
87291 +
87292 + va_start(args, fmt);
87293 + ret = ____request_module(wait, module_param, fmt, args);
87294 + va_end(args);
87295 +
87296 + return ret;
87297 +}
87298 +
87299 +int __request_module(bool wait, const char *fmt, ...)
87300 +{
87301 + va_list args;
87302 + int ret;
87303 +
87304 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
87305 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
87306 + char module_param[MODULE_NAME_LEN];
87307 +
87308 + memset(module_param, 0, sizeof(module_param));
87309 +
87310 + snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
87311 +
87312 + va_start(args, fmt);
87313 + ret = ____request_module(wait, module_param, fmt, args);
87314 + va_end(args);
87315 +
87316 + return ret;
87317 + }
87318 +#endif
87319 +
87320 + va_start(args, fmt);
87321 + ret = ____request_module(wait, NULL, fmt, args);
87322 + va_end(args);
87323 +
87324 + return ret;
87325 +}
87326 +
87327 EXPORT_SYMBOL(__request_module);
87328 #endif /* CONFIG_MODULES */
87329
87330 @@ -218,6 +271,20 @@ static int ____call_usermodehelper(void *data)
87331 */
87332 set_user_nice(current, 0);
87333
87334 +#ifdef CONFIG_GRKERNSEC
87335 + /* this is race-free as far as userland is concerned as we copied
87336 + out the path to be used prior to this point and are now operating
87337 + on that copy
87338 + */
87339 + if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
87340 + strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
87341 + strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
87342 + printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
87343 + retval = -EPERM;
87344 + goto fail;
87345 + }
87346 +#endif
87347 +
87348 retval = -ENOMEM;
87349 new = prepare_kernel_cred(current);
87350 if (!new)
87351 @@ -240,8 +307,8 @@ static int ____call_usermodehelper(void *data)
87352 commit_creds(new);
87353
87354 retval = do_execve(getname_kernel(sub_info->path),
87355 - (const char __user *const __user *)sub_info->argv,
87356 - (const char __user *const __user *)sub_info->envp);
87357 + (const char __user *const __force_user *)sub_info->argv,
87358 + (const char __user *const __force_user *)sub_info->envp);
87359 if (!retval)
87360 return 0;
87361
87362 @@ -260,6 +327,10 @@ static int call_helper(void *data)
87363
87364 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
87365 {
87366 +#ifdef CONFIG_GRKERNSEC
87367 + kfree(info->path);
87368 + info->path = info->origpath;
87369 +#endif
87370 if (info->cleanup)
87371 (*info->cleanup)(info);
87372 kfree(info);
87373 @@ -303,7 +374,7 @@ static int wait_for_helper(void *data)
87374 *
87375 * Thus the __user pointer cast is valid here.
87376 */
87377 - sys_wait4(pid, (int __user *)&ret, 0, NULL);
87378 + sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
87379
87380 /*
87381 * If ret is 0, either ____call_usermodehelper failed and the
87382 @@ -542,7 +613,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
87383 goto out;
87384
87385 INIT_WORK(&sub_info->work, __call_usermodehelper);
87386 +#ifdef CONFIG_GRKERNSEC
87387 + sub_info->origpath = path;
87388 + sub_info->path = kstrdup(path, gfp_mask);
87389 +#else
87390 sub_info->path = path;
87391 +#endif
87392 sub_info->argv = argv;
87393 sub_info->envp = envp;
87394
87395 @@ -650,7 +726,7 @@ EXPORT_SYMBOL(call_usermodehelper);
87396 static int proc_cap_handler(struct ctl_table *table, int write,
87397 void __user *buffer, size_t *lenp, loff_t *ppos)
87398 {
87399 - struct ctl_table t;
87400 + ctl_table_no_const t;
87401 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
87402 kernel_cap_t new_cap;
87403 int err, i;
87404 diff --git a/kernel/kprobes.c b/kernel/kprobes.c
87405 index ceeadfc..11c18b6 100644
87406 --- a/kernel/kprobes.c
87407 +++ b/kernel/kprobes.c
87408 @@ -31,6 +31,9 @@
87409 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
87410 * <prasanna@in.ibm.com> added function-return probes.
87411 */
87412 +#ifdef CONFIG_GRKERNSEC_HIDESYM
87413 +#define __INCLUDED_BY_HIDESYM 1
87414 +#endif
87415 #include <linux/kprobes.h>
87416 #include <linux/hash.h>
87417 #include <linux/init.h>
87418 @@ -135,12 +138,12 @@ enum kprobe_slot_state {
87419
87420 static void *alloc_insn_page(void)
87421 {
87422 - return module_alloc(PAGE_SIZE);
87423 + return module_alloc_exec(PAGE_SIZE);
87424 }
87425
87426 static void free_insn_page(void *page)
87427 {
87428 - module_free(NULL, page);
87429 + module_free_exec(NULL, page);
87430 }
87431
87432 struct kprobe_insn_cache kprobe_insn_slots = {
87433 @@ -2151,11 +2154,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
87434 kprobe_type = "k";
87435
87436 if (sym)
87437 - seq_printf(pi, "%p %s %s+0x%x %s ",
87438 + seq_printf(pi, "%pK %s %s+0x%x %s ",
87439 p->addr, kprobe_type, sym, offset,
87440 (modname ? modname : " "));
87441 else
87442 - seq_printf(pi, "%p %s %p ",
87443 + seq_printf(pi, "%pK %s %pK ",
87444 p->addr, kprobe_type, p->addr);
87445
87446 if (!pp)
87447 diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
87448 index 2495a9b..071b906 100644
87449 --- a/kernel/ksysfs.c
87450 +++ b/kernel/ksysfs.c
87451 @@ -49,6 +49,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
87452 {
87453 if (count+1 > UEVENT_HELPER_PATH_LEN)
87454 return -ENOENT;
87455 + if (!capable(CAP_SYS_ADMIN))
87456 + return -EPERM;
87457 memcpy(uevent_helper, buf, count);
87458 uevent_helper[count] = '\0';
87459 if (count && uevent_helper[count-1] == '\n')
87460 @@ -175,7 +177,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
87461 return count;
87462 }
87463
87464 -static struct bin_attribute notes_attr = {
87465 +static bin_attribute_no_const notes_attr __read_only = {
87466 .attr = {
87467 .name = "notes",
87468 .mode = S_IRUGO,
87469 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
87470 index d24e433..fa04fb8 100644
87471 --- a/kernel/locking/lockdep.c
87472 +++ b/kernel/locking/lockdep.c
87473 @@ -597,6 +597,10 @@ static int static_obj(void *obj)
87474 end = (unsigned long) &_end,
87475 addr = (unsigned long) obj;
87476
87477 +#ifdef CONFIG_PAX_KERNEXEC
87478 + start = ktla_ktva(start);
87479 +#endif
87480 +
87481 /*
87482 * static variable?
87483 */
87484 @@ -738,6 +742,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
87485 if (!static_obj(lock->key)) {
87486 debug_locks_off();
87487 printk("INFO: trying to register non-static key.\n");
87488 + printk("lock:%pS key:%pS.\n", lock, lock->key);
87489 printk("the code is fine but needs lockdep annotation.\n");
87490 printk("turning off the locking correctness validator.\n");
87491 dump_stack();
87492 @@ -3079,7 +3084,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
87493 if (!class)
87494 return 0;
87495 }
87496 - atomic_inc((atomic_t *)&class->ops);
87497 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
87498 if (very_verbose(class)) {
87499 printk("\nacquire class [%p] %s", class->key, class->name);
87500 if (class->name_version > 1)
87501 diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
87502 index ef43ac4..2720dfa 100644
87503 --- a/kernel/locking/lockdep_proc.c
87504 +++ b/kernel/locking/lockdep_proc.c
87505 @@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
87506 return 0;
87507 }
87508
87509 - seq_printf(m, "%p", class->key);
87510 + seq_printf(m, "%pK", class->key);
87511 #ifdef CONFIG_DEBUG_LOCKDEP
87512 seq_printf(m, " OPS:%8ld", class->ops);
87513 #endif
87514 @@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
87515
87516 list_for_each_entry(entry, &class->locks_after, entry) {
87517 if (entry->distance == 1) {
87518 - seq_printf(m, " -> [%p] ", entry->class->key);
87519 + seq_printf(m, " -> [%pK] ", entry->class->key);
87520 print_name(m, entry->class);
87521 seq_puts(m, "\n");
87522 }
87523 @@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
87524 if (!class->key)
87525 continue;
87526
87527 - seq_printf(m, "[%p] ", class->key);
87528 + seq_printf(m, "[%pK] ", class->key);
87529 print_name(m, class);
87530 seq_puts(m, "\n");
87531 }
87532 @@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
87533 if (!i)
87534 seq_line(m, '-', 40-namelen, namelen);
87535
87536 - snprintf(ip, sizeof(ip), "[<%p>]",
87537 + snprintf(ip, sizeof(ip), "[<%pK>]",
87538 (void *)class->contention_point[i]);
87539 seq_printf(m, "%40s %14lu %29s %pS\n",
87540 name, stats->contention_point[i],
87541 @@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
87542 if (!i)
87543 seq_line(m, '-', 40-namelen, namelen);
87544
87545 - snprintf(ip, sizeof(ip), "[<%p>]",
87546 + snprintf(ip, sizeof(ip), "[<%pK>]",
87547 (void *)class->contending_point[i]);
87548 seq_printf(m, "%40s %14lu %29s %pS\n",
87549 name, stats->contending_point[i],
87550 diff --git a/kernel/locking/mcs_spinlock.c b/kernel/locking/mcs_spinlock.c
87551 index 838dc9e..760e158 100644
87552 --- a/kernel/locking/mcs_spinlock.c
87553 +++ b/kernel/locking/mcs_spinlock.c
87554 @@ -71,7 +71,7 @@ bool osq_lock(struct optimistic_spin_queue **lock)
87555 if (likely(prev == NULL))
87556 return true;
87557
87558 - ACCESS_ONCE(prev->next) = node;
87559 + ACCESS_ONCE_RW(prev->next) = node;
87560
87561 /*
87562 * Normally @prev is untouchable after the above store; because at that
87563 @@ -143,8 +143,8 @@ unqueue:
87564 * it will wait in Step-A.
87565 */
87566
87567 - ACCESS_ONCE(next->prev) = prev;
87568 - ACCESS_ONCE(prev->next) = next;
87569 + ACCESS_ONCE_RW(next->prev) = prev;
87570 + ACCESS_ONCE_RW(prev->next) = next;
87571
87572 return false;
87573 }
87574 @@ -165,13 +165,13 @@ void osq_unlock(struct optimistic_spin_queue **lock)
87575 */
87576 next = xchg(&node->next, NULL);
87577 if (next) {
87578 - ACCESS_ONCE(next->locked) = 1;
87579 + ACCESS_ONCE_RW(next->locked) = 1;
87580 return;
87581 }
87582
87583 next = osq_wait_next(lock, node, NULL);
87584 if (next)
87585 - ACCESS_ONCE(next->locked) = 1;
87586 + ACCESS_ONCE_RW(next->locked) = 1;
87587 }
87588
87589 #endif
87590 diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
87591 index a2dbac4..e02a34a 100644
87592 --- a/kernel/locking/mcs_spinlock.h
87593 +++ b/kernel/locking/mcs_spinlock.h
87594 @@ -81,7 +81,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
87595 */
87596 return;
87597 }
87598 - ACCESS_ONCE(prev->next) = node;
87599 + ACCESS_ONCE_RW(prev->next) = node;
87600
87601 /* Wait until the lock holder passes the lock down. */
87602 arch_mcs_spin_lock_contended(&node->locked);
87603 diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
87604 index 5cf6731..ce3bc5a 100644
87605 --- a/kernel/locking/mutex-debug.c
87606 +++ b/kernel/locking/mutex-debug.c
87607 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
87608 }
87609
87610 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
87611 - struct thread_info *ti)
87612 + struct task_struct *task)
87613 {
87614 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
87615
87616 /* Mark the current thread as blocked on the lock: */
87617 - ti->task->blocked_on = waiter;
87618 + task->blocked_on = waiter;
87619 }
87620
87621 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
87622 - struct thread_info *ti)
87623 + struct task_struct *task)
87624 {
87625 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
87626 - DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
87627 - DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
87628 - ti->task->blocked_on = NULL;
87629 + DEBUG_LOCKS_WARN_ON(waiter->task != task);
87630 + DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
87631 + task->blocked_on = NULL;
87632
87633 list_del_init(&waiter->list);
87634 waiter->task = NULL;
87635 diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
87636 index 0799fd3..d06ae3b 100644
87637 --- a/kernel/locking/mutex-debug.h
87638 +++ b/kernel/locking/mutex-debug.h
87639 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
87640 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
87641 extern void debug_mutex_add_waiter(struct mutex *lock,
87642 struct mutex_waiter *waiter,
87643 - struct thread_info *ti);
87644 + struct task_struct *task);
87645 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
87646 - struct thread_info *ti);
87647 + struct task_struct *task);
87648 extern void debug_mutex_unlock(struct mutex *lock);
87649 extern void debug_mutex_init(struct mutex *lock, const char *name,
87650 struct lock_class_key *key);
87651 diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
87652 index bc73d33..6f308aa 100644
87653 --- a/kernel/locking/mutex.c
87654 +++ b/kernel/locking/mutex.c
87655 @@ -490,7 +490,7 @@ slowpath:
87656 goto skip_wait;
87657
87658 debug_mutex_lock_common(lock, &waiter);
87659 - debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
87660 + debug_mutex_add_waiter(lock, &waiter, task);
87661
87662 /* add waiting tasks to the end of the waitqueue (FIFO): */
87663 list_add_tail(&waiter.list, &lock->wait_list);
87664 @@ -534,7 +534,7 @@ slowpath:
87665 schedule_preempt_disabled();
87666 spin_lock_mutex(&lock->wait_lock, flags);
87667 }
87668 - mutex_remove_waiter(lock, &waiter, current_thread_info());
87669 + mutex_remove_waiter(lock, &waiter, task);
87670 /* set it to 0 if there are no waiters left: */
87671 if (likely(list_empty(&lock->wait_list)))
87672 atomic_set(&lock->count, 0);
87673 @@ -571,7 +571,7 @@ skip_wait:
87674 return 0;
87675
87676 err:
87677 - mutex_remove_waiter(lock, &waiter, task_thread_info(task));
87678 + mutex_remove_waiter(lock, &waiter, task);
87679 spin_unlock_mutex(&lock->wait_lock, flags);
87680 debug_mutex_free_waiter(&waiter);
87681 mutex_release(&lock->dep_map, 1, ip);
87682 diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
87683 index 1d96dd0..994ff19 100644
87684 --- a/kernel/locking/rtmutex-tester.c
87685 +++ b/kernel/locking/rtmutex-tester.c
87686 @@ -22,7 +22,7 @@
87687 #define MAX_RT_TEST_MUTEXES 8
87688
87689 static spinlock_t rttest_lock;
87690 -static atomic_t rttest_event;
87691 +static atomic_unchecked_t rttest_event;
87692
87693 struct test_thread_data {
87694 int opcode;
87695 @@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
87696
87697 case RTTEST_LOCKCONT:
87698 td->mutexes[td->opdata] = 1;
87699 - td->event = atomic_add_return(1, &rttest_event);
87700 + td->event = atomic_add_return_unchecked(1, &rttest_event);
87701 return 0;
87702
87703 case RTTEST_RESET:
87704 @@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
87705 return 0;
87706
87707 case RTTEST_RESETEVENT:
87708 - atomic_set(&rttest_event, 0);
87709 + atomic_set_unchecked(&rttest_event, 0);
87710 return 0;
87711
87712 default:
87713 @@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
87714 return ret;
87715
87716 td->mutexes[id] = 1;
87717 - td->event = atomic_add_return(1, &rttest_event);
87718 + td->event = atomic_add_return_unchecked(1, &rttest_event);
87719 rt_mutex_lock(&mutexes[id]);
87720 - td->event = atomic_add_return(1, &rttest_event);
87721 + td->event = atomic_add_return_unchecked(1, &rttest_event);
87722 td->mutexes[id] = 4;
87723 return 0;
87724
87725 @@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
87726 return ret;
87727
87728 td->mutexes[id] = 1;
87729 - td->event = atomic_add_return(1, &rttest_event);
87730 + td->event = atomic_add_return_unchecked(1, &rttest_event);
87731 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
87732 - td->event = atomic_add_return(1, &rttest_event);
87733 + td->event = atomic_add_return_unchecked(1, &rttest_event);
87734 td->mutexes[id] = ret ? 0 : 4;
87735 return ret ? -EINTR : 0;
87736
87737 @@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
87738 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
87739 return ret;
87740
87741 - td->event = atomic_add_return(1, &rttest_event);
87742 + td->event = atomic_add_return_unchecked(1, &rttest_event);
87743 rt_mutex_unlock(&mutexes[id]);
87744 - td->event = atomic_add_return(1, &rttest_event);
87745 + td->event = atomic_add_return_unchecked(1, &rttest_event);
87746 td->mutexes[id] = 0;
87747 return 0;
87748
87749 @@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
87750 break;
87751
87752 td->mutexes[dat] = 2;
87753 - td->event = atomic_add_return(1, &rttest_event);
87754 + td->event = atomic_add_return_unchecked(1, &rttest_event);
87755 break;
87756
87757 default:
87758 @@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
87759 return;
87760
87761 td->mutexes[dat] = 3;
87762 - td->event = atomic_add_return(1, &rttest_event);
87763 + td->event = atomic_add_return_unchecked(1, &rttest_event);
87764 break;
87765
87766 case RTTEST_LOCKNOWAIT:
87767 @@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
87768 return;
87769
87770 td->mutexes[dat] = 1;
87771 - td->event = atomic_add_return(1, &rttest_event);
87772 + td->event = atomic_add_return_unchecked(1, &rttest_event);
87773 return;
87774
87775 default:
87776 diff --git a/kernel/module.c b/kernel/module.c
87777 index 079c461..741f79c 100644
87778 --- a/kernel/module.c
87779 +++ b/kernel/module.c
87780 @@ -61,6 +61,7 @@
87781 #include <linux/pfn.h>
87782 #include <linux/bsearch.h>
87783 #include <linux/fips.h>
87784 +#include <linux/grsecurity.h>
87785 #include <uapi/linux/module.h>
87786 #include "module-internal.h"
87787
87788 @@ -157,7 +158,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
87789
87790 /* Bounds of module allocation, for speeding __module_address.
87791 * Protected by module_mutex. */
87792 -static unsigned long module_addr_min = -1UL, module_addr_max = 0;
87793 +static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
87794 +static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
87795
87796 int register_module_notifier(struct notifier_block * nb)
87797 {
87798 @@ -324,7 +326,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
87799 return true;
87800
87801 list_for_each_entry_rcu(mod, &modules, list) {
87802 - struct symsearch arr[] = {
87803 + struct symsearch modarr[] = {
87804 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
87805 NOT_GPL_ONLY, false },
87806 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
87807 @@ -349,7 +351,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
87808 if (mod->state == MODULE_STATE_UNFORMED)
87809 continue;
87810
87811 - if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
87812 + if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
87813 return true;
87814 }
87815 return false;
87816 @@ -489,7 +491,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
87817 if (!pcpusec->sh_size)
87818 return 0;
87819
87820 - if (align > PAGE_SIZE) {
87821 + if (align-1 >= PAGE_SIZE) {
87822 pr_warn("%s: per-cpu alignment %li > %li\n",
87823 mod->name, align, PAGE_SIZE);
87824 align = PAGE_SIZE;
87825 @@ -1061,7 +1063,7 @@ struct module_attribute module_uevent =
87826 static ssize_t show_coresize(struct module_attribute *mattr,
87827 struct module_kobject *mk, char *buffer)
87828 {
87829 - return sprintf(buffer, "%u\n", mk->mod->core_size);
87830 + return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
87831 }
87832
87833 static struct module_attribute modinfo_coresize =
87834 @@ -1070,7 +1072,7 @@ static struct module_attribute modinfo_coresize =
87835 static ssize_t show_initsize(struct module_attribute *mattr,
87836 struct module_kobject *mk, char *buffer)
87837 {
87838 - return sprintf(buffer, "%u\n", mk->mod->init_size);
87839 + return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
87840 }
87841
87842 static struct module_attribute modinfo_initsize =
87843 @@ -1162,12 +1164,29 @@ static int check_version(Elf_Shdr *sechdrs,
87844 goto bad_version;
87845 }
87846
87847 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
87848 + /*
87849 + * avoid potentially printing jibberish on attempted load
87850 + * of a module randomized with a different seed
87851 + */
87852 + pr_warn("no symbol version for %s\n", symname);
87853 +#else
87854 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
87855 +#endif
87856 return 0;
87857
87858 bad_version:
87859 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
87860 + /*
87861 + * avoid potentially printing jibberish on attempted load
87862 + * of a module randomized with a different seed
87863 + */
87864 + printk("attempted module disagrees about version of symbol %s\n",
87865 + symname);
87866 +#else
87867 printk("%s: disagrees about version of symbol %s\n",
87868 mod->name, symname);
87869 +#endif
87870 return 0;
87871 }
87872
87873 @@ -1283,7 +1302,7 @@ resolve_symbol_wait(struct module *mod,
87874 */
87875 #ifdef CONFIG_SYSFS
87876
87877 -#ifdef CONFIG_KALLSYMS
87878 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
87879 static inline bool sect_empty(const Elf_Shdr *sect)
87880 {
87881 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
87882 @@ -1423,7 +1442,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
87883 {
87884 unsigned int notes, loaded, i;
87885 struct module_notes_attrs *notes_attrs;
87886 - struct bin_attribute *nattr;
87887 + bin_attribute_no_const *nattr;
87888
87889 /* failed to create section attributes, so can't create notes */
87890 if (!mod->sect_attrs)
87891 @@ -1535,7 +1554,7 @@ static void del_usage_links(struct module *mod)
87892 static int module_add_modinfo_attrs(struct module *mod)
87893 {
87894 struct module_attribute *attr;
87895 - struct module_attribute *temp_attr;
87896 + module_attribute_no_const *temp_attr;
87897 int error = 0;
87898 int i;
87899
87900 @@ -1756,21 +1775,21 @@ static void set_section_ro_nx(void *base,
87901
87902 static void unset_module_core_ro_nx(struct module *mod)
87903 {
87904 - set_page_attributes(mod->module_core + mod->core_text_size,
87905 - mod->module_core + mod->core_size,
87906 + set_page_attributes(mod->module_core_rw,
87907 + mod->module_core_rw + mod->core_size_rw,
87908 set_memory_x);
87909 - set_page_attributes(mod->module_core,
87910 - mod->module_core + mod->core_ro_size,
87911 + set_page_attributes(mod->module_core_rx,
87912 + mod->module_core_rx + mod->core_size_rx,
87913 set_memory_rw);
87914 }
87915
87916 static void unset_module_init_ro_nx(struct module *mod)
87917 {
87918 - set_page_attributes(mod->module_init + mod->init_text_size,
87919 - mod->module_init + mod->init_size,
87920 + set_page_attributes(mod->module_init_rw,
87921 + mod->module_init_rw + mod->init_size_rw,
87922 set_memory_x);
87923 - set_page_attributes(mod->module_init,
87924 - mod->module_init + mod->init_ro_size,
87925 + set_page_attributes(mod->module_init_rx,
87926 + mod->module_init_rx + mod->init_size_rx,
87927 set_memory_rw);
87928 }
87929
87930 @@ -1783,14 +1802,14 @@ void set_all_modules_text_rw(void)
87931 list_for_each_entry_rcu(mod, &modules, list) {
87932 if (mod->state == MODULE_STATE_UNFORMED)
87933 continue;
87934 - if ((mod->module_core) && (mod->core_text_size)) {
87935 - set_page_attributes(mod->module_core,
87936 - mod->module_core + mod->core_text_size,
87937 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
87938 + set_page_attributes(mod->module_core_rx,
87939 + mod->module_core_rx + mod->core_size_rx,
87940 set_memory_rw);
87941 }
87942 - if ((mod->module_init) && (mod->init_text_size)) {
87943 - set_page_attributes(mod->module_init,
87944 - mod->module_init + mod->init_text_size,
87945 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
87946 + set_page_attributes(mod->module_init_rx,
87947 + mod->module_init_rx + mod->init_size_rx,
87948 set_memory_rw);
87949 }
87950 }
87951 @@ -1806,14 +1825,14 @@ void set_all_modules_text_ro(void)
87952 list_for_each_entry_rcu(mod, &modules, list) {
87953 if (mod->state == MODULE_STATE_UNFORMED)
87954 continue;
87955 - if ((mod->module_core) && (mod->core_text_size)) {
87956 - set_page_attributes(mod->module_core,
87957 - mod->module_core + mod->core_text_size,
87958 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
87959 + set_page_attributes(mod->module_core_rx,
87960 + mod->module_core_rx + mod->core_size_rx,
87961 set_memory_ro);
87962 }
87963 - if ((mod->module_init) && (mod->init_text_size)) {
87964 - set_page_attributes(mod->module_init,
87965 - mod->module_init + mod->init_text_size,
87966 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
87967 + set_page_attributes(mod->module_init_rx,
87968 + mod->module_init_rx + mod->init_size_rx,
87969 set_memory_ro);
87970 }
87971 }
87972 @@ -1864,16 +1883,19 @@ static void free_module(struct module *mod)
87973
87974 /* This may be NULL, but that's OK */
87975 unset_module_init_ro_nx(mod);
87976 - module_free(mod, mod->module_init);
87977 + module_free(mod, mod->module_init_rw);
87978 + module_free_exec(mod, mod->module_init_rx);
87979 kfree(mod->args);
87980 percpu_modfree(mod);
87981
87982 /* Free lock-classes: */
87983 - lockdep_free_key_range(mod->module_core, mod->core_size);
87984 + lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
87985 + lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
87986
87987 /* Finally, free the core (containing the module structure) */
87988 unset_module_core_ro_nx(mod);
87989 - module_free(mod, mod->module_core);
87990 + module_free_exec(mod, mod->module_core_rx);
87991 + module_free(mod, mod->module_core_rw);
87992
87993 #ifdef CONFIG_MPU
87994 update_protections(current->mm);
87995 @@ -1942,9 +1964,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
87996 int ret = 0;
87997 const struct kernel_symbol *ksym;
87998
87999 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
88000 + int is_fs_load = 0;
88001 + int register_filesystem_found = 0;
88002 + char *p;
88003 +
88004 + p = strstr(mod->args, "grsec_modharden_fs");
88005 + if (p) {
88006 + char *endptr = p + sizeof("grsec_modharden_fs") - 1;
88007 + /* copy \0 as well */
88008 + memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
88009 + is_fs_load = 1;
88010 + }
88011 +#endif
88012 +
88013 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
88014 const char *name = info->strtab + sym[i].st_name;
88015
88016 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
88017 + /* it's a real shame this will never get ripped and copied
88018 + upstream! ;(
88019 + */
88020 + if (is_fs_load && !strcmp(name, "register_filesystem"))
88021 + register_filesystem_found = 1;
88022 +#endif
88023 +
88024 switch (sym[i].st_shndx) {
88025 case SHN_COMMON:
88026 /* Ignore common symbols */
88027 @@ -1969,7 +2013,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
88028 ksym = resolve_symbol_wait(mod, info, name);
88029 /* Ok if resolved. */
88030 if (ksym && !IS_ERR(ksym)) {
88031 + pax_open_kernel();
88032 sym[i].st_value = ksym->value;
88033 + pax_close_kernel();
88034 break;
88035 }
88036
88037 @@ -1988,11 +2034,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
88038 secbase = (unsigned long)mod_percpu(mod);
88039 else
88040 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
88041 + pax_open_kernel();
88042 sym[i].st_value += secbase;
88043 + pax_close_kernel();
88044 break;
88045 }
88046 }
88047
88048 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
88049 + if (is_fs_load && !register_filesystem_found) {
88050 + printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
88051 + ret = -EPERM;
88052 + }
88053 +#endif
88054 +
88055 return ret;
88056 }
88057
88058 @@ -2076,22 +2131,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
88059 || s->sh_entsize != ~0UL
88060 || strstarts(sname, ".init"))
88061 continue;
88062 - s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
88063 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
88064 + s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
88065 + else
88066 + s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
88067 pr_debug("\t%s\n", sname);
88068 }
88069 - switch (m) {
88070 - case 0: /* executable */
88071 - mod->core_size = debug_align(mod->core_size);
88072 - mod->core_text_size = mod->core_size;
88073 - break;
88074 - case 1: /* RO: text and ro-data */
88075 - mod->core_size = debug_align(mod->core_size);
88076 - mod->core_ro_size = mod->core_size;
88077 - break;
88078 - case 3: /* whole core */
88079 - mod->core_size = debug_align(mod->core_size);
88080 - break;
88081 - }
88082 }
88083
88084 pr_debug("Init section allocation order:\n");
88085 @@ -2105,23 +2150,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
88086 || s->sh_entsize != ~0UL
88087 || !strstarts(sname, ".init"))
88088 continue;
88089 - s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
88090 - | INIT_OFFSET_MASK);
88091 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
88092 + s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
88093 + else
88094 + s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
88095 + s->sh_entsize |= INIT_OFFSET_MASK;
88096 pr_debug("\t%s\n", sname);
88097 }
88098 - switch (m) {
88099 - case 0: /* executable */
88100 - mod->init_size = debug_align(mod->init_size);
88101 - mod->init_text_size = mod->init_size;
88102 - break;
88103 - case 1: /* RO: text and ro-data */
88104 - mod->init_size = debug_align(mod->init_size);
88105 - mod->init_ro_size = mod->init_size;
88106 - break;
88107 - case 3: /* whole init */
88108 - mod->init_size = debug_align(mod->init_size);
88109 - break;
88110 - }
88111 }
88112 }
88113
88114 @@ -2294,7 +2329,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
88115
88116 /* Put symbol section at end of init part of module. */
88117 symsect->sh_flags |= SHF_ALLOC;
88118 - symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
88119 + symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
88120 info->index.sym) | INIT_OFFSET_MASK;
88121 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
88122
88123 @@ -2311,13 +2346,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
88124 }
88125
88126 /* Append room for core symbols at end of core part. */
88127 - info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
88128 - info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
88129 - mod->core_size += strtab_size;
88130 + info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
88131 + info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
88132 + mod->core_size_rx += strtab_size;
88133
88134 /* Put string table section at end of init part of module. */
88135 strsect->sh_flags |= SHF_ALLOC;
88136 - strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
88137 + strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
88138 info->index.str) | INIT_OFFSET_MASK;
88139 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
88140 }
88141 @@ -2335,12 +2370,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
88142 /* Make sure we get permanent strtab: don't use info->strtab. */
88143 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
88144
88145 + pax_open_kernel();
88146 +
88147 /* Set types up while we still have access to sections. */
88148 for (i = 0; i < mod->num_symtab; i++)
88149 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
88150
88151 - mod->core_symtab = dst = mod->module_core + info->symoffs;
88152 - mod->core_strtab = s = mod->module_core + info->stroffs;
88153 + mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
88154 + mod->core_strtab = s = mod->module_core_rx + info->stroffs;
88155 src = mod->symtab;
88156 for (ndst = i = 0; i < mod->num_symtab; i++) {
88157 if (i == 0 ||
88158 @@ -2352,6 +2389,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
88159 }
88160 }
88161 mod->core_num_syms = ndst;
88162 +
88163 + pax_close_kernel();
88164 }
88165 #else
88166 static inline void layout_symtab(struct module *mod, struct load_info *info)
88167 @@ -2385,17 +2424,33 @@ void * __weak module_alloc(unsigned long size)
88168 return vmalloc_exec(size);
88169 }
88170
88171 -static void *module_alloc_update_bounds(unsigned long size)
88172 +static void *module_alloc_update_bounds_rw(unsigned long size)
88173 {
88174 void *ret = module_alloc(size);
88175
88176 if (ret) {
88177 mutex_lock(&module_mutex);
88178 /* Update module bounds. */
88179 - if ((unsigned long)ret < module_addr_min)
88180 - module_addr_min = (unsigned long)ret;
88181 - if ((unsigned long)ret + size > module_addr_max)
88182 - module_addr_max = (unsigned long)ret + size;
88183 + if ((unsigned long)ret < module_addr_min_rw)
88184 + module_addr_min_rw = (unsigned long)ret;
88185 + if ((unsigned long)ret + size > module_addr_max_rw)
88186 + module_addr_max_rw = (unsigned long)ret + size;
88187 + mutex_unlock(&module_mutex);
88188 + }
88189 + return ret;
88190 +}
88191 +
88192 +static void *module_alloc_update_bounds_rx(unsigned long size)
88193 +{
88194 + void *ret = module_alloc_exec(size);
88195 +
88196 + if (ret) {
88197 + mutex_lock(&module_mutex);
88198 + /* Update module bounds. */
88199 + if ((unsigned long)ret < module_addr_min_rx)
88200 + module_addr_min_rx = (unsigned long)ret;
88201 + if ((unsigned long)ret + size > module_addr_max_rx)
88202 + module_addr_max_rx = (unsigned long)ret + size;
88203 mutex_unlock(&module_mutex);
88204 }
88205 return ret;
88206 @@ -2652,7 +2707,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
88207 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
88208
88209 if (info->index.sym == 0) {
88210 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
88211 + /*
88212 + * avoid potentially printing jibberish on attempted load
88213 + * of a module randomized with a different seed
88214 + */
88215 + pr_warn("module has no symbols (stripped?)\n");
88216 +#else
88217 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
88218 +#endif
88219 return ERR_PTR(-ENOEXEC);
88220 }
88221
88222 @@ -2668,8 +2731,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
88223 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
88224 {
88225 const char *modmagic = get_modinfo(info, "vermagic");
88226 + const char *license = get_modinfo(info, "license");
88227 int err;
88228
88229 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
88230 + if (!license || !license_is_gpl_compatible(license))
88231 + return -ENOEXEC;
88232 +#endif
88233 +
88234 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
88235 modmagic = NULL;
88236
88237 @@ -2694,7 +2763,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
88238 }
88239
88240 /* Set up license info based on the info section */
88241 - set_license(mod, get_modinfo(info, "license"));
88242 + set_license(mod, license);
88243
88244 return 0;
88245 }
88246 @@ -2788,7 +2857,7 @@ static int move_module(struct module *mod, struct load_info *info)
88247 void *ptr;
88248
88249 /* Do the allocs. */
88250 - ptr = module_alloc_update_bounds(mod->core_size);
88251 + ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
88252 /*
88253 * The pointer to this block is stored in the module structure
88254 * which is inside the block. Just mark it as not being a
88255 @@ -2798,11 +2867,11 @@ static int move_module(struct module *mod, struct load_info *info)
88256 if (!ptr)
88257 return -ENOMEM;
88258
88259 - memset(ptr, 0, mod->core_size);
88260 - mod->module_core = ptr;
88261 + memset(ptr, 0, mod->core_size_rw);
88262 + mod->module_core_rw = ptr;
88263
88264 - if (mod->init_size) {
88265 - ptr = module_alloc_update_bounds(mod->init_size);
88266 + if (mod->init_size_rw) {
88267 + ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
88268 /*
88269 * The pointer to this block is stored in the module structure
88270 * which is inside the block. This block doesn't need to be
88271 @@ -2811,13 +2880,45 @@ static int move_module(struct module *mod, struct load_info *info)
88272 */
88273 kmemleak_ignore(ptr);
88274 if (!ptr) {
88275 - module_free(mod, mod->module_core);
88276 + module_free(mod, mod->module_core_rw);
88277 return -ENOMEM;
88278 }
88279 - memset(ptr, 0, mod->init_size);
88280 - mod->module_init = ptr;
88281 + memset(ptr, 0, mod->init_size_rw);
88282 + mod->module_init_rw = ptr;
88283 } else
88284 - mod->module_init = NULL;
88285 + mod->module_init_rw = NULL;
88286 +
88287 + ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
88288 + kmemleak_not_leak(ptr);
88289 + if (!ptr) {
88290 + if (mod->module_init_rw)
88291 + module_free(mod, mod->module_init_rw);
88292 + module_free(mod, mod->module_core_rw);
88293 + return -ENOMEM;
88294 + }
88295 +
88296 + pax_open_kernel();
88297 + memset(ptr, 0, mod->core_size_rx);
88298 + pax_close_kernel();
88299 + mod->module_core_rx = ptr;
88300 +
88301 + if (mod->init_size_rx) {
88302 + ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
88303 + kmemleak_ignore(ptr);
88304 + if (!ptr && mod->init_size_rx) {
88305 + module_free_exec(mod, mod->module_core_rx);
88306 + if (mod->module_init_rw)
88307 + module_free(mod, mod->module_init_rw);
88308 + module_free(mod, mod->module_core_rw);
88309 + return -ENOMEM;
88310 + }
88311 +
88312 + pax_open_kernel();
88313 + memset(ptr, 0, mod->init_size_rx);
88314 + pax_close_kernel();
88315 + mod->module_init_rx = ptr;
88316 + } else
88317 + mod->module_init_rx = NULL;
88318
88319 /* Transfer each section which specifies SHF_ALLOC */
88320 pr_debug("final section addresses:\n");
88321 @@ -2828,16 +2929,45 @@ static int move_module(struct module *mod, struct load_info *info)
88322 if (!(shdr->sh_flags & SHF_ALLOC))
88323 continue;
88324
88325 - if (shdr->sh_entsize & INIT_OFFSET_MASK)
88326 - dest = mod->module_init
88327 - + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
88328 - else
88329 - dest = mod->module_core + shdr->sh_entsize;
88330 + if (shdr->sh_entsize & INIT_OFFSET_MASK) {
88331 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
88332 + dest = mod->module_init_rw
88333 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
88334 + else
88335 + dest = mod->module_init_rx
88336 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
88337 + } else {
88338 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
88339 + dest = mod->module_core_rw + shdr->sh_entsize;
88340 + else
88341 + dest = mod->module_core_rx + shdr->sh_entsize;
88342 + }
88343 +
88344 + if (shdr->sh_type != SHT_NOBITS) {
88345 +
88346 +#ifdef CONFIG_PAX_KERNEXEC
88347 +#ifdef CONFIG_X86_64
88348 + if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
88349 + set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
88350 +#endif
88351 + if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
88352 + pax_open_kernel();
88353 + memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
88354 + pax_close_kernel();
88355 + } else
88356 +#endif
88357
88358 - if (shdr->sh_type != SHT_NOBITS)
88359 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
88360 + }
88361 /* Update sh_addr to point to copy in image. */
88362 - shdr->sh_addr = (unsigned long)dest;
88363 +
88364 +#ifdef CONFIG_PAX_KERNEXEC
88365 + if (shdr->sh_flags & SHF_EXECINSTR)
88366 + shdr->sh_addr = ktva_ktla((unsigned long)dest);
88367 + else
88368 +#endif
88369 +
88370 + shdr->sh_addr = (unsigned long)dest;
88371 pr_debug("\t0x%lx %s\n",
88372 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
88373 }
88374 @@ -2894,12 +3024,12 @@ static void flush_module_icache(const struct module *mod)
88375 * Do it before processing of module parameters, so the module
88376 * can provide parameter accessor functions of its own.
88377 */
88378 - if (mod->module_init)
88379 - flush_icache_range((unsigned long)mod->module_init,
88380 - (unsigned long)mod->module_init
88381 - + mod->init_size);
88382 - flush_icache_range((unsigned long)mod->module_core,
88383 - (unsigned long)mod->module_core + mod->core_size);
88384 + if (mod->module_init_rx)
88385 + flush_icache_range((unsigned long)mod->module_init_rx,
88386 + (unsigned long)mod->module_init_rx
88387 + + mod->init_size_rx);
88388 + flush_icache_range((unsigned long)mod->module_core_rx,
88389 + (unsigned long)mod->module_core_rx + mod->core_size_rx);
88390
88391 set_fs(old_fs);
88392 }
88393 @@ -2956,8 +3086,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
88394 static void module_deallocate(struct module *mod, struct load_info *info)
88395 {
88396 percpu_modfree(mod);
88397 - module_free(mod, mod->module_init);
88398 - module_free(mod, mod->module_core);
88399 + module_free_exec(mod, mod->module_init_rx);
88400 + module_free_exec(mod, mod->module_core_rx);
88401 + module_free(mod, mod->module_init_rw);
88402 + module_free(mod, mod->module_core_rw);
88403 }
88404
88405 int __weak module_finalize(const Elf_Ehdr *hdr,
88406 @@ -2970,7 +3102,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
88407 static int post_relocation(struct module *mod, const struct load_info *info)
88408 {
88409 /* Sort exception table now relocations are done. */
88410 + pax_open_kernel();
88411 sort_extable(mod->extable, mod->extable + mod->num_exentries);
88412 + pax_close_kernel();
88413
88414 /* Copy relocated percpu area over. */
88415 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
88416 @@ -3024,16 +3158,16 @@ static int do_init_module(struct module *mod)
88417 MODULE_STATE_COMING, mod);
88418
88419 /* Set RO and NX regions for core */
88420 - set_section_ro_nx(mod->module_core,
88421 - mod->core_text_size,
88422 - mod->core_ro_size,
88423 - mod->core_size);
88424 + set_section_ro_nx(mod->module_core_rx,
88425 + mod->core_size_rx,
88426 + mod->core_size_rx,
88427 + mod->core_size_rx);
88428
88429 /* Set RO and NX regions for init */
88430 - set_section_ro_nx(mod->module_init,
88431 - mod->init_text_size,
88432 - mod->init_ro_size,
88433 - mod->init_size);
88434 + set_section_ro_nx(mod->module_init_rx,
88435 + mod->init_size_rx,
88436 + mod->init_size_rx,
88437 + mod->init_size_rx);
88438
88439 do_mod_ctors(mod);
88440 /* Start the module */
88441 @@ -3094,11 +3228,12 @@ static int do_init_module(struct module *mod)
88442 mod->strtab = mod->core_strtab;
88443 #endif
88444 unset_module_init_ro_nx(mod);
88445 - module_free(mod, mod->module_init);
88446 - mod->module_init = NULL;
88447 - mod->init_size = 0;
88448 - mod->init_ro_size = 0;
88449 - mod->init_text_size = 0;
88450 + module_free(mod, mod->module_init_rw);
88451 + module_free_exec(mod, mod->module_init_rx);
88452 + mod->module_init_rw = NULL;
88453 + mod->module_init_rx = NULL;
88454 + mod->init_size_rw = 0;
88455 + mod->init_size_rx = 0;
88456 mutex_unlock(&module_mutex);
88457 wake_up_all(&module_wq);
88458
88459 @@ -3241,9 +3376,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
88460 if (err)
88461 goto free_unload;
88462
88463 + /* Now copy in args */
88464 + mod->args = strndup_user(uargs, ~0UL >> 1);
88465 + if (IS_ERR(mod->args)) {
88466 + err = PTR_ERR(mod->args);
88467 + goto free_unload;
88468 + }
88469 +
88470 /* Set up MODINFO_ATTR fields */
88471 setup_modinfo(mod, info);
88472
88473 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
88474 + {
88475 + char *p, *p2;
88476 +
88477 + if (strstr(mod->args, "grsec_modharden_netdev")) {
88478 + 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);
88479 + err = -EPERM;
88480 + goto free_modinfo;
88481 + } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
88482 + p += sizeof("grsec_modharden_normal") - 1;
88483 + p2 = strstr(p, "_");
88484 + if (p2) {
88485 + *p2 = '\0';
88486 + printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
88487 + *p2 = '_';
88488 + }
88489 + err = -EPERM;
88490 + goto free_modinfo;
88491 + }
88492 + }
88493 +#endif
88494 +
88495 /* Fix up syms, so that st_value is a pointer to location. */
88496 err = simplify_symbols(mod, info);
88497 if (err < 0)
88498 @@ -3259,13 +3423,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
88499
88500 flush_module_icache(mod);
88501
88502 - /* Now copy in args */
88503 - mod->args = strndup_user(uargs, ~0UL >> 1);
88504 - if (IS_ERR(mod->args)) {
88505 - err = PTR_ERR(mod->args);
88506 - goto free_arch_cleanup;
88507 - }
88508 -
88509 dynamic_debug_setup(info->debug, info->num_debug);
88510
88511 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
88512 @@ -3303,11 +3460,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
88513 ddebug_cleanup:
88514 dynamic_debug_remove(info->debug);
88515 synchronize_sched();
88516 - kfree(mod->args);
88517 - free_arch_cleanup:
88518 module_arch_cleanup(mod);
88519 free_modinfo:
88520 free_modinfo(mod);
88521 + kfree(mod->args);
88522 free_unload:
88523 module_unload_free(mod);
88524 unlink_mod:
88525 @@ -3390,10 +3546,16 @@ static const char *get_ksymbol(struct module *mod,
88526 unsigned long nextval;
88527
88528 /* At worse, next value is at end of module */
88529 - if (within_module_init(addr, mod))
88530 - nextval = (unsigned long)mod->module_init+mod->init_text_size;
88531 + if (within_module_init_rx(addr, mod))
88532 + nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
88533 + else if (within_module_init_rw(addr, mod))
88534 + nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
88535 + else if (within_module_core_rx(addr, mod))
88536 + nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
88537 + else if (within_module_core_rw(addr, mod))
88538 + nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
88539 else
88540 - nextval = (unsigned long)mod->module_core+mod->core_text_size;
88541 + return NULL;
88542
88543 /* Scan for closest preceding symbol, and next symbol. (ELF
88544 starts real symbols at 1). */
88545 @@ -3644,7 +3806,7 @@ static int m_show(struct seq_file *m, void *p)
88546 return 0;
88547
88548 seq_printf(m, "%s %u",
88549 - mod->name, mod->init_size + mod->core_size);
88550 + mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
88551 print_unload_info(m, mod);
88552
88553 /* Informative for users. */
88554 @@ -3653,7 +3815,7 @@ static int m_show(struct seq_file *m, void *p)
88555 mod->state == MODULE_STATE_COMING ? "Loading":
88556 "Live");
88557 /* Used by oprofile and other similar tools. */
88558 - seq_printf(m, " 0x%pK", mod->module_core);
88559 + seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
88560
88561 /* Taints info */
88562 if (mod->taints)
88563 @@ -3689,7 +3851,17 @@ static const struct file_operations proc_modules_operations = {
88564
88565 static int __init proc_modules_init(void)
88566 {
88567 +#ifndef CONFIG_GRKERNSEC_HIDESYM
88568 +#ifdef CONFIG_GRKERNSEC_PROC_USER
88569 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
88570 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
88571 + proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
88572 +#else
88573 proc_create("modules", 0, NULL, &proc_modules_operations);
88574 +#endif
88575 +#else
88576 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
88577 +#endif
88578 return 0;
88579 }
88580 module_init(proc_modules_init);
88581 @@ -3750,14 +3922,14 @@ struct module *__module_address(unsigned long addr)
88582 {
88583 struct module *mod;
88584
88585 - if (addr < module_addr_min || addr > module_addr_max)
88586 + if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
88587 + (addr < module_addr_min_rw || addr > module_addr_max_rw))
88588 return NULL;
88589
88590 list_for_each_entry_rcu(mod, &modules, list) {
88591 if (mod->state == MODULE_STATE_UNFORMED)
88592 continue;
88593 - if (within_module_core(addr, mod)
88594 - || within_module_init(addr, mod))
88595 + if (within_module_init(addr, mod) || within_module_core(addr, mod))
88596 return mod;
88597 }
88598 return NULL;
88599 @@ -3792,11 +3964,20 @@ bool is_module_text_address(unsigned long addr)
88600 */
88601 struct module *__module_text_address(unsigned long addr)
88602 {
88603 - struct module *mod = __module_address(addr);
88604 + struct module *mod;
88605 +
88606 +#ifdef CONFIG_X86_32
88607 + addr = ktla_ktva(addr);
88608 +#endif
88609 +
88610 + if (addr < module_addr_min_rx || addr > module_addr_max_rx)
88611 + return NULL;
88612 +
88613 + mod = __module_address(addr);
88614 +
88615 if (mod) {
88616 /* Make sure it's within the text section. */
88617 - if (!within(addr, mod->module_init, mod->init_text_size)
88618 - && !within(addr, mod->module_core, mod->core_text_size))
88619 + if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
88620 mod = NULL;
88621 }
88622 return mod;
88623 diff --git a/kernel/notifier.c b/kernel/notifier.c
88624 index db4c8b0..ad011c5 100644
88625 --- a/kernel/notifier.c
88626 +++ b/kernel/notifier.c
88627 @@ -5,6 +5,7 @@
88628 #include <linux/rcupdate.h>
88629 #include <linux/vmalloc.h>
88630 #include <linux/reboot.h>
88631 +#include <linux/mm.h>
88632
88633 /*
88634 * Notifier list for kernel code which wants to be called
88635 @@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
88636 while ((*nl) != NULL) {
88637 if (n->priority > (*nl)->priority)
88638 break;
88639 - nl = &((*nl)->next);
88640 + nl = (struct notifier_block **)&((*nl)->next);
88641 }
88642 - n->next = *nl;
88643 + pax_open_kernel();
88644 + *(const void **)&n->next = *nl;
88645 rcu_assign_pointer(*nl, n);
88646 + pax_close_kernel();
88647 return 0;
88648 }
88649
88650 @@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
88651 return 0;
88652 if (n->priority > (*nl)->priority)
88653 break;
88654 - nl = &((*nl)->next);
88655 + nl = (struct notifier_block **)&((*nl)->next);
88656 }
88657 - n->next = *nl;
88658 + pax_open_kernel();
88659 + *(const void **)&n->next = *nl;
88660 rcu_assign_pointer(*nl, n);
88661 + pax_close_kernel();
88662 return 0;
88663 }
88664
88665 @@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
88666 {
88667 while ((*nl) != NULL) {
88668 if ((*nl) == n) {
88669 + pax_open_kernel();
88670 rcu_assign_pointer(*nl, n->next);
88671 + pax_close_kernel();
88672 return 0;
88673 }
88674 - nl = &((*nl)->next);
88675 + nl = (struct notifier_block **)&((*nl)->next);
88676 }
88677 return -ENOENT;
88678 }
88679 diff --git a/kernel/padata.c b/kernel/padata.c
88680 index 161402f..598814c 100644
88681 --- a/kernel/padata.c
88682 +++ b/kernel/padata.c
88683 @@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
88684 * seq_nr mod. number of cpus in use.
88685 */
88686
88687 - seq_nr = atomic_inc_return(&pd->seq_nr);
88688 + seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
88689 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
88690
88691 return padata_index_to_cpu(pd, cpu_index);
88692 @@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
88693 padata_init_pqueues(pd);
88694 padata_init_squeues(pd);
88695 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
88696 - atomic_set(&pd->seq_nr, -1);
88697 + atomic_set_unchecked(&pd->seq_nr, -1);
88698 atomic_set(&pd->reorder_objects, 0);
88699 atomic_set(&pd->refcnt, 0);
88700 pd->pinst = pinst;
88701 diff --git a/kernel/panic.c b/kernel/panic.c
88702 index d02fa9f..9faec0a 100644
88703 --- a/kernel/panic.c
88704 +++ b/kernel/panic.c
88705 @@ -52,7 +52,7 @@ EXPORT_SYMBOL(panic_blink);
88706 /*
88707 * Stop ourself in panic -- architecture code may override this
88708 */
88709 -void __weak panic_smp_self_stop(void)
88710 +void __weak __noreturn panic_smp_self_stop(void)
88711 {
88712 while (1)
88713 cpu_relax();
88714 @@ -408,7 +408,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
88715 disable_trace_on_warning();
88716
88717 pr_warn("------------[ cut here ]------------\n");
88718 - pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
88719 + pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
88720 raw_smp_processor_id(), current->pid, file, line, caller);
88721
88722 if (args)
88723 @@ -462,7 +462,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
88724 */
88725 __visible void __stack_chk_fail(void)
88726 {
88727 - panic("stack-protector: Kernel stack is corrupted in: %p\n",
88728 + dump_stack();
88729 + panic("stack-protector: Kernel stack is corrupted in: %pA\n",
88730 __builtin_return_address(0));
88731 }
88732 EXPORT_SYMBOL(__stack_chk_fail);
88733 diff --git a/kernel/pid.c b/kernel/pid.c
88734 index 9b9a266..c20ef80 100644
88735 --- a/kernel/pid.c
88736 +++ b/kernel/pid.c
88737 @@ -33,6 +33,7 @@
88738 #include <linux/rculist.h>
88739 #include <linux/bootmem.h>
88740 #include <linux/hash.h>
88741 +#include <linux/security.h>
88742 #include <linux/pid_namespace.h>
88743 #include <linux/init_task.h>
88744 #include <linux/syscalls.h>
88745 @@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
88746
88747 int pid_max = PID_MAX_DEFAULT;
88748
88749 -#define RESERVED_PIDS 300
88750 +#define RESERVED_PIDS 500
88751
88752 int pid_max_min = RESERVED_PIDS + 1;
88753 int pid_max_max = PID_MAX_LIMIT;
88754 @@ -445,10 +446,18 @@ EXPORT_SYMBOL(pid_task);
88755 */
88756 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
88757 {
88758 + struct task_struct *task;
88759 +
88760 rcu_lockdep_assert(rcu_read_lock_held(),
88761 "find_task_by_pid_ns() needs rcu_read_lock()"
88762 " protection");
88763 - return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
88764 +
88765 + task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
88766 +
88767 + if (gr_pid_is_chrooted(task))
88768 + return NULL;
88769 +
88770 + return task;
88771 }
88772
88773 struct task_struct *find_task_by_vpid(pid_t vnr)
88774 @@ -456,6 +465,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
88775 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
88776 }
88777
88778 +struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
88779 +{
88780 + rcu_lockdep_assert(rcu_read_lock_held(),
88781 + "find_task_by_pid_ns() needs rcu_read_lock()"
88782 + " protection");
88783 + return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
88784 +}
88785 +
88786 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
88787 {
88788 struct pid *pid;
88789 diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
88790 index db95d8e..a0ca23f 100644
88791 --- a/kernel/pid_namespace.c
88792 +++ b/kernel/pid_namespace.c
88793 @@ -253,7 +253,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
88794 void __user *buffer, size_t *lenp, loff_t *ppos)
88795 {
88796 struct pid_namespace *pid_ns = task_active_pid_ns(current);
88797 - struct ctl_table tmp = *table;
88798 + ctl_table_no_const tmp = *table;
88799
88800 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
88801 return -EPERM;
88802 diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
88803 index 3b89464..5e38379 100644
88804 --- a/kernel/posix-cpu-timers.c
88805 +++ b/kernel/posix-cpu-timers.c
88806 @@ -1464,14 +1464,14 @@ struct k_clock clock_posix_cpu = {
88807
88808 static __init int init_posix_cpu_timers(void)
88809 {
88810 - struct k_clock process = {
88811 + static struct k_clock process = {
88812 .clock_getres = process_cpu_clock_getres,
88813 .clock_get = process_cpu_clock_get,
88814 .timer_create = process_cpu_timer_create,
88815 .nsleep = process_cpu_nsleep,
88816 .nsleep_restart = process_cpu_nsleep_restart,
88817 };
88818 - struct k_clock thread = {
88819 + static struct k_clock thread = {
88820 .clock_getres = thread_cpu_clock_getres,
88821 .clock_get = thread_cpu_clock_get,
88822 .timer_create = thread_cpu_timer_create,
88823 diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
88824 index 424c2d4..679242f 100644
88825 --- a/kernel/posix-timers.c
88826 +++ b/kernel/posix-timers.c
88827 @@ -43,6 +43,7 @@
88828 #include <linux/hash.h>
88829 #include <linux/posix-clock.h>
88830 #include <linux/posix-timers.h>
88831 +#include <linux/grsecurity.h>
88832 #include <linux/syscalls.h>
88833 #include <linux/wait.h>
88834 #include <linux/workqueue.h>
88835 @@ -122,7 +123,7 @@ static DEFINE_SPINLOCK(hash_lock);
88836 * which we beg off on and pass to do_sys_settimeofday().
88837 */
88838
88839 -static struct k_clock posix_clocks[MAX_CLOCKS];
88840 +static struct k_clock *posix_clocks[MAX_CLOCKS];
88841
88842 /*
88843 * These ones are defined below.
88844 @@ -275,7 +276,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
88845 */
88846 static __init int init_posix_timers(void)
88847 {
88848 - struct k_clock clock_realtime = {
88849 + static struct k_clock clock_realtime = {
88850 .clock_getres = hrtimer_get_res,
88851 .clock_get = posix_clock_realtime_get,
88852 .clock_set = posix_clock_realtime_set,
88853 @@ -287,7 +288,7 @@ static __init int init_posix_timers(void)
88854 .timer_get = common_timer_get,
88855 .timer_del = common_timer_del,
88856 };
88857 - struct k_clock clock_monotonic = {
88858 + static struct k_clock clock_monotonic = {
88859 .clock_getres = hrtimer_get_res,
88860 .clock_get = posix_ktime_get_ts,
88861 .nsleep = common_nsleep,
88862 @@ -297,19 +298,19 @@ static __init int init_posix_timers(void)
88863 .timer_get = common_timer_get,
88864 .timer_del = common_timer_del,
88865 };
88866 - struct k_clock clock_monotonic_raw = {
88867 + static struct k_clock clock_monotonic_raw = {
88868 .clock_getres = hrtimer_get_res,
88869 .clock_get = posix_get_monotonic_raw,
88870 };
88871 - struct k_clock clock_realtime_coarse = {
88872 + static struct k_clock clock_realtime_coarse = {
88873 .clock_getres = posix_get_coarse_res,
88874 .clock_get = posix_get_realtime_coarse,
88875 };
88876 - struct k_clock clock_monotonic_coarse = {
88877 + static struct k_clock clock_monotonic_coarse = {
88878 .clock_getres = posix_get_coarse_res,
88879 .clock_get = posix_get_monotonic_coarse,
88880 };
88881 - struct k_clock clock_tai = {
88882 + static struct k_clock clock_tai = {
88883 .clock_getres = hrtimer_get_res,
88884 .clock_get = posix_get_tai,
88885 .nsleep = common_nsleep,
88886 @@ -319,7 +320,7 @@ static __init int init_posix_timers(void)
88887 .timer_get = common_timer_get,
88888 .timer_del = common_timer_del,
88889 };
88890 - struct k_clock clock_boottime = {
88891 + static struct k_clock clock_boottime = {
88892 .clock_getres = hrtimer_get_res,
88893 .clock_get = posix_get_boottime,
88894 .nsleep = common_nsleep,
88895 @@ -531,7 +532,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
88896 return;
88897 }
88898
88899 - posix_clocks[clock_id] = *new_clock;
88900 + posix_clocks[clock_id] = new_clock;
88901 }
88902 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
88903
88904 @@ -577,9 +578,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
88905 return (id & CLOCKFD_MASK) == CLOCKFD ?
88906 &clock_posix_dynamic : &clock_posix_cpu;
88907
88908 - if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
88909 + if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
88910 return NULL;
88911 - return &posix_clocks[id];
88912 + return posix_clocks[id];
88913 }
88914
88915 static int common_timer_create(struct k_itimer *new_timer)
88916 @@ -597,7 +598,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
88917 struct k_clock *kc = clockid_to_kclock(which_clock);
88918 struct k_itimer *new_timer;
88919 int error, new_timer_id;
88920 - sigevent_t event;
88921 + sigevent_t event = { };
88922 int it_id_set = IT_ID_NOT_SET;
88923
88924 if (!kc)
88925 @@ -1011,6 +1012,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
88926 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
88927 return -EFAULT;
88928
88929 + /* only the CLOCK_REALTIME clock can be set, all other clocks
88930 + have their clock_set fptr set to a nosettime dummy function
88931 + CLOCK_REALTIME has a NULL clock_set fptr which causes it to
88932 + call common_clock_set, which calls do_sys_settimeofday, which
88933 + we hook
88934 + */
88935 +
88936 return kc->clock_set(which_clock, &new_tp);
88937 }
88938
88939 diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
88940 index 2fac9cc..56fef29 100644
88941 --- a/kernel/power/Kconfig
88942 +++ b/kernel/power/Kconfig
88943 @@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
88944 config HIBERNATION
88945 bool "Hibernation (aka 'suspend to disk')"
88946 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
88947 + depends on !GRKERNSEC_KMEM
88948 + depends on !PAX_MEMORY_SANITIZE
88949 select HIBERNATE_CALLBACKS
88950 select LZO_COMPRESS
88951 select LZO_DECOMPRESS
88952 diff --git a/kernel/power/process.c b/kernel/power/process.c
88953 index 06ec886..9dba35e 100644
88954 --- a/kernel/power/process.c
88955 +++ b/kernel/power/process.c
88956 @@ -34,6 +34,7 @@ static int try_to_freeze_tasks(bool user_only)
88957 unsigned int elapsed_msecs;
88958 bool wakeup = false;
88959 int sleep_usecs = USEC_PER_MSEC;
88960 + bool timedout = false;
88961
88962 do_gettimeofday(&start);
88963
88964 @@ -44,13 +45,20 @@ static int try_to_freeze_tasks(bool user_only)
88965
88966 while (true) {
88967 todo = 0;
88968 + if (time_after(jiffies, end_time))
88969 + timedout = true;
88970 read_lock(&tasklist_lock);
88971 do_each_thread(g, p) {
88972 if (p == current || !freeze_task(p))
88973 continue;
88974
88975 - if (!freezer_should_skip(p))
88976 + if (!freezer_should_skip(p)) {
88977 todo++;
88978 + if (timedout) {
88979 + printk(KERN_ERR "Task refusing to freeze:\n");
88980 + sched_show_task(p);
88981 + }
88982 + }
88983 } while_each_thread(g, p);
88984 read_unlock(&tasklist_lock);
88985
88986 @@ -59,7 +67,7 @@ static int try_to_freeze_tasks(bool user_only)
88987 todo += wq_busy;
88988 }
88989
88990 - if (!todo || time_after(jiffies, end_time))
88991 + if (!todo || timedout)
88992 break;
88993
88994 if (pm_wakeup_pending()) {
88995 diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
88996 index 221229c..c76ca0a 100644
88997 --- a/kernel/printk/printk.c
88998 +++ b/kernel/printk/printk.c
88999 @@ -385,6 +385,11 @@ static int check_syslog_permissions(int type, bool from_file)
89000 if (from_file && type != SYSLOG_ACTION_OPEN)
89001 return 0;
89002
89003 +#ifdef CONFIG_GRKERNSEC_DMESG
89004 + if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
89005 + return -EPERM;
89006 +#endif
89007 +
89008 if (syslog_action_restricted(type)) {
89009 if (capable(CAP_SYSLOG))
89010 return 0;
89011 diff --git a/kernel/profile.c b/kernel/profile.c
89012 index cb980f0..ccd8782 100644
89013 --- a/kernel/profile.c
89014 +++ b/kernel/profile.c
89015 @@ -37,7 +37,7 @@ struct profile_hit {
89016 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
89017 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
89018
89019 -static atomic_t *prof_buffer;
89020 +static atomic_unchecked_t *prof_buffer;
89021 static unsigned long prof_len, prof_shift;
89022
89023 int prof_on __read_mostly;
89024 @@ -260,7 +260,7 @@ static void profile_flip_buffers(void)
89025 hits[i].pc = 0;
89026 continue;
89027 }
89028 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
89029 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
89030 hits[i].hits = hits[i].pc = 0;
89031 }
89032 }
89033 @@ -321,9 +321,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
89034 * Add the current hit(s) and flush the write-queue out
89035 * to the global buffer:
89036 */
89037 - atomic_add(nr_hits, &prof_buffer[pc]);
89038 + atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
89039 for (i = 0; i < NR_PROFILE_HIT; ++i) {
89040 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
89041 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
89042 hits[i].pc = hits[i].hits = 0;
89043 }
89044 out:
89045 @@ -398,7 +398,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
89046 {
89047 unsigned long pc;
89048 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
89049 - atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
89050 + atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
89051 }
89052 #endif /* !CONFIG_SMP */
89053
89054 @@ -494,7 +494,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
89055 return -EFAULT;
89056 buf++; p++; count--; read++;
89057 }
89058 - pnt = (char *)prof_buffer + p - sizeof(atomic_t);
89059 + pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
89060 if (copy_to_user(buf, (void *)pnt, count))
89061 return -EFAULT;
89062 read += count;
89063 @@ -525,7 +525,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
89064 }
89065 #endif
89066 profile_discard_flip_buffers();
89067 - memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
89068 + memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
89069 return count;
89070 }
89071
89072 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
89073 index adf9862..9d86345 100644
89074 --- a/kernel/ptrace.c
89075 +++ b/kernel/ptrace.c
89076 @@ -327,7 +327,7 @@ static int ptrace_attach(struct task_struct *task, long request,
89077 if (seize)
89078 flags |= PT_SEIZED;
89079 rcu_read_lock();
89080 - if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
89081 + if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
89082 flags |= PT_PTRACE_CAP;
89083 rcu_read_unlock();
89084 task->ptrace = flags;
89085 @@ -538,7 +538,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
89086 break;
89087 return -EIO;
89088 }
89089 - if (copy_to_user(dst, buf, retval))
89090 + if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
89091 return -EFAULT;
89092 copied += retval;
89093 src += retval;
89094 @@ -806,7 +806,7 @@ int ptrace_request(struct task_struct *child, long request,
89095 bool seized = child->ptrace & PT_SEIZED;
89096 int ret = -EIO;
89097 siginfo_t siginfo, *si;
89098 - void __user *datavp = (void __user *) data;
89099 + void __user *datavp = (__force void __user *) data;
89100 unsigned long __user *datalp = datavp;
89101 unsigned long flags;
89102
89103 @@ -1052,14 +1052,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
89104 goto out;
89105 }
89106
89107 + if (gr_handle_ptrace(child, request)) {
89108 + ret = -EPERM;
89109 + goto out_put_task_struct;
89110 + }
89111 +
89112 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
89113 ret = ptrace_attach(child, request, addr, data);
89114 /*
89115 * Some architectures need to do book-keeping after
89116 * a ptrace attach.
89117 */
89118 - if (!ret)
89119 + if (!ret) {
89120 arch_ptrace_attach(child);
89121 + gr_audit_ptrace(child);
89122 + }
89123 goto out_put_task_struct;
89124 }
89125
89126 @@ -1087,7 +1094,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
89127 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
89128 if (copied != sizeof(tmp))
89129 return -EIO;
89130 - return put_user(tmp, (unsigned long __user *)data);
89131 + return put_user(tmp, (__force unsigned long __user *)data);
89132 }
89133
89134 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
89135 @@ -1181,7 +1188,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
89136 }
89137
89138 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
89139 - compat_long_t, addr, compat_long_t, data)
89140 + compat_ulong_t, addr, compat_ulong_t, data)
89141 {
89142 struct task_struct *child;
89143 long ret;
89144 @@ -1197,14 +1204,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
89145 goto out;
89146 }
89147
89148 + if (gr_handle_ptrace(child, request)) {
89149 + ret = -EPERM;
89150 + goto out_put_task_struct;
89151 + }
89152 +
89153 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
89154 ret = ptrace_attach(child, request, addr, data);
89155 /*
89156 * Some architectures need to do book-keeping after
89157 * a ptrace attach.
89158 */
89159 - if (!ret)
89160 + if (!ret) {
89161 arch_ptrace_attach(child);
89162 + gr_audit_ptrace(child);
89163 + }
89164 goto out_put_task_struct;
89165 }
89166
89167 diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
89168 index bd30bc6..dce23da 100644
89169 --- a/kernel/rcu/rcutorture.c
89170 +++ b/kernel/rcu/rcutorture.c
89171 @@ -122,12 +122,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
89172 rcu_torture_count) = { 0 };
89173 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
89174 rcu_torture_batch) = { 0 };
89175 -static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
89176 -static atomic_t n_rcu_torture_alloc;
89177 -static atomic_t n_rcu_torture_alloc_fail;
89178 -static atomic_t n_rcu_torture_free;
89179 -static atomic_t n_rcu_torture_mberror;
89180 -static atomic_t n_rcu_torture_error;
89181 +static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
89182 +static atomic_unchecked_t n_rcu_torture_alloc;
89183 +static atomic_unchecked_t n_rcu_torture_alloc_fail;
89184 +static atomic_unchecked_t n_rcu_torture_free;
89185 +static atomic_unchecked_t n_rcu_torture_mberror;
89186 +static atomic_unchecked_t n_rcu_torture_error;
89187 static long n_rcu_torture_barrier_error;
89188 static long n_rcu_torture_boost_ktrerror;
89189 static long n_rcu_torture_boost_rterror;
89190 @@ -186,11 +186,11 @@ rcu_torture_alloc(void)
89191
89192 spin_lock_bh(&rcu_torture_lock);
89193 if (list_empty(&rcu_torture_freelist)) {
89194 - atomic_inc(&n_rcu_torture_alloc_fail);
89195 + atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
89196 spin_unlock_bh(&rcu_torture_lock);
89197 return NULL;
89198 }
89199 - atomic_inc(&n_rcu_torture_alloc);
89200 + atomic_inc_unchecked(&n_rcu_torture_alloc);
89201 p = rcu_torture_freelist.next;
89202 list_del_init(p);
89203 spin_unlock_bh(&rcu_torture_lock);
89204 @@ -203,7 +203,7 @@ rcu_torture_alloc(void)
89205 static void
89206 rcu_torture_free(struct rcu_torture *p)
89207 {
89208 - atomic_inc(&n_rcu_torture_free);
89209 + atomic_inc_unchecked(&n_rcu_torture_free);
89210 spin_lock_bh(&rcu_torture_lock);
89211 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
89212 spin_unlock_bh(&rcu_torture_lock);
89213 @@ -287,7 +287,7 @@ rcu_torture_cb(struct rcu_head *p)
89214 i = rp->rtort_pipe_count;
89215 if (i > RCU_TORTURE_PIPE_LEN)
89216 i = RCU_TORTURE_PIPE_LEN;
89217 - atomic_inc(&rcu_torture_wcount[i]);
89218 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
89219 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
89220 rp->rtort_mbtest = 0;
89221 rcu_torture_free(rp);
89222 @@ -714,7 +714,7 @@ rcu_torture_writer(void *arg)
89223 i = old_rp->rtort_pipe_count;
89224 if (i > RCU_TORTURE_PIPE_LEN)
89225 i = RCU_TORTURE_PIPE_LEN;
89226 - atomic_inc(&rcu_torture_wcount[i]);
89227 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
89228 old_rp->rtort_pipe_count++;
89229 if (gp_normal == gp_exp)
89230 exp = !!(torture_random(&rand) & 0x80);
89231 @@ -732,7 +732,7 @@ rcu_torture_writer(void *arg)
89232 i = rp->rtort_pipe_count;
89233 if (i > RCU_TORTURE_PIPE_LEN)
89234 i = RCU_TORTURE_PIPE_LEN;
89235 - atomic_inc(&rcu_torture_wcount[i]);
89236 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
89237 if (++rp->rtort_pipe_count >=
89238 RCU_TORTURE_PIPE_LEN) {
89239 rp->rtort_mbtest = 0;
89240 @@ -825,7 +825,7 @@ static void rcu_torture_timer(unsigned long unused)
89241 return;
89242 }
89243 if (p->rtort_mbtest == 0)
89244 - atomic_inc(&n_rcu_torture_mberror);
89245 + atomic_inc_unchecked(&n_rcu_torture_mberror);
89246 spin_lock(&rand_lock);
89247 cur_ops->read_delay(&rand);
89248 n_rcu_torture_timers++;
89249 @@ -895,7 +895,7 @@ rcu_torture_reader(void *arg)
89250 continue;
89251 }
89252 if (p->rtort_mbtest == 0)
89253 - atomic_inc(&n_rcu_torture_mberror);
89254 + atomic_inc_unchecked(&n_rcu_torture_mberror);
89255 cur_ops->read_delay(&rand);
89256 preempt_disable();
89257 pipe_count = p->rtort_pipe_count;
89258 @@ -950,15 +950,15 @@ rcu_torture_printk(char *page)
89259 }
89260 page += sprintf(page, "%s%s ", torture_type, TORTURE_FLAG);
89261 page += sprintf(page,
89262 - "rtc: %p ver: %lu tfle: %d rta: %d rtaf: %d rtf: %d ",
89263 + "rtc: %pP ver: %lu tfle: %d rta: %d rtaf: %d rtf: %d ",
89264 rcu_torture_current,
89265 rcu_torture_current_version,
89266 list_empty(&rcu_torture_freelist),
89267 - atomic_read(&n_rcu_torture_alloc),
89268 - atomic_read(&n_rcu_torture_alloc_fail),
89269 - atomic_read(&n_rcu_torture_free));
89270 + atomic_read_unchecked(&n_rcu_torture_alloc),
89271 + atomic_read_unchecked(&n_rcu_torture_alloc_fail),
89272 + atomic_read_unchecked(&n_rcu_torture_free));
89273 page += sprintf(page, "rtmbe: %d rtbke: %ld rtbre: %ld ",
89274 - atomic_read(&n_rcu_torture_mberror),
89275 + atomic_read_unchecked(&n_rcu_torture_mberror),
89276 n_rcu_torture_boost_ktrerror,
89277 n_rcu_torture_boost_rterror);
89278 page += sprintf(page, "rtbf: %ld rtb: %ld nt: %ld ",
89279 @@ -971,14 +971,14 @@ rcu_torture_printk(char *page)
89280 n_barrier_attempts,
89281 n_rcu_torture_barrier_error);
89282 page += sprintf(page, "\n%s%s ", torture_type, TORTURE_FLAG);
89283 - if (atomic_read(&n_rcu_torture_mberror) != 0 ||
89284 + if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
89285 n_rcu_torture_barrier_error != 0 ||
89286 n_rcu_torture_boost_ktrerror != 0 ||
89287 n_rcu_torture_boost_rterror != 0 ||
89288 n_rcu_torture_boost_failure != 0 ||
89289 i > 1) {
89290 page += sprintf(page, "!!! ");
89291 - atomic_inc(&n_rcu_torture_error);
89292 + atomic_inc_unchecked(&n_rcu_torture_error);
89293 WARN_ON_ONCE(1);
89294 }
89295 page += sprintf(page, "Reader Pipe: ");
89296 @@ -992,7 +992,7 @@ rcu_torture_printk(char *page)
89297 page += sprintf(page, "Free-Block Circulation: ");
89298 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
89299 page += sprintf(page, " %d",
89300 - atomic_read(&rcu_torture_wcount[i]));
89301 + atomic_read_unchecked(&rcu_torture_wcount[i]));
89302 }
89303 page += sprintf(page, "\n");
89304 if (cur_ops->stats)
89305 @@ -1341,7 +1341,7 @@ rcu_torture_cleanup(void)
89306
89307 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
89308
89309 - if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
89310 + if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
89311 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
89312 else if (torture_onoff_failures())
89313 rcu_torture_print_module_parms(cur_ops,
89314 @@ -1460,18 +1460,18 @@ rcu_torture_init(void)
89315
89316 rcu_torture_current = NULL;
89317 rcu_torture_current_version = 0;
89318 - atomic_set(&n_rcu_torture_alloc, 0);
89319 - atomic_set(&n_rcu_torture_alloc_fail, 0);
89320 - atomic_set(&n_rcu_torture_free, 0);
89321 - atomic_set(&n_rcu_torture_mberror, 0);
89322 - atomic_set(&n_rcu_torture_error, 0);
89323 + atomic_set_unchecked(&n_rcu_torture_alloc, 0);
89324 + atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
89325 + atomic_set_unchecked(&n_rcu_torture_free, 0);
89326 + atomic_set_unchecked(&n_rcu_torture_mberror, 0);
89327 + atomic_set_unchecked(&n_rcu_torture_error, 0);
89328 n_rcu_torture_barrier_error = 0;
89329 n_rcu_torture_boost_ktrerror = 0;
89330 n_rcu_torture_boost_rterror = 0;
89331 n_rcu_torture_boost_failure = 0;
89332 n_rcu_torture_boosts = 0;
89333 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
89334 - atomic_set(&rcu_torture_wcount[i], 0);
89335 + atomic_set_unchecked(&rcu_torture_wcount[i], 0);
89336 for_each_possible_cpu(cpu) {
89337 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
89338 per_cpu(rcu_torture_count, cpu)[i] = 0;
89339 diff --git a/kernel/rcu/srcu.c b/kernel/rcu/srcu.c
89340 index c639556..cf0a0d5 100644
89341 --- a/kernel/rcu/srcu.c
89342 +++ b/kernel/rcu/srcu.c
89343 @@ -298,9 +298,9 @@ int __srcu_read_lock(struct srcu_struct *sp)
89344
89345 idx = ACCESS_ONCE(sp->completed) & 0x1;
89346 preempt_disable();
89347 - ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
89348 + ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
89349 smp_mb(); /* B */ /* Avoid leaking the critical section. */
89350 - ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
89351 + ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
89352 preempt_enable();
89353 return idx;
89354 }
89355 diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
89356 index d9efcc1..ea543e9 100644
89357 --- a/kernel/rcu/tiny.c
89358 +++ b/kernel/rcu/tiny.c
89359 @@ -42,7 +42,7 @@
89360 /* Forward declarations for tiny_plugin.h. */
89361 struct rcu_ctrlblk;
89362 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
89363 -static void rcu_process_callbacks(struct softirq_action *unused);
89364 +static void rcu_process_callbacks(void);
89365 static void __call_rcu(struct rcu_head *head,
89366 void (*func)(struct rcu_head *rcu),
89367 struct rcu_ctrlblk *rcp);
89368 @@ -308,7 +308,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
89369 false));
89370 }
89371
89372 -static void rcu_process_callbacks(struct softirq_action *unused)
89373 +static __latent_entropy void rcu_process_callbacks(void)
89374 {
89375 __rcu_process_callbacks(&rcu_sched_ctrlblk);
89376 __rcu_process_callbacks(&rcu_bh_ctrlblk);
89377 diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
89378 index 0c47e30..a084591 100644
89379 --- a/kernel/rcu/tree.c
89380 +++ b/kernel/rcu/tree.c
89381 @@ -388,9 +388,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
89382 rcu_prepare_for_idle(smp_processor_id());
89383 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
89384 smp_mb__before_atomic_inc(); /* See above. */
89385 - atomic_inc(&rdtp->dynticks);
89386 + atomic_inc_unchecked(&rdtp->dynticks);
89387 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
89388 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
89389 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
89390
89391 /*
89392 * It is illegal to enter an extended quiescent state while
89393 @@ -508,10 +508,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
89394 int user)
89395 {
89396 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
89397 - atomic_inc(&rdtp->dynticks);
89398 + atomic_inc_unchecked(&rdtp->dynticks);
89399 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
89400 smp_mb__after_atomic_inc(); /* See above. */
89401 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
89402 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
89403 rcu_cleanup_after_idle(smp_processor_id());
89404 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
89405 if (!user && !is_idle_task(current)) {
89406 @@ -632,14 +632,14 @@ void rcu_nmi_enter(void)
89407 struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
89408
89409 if (rdtp->dynticks_nmi_nesting == 0 &&
89410 - (atomic_read(&rdtp->dynticks) & 0x1))
89411 + (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
89412 return;
89413 rdtp->dynticks_nmi_nesting++;
89414 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
89415 - atomic_inc(&rdtp->dynticks);
89416 + atomic_inc_unchecked(&rdtp->dynticks);
89417 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
89418 smp_mb__after_atomic_inc(); /* See above. */
89419 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
89420 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
89421 }
89422
89423 /**
89424 @@ -658,9 +658,9 @@ void rcu_nmi_exit(void)
89425 return;
89426 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
89427 smp_mb__before_atomic_inc(); /* See above. */
89428 - atomic_inc(&rdtp->dynticks);
89429 + atomic_inc_unchecked(&rdtp->dynticks);
89430 smp_mb__after_atomic_inc(); /* Force delay to next write. */
89431 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
89432 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
89433 }
89434
89435 /**
89436 @@ -673,7 +673,7 @@ void rcu_nmi_exit(void)
89437 */
89438 bool notrace __rcu_is_watching(void)
89439 {
89440 - return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
89441 + return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
89442 }
89443
89444 /**
89445 @@ -756,7 +756,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
89446 static int dyntick_save_progress_counter(struct rcu_data *rdp,
89447 bool *isidle, unsigned long *maxj)
89448 {
89449 - rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
89450 + rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
89451 rcu_sysidle_check_cpu(rdp, isidle, maxj);
89452 return (rdp->dynticks_snap & 0x1) == 0;
89453 }
89454 @@ -779,7 +779,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
89455 unsigned int curr;
89456 unsigned int snap;
89457
89458 - curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
89459 + curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
89460 snap = (unsigned int)rdp->dynticks_snap;
89461
89462 /*
89463 @@ -1449,9 +1449,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
89464 rdp = this_cpu_ptr(rsp->rda);
89465 rcu_preempt_check_blocked_tasks(rnp);
89466 rnp->qsmask = rnp->qsmaskinit;
89467 - ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
89468 + ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
89469 WARN_ON_ONCE(rnp->completed != rsp->completed);
89470 - ACCESS_ONCE(rnp->completed) = rsp->completed;
89471 + ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
89472 if (rnp == rdp->mynode)
89473 __note_gp_changes(rsp, rnp, rdp);
89474 rcu_preempt_boost_start_gp(rnp);
89475 @@ -1545,7 +1545,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
89476 rcu_for_each_node_breadth_first(rsp, rnp) {
89477 raw_spin_lock_irq(&rnp->lock);
89478 smp_mb__after_unlock_lock();
89479 - ACCESS_ONCE(rnp->completed) = rsp->gpnum;
89480 + ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
89481 rdp = this_cpu_ptr(rsp->rda);
89482 if (rnp == rdp->mynode)
89483 __note_gp_changes(rsp, rnp, rdp);
89484 @@ -1560,7 +1560,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
89485 rcu_nocb_gp_set(rnp, nocb);
89486
89487 /* Declare grace period done. */
89488 - ACCESS_ONCE(rsp->completed) = rsp->gpnum;
89489 + ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
89490 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
89491 rsp->fqs_state = RCU_GP_IDLE;
89492 rdp = this_cpu_ptr(rsp->rda);
89493 @@ -1912,7 +1912,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
89494 rsp->qlen += rdp->qlen;
89495 rdp->n_cbs_orphaned += rdp->qlen;
89496 rdp->qlen_lazy = 0;
89497 - ACCESS_ONCE(rdp->qlen) = 0;
89498 + ACCESS_ONCE_RW(rdp->qlen) = 0;
89499 }
89500
89501 /*
89502 @@ -2159,7 +2159,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
89503 }
89504 smp_mb(); /* List handling before counting for rcu_barrier(). */
89505 rdp->qlen_lazy -= count_lazy;
89506 - ACCESS_ONCE(rdp->qlen) -= count;
89507 + ACCESS_ONCE_RW(rdp->qlen) -= count;
89508 rdp->n_cbs_invoked += count;
89509
89510 /* Reinstate batch limit if we have worked down the excess. */
89511 @@ -2304,7 +2304,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
89512 if (rnp_old != NULL)
89513 raw_spin_unlock(&rnp_old->fqslock);
89514 if (ret) {
89515 - ACCESS_ONCE(rsp->n_force_qs_lh)++;
89516 + ACCESS_ONCE_RW(rsp->n_force_qs_lh)++;
89517 return;
89518 }
89519 rnp_old = rnp;
89520 @@ -2316,7 +2316,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
89521 smp_mb__after_unlock_lock();
89522 raw_spin_unlock(&rnp_old->fqslock);
89523 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
89524 - ACCESS_ONCE(rsp->n_force_qs_lh)++;
89525 + ACCESS_ONCE_RW(rsp->n_force_qs_lh)++;
89526 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
89527 return; /* Someone beat us to it. */
89528 }
89529 @@ -2362,7 +2362,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
89530 /*
89531 * Do RCU core processing for the current CPU.
89532 */
89533 -static void rcu_process_callbacks(struct softirq_action *unused)
89534 +static void rcu_process_callbacks(void)
89535 {
89536 struct rcu_state *rsp;
89537
89538 @@ -2470,7 +2470,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
89539 WARN_ON_ONCE((unsigned long)head & 0x3); /* Misaligned rcu_head! */
89540 if (debug_rcu_head_queue(head)) {
89541 /* Probable double call_rcu(), so leak the callback. */
89542 - ACCESS_ONCE(head->func) = rcu_leak_callback;
89543 + ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
89544 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
89545 return;
89546 }
89547 @@ -2498,7 +2498,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
89548 local_irq_restore(flags);
89549 return;
89550 }
89551 - ACCESS_ONCE(rdp->qlen)++;
89552 + ACCESS_ONCE_RW(rdp->qlen)++;
89553 if (lazy)
89554 rdp->qlen_lazy++;
89555 else
89556 @@ -2759,11 +2759,11 @@ void synchronize_sched_expedited(void)
89557 * counter wrap on a 32-bit system. Quite a few more CPUs would of
89558 * course be required on a 64-bit system.
89559 */
89560 - if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
89561 + if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
89562 (ulong)atomic_long_read(&rsp->expedited_done) +
89563 ULONG_MAX / 8)) {
89564 synchronize_sched();
89565 - atomic_long_inc(&rsp->expedited_wrap);
89566 + atomic_long_inc_unchecked(&rsp->expedited_wrap);
89567 return;
89568 }
89569
89570 @@ -2771,7 +2771,7 @@ void synchronize_sched_expedited(void)
89571 * Take a ticket. Note that atomic_inc_return() implies a
89572 * full memory barrier.
89573 */
89574 - snap = atomic_long_inc_return(&rsp->expedited_start);
89575 + snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
89576 firstsnap = snap;
89577 get_online_cpus();
89578 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
89579 @@ -2784,14 +2784,14 @@ void synchronize_sched_expedited(void)
89580 synchronize_sched_expedited_cpu_stop,
89581 NULL) == -EAGAIN) {
89582 put_online_cpus();
89583 - atomic_long_inc(&rsp->expedited_tryfail);
89584 + atomic_long_inc_unchecked(&rsp->expedited_tryfail);
89585
89586 /* Check to see if someone else did our work for us. */
89587 s = atomic_long_read(&rsp->expedited_done);
89588 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
89589 /* ensure test happens before caller kfree */
89590 smp_mb__before_atomic_inc(); /* ^^^ */
89591 - atomic_long_inc(&rsp->expedited_workdone1);
89592 + atomic_long_inc_unchecked(&rsp->expedited_workdone1);
89593 return;
89594 }
89595
89596 @@ -2800,7 +2800,7 @@ void synchronize_sched_expedited(void)
89597 udelay(trycount * num_online_cpus());
89598 } else {
89599 wait_rcu_gp(call_rcu_sched);
89600 - atomic_long_inc(&rsp->expedited_normal);
89601 + atomic_long_inc_unchecked(&rsp->expedited_normal);
89602 return;
89603 }
89604
89605 @@ -2809,7 +2809,7 @@ void synchronize_sched_expedited(void)
89606 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
89607 /* ensure test happens before caller kfree */
89608 smp_mb__before_atomic_inc(); /* ^^^ */
89609 - atomic_long_inc(&rsp->expedited_workdone2);
89610 + atomic_long_inc_unchecked(&rsp->expedited_workdone2);
89611 return;
89612 }
89613
89614 @@ -2821,10 +2821,10 @@ void synchronize_sched_expedited(void)
89615 * period works for us.
89616 */
89617 get_online_cpus();
89618 - snap = atomic_long_read(&rsp->expedited_start);
89619 + snap = atomic_long_read_unchecked(&rsp->expedited_start);
89620 smp_mb(); /* ensure read is before try_stop_cpus(). */
89621 }
89622 - atomic_long_inc(&rsp->expedited_stoppedcpus);
89623 + atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
89624
89625 /*
89626 * Everyone up to our most recent fetch is covered by our grace
89627 @@ -2833,16 +2833,16 @@ void synchronize_sched_expedited(void)
89628 * than we did already did their update.
89629 */
89630 do {
89631 - atomic_long_inc(&rsp->expedited_done_tries);
89632 + atomic_long_inc_unchecked(&rsp->expedited_done_tries);
89633 s = atomic_long_read(&rsp->expedited_done);
89634 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
89635 /* ensure test happens before caller kfree */
89636 smp_mb__before_atomic_inc(); /* ^^^ */
89637 - atomic_long_inc(&rsp->expedited_done_lost);
89638 + atomic_long_inc_unchecked(&rsp->expedited_done_lost);
89639 break;
89640 }
89641 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
89642 - atomic_long_inc(&rsp->expedited_done_exit);
89643 + atomic_long_inc_unchecked(&rsp->expedited_done_exit);
89644
89645 put_online_cpus();
89646 }
89647 @@ -3048,7 +3048,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
89648 * ACCESS_ONCE() to prevent the compiler from speculating
89649 * the increment to precede the early-exit check.
89650 */
89651 - ACCESS_ONCE(rsp->n_barrier_done)++;
89652 + ACCESS_ONCE_RW(rsp->n_barrier_done)++;
89653 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
89654 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
89655 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
89656 @@ -3098,7 +3098,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
89657
89658 /* Increment ->n_barrier_done to prevent duplicate work. */
89659 smp_mb(); /* Keep increment after above mechanism. */
89660 - ACCESS_ONCE(rsp->n_barrier_done)++;
89661 + ACCESS_ONCE_RW(rsp->n_barrier_done)++;
89662 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
89663 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
89664 smp_mb(); /* Keep increment before caller's subsequent code. */
89665 @@ -3143,10 +3143,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
89666 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
89667 init_callback_list(rdp);
89668 rdp->qlen_lazy = 0;
89669 - ACCESS_ONCE(rdp->qlen) = 0;
89670 + ACCESS_ONCE_RW(rdp->qlen) = 0;
89671 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
89672 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
89673 - WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
89674 + WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
89675 rdp->cpu = cpu;
89676 rdp->rsp = rsp;
89677 rcu_boot_init_nocb_percpu_data(rdp);
89678 @@ -3180,8 +3180,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
89679 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
89680 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
89681 rcu_sysidle_init_percpu_data(rdp->dynticks);
89682 - atomic_set(&rdp->dynticks->dynticks,
89683 - (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
89684 + atomic_set_unchecked(&rdp->dynticks->dynticks,
89685 + (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
89686 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
89687
89688 /* Add CPU to rcu_node bitmasks. */
89689 diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
89690 index 75dc3c3..b95d624 100644
89691 --- a/kernel/rcu/tree.h
89692 +++ b/kernel/rcu/tree.h
89693 @@ -87,11 +87,11 @@ struct rcu_dynticks {
89694 long long dynticks_nesting; /* Track irq/process nesting level. */
89695 /* Process level is worth LLONG_MAX/2. */
89696 int dynticks_nmi_nesting; /* Track NMI nesting level. */
89697 - atomic_t dynticks; /* Even value for idle, else odd. */
89698 + atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
89699 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
89700 long long dynticks_idle_nesting;
89701 /* irq/process nesting level from idle. */
89702 - atomic_t dynticks_idle; /* Even value for idle, else odd. */
89703 + atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
89704 /* "Idle" excludes userspace execution. */
89705 unsigned long dynticks_idle_jiffies;
89706 /* End of last non-NMI non-idle period. */
89707 @@ -431,17 +431,17 @@ struct rcu_state {
89708 /* _rcu_barrier(). */
89709 /* End of fields guarded by barrier_mutex. */
89710
89711 - atomic_long_t expedited_start; /* Starting ticket. */
89712 - atomic_long_t expedited_done; /* Done ticket. */
89713 - atomic_long_t expedited_wrap; /* # near-wrap incidents. */
89714 - atomic_long_t expedited_tryfail; /* # acquisition failures. */
89715 - atomic_long_t expedited_workdone1; /* # done by others #1. */
89716 - atomic_long_t expedited_workdone2; /* # done by others #2. */
89717 - atomic_long_t expedited_normal; /* # fallbacks to normal. */
89718 - atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
89719 - atomic_long_t expedited_done_tries; /* # tries to update _done. */
89720 - atomic_long_t expedited_done_lost; /* # times beaten to _done. */
89721 - atomic_long_t expedited_done_exit; /* # times exited _done loop. */
89722 + atomic_long_unchecked_t expedited_start; /* Starting ticket. */
89723 + atomic_long_t expedited_done; /* Done ticket. */
89724 + atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
89725 + atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
89726 + atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
89727 + atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
89728 + atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
89729 + atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
89730 + atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
89731 + atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
89732 + atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
89733
89734 unsigned long jiffies_force_qs; /* Time at which to invoke */
89735 /* force_quiescent_state(). */
89736 diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
89737 index 962d1d5..c6c62d12d 100644
89738 --- a/kernel/rcu/tree_plugin.h
89739 +++ b/kernel/rcu/tree_plugin.h
89740 @@ -758,7 +758,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
89741 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
89742 {
89743 return !rcu_preempted_readers_exp(rnp) &&
89744 - ACCESS_ONCE(rnp->expmask) == 0;
89745 + ACCESS_ONCE_RW(rnp->expmask) == 0;
89746 }
89747
89748 /*
89749 @@ -920,7 +920,7 @@ void synchronize_rcu_expedited(void)
89750
89751 /* Clean up and exit. */
89752 smp_mb(); /* ensure expedited GP seen before counter increment. */
89753 - ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
89754 + ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
89755 unlock_mb_ret:
89756 mutex_unlock(&sync_rcu_preempt_exp_mutex);
89757 mb_ret:
89758 @@ -1496,7 +1496,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
89759 free_cpumask_var(cm);
89760 }
89761
89762 -static struct smp_hotplug_thread rcu_cpu_thread_spec = {
89763 +static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
89764 .store = &rcu_cpu_kthread_task,
89765 .thread_should_run = rcu_cpu_kthread_should_run,
89766 .thread_fn = rcu_cpu_kthread,
89767 @@ -1972,7 +1972,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
89768 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
89769 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
89770 cpu, ticks_value, ticks_title,
89771 - atomic_read(&rdtp->dynticks) & 0xfff,
89772 + atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
89773 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
89774 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
89775 fast_no_hz);
89776 @@ -2138,7 +2138,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
89777
89778 /* Enqueue the callback on the nocb list and update counts. */
89779 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
89780 - ACCESS_ONCE(*old_rhpp) = rhp;
89781 + ACCESS_ONCE_RW(*old_rhpp) = rhp;
89782 atomic_long_add(rhcount, &rdp->nocb_q_count);
89783 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
89784
89785 @@ -2311,12 +2311,12 @@ static int rcu_nocb_kthread(void *arg)
89786 * Extract queued callbacks, update counts, and wait
89787 * for a grace period to elapse.
89788 */
89789 - ACCESS_ONCE(rdp->nocb_head) = NULL;
89790 + ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
89791 tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
89792 c = atomic_long_xchg(&rdp->nocb_q_count, 0);
89793 cl = atomic_long_xchg(&rdp->nocb_q_count_lazy, 0);
89794 - ACCESS_ONCE(rdp->nocb_p_count) += c;
89795 - ACCESS_ONCE(rdp->nocb_p_count_lazy) += cl;
89796 + ACCESS_ONCE_RW(rdp->nocb_p_count) += c;
89797 + ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) += cl;
89798 rcu_nocb_wait_gp(rdp);
89799
89800 /* Each pass through the following loop invokes a callback. */
89801 @@ -2342,8 +2342,8 @@ static int rcu_nocb_kthread(void *arg)
89802 list = next;
89803 }
89804 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
89805 - ACCESS_ONCE(rdp->nocb_p_count) -= c;
89806 - ACCESS_ONCE(rdp->nocb_p_count_lazy) -= cl;
89807 + ACCESS_ONCE_RW(rdp->nocb_p_count) -= c;
89808 + ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) -= cl;
89809 rdp->n_nocbs_invoked += c;
89810 }
89811 return 0;
89812 @@ -2360,7 +2360,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
89813 {
89814 if (!rcu_nocb_need_deferred_wakeup(rdp))
89815 return;
89816 - ACCESS_ONCE(rdp->nocb_defer_wakeup) = false;
89817 + ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = false;
89818 wake_up(&rdp->nocb_wq);
89819 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWakeEmpty"));
89820 }
89821 @@ -2386,7 +2386,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp)
89822 t = kthread_run(rcu_nocb_kthread, rdp,
89823 "rcuo%c/%d", rsp->abbr, cpu);
89824 BUG_ON(IS_ERR(t));
89825 - ACCESS_ONCE(rdp->nocb_kthread) = t;
89826 + ACCESS_ONCE_RW(rdp->nocb_kthread) = t;
89827 }
89828 }
89829
89830 @@ -2522,11 +2522,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
89831
89832 /* Record start of fully idle period. */
89833 j = jiffies;
89834 - ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
89835 + ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
89836 smp_mb__before_atomic_inc();
89837 - atomic_inc(&rdtp->dynticks_idle);
89838 + atomic_inc_unchecked(&rdtp->dynticks_idle);
89839 smp_mb__after_atomic_inc();
89840 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
89841 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
89842 }
89843
89844 /*
89845 @@ -2591,9 +2591,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
89846
89847 /* Record end of idle period. */
89848 smp_mb__before_atomic_inc();
89849 - atomic_inc(&rdtp->dynticks_idle);
89850 + atomic_inc_unchecked(&rdtp->dynticks_idle);
89851 smp_mb__after_atomic_inc();
89852 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
89853 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
89854
89855 /*
89856 * If we are the timekeeping CPU, we are permitted to be non-idle
89857 @@ -2634,7 +2634,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
89858 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
89859
89860 /* Pick up current idle and NMI-nesting counter and check. */
89861 - cur = atomic_read(&rdtp->dynticks_idle);
89862 + cur = atomic_read_unchecked(&rdtp->dynticks_idle);
89863 if (cur & 0x1) {
89864 *isidle = false; /* We are not idle! */
89865 return;
89866 @@ -2697,7 +2697,7 @@ static void rcu_sysidle(unsigned long j)
89867 case RCU_SYSIDLE_NOT:
89868
89869 /* First time all are idle, so note a short idle period. */
89870 - ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
89871 + ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
89872 break;
89873
89874 case RCU_SYSIDLE_SHORT:
89875 @@ -2734,7 +2734,7 @@ static void rcu_sysidle(unsigned long j)
89876 static void rcu_sysidle_cancel(void)
89877 {
89878 smp_mb();
89879 - ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
89880 + ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
89881 }
89882
89883 /*
89884 @@ -2782,7 +2782,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
89885 smp_mb(); /* grace period precedes setting inuse. */
89886
89887 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
89888 - ACCESS_ONCE(rshp->inuse) = 0;
89889 + ACCESS_ONCE_RW(rshp->inuse) = 0;
89890 }
89891
89892 /*
89893 diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
89894 index 5cdc62e..cc52e88 100644
89895 --- a/kernel/rcu/tree_trace.c
89896 +++ b/kernel/rcu/tree_trace.c
89897 @@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
89898 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
89899 rdp->passed_quiesce, rdp->qs_pending);
89900 seq_printf(m, " dt=%d/%llx/%d df=%lu",
89901 - atomic_read(&rdp->dynticks->dynticks),
89902 + atomic_read_unchecked(&rdp->dynticks->dynticks),
89903 rdp->dynticks->dynticks_nesting,
89904 rdp->dynticks->dynticks_nmi_nesting,
89905 rdp->dynticks_fqs);
89906 @@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
89907 struct rcu_state *rsp = (struct rcu_state *)m->private;
89908
89909 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",
89910 - atomic_long_read(&rsp->expedited_start),
89911 + atomic_long_read_unchecked(&rsp->expedited_start),
89912 atomic_long_read(&rsp->expedited_done),
89913 - atomic_long_read(&rsp->expedited_wrap),
89914 - atomic_long_read(&rsp->expedited_tryfail),
89915 - atomic_long_read(&rsp->expedited_workdone1),
89916 - atomic_long_read(&rsp->expedited_workdone2),
89917 - atomic_long_read(&rsp->expedited_normal),
89918 - atomic_long_read(&rsp->expedited_stoppedcpus),
89919 - atomic_long_read(&rsp->expedited_done_tries),
89920 - atomic_long_read(&rsp->expedited_done_lost),
89921 - atomic_long_read(&rsp->expedited_done_exit));
89922 + atomic_long_read_unchecked(&rsp->expedited_wrap),
89923 + atomic_long_read_unchecked(&rsp->expedited_tryfail),
89924 + atomic_long_read_unchecked(&rsp->expedited_workdone1),
89925 + atomic_long_read_unchecked(&rsp->expedited_workdone2),
89926 + atomic_long_read_unchecked(&rsp->expedited_normal),
89927 + atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
89928 + atomic_long_read_unchecked(&rsp->expedited_done_tries),
89929 + atomic_long_read_unchecked(&rsp->expedited_done_lost),
89930 + atomic_long_read_unchecked(&rsp->expedited_done_exit));
89931 return 0;
89932 }
89933
89934 diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
89935 index 4c0a9b0..7e81362 100644
89936 --- a/kernel/rcu/update.c
89937 +++ b/kernel/rcu/update.c
89938 @@ -311,10 +311,10 @@ int rcu_jiffies_till_stall_check(void)
89939 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
89940 */
89941 if (till_stall_check < 3) {
89942 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
89943 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
89944 till_stall_check = 3;
89945 } else if (till_stall_check > 300) {
89946 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
89947 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
89948 till_stall_check = 300;
89949 }
89950 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
89951 diff --git a/kernel/resource.c b/kernel/resource.c
89952 index 8957d68..770cbe4 100644
89953 --- a/kernel/resource.c
89954 +++ b/kernel/resource.c
89955 @@ -152,8 +152,18 @@ static const struct file_operations proc_iomem_operations = {
89956
89957 static int __init ioresources_init(void)
89958 {
89959 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
89960 +#ifdef CONFIG_GRKERNSEC_PROC_USER
89961 + proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
89962 + proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
89963 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
89964 + proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
89965 + proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
89966 +#endif
89967 +#else
89968 proc_create("ioports", 0, NULL, &proc_ioports_operations);
89969 proc_create("iomem", 0, NULL, &proc_iomem_operations);
89970 +#endif
89971 return 0;
89972 }
89973 __initcall(ioresources_init);
89974 diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
89975 index e73efba..c9bfbd4 100644
89976 --- a/kernel/sched/auto_group.c
89977 +++ b/kernel/sched/auto_group.c
89978 @@ -11,7 +11,7 @@
89979
89980 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
89981 static struct autogroup autogroup_default;
89982 -static atomic_t autogroup_seq_nr;
89983 +static atomic_unchecked_t autogroup_seq_nr;
89984
89985 void __init autogroup_init(struct task_struct *init_task)
89986 {
89987 @@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
89988
89989 kref_init(&ag->kref);
89990 init_rwsem(&ag->lock);
89991 - ag->id = atomic_inc_return(&autogroup_seq_nr);
89992 + ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
89993 ag->tg = tg;
89994 #ifdef CONFIG_RT_GROUP_SCHED
89995 /*
89996 diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
89997 index a63f4dc..349bbb0 100644
89998 --- a/kernel/sched/completion.c
89999 +++ b/kernel/sched/completion.c
90000 @@ -204,7 +204,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
90001 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
90002 * or number of jiffies left till timeout) if completed.
90003 */
90004 -long __sched
90005 +long __sched __intentional_overflow(-1)
90006 wait_for_completion_interruptible_timeout(struct completion *x,
90007 unsigned long timeout)
90008 {
90009 @@ -221,7 +221,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
90010 *
90011 * Return: -ERESTARTSYS if interrupted, 0 if completed.
90012 */
90013 -int __sched wait_for_completion_killable(struct completion *x)
90014 +int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
90015 {
90016 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
90017 if (t == -ERESTARTSYS)
90018 @@ -242,7 +242,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
90019 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
90020 * or number of jiffies left till timeout) if completed.
90021 */
90022 -long __sched
90023 +long __sched __intentional_overflow(-1)
90024 wait_for_completion_killable_timeout(struct completion *x,
90025 unsigned long timeout)
90026 {
90027 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
90028 index 084d17f..e416b9f 100644
90029 --- a/kernel/sched/core.c
90030 +++ b/kernel/sched/core.c
90031 @@ -1775,7 +1775,7 @@ void set_numabalancing_state(bool enabled)
90032 int sysctl_numa_balancing(struct ctl_table *table, int write,
90033 void __user *buffer, size_t *lenp, loff_t *ppos)
90034 {
90035 - struct ctl_table t;
90036 + ctl_table_no_const t;
90037 int err;
90038 int state = numabalancing_enabled;
90039
90040 @@ -2238,8 +2238,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
90041 next->active_mm = oldmm;
90042 atomic_inc(&oldmm->mm_count);
90043 enter_lazy_tlb(oldmm, next);
90044 - } else
90045 + } else {
90046 switch_mm(oldmm, mm, next);
90047 + populate_stack();
90048 + }
90049
90050 if (!prev->mm) {
90051 prev->active_mm = NULL;
90052 @@ -3004,6 +3006,8 @@ int can_nice(const struct task_struct *p, const int nice)
90053 /* convert nice value [19,-20] to rlimit style value [1,40] */
90054 int nice_rlim = 20 - nice;
90055
90056 + gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
90057 +
90058 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
90059 capable(CAP_SYS_NICE));
90060 }
90061 @@ -3037,7 +3041,8 @@ SYSCALL_DEFINE1(nice, int, increment)
90062 if (nice > MAX_NICE)
90063 nice = MAX_NICE;
90064
90065 - if (increment < 0 && !can_nice(current, nice))
90066 + if (increment < 0 && (!can_nice(current, nice) ||
90067 + gr_handle_chroot_nice()))
90068 return -EPERM;
90069
90070 retval = security_task_setnice(current, nice);
90071 @@ -3310,6 +3315,7 @@ recheck:
90072 if (policy != p->policy && !rlim_rtprio)
90073 return -EPERM;
90074
90075 + gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
90076 /* can't increase priority */
90077 if (attr->sched_priority > p->rt_priority &&
90078 attr->sched_priority > rlim_rtprio)
90079 @@ -4708,6 +4714,7 @@ void idle_task_exit(void)
90080
90081 if (mm != &init_mm) {
90082 switch_mm(mm, &init_mm, current);
90083 + populate_stack();
90084 finish_arch_post_lock_switch();
90085 }
90086 mmdrop(mm);
90087 @@ -4803,7 +4810,7 @@ static void migrate_tasks(unsigned int dead_cpu)
90088
90089 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
90090
90091 -static struct ctl_table sd_ctl_dir[] = {
90092 +static ctl_table_no_const sd_ctl_dir[] __read_only = {
90093 {
90094 .procname = "sched_domain",
90095 .mode = 0555,
90096 @@ -4820,17 +4827,17 @@ static struct ctl_table sd_ctl_root[] = {
90097 {}
90098 };
90099
90100 -static struct ctl_table *sd_alloc_ctl_entry(int n)
90101 +static ctl_table_no_const *sd_alloc_ctl_entry(int n)
90102 {
90103 - struct ctl_table *entry =
90104 + ctl_table_no_const *entry =
90105 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
90106
90107 return entry;
90108 }
90109
90110 -static void sd_free_ctl_entry(struct ctl_table **tablep)
90111 +static void sd_free_ctl_entry(ctl_table_no_const *tablep)
90112 {
90113 - struct ctl_table *entry;
90114 + ctl_table_no_const *entry;
90115
90116 /*
90117 * In the intermediate directories, both the child directory and
90118 @@ -4838,22 +4845,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
90119 * will always be set. In the lowest directory the names are
90120 * static strings and all have proc handlers.
90121 */
90122 - for (entry = *tablep; entry->mode; entry++) {
90123 - if (entry->child)
90124 - sd_free_ctl_entry(&entry->child);
90125 + for (entry = tablep; entry->mode; entry++) {
90126 + if (entry->child) {
90127 + sd_free_ctl_entry(entry->child);
90128 + pax_open_kernel();
90129 + entry->child = NULL;
90130 + pax_close_kernel();
90131 + }
90132 if (entry->proc_handler == NULL)
90133 kfree(entry->procname);
90134 }
90135
90136 - kfree(*tablep);
90137 - *tablep = NULL;
90138 + kfree(tablep);
90139 }
90140
90141 static int min_load_idx = 0;
90142 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
90143
90144 static void
90145 -set_table_entry(struct ctl_table *entry,
90146 +set_table_entry(ctl_table_no_const *entry,
90147 const char *procname, void *data, int maxlen,
90148 umode_t mode, proc_handler *proc_handler,
90149 bool load_idx)
90150 @@ -4873,7 +4883,7 @@ set_table_entry(struct ctl_table *entry,
90151 static struct ctl_table *
90152 sd_alloc_ctl_domain_table(struct sched_domain *sd)
90153 {
90154 - struct ctl_table *table = sd_alloc_ctl_entry(14);
90155 + ctl_table_no_const *table = sd_alloc_ctl_entry(14);
90156
90157 if (table == NULL)
90158 return NULL;
90159 @@ -4911,9 +4921,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
90160 return table;
90161 }
90162
90163 -static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
90164 +static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
90165 {
90166 - struct ctl_table *entry, *table;
90167 + ctl_table_no_const *entry, *table;
90168 struct sched_domain *sd;
90169 int domain_num = 0, i;
90170 char buf[32];
90171 @@ -4940,11 +4950,13 @@ static struct ctl_table_header *sd_sysctl_header;
90172 static void register_sched_domain_sysctl(void)
90173 {
90174 int i, cpu_num = num_possible_cpus();
90175 - struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
90176 + ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
90177 char buf[32];
90178
90179 WARN_ON(sd_ctl_dir[0].child);
90180 + pax_open_kernel();
90181 sd_ctl_dir[0].child = entry;
90182 + pax_close_kernel();
90183
90184 if (entry == NULL)
90185 return;
90186 @@ -4967,8 +4979,12 @@ static void unregister_sched_domain_sysctl(void)
90187 if (sd_sysctl_header)
90188 unregister_sysctl_table(sd_sysctl_header);
90189 sd_sysctl_header = NULL;
90190 - if (sd_ctl_dir[0].child)
90191 - sd_free_ctl_entry(&sd_ctl_dir[0].child);
90192 + if (sd_ctl_dir[0].child) {
90193 + sd_free_ctl_entry(sd_ctl_dir[0].child);
90194 + pax_open_kernel();
90195 + sd_ctl_dir[0].child = NULL;
90196 + pax_close_kernel();
90197 + }
90198 }
90199 #else
90200 static void register_sched_domain_sysctl(void)
90201 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
90202 index 8cbe2d2..61f20a1 100644
90203 --- a/kernel/sched/fair.c
90204 +++ b/kernel/sched/fair.c
90205 @@ -1806,7 +1806,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
90206
90207 static void reset_ptenuma_scan(struct task_struct *p)
90208 {
90209 - ACCESS_ONCE(p->mm->numa_scan_seq)++;
90210 + ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
90211 p->mm->numa_scan_offset = 0;
90212 }
90213
90214 @@ -7181,7 +7181,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
90215 * run_rebalance_domains is triggered when needed from the scheduler tick.
90216 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
90217 */
90218 -static void run_rebalance_domains(struct softirq_action *h)
90219 +static __latent_entropy void run_rebalance_domains(void)
90220 {
90221 struct rq *this_rq = this_rq();
90222 enum cpu_idle_type idle = this_rq->idle_balance ?
90223 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
90224 index 369b4d6..fa4eb3b 100644
90225 --- a/kernel/sched/sched.h
90226 +++ b/kernel/sched/sched.h
90227 @@ -1157,7 +1157,7 @@ struct sched_class {
90228 #ifdef CONFIG_FAIR_GROUP_SCHED
90229 void (*task_move_group) (struct task_struct *p, int on_rq);
90230 #endif
90231 -};
90232 +} __do_const;
90233
90234 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
90235 {
90236 diff --git a/kernel/signal.c b/kernel/signal.c
90237 index 6ea13c0..31e3b25 100644
90238 --- a/kernel/signal.c
90239 +++ b/kernel/signal.c
90240 @@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
90241
90242 int print_fatal_signals __read_mostly;
90243
90244 -static void __user *sig_handler(struct task_struct *t, int sig)
90245 +static __sighandler_t sig_handler(struct task_struct *t, int sig)
90246 {
90247 return t->sighand->action[sig - 1].sa.sa_handler;
90248 }
90249
90250 -static int sig_handler_ignored(void __user *handler, int sig)
90251 +static int sig_handler_ignored(__sighandler_t handler, int sig)
90252 {
90253 /* Is it explicitly or implicitly ignored? */
90254 return handler == SIG_IGN ||
90255 @@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
90256
90257 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
90258 {
90259 - void __user *handler;
90260 + __sighandler_t handler;
90261
90262 handler = sig_handler(t, sig);
90263
90264 @@ -371,6 +371,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
90265 atomic_inc(&user->sigpending);
90266 rcu_read_unlock();
90267
90268 + if (!override_rlimit)
90269 + gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
90270 +
90271 if (override_rlimit ||
90272 atomic_read(&user->sigpending) <=
90273 task_rlimit(t, RLIMIT_SIGPENDING)) {
90274 @@ -498,7 +501,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
90275
90276 int unhandled_signal(struct task_struct *tsk, int sig)
90277 {
90278 - void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
90279 + __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
90280 if (is_global_init(tsk))
90281 return 1;
90282 if (handler != SIG_IGN && handler != SIG_DFL)
90283 @@ -818,6 +821,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
90284 }
90285 }
90286
90287 + /* allow glibc communication via tgkill to other threads in our
90288 + thread group */
90289 + if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
90290 + sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
90291 + && gr_handle_signal(t, sig))
90292 + return -EPERM;
90293 +
90294 return security_task_kill(t, info, sig, 0);
90295 }
90296
90297 @@ -1201,7 +1211,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
90298 return send_signal(sig, info, p, 1);
90299 }
90300
90301 -static int
90302 +int
90303 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
90304 {
90305 return send_signal(sig, info, t, 0);
90306 @@ -1238,6 +1248,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
90307 unsigned long int flags;
90308 int ret, blocked, ignored;
90309 struct k_sigaction *action;
90310 + int is_unhandled = 0;
90311
90312 spin_lock_irqsave(&t->sighand->siglock, flags);
90313 action = &t->sighand->action[sig-1];
90314 @@ -1252,9 +1263,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
90315 }
90316 if (action->sa.sa_handler == SIG_DFL)
90317 t->signal->flags &= ~SIGNAL_UNKILLABLE;
90318 + if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
90319 + is_unhandled = 1;
90320 ret = specific_send_sig_info(sig, info, t);
90321 spin_unlock_irqrestore(&t->sighand->siglock, flags);
90322
90323 + /* only deal with unhandled signals, java etc trigger SIGSEGV during
90324 + normal operation */
90325 + if (is_unhandled) {
90326 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
90327 + gr_handle_crash(t, sig);
90328 + }
90329 +
90330 return ret;
90331 }
90332
90333 @@ -1321,8 +1341,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
90334 ret = check_kill_permission(sig, info, p);
90335 rcu_read_unlock();
90336
90337 - if (!ret && sig)
90338 + if (!ret && sig) {
90339 ret = do_send_sig_info(sig, info, p, true);
90340 + if (!ret)
90341 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
90342 + }
90343
90344 return ret;
90345 }
90346 @@ -2928,7 +2951,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
90347 int error = -ESRCH;
90348
90349 rcu_read_lock();
90350 - p = find_task_by_vpid(pid);
90351 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90352 + /* allow glibc communication via tgkill to other threads in our
90353 + thread group */
90354 + if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
90355 + sig == (SIGRTMIN+1) && tgid == info->si_pid)
90356 + p = find_task_by_vpid_unrestricted(pid);
90357 + else
90358 +#endif
90359 + p = find_task_by_vpid(pid);
90360 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
90361 error = check_kill_permission(sig, info, p);
90362 /*
90363 @@ -3241,8 +3272,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
90364 }
90365 seg = get_fs();
90366 set_fs(KERNEL_DS);
90367 - ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
90368 - (stack_t __force __user *) &uoss,
90369 + ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
90370 + (stack_t __force_user *) &uoss,
90371 compat_user_stack_pointer());
90372 set_fs(seg);
90373 if (ret >= 0 && uoss_ptr) {
90374 diff --git a/kernel/smpboot.c b/kernel/smpboot.c
90375 index eb89e18..a4e6792 100644
90376 --- a/kernel/smpboot.c
90377 +++ b/kernel/smpboot.c
90378 @@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
90379 }
90380 smpboot_unpark_thread(plug_thread, cpu);
90381 }
90382 - list_add(&plug_thread->list, &hotplug_threads);
90383 + pax_list_add(&plug_thread->list, &hotplug_threads);
90384 out:
90385 mutex_unlock(&smpboot_threads_lock);
90386 return ret;
90387 @@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
90388 {
90389 get_online_cpus();
90390 mutex_lock(&smpboot_threads_lock);
90391 - list_del(&plug_thread->list);
90392 + pax_list_del(&plug_thread->list);
90393 smpboot_destroy_threads(plug_thread);
90394 mutex_unlock(&smpboot_threads_lock);
90395 put_online_cpus();
90396 diff --git a/kernel/softirq.c b/kernel/softirq.c
90397 index 92f24f5..db41501 100644
90398 --- a/kernel/softirq.c
90399 +++ b/kernel/softirq.c
90400 @@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
90401 EXPORT_SYMBOL(irq_stat);
90402 #endif
90403
90404 -static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
90405 +static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
90406
90407 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
90408
90409 @@ -268,7 +268,7 @@ restart:
90410 kstat_incr_softirqs_this_cpu(vec_nr);
90411
90412 trace_softirq_entry(vec_nr);
90413 - h->action(h);
90414 + h->action();
90415 trace_softirq_exit(vec_nr);
90416 if (unlikely(prev_count != preempt_count())) {
90417 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
90418 @@ -428,7 +428,7 @@ void __raise_softirq_irqoff(unsigned int nr)
90419 or_softirq_pending(1UL << nr);
90420 }
90421
90422 -void open_softirq(int nr, void (*action)(struct softirq_action *))
90423 +void __init open_softirq(int nr, void (*action)(void))
90424 {
90425 softirq_vec[nr].action = action;
90426 }
90427 @@ -480,7 +480,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
90428 }
90429 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
90430
90431 -static void tasklet_action(struct softirq_action *a)
90432 +static void tasklet_action(void)
90433 {
90434 struct tasklet_struct *list;
90435
90436 @@ -516,7 +516,7 @@ static void tasklet_action(struct softirq_action *a)
90437 }
90438 }
90439
90440 -static void tasklet_hi_action(struct softirq_action *a)
90441 +static __latent_entropy void tasklet_hi_action(void)
90442 {
90443 struct tasklet_struct *list;
90444
90445 @@ -743,7 +743,7 @@ static struct notifier_block cpu_nfb = {
90446 .notifier_call = cpu_callback
90447 };
90448
90449 -static struct smp_hotplug_thread softirq_threads = {
90450 +static struct smp_hotplug_thread softirq_threads __read_only = {
90451 .store = &ksoftirqd,
90452 .thread_should_run = ksoftirqd_should_run,
90453 .thread_fn = run_ksoftirqd,
90454 diff --git a/kernel/sys.c b/kernel/sys.c
90455 index fba0f29..84400e2 100644
90456 --- a/kernel/sys.c
90457 +++ b/kernel/sys.c
90458 @@ -148,6 +148,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
90459 error = -EACCES;
90460 goto out;
90461 }
90462 +
90463 + if (gr_handle_chroot_setpriority(p, niceval)) {
90464 + error = -EACCES;
90465 + goto out;
90466 + }
90467 +
90468 no_nice = security_task_setnice(p, niceval);
90469 if (no_nice) {
90470 error = no_nice;
90471 @@ -351,6 +357,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
90472 goto error;
90473 }
90474
90475 + if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
90476 + goto error;
90477 +
90478 if (rgid != (gid_t) -1 ||
90479 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
90480 new->sgid = new->egid;
90481 @@ -386,6 +395,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
90482 old = current_cred();
90483
90484 retval = -EPERM;
90485 +
90486 + if (gr_check_group_change(kgid, kgid, kgid))
90487 + goto error;
90488 +
90489 if (ns_capable(old->user_ns, CAP_SETGID))
90490 new->gid = new->egid = new->sgid = new->fsgid = kgid;
90491 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
90492 @@ -403,7 +416,7 @@ error:
90493 /*
90494 * change the user struct in a credentials set to match the new UID
90495 */
90496 -static int set_user(struct cred *new)
90497 +int set_user(struct cred *new)
90498 {
90499 struct user_struct *new_user;
90500
90501 @@ -483,6 +496,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
90502 goto error;
90503 }
90504
90505 + if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
90506 + goto error;
90507 +
90508 if (!uid_eq(new->uid, old->uid)) {
90509 retval = set_user(new);
90510 if (retval < 0)
90511 @@ -533,6 +549,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
90512 old = current_cred();
90513
90514 retval = -EPERM;
90515 +
90516 + if (gr_check_crash_uid(kuid))
90517 + goto error;
90518 + if (gr_check_user_change(kuid, kuid, kuid))
90519 + goto error;
90520 +
90521 if (ns_capable(old->user_ns, CAP_SETUID)) {
90522 new->suid = new->uid = kuid;
90523 if (!uid_eq(kuid, old->uid)) {
90524 @@ -602,6 +624,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
90525 goto error;
90526 }
90527
90528 + if (gr_check_user_change(kruid, keuid, INVALID_UID))
90529 + goto error;
90530 +
90531 if (ruid != (uid_t) -1) {
90532 new->uid = kruid;
90533 if (!uid_eq(kruid, old->uid)) {
90534 @@ -684,6 +709,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
90535 goto error;
90536 }
90537
90538 + if (gr_check_group_change(krgid, kegid, INVALID_GID))
90539 + goto error;
90540 +
90541 if (rgid != (gid_t) -1)
90542 new->gid = krgid;
90543 if (egid != (gid_t) -1)
90544 @@ -745,12 +773,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
90545 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
90546 ns_capable(old->user_ns, CAP_SETUID)) {
90547 if (!uid_eq(kuid, old->fsuid)) {
90548 + if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
90549 + goto error;
90550 +
90551 new->fsuid = kuid;
90552 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
90553 goto change_okay;
90554 }
90555 }
90556
90557 +error:
90558 abort_creds(new);
90559 return old_fsuid;
90560
90561 @@ -783,12 +815,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
90562 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
90563 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
90564 ns_capable(old->user_ns, CAP_SETGID)) {
90565 + if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
90566 + goto error;
90567 +
90568 if (!gid_eq(kgid, old->fsgid)) {
90569 new->fsgid = kgid;
90570 goto change_okay;
90571 }
90572 }
90573
90574 +error:
90575 abort_creds(new);
90576 return old_fsgid;
90577
90578 @@ -1167,19 +1203,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
90579 return -EFAULT;
90580
90581 down_read(&uts_sem);
90582 - error = __copy_to_user(&name->sysname, &utsname()->sysname,
90583 + error = __copy_to_user(name->sysname, &utsname()->sysname,
90584 __OLD_UTS_LEN);
90585 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
90586 - error |= __copy_to_user(&name->nodename, &utsname()->nodename,
90587 + error |= __copy_to_user(name->nodename, &utsname()->nodename,
90588 __OLD_UTS_LEN);
90589 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
90590 - error |= __copy_to_user(&name->release, &utsname()->release,
90591 + error |= __copy_to_user(name->release, &utsname()->release,
90592 __OLD_UTS_LEN);
90593 error |= __put_user(0, name->release + __OLD_UTS_LEN);
90594 - error |= __copy_to_user(&name->version, &utsname()->version,
90595 + error |= __copy_to_user(name->version, &utsname()->version,
90596 __OLD_UTS_LEN);
90597 error |= __put_user(0, name->version + __OLD_UTS_LEN);
90598 - error |= __copy_to_user(&name->machine, &utsname()->machine,
90599 + error |= __copy_to_user(name->machine, &utsname()->machine,
90600 __OLD_UTS_LEN);
90601 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
90602 up_read(&uts_sem);
90603 @@ -1381,6 +1417,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
90604 */
90605 new_rlim->rlim_cur = 1;
90606 }
90607 + /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
90608 + is changed to a lower value. Since tasks can be created by the same
90609 + user in between this limit change and an execve by this task, force
90610 + a recheck only for this task by setting PF_NPROC_EXCEEDED
90611 + */
90612 + if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
90613 + tsk->flags |= PF_NPROC_EXCEEDED;
90614 }
90615 if (!retval) {
90616 if (old_rlim)
90617 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
90618 index 0e0373f..69f5181 100644
90619 --- a/kernel/sysctl.c
90620 +++ b/kernel/sysctl.c
90621 @@ -94,7 +94,6 @@
90622
90623
90624 #if defined(CONFIG_SYSCTL)
90625 -
90626 /* External variables not in a header file. */
90627 extern int max_threads;
90628 extern int suid_dumpable;
90629 @@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
90630
90631 /* Constants used for minimum and maximum */
90632 #ifdef CONFIG_LOCKUP_DETECTOR
90633 -static int sixty = 60;
90634 +static int sixty __read_only = 60;
90635 #endif
90636
90637 -static int __maybe_unused neg_one = -1;
90638 +static int __maybe_unused neg_one __read_only = -1;
90639
90640 -static int zero;
90641 -static int __maybe_unused one = 1;
90642 -static int __maybe_unused two = 2;
90643 -static int __maybe_unused four = 4;
90644 -static unsigned long one_ul = 1;
90645 -static int one_hundred = 100;
90646 +static int zero __read_only = 0;
90647 +static int __maybe_unused one __read_only = 1;
90648 +static int __maybe_unused two __read_only = 2;
90649 +static int __maybe_unused three __read_only = 3;
90650 +static int __maybe_unused four __read_only = 4;
90651 +static unsigned long one_ul __read_only = 1;
90652 +static int one_hundred __read_only = 100;
90653 #ifdef CONFIG_PRINTK
90654 -static int ten_thousand = 10000;
90655 +static int ten_thousand __read_only = 10000;
90656 #endif
90657
90658 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
90659 @@ -178,10 +178,8 @@ static int proc_taint(struct ctl_table *table, int write,
90660 void __user *buffer, size_t *lenp, loff_t *ppos);
90661 #endif
90662
90663 -#ifdef CONFIG_PRINTK
90664 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
90665 void __user *buffer, size_t *lenp, loff_t *ppos);
90666 -#endif
90667
90668 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
90669 void __user *buffer, size_t *lenp, loff_t *ppos);
90670 @@ -212,6 +210,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
90671
90672 #endif
90673
90674 +extern struct ctl_table grsecurity_table[];
90675 +
90676 static struct ctl_table kern_table[];
90677 static struct ctl_table vm_table[];
90678 static struct ctl_table fs_table[];
90679 @@ -226,6 +226,20 @@ extern struct ctl_table epoll_table[];
90680 int sysctl_legacy_va_layout;
90681 #endif
90682
90683 +#ifdef CONFIG_PAX_SOFTMODE
90684 +static ctl_table pax_table[] = {
90685 + {
90686 + .procname = "softmode",
90687 + .data = &pax_softmode,
90688 + .maxlen = sizeof(unsigned int),
90689 + .mode = 0600,
90690 + .proc_handler = &proc_dointvec,
90691 + },
90692 +
90693 + { }
90694 +};
90695 +#endif
90696 +
90697 /* The default sysctl tables: */
90698
90699 static struct ctl_table sysctl_base_table[] = {
90700 @@ -274,6 +288,22 @@ static int max_extfrag_threshold = 1000;
90701 #endif
90702
90703 static struct ctl_table kern_table[] = {
90704 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
90705 + {
90706 + .procname = "grsecurity",
90707 + .mode = 0500,
90708 + .child = grsecurity_table,
90709 + },
90710 +#endif
90711 +
90712 +#ifdef CONFIG_PAX_SOFTMODE
90713 + {
90714 + .procname = "pax",
90715 + .mode = 0500,
90716 + .child = pax_table,
90717 + },
90718 +#endif
90719 +
90720 {
90721 .procname = "sched_child_runs_first",
90722 .data = &sysctl_sched_child_runs_first,
90723 @@ -629,7 +659,7 @@ static struct ctl_table kern_table[] = {
90724 .data = &modprobe_path,
90725 .maxlen = KMOD_PATH_LEN,
90726 .mode = 0644,
90727 - .proc_handler = proc_dostring,
90728 + .proc_handler = proc_dostring_modpriv,
90729 },
90730 {
90731 .procname = "modules_disabled",
90732 @@ -796,16 +826,20 @@ static struct ctl_table kern_table[] = {
90733 .extra1 = &zero,
90734 .extra2 = &one,
90735 },
90736 +#endif
90737 {
90738 .procname = "kptr_restrict",
90739 .data = &kptr_restrict,
90740 .maxlen = sizeof(int),
90741 .mode = 0644,
90742 .proc_handler = proc_dointvec_minmax_sysadmin,
90743 +#ifdef CONFIG_GRKERNSEC_HIDESYM
90744 + .extra1 = &two,
90745 +#else
90746 .extra1 = &zero,
90747 +#endif
90748 .extra2 = &two,
90749 },
90750 -#endif
90751 {
90752 .procname = "ngroups_max",
90753 .data = &ngroups_max,
90754 @@ -1050,10 +1084,17 @@ static struct ctl_table kern_table[] = {
90755 */
90756 {
90757 .procname = "perf_event_paranoid",
90758 - .data = &sysctl_perf_event_paranoid,
90759 - .maxlen = sizeof(sysctl_perf_event_paranoid),
90760 + .data = &sysctl_perf_event_legitimately_concerned,
90761 + .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
90762 .mode = 0644,
90763 - .proc_handler = proc_dointvec,
90764 + /* go ahead, be a hero */
90765 + .proc_handler = proc_dointvec_minmax_sysadmin,
90766 + .extra1 = &neg_one,
90767 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
90768 + .extra2 = &three,
90769 +#else
90770 + .extra2 = &two,
90771 +#endif
90772 },
90773 {
90774 .procname = "perf_event_mlock_kb",
90775 @@ -1315,6 +1356,13 @@ static struct ctl_table vm_table[] = {
90776 .proc_handler = proc_dointvec_minmax,
90777 .extra1 = &zero,
90778 },
90779 + {
90780 + .procname = "heap_stack_gap",
90781 + .data = &sysctl_heap_stack_gap,
90782 + .maxlen = sizeof(sysctl_heap_stack_gap),
90783 + .mode = 0644,
90784 + .proc_handler = proc_doulongvec_minmax,
90785 + },
90786 #else
90787 {
90788 .procname = "nr_trim_pages",
90789 @@ -1779,6 +1827,16 @@ int proc_dostring(struct ctl_table *table, int write,
90790 buffer, lenp, ppos);
90791 }
90792
90793 +int proc_dostring_modpriv(struct ctl_table *table, int write,
90794 + void __user *buffer, size_t *lenp, loff_t *ppos)
90795 +{
90796 + if (write && !capable(CAP_SYS_MODULE))
90797 + return -EPERM;
90798 +
90799 + return _proc_do_string(table->data, table->maxlen, write,
90800 + buffer, lenp, ppos);
90801 +}
90802 +
90803 static size_t proc_skip_spaces(char **buf)
90804 {
90805 size_t ret;
90806 @@ -1884,6 +1942,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
90807 len = strlen(tmp);
90808 if (len > *size)
90809 len = *size;
90810 + if (len > sizeof(tmp))
90811 + len = sizeof(tmp);
90812 if (copy_to_user(*buf, tmp, len))
90813 return -EFAULT;
90814 *size -= len;
90815 @@ -2048,7 +2108,7 @@ int proc_dointvec(struct ctl_table *table, int write,
90816 static int proc_taint(struct ctl_table *table, int write,
90817 void __user *buffer, size_t *lenp, loff_t *ppos)
90818 {
90819 - struct ctl_table t;
90820 + ctl_table_no_const t;
90821 unsigned long tmptaint = get_taint();
90822 int err;
90823
90824 @@ -2076,7 +2136,6 @@ static int proc_taint(struct ctl_table *table, int write,
90825 return err;
90826 }
90827
90828 -#ifdef CONFIG_PRINTK
90829 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
90830 void __user *buffer, size_t *lenp, loff_t *ppos)
90831 {
90832 @@ -2085,7 +2144,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
90833
90834 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
90835 }
90836 -#endif
90837
90838 struct do_proc_dointvec_minmax_conv_param {
90839 int *min;
90840 @@ -2632,6 +2690,12 @@ int proc_dostring(struct ctl_table *table, int write,
90841 return -ENOSYS;
90842 }
90843
90844 +int proc_dostring_modpriv(struct ctl_table *table, int write,
90845 + void __user *buffer, size_t *lenp, loff_t *ppos)
90846 +{
90847 + return -ENOSYS;
90848 +}
90849 +
90850 int proc_dointvec(struct ctl_table *table, int write,
90851 void __user *buffer, size_t *lenp, loff_t *ppos)
90852 {
90853 @@ -2688,5 +2752,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
90854 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
90855 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
90856 EXPORT_SYMBOL(proc_dostring);
90857 +EXPORT_SYMBOL(proc_dostring_modpriv);
90858 EXPORT_SYMBOL(proc_doulongvec_minmax);
90859 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
90860 diff --git a/kernel/taskstats.c b/kernel/taskstats.c
90861 index 13d2f7c..c93d0b0 100644
90862 --- a/kernel/taskstats.c
90863 +++ b/kernel/taskstats.c
90864 @@ -28,9 +28,12 @@
90865 #include <linux/fs.h>
90866 #include <linux/file.h>
90867 #include <linux/pid_namespace.h>
90868 +#include <linux/grsecurity.h>
90869 #include <net/genetlink.h>
90870 #include <linux/atomic.h>
90871
90872 +extern int gr_is_taskstats_denied(int pid);
90873 +
90874 /*
90875 * Maximum length of a cpumask that can be specified in
90876 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
90877 @@ -576,6 +579,9 @@ err:
90878
90879 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
90880 {
90881 + if (gr_is_taskstats_denied(current->pid))
90882 + return -EACCES;
90883 +
90884 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
90885 return cmd_attr_register_cpumask(info);
90886 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
90887 diff --git a/kernel/time.c b/kernel/time.c
90888 index 7c7964c..2a0d412 100644
90889 --- a/kernel/time.c
90890 +++ b/kernel/time.c
90891 @@ -172,6 +172,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
90892 return error;
90893
90894 if (tz) {
90895 + /* we log in do_settimeofday called below, so don't log twice
90896 + */
90897 + if (!tv)
90898 + gr_log_timechange();
90899 +
90900 sys_tz = *tz;
90901 update_vsyscall_tz();
90902 if (firsttime) {
90903 diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
90904 index 88c9c65..7497ebc 100644
90905 --- a/kernel/time/alarmtimer.c
90906 +++ b/kernel/time/alarmtimer.c
90907 @@ -795,7 +795,7 @@ static int __init alarmtimer_init(void)
90908 struct platform_device *pdev;
90909 int error = 0;
90910 int i;
90911 - struct k_clock alarm_clock = {
90912 + static struct k_clock alarm_clock = {
90913 .clock_getres = alarm_clock_getres,
90914 .clock_get = alarm_clock_get,
90915 .timer_create = alarm_timer_create,
90916 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
90917 index f7df8ea..0810193 100644
90918 --- a/kernel/time/timekeeping.c
90919 +++ b/kernel/time/timekeeping.c
90920 @@ -15,6 +15,7 @@
90921 #include <linux/init.h>
90922 #include <linux/mm.h>
90923 #include <linux/sched.h>
90924 +#include <linux/grsecurity.h>
90925 #include <linux/syscore_ops.h>
90926 #include <linux/clocksource.h>
90927 #include <linux/jiffies.h>
90928 @@ -502,6 +503,8 @@ int do_settimeofday(const struct timespec *tv)
90929 if (!timespec_valid_strict(tv))
90930 return -EINVAL;
90931
90932 + gr_log_timechange();
90933 +
90934 raw_spin_lock_irqsave(&timekeeper_lock, flags);
90935 write_seqcount_begin(&timekeeper_seq);
90936
90937 diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
90938 index 61ed862..3b52c65 100644
90939 --- a/kernel/time/timer_list.c
90940 +++ b/kernel/time/timer_list.c
90941 @@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
90942
90943 static void print_name_offset(struct seq_file *m, void *sym)
90944 {
90945 +#ifdef CONFIG_GRKERNSEC_HIDESYM
90946 + SEQ_printf(m, "<%p>", NULL);
90947 +#else
90948 char symname[KSYM_NAME_LEN];
90949
90950 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
90951 SEQ_printf(m, "<%pK>", sym);
90952 else
90953 SEQ_printf(m, "%s", symname);
90954 +#endif
90955 }
90956
90957 static void
90958 @@ -119,7 +123,11 @@ next_one:
90959 static void
90960 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
90961 {
90962 +#ifdef CONFIG_GRKERNSEC_HIDESYM
90963 + SEQ_printf(m, " .base: %p\n", NULL);
90964 +#else
90965 SEQ_printf(m, " .base: %pK\n", base);
90966 +#endif
90967 SEQ_printf(m, " .index: %d\n",
90968 base->index);
90969 SEQ_printf(m, " .resolution: %Lu nsecs\n",
90970 @@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
90971 {
90972 struct proc_dir_entry *pe;
90973
90974 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
90975 + pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
90976 +#else
90977 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
90978 +#endif
90979 if (!pe)
90980 return -ENOMEM;
90981 return 0;
90982 diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
90983 index 1fb08f2..ca4bb1e 100644
90984 --- a/kernel/time/timer_stats.c
90985 +++ b/kernel/time/timer_stats.c
90986 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
90987 static unsigned long nr_entries;
90988 static struct entry entries[MAX_ENTRIES];
90989
90990 -static atomic_t overflow_count;
90991 +static atomic_unchecked_t overflow_count;
90992
90993 /*
90994 * The entries are in a hash-table, for fast lookup:
90995 @@ -140,7 +140,7 @@ static void reset_entries(void)
90996 nr_entries = 0;
90997 memset(entries, 0, sizeof(entries));
90998 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
90999 - atomic_set(&overflow_count, 0);
91000 + atomic_set_unchecked(&overflow_count, 0);
91001 }
91002
91003 static struct entry *alloc_entry(void)
91004 @@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
91005 if (likely(entry))
91006 entry->count++;
91007 else
91008 - atomic_inc(&overflow_count);
91009 + atomic_inc_unchecked(&overflow_count);
91010
91011 out_unlock:
91012 raw_spin_unlock_irqrestore(lock, flags);
91013 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
91014
91015 static void print_name_offset(struct seq_file *m, unsigned long addr)
91016 {
91017 +#ifdef CONFIG_GRKERNSEC_HIDESYM
91018 + seq_printf(m, "<%p>", NULL);
91019 +#else
91020 char symname[KSYM_NAME_LEN];
91021
91022 if (lookup_symbol_name(addr, symname) < 0)
91023 - seq_printf(m, "<%p>", (void *)addr);
91024 + seq_printf(m, "<%pK>", (void *)addr);
91025 else
91026 seq_printf(m, "%s", symname);
91027 +#endif
91028 }
91029
91030 static int tstats_show(struct seq_file *m, void *v)
91031 @@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
91032
91033 seq_puts(m, "Timer Stats Version: v0.3\n");
91034 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
91035 - if (atomic_read(&overflow_count))
91036 - seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
91037 + if (atomic_read_unchecked(&overflow_count))
91038 + seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
91039 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
91040
91041 for (i = 0; i < nr_entries; i++) {
91042 @@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
91043 {
91044 struct proc_dir_entry *pe;
91045
91046 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
91047 + pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
91048 +#else
91049 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
91050 +#endif
91051 if (!pe)
91052 return -ENOMEM;
91053 return 0;
91054 diff --git a/kernel/timer.c b/kernel/timer.c
91055 index 3bb01a3..0e7760e 100644
91056 --- a/kernel/timer.c
91057 +++ b/kernel/timer.c
91058 @@ -1393,7 +1393,7 @@ void update_process_times(int user_tick)
91059 /*
91060 * This function runs timers and the timer-tq in bottom half context.
91061 */
91062 -static void run_timer_softirq(struct softirq_action *h)
91063 +static __latent_entropy void run_timer_softirq(void)
91064 {
91065 struct tvec_base *base = __this_cpu_read(tvec_bases);
91066
91067 @@ -1456,7 +1456,7 @@ static void process_timeout(unsigned long __data)
91068 *
91069 * In all cases the return value is guaranteed to be non-negative.
91070 */
91071 -signed long __sched schedule_timeout(signed long timeout)
91072 +signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
91073 {
91074 struct timer_list timer;
91075 unsigned long expire;
91076 diff --git a/kernel/torture.c b/kernel/torture.c
91077 index acc9afc..4f9eb49 100644
91078 --- a/kernel/torture.c
91079 +++ b/kernel/torture.c
91080 @@ -489,7 +489,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
91081 mutex_lock(&fullstop_mutex);
91082 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
91083 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
91084 - ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
91085 + ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
91086 } else {
91087 pr_warn("Concurrent rmmod and shutdown illegal!\n");
91088 }
91089 @@ -551,11 +551,11 @@ static int torture_stutter(void *arg)
91090 do {
91091 if (!torture_must_stop()) {
91092 schedule_timeout_interruptible(stutter);
91093 - ACCESS_ONCE(stutter_pause_test) = 1;
91094 + ACCESS_ONCE_RW(stutter_pause_test) = 1;
91095 }
91096 if (!torture_must_stop())
91097 schedule_timeout_interruptible(stutter);
91098 - ACCESS_ONCE(stutter_pause_test) = 0;
91099 + ACCESS_ONCE_RW(stutter_pause_test) = 0;
91100 torture_shutdown_absorb("torture_stutter");
91101 } while (!torture_must_stop());
91102 torture_kthread_stopping("torture_stutter");
91103 @@ -636,7 +636,7 @@ bool torture_cleanup(void)
91104 schedule_timeout_uninterruptible(10);
91105 return true;
91106 }
91107 - ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
91108 + ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
91109 mutex_unlock(&fullstop_mutex);
91110 torture_shutdown_cleanup();
91111 torture_shuffle_cleanup();
91112 diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
91113 index c1bd4ad..4b861dc 100644
91114 --- a/kernel/trace/blktrace.c
91115 +++ b/kernel/trace/blktrace.c
91116 @@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
91117 struct blk_trace *bt = filp->private_data;
91118 char buf[16];
91119
91120 - snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
91121 + snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
91122
91123 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
91124 }
91125 @@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
91126 return 1;
91127
91128 bt = buf->chan->private_data;
91129 - atomic_inc(&bt->dropped);
91130 + atomic_inc_unchecked(&bt->dropped);
91131 return 0;
91132 }
91133
91134 @@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
91135
91136 bt->dir = dir;
91137 bt->dev = dev;
91138 - atomic_set(&bt->dropped, 0);
91139 + atomic_set_unchecked(&bt->dropped, 0);
91140 INIT_LIST_HEAD(&bt->running_list);
91141
91142 ret = -EIO;
91143 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
91144 index 4a54a25..7ca9c89 100644
91145 --- a/kernel/trace/ftrace.c
91146 +++ b/kernel/trace/ftrace.c
91147 @@ -1960,12 +1960,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
91148 if (unlikely(ftrace_disabled))
91149 return 0;
91150
91151 + ret = ftrace_arch_code_modify_prepare();
91152 + FTRACE_WARN_ON(ret);
91153 + if (ret)
91154 + return 0;
91155 +
91156 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
91157 + FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
91158 if (ret) {
91159 ftrace_bug(ret, ip);
91160 - return 0;
91161 }
91162 - return 1;
91163 + return ret ? 0 : 1;
91164 }
91165
91166 /*
91167 @@ -4195,8 +4200,10 @@ static int ftrace_process_locs(struct module *mod,
91168 if (!count)
91169 return 0;
91170
91171 + pax_open_kernel();
91172 sort(start, count, sizeof(*start),
91173 ftrace_cmp_ips, ftrace_swap_ips);
91174 + pax_close_kernel();
91175
91176 start_pg = ftrace_allocate_pages(count);
91177 if (!start_pg)
91178 @@ -4908,8 +4915,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
91179 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
91180
91181 static int ftrace_graph_active;
91182 -static struct notifier_block ftrace_suspend_notifier;
91183 -
91184 int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
91185 {
91186 return 0;
91187 @@ -5085,6 +5090,10 @@ static void update_function_graph_func(void)
91188 ftrace_graph_entry = ftrace_graph_entry_test;
91189 }
91190
91191 +static struct notifier_block ftrace_suspend_notifier = {
91192 + .notifier_call = ftrace_suspend_notifier_call
91193 +};
91194 +
91195 int register_ftrace_graph(trace_func_graph_ret_t retfunc,
91196 trace_func_graph_ent_t entryfunc)
91197 {
91198 @@ -5098,7 +5107,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
91199 goto out;
91200 }
91201
91202 - ftrace_suspend_notifier.notifier_call = ftrace_suspend_notifier_call;
91203 register_pm_notifier(&ftrace_suspend_notifier);
91204
91205 ftrace_graph_active++;
91206 diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
91207 index c634868..00d0d19 100644
91208 --- a/kernel/trace/ring_buffer.c
91209 +++ b/kernel/trace/ring_buffer.c
91210 @@ -352,9 +352,9 @@ struct buffer_data_page {
91211 */
91212 struct buffer_page {
91213 struct list_head list; /* list of buffer pages */
91214 - local_t write; /* index for next write */
91215 + local_unchecked_t write; /* index for next write */
91216 unsigned read; /* index for next read */
91217 - local_t entries; /* entries on this page */
91218 + local_unchecked_t entries; /* entries on this page */
91219 unsigned long real_end; /* real end of data */
91220 struct buffer_data_page *page; /* Actual data page */
91221 };
91222 @@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
91223 unsigned long last_overrun;
91224 local_t entries_bytes;
91225 local_t entries;
91226 - local_t overrun;
91227 - local_t commit_overrun;
91228 + local_unchecked_t overrun;
91229 + local_unchecked_t commit_overrun;
91230 local_t dropped_events;
91231 local_t committing;
91232 local_t commits;
91233 @@ -992,8 +992,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
91234 *
91235 * We add a counter to the write field to denote this.
91236 */
91237 - old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
91238 - old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
91239 + old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
91240 + old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
91241
91242 /*
91243 * Just make sure we have seen our old_write and synchronize
91244 @@ -1021,8 +1021,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
91245 * cmpxchg to only update if an interrupt did not already
91246 * do it for us. If the cmpxchg fails, we don't care.
91247 */
91248 - (void)local_cmpxchg(&next_page->write, old_write, val);
91249 - (void)local_cmpxchg(&next_page->entries, old_entries, eval);
91250 + (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
91251 + (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
91252
91253 /*
91254 * No need to worry about races with clearing out the commit.
91255 @@ -1389,12 +1389,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
91256
91257 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
91258 {
91259 - return local_read(&bpage->entries) & RB_WRITE_MASK;
91260 + return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
91261 }
91262
91263 static inline unsigned long rb_page_write(struct buffer_page *bpage)
91264 {
91265 - return local_read(&bpage->write) & RB_WRITE_MASK;
91266 + return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
91267 }
91268
91269 static int
91270 @@ -1489,7 +1489,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
91271 * bytes consumed in ring buffer from here.
91272 * Increment overrun to account for the lost events.
91273 */
91274 - local_add(page_entries, &cpu_buffer->overrun);
91275 + local_add_unchecked(page_entries, &cpu_buffer->overrun);
91276 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
91277 }
91278
91279 @@ -2067,7 +2067,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
91280 * it is our responsibility to update
91281 * the counters.
91282 */
91283 - local_add(entries, &cpu_buffer->overrun);
91284 + local_add_unchecked(entries, &cpu_buffer->overrun);
91285 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
91286
91287 /*
91288 @@ -2217,7 +2217,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
91289 if (tail == BUF_PAGE_SIZE)
91290 tail_page->real_end = 0;
91291
91292 - local_sub(length, &tail_page->write);
91293 + local_sub_unchecked(length, &tail_page->write);
91294 return;
91295 }
91296
91297 @@ -2252,7 +2252,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
91298 rb_event_set_padding(event);
91299
91300 /* Set the write back to the previous setting */
91301 - local_sub(length, &tail_page->write);
91302 + local_sub_unchecked(length, &tail_page->write);
91303 return;
91304 }
91305
91306 @@ -2264,7 +2264,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
91307
91308 /* Set write to end of buffer */
91309 length = (tail + length) - BUF_PAGE_SIZE;
91310 - local_sub(length, &tail_page->write);
91311 + local_sub_unchecked(length, &tail_page->write);
91312 }
91313
91314 /*
91315 @@ -2290,7 +2290,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
91316 * about it.
91317 */
91318 if (unlikely(next_page == commit_page)) {
91319 - local_inc(&cpu_buffer->commit_overrun);
91320 + local_inc_unchecked(&cpu_buffer->commit_overrun);
91321 goto out_reset;
91322 }
91323
91324 @@ -2346,7 +2346,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
91325 cpu_buffer->tail_page) &&
91326 (cpu_buffer->commit_page ==
91327 cpu_buffer->reader_page))) {
91328 - local_inc(&cpu_buffer->commit_overrun);
91329 + local_inc_unchecked(&cpu_buffer->commit_overrun);
91330 goto out_reset;
91331 }
91332 }
91333 @@ -2394,7 +2394,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
91334 length += RB_LEN_TIME_EXTEND;
91335
91336 tail_page = cpu_buffer->tail_page;
91337 - write = local_add_return(length, &tail_page->write);
91338 + write = local_add_return_unchecked(length, &tail_page->write);
91339
91340 /* set write to only the index of the write */
91341 write &= RB_WRITE_MASK;
91342 @@ -2418,7 +2418,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
91343 kmemcheck_annotate_bitfield(event, bitfield);
91344 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
91345
91346 - local_inc(&tail_page->entries);
91347 + local_inc_unchecked(&tail_page->entries);
91348
91349 /*
91350 * If this is the first commit on the page, then update
91351 @@ -2451,7 +2451,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
91352
91353 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
91354 unsigned long write_mask =
91355 - local_read(&bpage->write) & ~RB_WRITE_MASK;
91356 + local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
91357 unsigned long event_length = rb_event_length(event);
91358 /*
91359 * This is on the tail page. It is possible that
91360 @@ -2461,7 +2461,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
91361 */
91362 old_index += write_mask;
91363 new_index += write_mask;
91364 - index = local_cmpxchg(&bpage->write, old_index, new_index);
91365 + index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
91366 if (index == old_index) {
91367 /* update counters */
91368 local_sub(event_length, &cpu_buffer->entries_bytes);
91369 @@ -2853,7 +2853,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
91370
91371 /* Do the likely case first */
91372 if (likely(bpage->page == (void *)addr)) {
91373 - local_dec(&bpage->entries);
91374 + local_dec_unchecked(&bpage->entries);
91375 return;
91376 }
91377
91378 @@ -2865,7 +2865,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
91379 start = bpage;
91380 do {
91381 if (bpage->page == (void *)addr) {
91382 - local_dec(&bpage->entries);
91383 + local_dec_unchecked(&bpage->entries);
91384 return;
91385 }
91386 rb_inc_page(cpu_buffer, &bpage);
91387 @@ -3149,7 +3149,7 @@ static inline unsigned long
91388 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
91389 {
91390 return local_read(&cpu_buffer->entries) -
91391 - (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
91392 + (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
91393 }
91394
91395 /**
91396 @@ -3238,7 +3238,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
91397 return 0;
91398
91399 cpu_buffer = buffer->buffers[cpu];
91400 - ret = local_read(&cpu_buffer->overrun);
91401 + ret = local_read_unchecked(&cpu_buffer->overrun);
91402
91403 return ret;
91404 }
91405 @@ -3261,7 +3261,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
91406 return 0;
91407
91408 cpu_buffer = buffer->buffers[cpu];
91409 - ret = local_read(&cpu_buffer->commit_overrun);
91410 + ret = local_read_unchecked(&cpu_buffer->commit_overrun);
91411
91412 return ret;
91413 }
91414 @@ -3346,7 +3346,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
91415 /* if you care about this being correct, lock the buffer */
91416 for_each_buffer_cpu(buffer, cpu) {
91417 cpu_buffer = buffer->buffers[cpu];
91418 - overruns += local_read(&cpu_buffer->overrun);
91419 + overruns += local_read_unchecked(&cpu_buffer->overrun);
91420 }
91421
91422 return overruns;
91423 @@ -3522,8 +3522,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
91424 /*
91425 * Reset the reader page to size zero.
91426 */
91427 - local_set(&cpu_buffer->reader_page->write, 0);
91428 - local_set(&cpu_buffer->reader_page->entries, 0);
91429 + local_set_unchecked(&cpu_buffer->reader_page->write, 0);
91430 + local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
91431 local_set(&cpu_buffer->reader_page->page->commit, 0);
91432 cpu_buffer->reader_page->real_end = 0;
91433
91434 @@ -3557,7 +3557,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
91435 * want to compare with the last_overrun.
91436 */
91437 smp_mb();
91438 - overwrite = local_read(&(cpu_buffer->overrun));
91439 + overwrite = local_read_unchecked(&(cpu_buffer->overrun));
91440
91441 /*
91442 * Here's the tricky part.
91443 @@ -4127,8 +4127,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
91444
91445 cpu_buffer->head_page
91446 = list_entry(cpu_buffer->pages, struct buffer_page, list);
91447 - local_set(&cpu_buffer->head_page->write, 0);
91448 - local_set(&cpu_buffer->head_page->entries, 0);
91449 + local_set_unchecked(&cpu_buffer->head_page->write, 0);
91450 + local_set_unchecked(&cpu_buffer->head_page->entries, 0);
91451 local_set(&cpu_buffer->head_page->page->commit, 0);
91452
91453 cpu_buffer->head_page->read = 0;
91454 @@ -4138,14 +4138,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
91455
91456 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
91457 INIT_LIST_HEAD(&cpu_buffer->new_pages);
91458 - local_set(&cpu_buffer->reader_page->write, 0);
91459 - local_set(&cpu_buffer->reader_page->entries, 0);
91460 + local_set_unchecked(&cpu_buffer->reader_page->write, 0);
91461 + local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
91462 local_set(&cpu_buffer->reader_page->page->commit, 0);
91463 cpu_buffer->reader_page->read = 0;
91464
91465 local_set(&cpu_buffer->entries_bytes, 0);
91466 - local_set(&cpu_buffer->overrun, 0);
91467 - local_set(&cpu_buffer->commit_overrun, 0);
91468 + local_set_unchecked(&cpu_buffer->overrun, 0);
91469 + local_set_unchecked(&cpu_buffer->commit_overrun, 0);
91470 local_set(&cpu_buffer->dropped_events, 0);
91471 local_set(&cpu_buffer->entries, 0);
91472 local_set(&cpu_buffer->committing, 0);
91473 @@ -4550,8 +4550,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
91474 rb_init_page(bpage);
91475 bpage = reader->page;
91476 reader->page = *data_page;
91477 - local_set(&reader->write, 0);
91478 - local_set(&reader->entries, 0);
91479 + local_set_unchecked(&reader->write, 0);
91480 + local_set_unchecked(&reader->entries, 0);
91481 reader->read = 0;
91482 *data_page = bpage;
91483
91484 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
91485 index 1848dc6..5fc244c 100644
91486 --- a/kernel/trace/trace.c
91487 +++ b/kernel/trace/trace.c
91488 @@ -3447,7 +3447,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
91489 return 0;
91490 }
91491
91492 -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
91493 +int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
91494 {
91495 /* do nothing if flag is already set */
91496 if (!!(trace_flags & mask) == !!enabled)
91497 diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
91498 index 2e29d7b..61367d7 100644
91499 --- a/kernel/trace/trace.h
91500 +++ b/kernel/trace/trace.h
91501 @@ -1264,7 +1264,7 @@ extern const char *__stop___tracepoint_str[];
91502 void trace_printk_init_buffers(void);
91503 void trace_printk_start_comm(void);
91504 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
91505 -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
91506 +int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
91507
91508 /*
91509 * Normal trace_printk() and friends allocates special buffers
91510 diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
91511 index 26dc348..8708ca7 100644
91512 --- a/kernel/trace/trace_clock.c
91513 +++ b/kernel/trace/trace_clock.c
91514 @@ -123,7 +123,7 @@ u64 notrace trace_clock_global(void)
91515 return now;
91516 }
91517
91518 -static atomic64_t trace_counter;
91519 +static atomic64_unchecked_t trace_counter;
91520
91521 /*
91522 * trace_clock_counter(): simply an atomic counter.
91523 @@ -132,5 +132,5 @@ static atomic64_t trace_counter;
91524 */
91525 u64 notrace trace_clock_counter(void)
91526 {
91527 - return atomic64_add_return(1, &trace_counter);
91528 + return atomic64_inc_return_unchecked(&trace_counter);
91529 }
91530 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
91531 index 3ddfd8f..41a10fe 100644
91532 --- a/kernel/trace/trace_events.c
91533 +++ b/kernel/trace/trace_events.c
91534 @@ -1718,7 +1718,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
91535 return 0;
91536 }
91537
91538 -struct ftrace_module_file_ops;
91539 static void __add_event_to_tracers(struct ftrace_event_call *call);
91540
91541 /* Add an additional event_call dynamically */
91542 diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
91543 index 0abd9b8..6a663a2 100644
91544 --- a/kernel/trace/trace_mmiotrace.c
91545 +++ b/kernel/trace/trace_mmiotrace.c
91546 @@ -24,7 +24,7 @@ struct header_iter {
91547 static struct trace_array *mmio_trace_array;
91548 static bool overrun_detected;
91549 static unsigned long prev_overruns;
91550 -static atomic_t dropped_count;
91551 +static atomic_unchecked_t dropped_count;
91552
91553 static void mmio_reset_data(struct trace_array *tr)
91554 {
91555 @@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
91556
91557 static unsigned long count_overruns(struct trace_iterator *iter)
91558 {
91559 - unsigned long cnt = atomic_xchg(&dropped_count, 0);
91560 + unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
91561 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
91562
91563 if (over > prev_overruns)
91564 @@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
91565 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
91566 sizeof(*entry), 0, pc);
91567 if (!event) {
91568 - atomic_inc(&dropped_count);
91569 + atomic_inc_unchecked(&dropped_count);
91570 return;
91571 }
91572 entry = ring_buffer_event_data(event);
91573 @@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
91574 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
91575 sizeof(*entry), 0, pc);
91576 if (!event) {
91577 - atomic_inc(&dropped_count);
91578 + atomic_inc_unchecked(&dropped_count);
91579 return;
91580 }
91581 entry = ring_buffer_event_data(event);
91582 diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
91583 index a436de1..f64dde2 100644
91584 --- a/kernel/trace/trace_output.c
91585 +++ b/kernel/trace/trace_output.c
91586 @@ -294,7 +294,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
91587
91588 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
91589 if (!IS_ERR(p)) {
91590 - p = mangle_path(s->buffer + s->len, p, "\n");
91591 + p = mangle_path(s->buffer + s->len, p, "\n\\");
91592 if (p) {
91593 s->len = p - s->buffer;
91594 return 1;
91595 @@ -939,14 +939,16 @@ int register_ftrace_event(struct trace_event *event)
91596 goto out;
91597 }
91598
91599 + pax_open_kernel();
91600 if (event->funcs->trace == NULL)
91601 - event->funcs->trace = trace_nop_print;
91602 + *(void **)&event->funcs->trace = trace_nop_print;
91603 if (event->funcs->raw == NULL)
91604 - event->funcs->raw = trace_nop_print;
91605 + *(void **)&event->funcs->raw = trace_nop_print;
91606 if (event->funcs->hex == NULL)
91607 - event->funcs->hex = trace_nop_print;
91608 + *(void **)&event->funcs->hex = trace_nop_print;
91609 if (event->funcs->binary == NULL)
91610 - event->funcs->binary = trace_nop_print;
91611 + *(void **)&event->funcs->binary = trace_nop_print;
91612 + pax_close_kernel();
91613
91614 key = event->type & (EVENT_HASHSIZE - 1);
91615
91616 diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
91617 index 21b320e..40607bc 100644
91618 --- a/kernel/trace/trace_stack.c
91619 +++ b/kernel/trace/trace_stack.c
91620 @@ -69,7 +69,7 @@ check_stack(unsigned long ip, unsigned long *stack)
91621 return;
91622
91623 /* we do not handle interrupt stacks yet */
91624 - if (!object_is_on_stack(stack))
91625 + if (!object_starts_on_stack(stack))
91626 return;
91627
91628 local_irq_save(flags);
91629 diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
91630 index bf71b4b..04dee68 100644
91631 --- a/kernel/user_namespace.c
91632 +++ b/kernel/user_namespace.c
91633 @@ -82,6 +82,21 @@ int create_user_ns(struct cred *new)
91634 !kgid_has_mapping(parent_ns, group))
91635 return -EPERM;
91636
91637 +#ifdef CONFIG_GRKERNSEC
91638 + /*
91639 + * This doesn't really inspire confidence:
91640 + * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
91641 + * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
91642 + * Increases kernel attack surface in areas developers
91643 + * previously cared little about ("low importance due
91644 + * to requiring "root" capability")
91645 + * To be removed when this code receives *proper* review
91646 + */
91647 + if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
91648 + !capable(CAP_SETGID))
91649 + return -EPERM;
91650 +#endif
91651 +
91652 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
91653 if (!ns)
91654 return -ENOMEM;
91655 @@ -865,7 +880,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
91656 if (atomic_read(&current->mm->mm_users) > 1)
91657 return -EINVAL;
91658
91659 - if (current->fs->users != 1)
91660 + if (atomic_read(&current->fs->users) != 1)
91661 return -EINVAL;
91662
91663 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
91664 diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
91665 index 4f69f9a..7c6f8f8 100644
91666 --- a/kernel/utsname_sysctl.c
91667 +++ b/kernel/utsname_sysctl.c
91668 @@ -47,7 +47,7 @@ static void put_uts(ctl_table *table, int write, void *which)
91669 static int proc_do_uts_string(ctl_table *table, int write,
91670 void __user *buffer, size_t *lenp, loff_t *ppos)
91671 {
91672 - struct ctl_table uts_table;
91673 + ctl_table_no_const uts_table;
91674 int r;
91675 memcpy(&uts_table, table, sizeof(uts_table));
91676 uts_table.data = get_uts(table, write);
91677 diff --git a/kernel/watchdog.c b/kernel/watchdog.c
91678 index 30e4822..dd2b854 100644
91679 --- a/kernel/watchdog.c
91680 +++ b/kernel/watchdog.c
91681 @@ -479,7 +479,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
91682 static void watchdog_nmi_disable(unsigned int cpu) { return; }
91683 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
91684
91685 -static struct smp_hotplug_thread watchdog_threads = {
91686 +static struct smp_hotplug_thread watchdog_threads __read_only = {
91687 .store = &softlockup_watchdog,
91688 .thread_should_run = watchdog_should_run,
91689 .thread_fn = watchdog,
91690 diff --git a/kernel/workqueue.c b/kernel/workqueue.c
91691 index 8edc8718..b6a70b9 100644
91692 --- a/kernel/workqueue.c
91693 +++ b/kernel/workqueue.c
91694 @@ -4709,7 +4709,7 @@ static void rebind_workers(struct worker_pool *pool)
91695 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
91696 worker_flags |= WORKER_REBOUND;
91697 worker_flags &= ~WORKER_UNBOUND;
91698 - ACCESS_ONCE(worker->flags) = worker_flags;
91699 + ACCESS_ONCE_RW(worker->flags) = worker_flags;
91700 }
91701
91702 spin_unlock_irq(&pool->lock);
91703 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
91704 index 819ac51..1c8a65e 100644
91705 --- a/lib/Kconfig.debug
91706 +++ b/lib/Kconfig.debug
91707 @@ -853,7 +853,7 @@ config DEBUG_MUTEXES
91708
91709 config DEBUG_WW_MUTEX_SLOWPATH
91710 bool "Wait/wound mutex debugging: Slowpath testing"
91711 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
91712 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
91713 select DEBUG_LOCK_ALLOC
91714 select DEBUG_SPINLOCK
91715 select DEBUG_MUTEXES
91716 @@ -866,7 +866,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
91717
91718 config DEBUG_LOCK_ALLOC
91719 bool "Lock debugging: detect incorrect freeing of live locks"
91720 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
91721 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
91722 select DEBUG_SPINLOCK
91723 select DEBUG_MUTEXES
91724 select LOCKDEP
91725 @@ -880,7 +880,7 @@ config DEBUG_LOCK_ALLOC
91726
91727 config PROVE_LOCKING
91728 bool "Lock debugging: prove locking correctness"
91729 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
91730 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
91731 select LOCKDEP
91732 select DEBUG_SPINLOCK
91733 select DEBUG_MUTEXES
91734 @@ -931,7 +931,7 @@ config LOCKDEP
91735
91736 config LOCK_STAT
91737 bool "Lock usage statistics"
91738 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
91739 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
91740 select LOCKDEP
91741 select DEBUG_SPINLOCK
91742 select DEBUG_MUTEXES
91743 @@ -1403,6 +1403,7 @@ config LATENCYTOP
91744 depends on DEBUG_KERNEL
91745 depends on STACKTRACE_SUPPORT
91746 depends on PROC_FS
91747 + depends on !GRKERNSEC_HIDESYM
91748 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
91749 select KALLSYMS
91750 select KALLSYMS_ALL
91751 @@ -1419,7 +1420,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
91752 config DEBUG_STRICT_USER_COPY_CHECKS
91753 bool "Strict user copy size checks"
91754 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
91755 - depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
91756 + depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
91757 help
91758 Enabling this option turns a certain set of sanity checks for user
91759 copy operations into compile time failures.
91760 @@ -1538,7 +1539,7 @@ endmenu # runtime tests
91761
91762 config PROVIDE_OHCI1394_DMA_INIT
91763 bool "Remote debugging over FireWire early on boot"
91764 - depends on PCI && X86
91765 + depends on PCI && X86 && !GRKERNSEC
91766 help
91767 If you want to debug problems which hang or crash the kernel early
91768 on boot and the crashing machine has a FireWire port, you can use
91769 diff --git a/lib/Makefile b/lib/Makefile
91770 index 0cd7b68..e149e37 100644
91771 --- a/lib/Makefile
91772 +++ b/lib/Makefile
91773 @@ -52,7 +52,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
91774 obj-$(CONFIG_BTREE) += btree.o
91775 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
91776 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
91777 -obj-$(CONFIG_DEBUG_LIST) += list_debug.o
91778 +obj-y += list_debug.o
91779 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
91780
91781 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
91782 diff --git a/lib/average.c b/lib/average.c
91783 index 114d1be..ab0350c 100644
91784 --- a/lib/average.c
91785 +++ b/lib/average.c
91786 @@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
91787 {
91788 unsigned long internal = ACCESS_ONCE(avg->internal);
91789
91790 - ACCESS_ONCE(avg->internal) = internal ?
91791 + ACCESS_ONCE_RW(avg->internal) = internal ?
91792 (((internal << avg->weight) - internal) +
91793 (val << avg->factor)) >> avg->weight :
91794 (val << avg->factor);
91795 diff --git a/lib/bitmap.c b/lib/bitmap.c
91796 index 06f7e4f..f3cf2b0 100644
91797 --- a/lib/bitmap.c
91798 +++ b/lib/bitmap.c
91799 @@ -422,7 +422,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
91800 {
91801 int c, old_c, totaldigits, ndigits, nchunks, nbits;
91802 u32 chunk;
91803 - const char __user __force *ubuf = (const char __user __force *)buf;
91804 + const char __user *ubuf = (const char __force_user *)buf;
91805
91806 bitmap_zero(maskp, nmaskbits);
91807
91808 @@ -507,7 +507,7 @@ int bitmap_parse_user(const char __user *ubuf,
91809 {
91810 if (!access_ok(VERIFY_READ, ubuf, ulen))
91811 return -EFAULT;
91812 - return __bitmap_parse((const char __force *)ubuf,
91813 + return __bitmap_parse((const char __force_kernel *)ubuf,
91814 ulen, 1, maskp, nmaskbits);
91815
91816 }
91817 @@ -598,7 +598,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
91818 {
91819 unsigned a, b;
91820 int c, old_c, totaldigits;
91821 - const char __user __force *ubuf = (const char __user __force *)buf;
91822 + const char __user *ubuf = (const char __force_user *)buf;
91823 int exp_digit, in_range;
91824
91825 totaldigits = c = 0;
91826 @@ -698,7 +698,7 @@ int bitmap_parselist_user(const char __user *ubuf,
91827 {
91828 if (!access_ok(VERIFY_READ, ubuf, ulen))
91829 return -EFAULT;
91830 - return __bitmap_parselist((const char __force *)ubuf,
91831 + return __bitmap_parselist((const char __force_kernel *)ubuf,
91832 ulen, 1, maskp, nmaskbits);
91833 }
91834 EXPORT_SYMBOL(bitmap_parselist_user);
91835 diff --git a/lib/bug.c b/lib/bug.c
91836 index 1686034..a9c00c8 100644
91837 --- a/lib/bug.c
91838 +++ b/lib/bug.c
91839 @@ -134,6 +134,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
91840 return BUG_TRAP_TYPE_NONE;
91841
91842 bug = find_bug(bugaddr);
91843 + if (!bug)
91844 + return BUG_TRAP_TYPE_NONE;
91845
91846 file = NULL;
91847 line = 0;
91848 diff --git a/lib/debugobjects.c b/lib/debugobjects.c
91849 index e0731c3..ad66444 100644
91850 --- a/lib/debugobjects.c
91851 +++ b/lib/debugobjects.c
91852 @@ -286,7 +286,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
91853 if (limit > 4)
91854 return;
91855
91856 - is_on_stack = object_is_on_stack(addr);
91857 + is_on_stack = object_starts_on_stack(addr);
91858 if (is_on_stack == onstack)
91859 return;
91860
91861 diff --git a/lib/div64.c b/lib/div64.c
91862 index 4382ad7..08aa558 100644
91863 --- a/lib/div64.c
91864 +++ b/lib/div64.c
91865 @@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
91866 EXPORT_SYMBOL(__div64_32);
91867
91868 #ifndef div_s64_rem
91869 -s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
91870 +s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
91871 {
91872 u64 quotient;
91873
91874 @@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
91875 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
91876 */
91877 #ifndef div64_u64
91878 -u64 div64_u64(u64 dividend, u64 divisor)
91879 +u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
91880 {
91881 u32 high = divisor >> 32;
91882 u64 quot;
91883 diff --git a/lib/dma-debug.c b/lib/dma-debug.c
91884 index 98f2d7e..899da5c 100644
91885 --- a/lib/dma-debug.c
91886 +++ b/lib/dma-debug.c
91887 @@ -971,7 +971,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
91888
91889 void dma_debug_add_bus(struct bus_type *bus)
91890 {
91891 - struct notifier_block *nb;
91892 + notifier_block_no_const *nb;
91893
91894 if (global_disable)
91895 return;
91896 @@ -1148,7 +1148,7 @@ static void check_unmap(struct dma_debug_entry *ref)
91897
91898 static void check_for_stack(struct device *dev, void *addr)
91899 {
91900 - if (object_is_on_stack(addr))
91901 + if (object_starts_on_stack(addr))
91902 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
91903 "stack [addr=%p]\n", addr);
91904 }
91905 diff --git a/lib/hash.c b/lib/hash.c
91906 index fea973f..386626f 100644
91907 --- a/lib/hash.c
91908 +++ b/lib/hash.c
91909 @@ -14,7 +14,7 @@
91910 #include <linux/hash.h>
91911 #include <linux/cache.h>
91912
91913 -static struct fast_hash_ops arch_hash_ops __read_mostly = {
91914 +static struct fast_hash_ops arch_hash_ops __read_only = {
91915 .hash = jhash,
91916 .hash2 = jhash2,
91917 };
91918 diff --git a/lib/inflate.c b/lib/inflate.c
91919 index 013a761..c28f3fc 100644
91920 --- a/lib/inflate.c
91921 +++ b/lib/inflate.c
91922 @@ -269,7 +269,7 @@ static void free(void *where)
91923 malloc_ptr = free_mem_ptr;
91924 }
91925 #else
91926 -#define malloc(a) kmalloc(a, GFP_KERNEL)
91927 +#define malloc(a) kmalloc((a), GFP_KERNEL)
91928 #define free(a) kfree(a)
91929 #endif
91930
91931 diff --git a/lib/ioremap.c b/lib/ioremap.c
91932 index 0c9216c..863bd89 100644
91933 --- a/lib/ioremap.c
91934 +++ b/lib/ioremap.c
91935 @@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
91936 unsigned long next;
91937
91938 phys_addr -= addr;
91939 - pmd = pmd_alloc(&init_mm, pud, addr);
91940 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
91941 if (!pmd)
91942 return -ENOMEM;
91943 do {
91944 @@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
91945 unsigned long next;
91946
91947 phys_addr -= addr;
91948 - pud = pud_alloc(&init_mm, pgd, addr);
91949 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
91950 if (!pud)
91951 return -ENOMEM;
91952 do {
91953 diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
91954 index bd2bea9..6b3c95e 100644
91955 --- a/lib/is_single_threaded.c
91956 +++ b/lib/is_single_threaded.c
91957 @@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
91958 struct task_struct *p, *t;
91959 bool ret;
91960
91961 + if (!mm)
91962 + return true;
91963 +
91964 if (atomic_read(&task->signal->live) != 1)
91965 return false;
91966
91967 diff --git a/lib/kobject.c b/lib/kobject.c
91968 index 58751bb..93a1853 100644
91969 --- a/lib/kobject.c
91970 +++ b/lib/kobject.c
91971 @@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
91972
91973
91974 static DEFINE_SPINLOCK(kobj_ns_type_lock);
91975 -static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
91976 +static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
91977
91978 -int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
91979 +int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
91980 {
91981 enum kobj_ns_type type = ops->type;
91982 int error;
91983 diff --git a/lib/list_debug.c b/lib/list_debug.c
91984 index c24c2f7..f0296f4 100644
91985 --- a/lib/list_debug.c
91986 +++ b/lib/list_debug.c
91987 @@ -11,7 +11,9 @@
91988 #include <linux/bug.h>
91989 #include <linux/kernel.h>
91990 #include <linux/rculist.h>
91991 +#include <linux/mm.h>
91992
91993 +#ifdef CONFIG_DEBUG_LIST
91994 /*
91995 * Insert a new entry between two known consecutive entries.
91996 *
91997 @@ -19,21 +21,40 @@
91998 * the prev/next entries already!
91999 */
92000
92001 +static bool __list_add_debug(struct list_head *new,
92002 + struct list_head *prev,
92003 + struct list_head *next)
92004 +{
92005 + if (unlikely(next->prev != prev)) {
92006 + printk(KERN_ERR "list_add corruption. next->prev should be "
92007 + "prev (%p), but was %p. (next=%p).\n",
92008 + prev, next->prev, next);
92009 + BUG();
92010 + return false;
92011 + }
92012 + if (unlikely(prev->next != next)) {
92013 + printk(KERN_ERR "list_add corruption. prev->next should be "
92014 + "next (%p), but was %p. (prev=%p).\n",
92015 + next, prev->next, prev);
92016 + BUG();
92017 + return false;
92018 + }
92019 + if (unlikely(new == prev || new == next)) {
92020 + printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
92021 + new, prev, next);
92022 + BUG();
92023 + return false;
92024 + }
92025 + return true;
92026 +}
92027 +
92028 void __list_add(struct list_head *new,
92029 - struct list_head *prev,
92030 - struct list_head *next)
92031 + struct list_head *prev,
92032 + struct list_head *next)
92033 {
92034 - WARN(next->prev != prev,
92035 - "list_add corruption. next->prev should be "
92036 - "prev (%p), but was %p. (next=%p).\n",
92037 - prev, next->prev, next);
92038 - WARN(prev->next != next,
92039 - "list_add corruption. prev->next should be "
92040 - "next (%p), but was %p. (prev=%p).\n",
92041 - next, prev->next, prev);
92042 - WARN(new == prev || new == next,
92043 - "list_add double add: new=%p, prev=%p, next=%p.\n",
92044 - new, prev, next);
92045 + if (!__list_add_debug(new, prev, next))
92046 + return;
92047 +
92048 next->prev = new;
92049 new->next = next;
92050 new->prev = prev;
92051 @@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
92052 }
92053 EXPORT_SYMBOL(__list_add);
92054
92055 -void __list_del_entry(struct list_head *entry)
92056 +static bool __list_del_entry_debug(struct list_head *entry)
92057 {
92058 struct list_head *prev, *next;
92059
92060 prev = entry->prev;
92061 next = entry->next;
92062
92063 - if (WARN(next == LIST_POISON1,
92064 - "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
92065 - entry, LIST_POISON1) ||
92066 - WARN(prev == LIST_POISON2,
92067 - "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
92068 - entry, LIST_POISON2) ||
92069 - WARN(prev->next != entry,
92070 - "list_del corruption. prev->next should be %p, "
92071 - "but was %p\n", entry, prev->next) ||
92072 - WARN(next->prev != entry,
92073 - "list_del corruption. next->prev should be %p, "
92074 - "but was %p\n", entry, next->prev))
92075 + if (unlikely(next == LIST_POISON1)) {
92076 + printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
92077 + entry, LIST_POISON1);
92078 + BUG();
92079 + return false;
92080 + }
92081 + if (unlikely(prev == LIST_POISON2)) {
92082 + printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
92083 + entry, LIST_POISON2);
92084 + BUG();
92085 + return false;
92086 + }
92087 + if (unlikely(entry->prev->next != entry)) {
92088 + printk(KERN_ERR "list_del corruption. prev->next should be %p, "
92089 + "but was %p\n", entry, prev->next);
92090 + BUG();
92091 + return false;
92092 + }
92093 + if (unlikely(entry->next->prev != entry)) {
92094 + printk(KERN_ERR "list_del corruption. next->prev should be %p, "
92095 + "but was %p\n", entry, next->prev);
92096 + BUG();
92097 + return false;
92098 + }
92099 + return true;
92100 +}
92101 +
92102 +void __list_del_entry(struct list_head *entry)
92103 +{
92104 + if (!__list_del_entry_debug(entry))
92105 return;
92106
92107 - __list_del(prev, next);
92108 + __list_del(entry->prev, entry->next);
92109 }
92110 EXPORT_SYMBOL(__list_del_entry);
92111
92112 @@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
92113 void __list_add_rcu(struct list_head *new,
92114 struct list_head *prev, struct list_head *next)
92115 {
92116 - WARN(next->prev != prev,
92117 - "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
92118 - prev, next->prev, next);
92119 - WARN(prev->next != next,
92120 - "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
92121 - next, prev->next, prev);
92122 + if (!__list_add_debug(new, prev, next))
92123 + return;
92124 +
92125 new->next = next;
92126 new->prev = prev;
92127 rcu_assign_pointer(list_next_rcu(prev), new);
92128 next->prev = new;
92129 }
92130 EXPORT_SYMBOL(__list_add_rcu);
92131 +#endif
92132 +
92133 +void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
92134 +{
92135 +#ifdef CONFIG_DEBUG_LIST
92136 + if (!__list_add_debug(new, prev, next))
92137 + return;
92138 +#endif
92139 +
92140 + pax_open_kernel();
92141 + next->prev = new;
92142 + new->next = next;
92143 + new->prev = prev;
92144 + prev->next = new;
92145 + pax_close_kernel();
92146 +}
92147 +EXPORT_SYMBOL(__pax_list_add);
92148 +
92149 +void pax_list_del(struct list_head *entry)
92150 +{
92151 +#ifdef CONFIG_DEBUG_LIST
92152 + if (!__list_del_entry_debug(entry))
92153 + return;
92154 +#endif
92155 +
92156 + pax_open_kernel();
92157 + __list_del(entry->prev, entry->next);
92158 + entry->next = LIST_POISON1;
92159 + entry->prev = LIST_POISON2;
92160 + pax_close_kernel();
92161 +}
92162 +EXPORT_SYMBOL(pax_list_del);
92163 +
92164 +void pax_list_del_init(struct list_head *entry)
92165 +{
92166 + pax_open_kernel();
92167 + __list_del(entry->prev, entry->next);
92168 + INIT_LIST_HEAD(entry);
92169 + pax_close_kernel();
92170 +}
92171 +EXPORT_SYMBOL(pax_list_del_init);
92172 +
92173 +void __pax_list_add_rcu(struct list_head *new,
92174 + struct list_head *prev, struct list_head *next)
92175 +{
92176 +#ifdef CONFIG_DEBUG_LIST
92177 + if (!__list_add_debug(new, prev, next))
92178 + return;
92179 +#endif
92180 +
92181 + pax_open_kernel();
92182 + new->next = next;
92183 + new->prev = prev;
92184 + rcu_assign_pointer(list_next_rcu(prev), new);
92185 + next->prev = new;
92186 + pax_close_kernel();
92187 +}
92188 +EXPORT_SYMBOL(__pax_list_add_rcu);
92189 +
92190 +void pax_list_del_rcu(struct list_head *entry)
92191 +{
92192 +#ifdef CONFIG_DEBUG_LIST
92193 + if (!__list_del_entry_debug(entry))
92194 + return;
92195 +#endif
92196 +
92197 + pax_open_kernel();
92198 + __list_del(entry->prev, entry->next);
92199 + entry->next = LIST_POISON1;
92200 + entry->prev = LIST_POISON2;
92201 + pax_close_kernel();
92202 +}
92203 +EXPORT_SYMBOL(pax_list_del_rcu);
92204 diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
92205 index 963b703..438bc51 100644
92206 --- a/lib/percpu-refcount.c
92207 +++ b/lib/percpu-refcount.c
92208 @@ -29,7 +29,7 @@
92209 * can't hit 0 before we've added up all the percpu refs.
92210 */
92211
92212 -#define PCPU_COUNT_BIAS (1U << 31)
92213 +#define PCPU_COUNT_BIAS (1U << 30)
92214
92215 /**
92216 * percpu_ref_init - initialize a percpu refcount
92217 diff --git a/lib/radix-tree.c b/lib/radix-tree.c
92218 index 9599aa7..9cf6c72 100644
92219 --- a/lib/radix-tree.c
92220 +++ b/lib/radix-tree.c
92221 @@ -66,7 +66,7 @@ struct radix_tree_preload {
92222 int nr;
92223 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
92224 };
92225 -static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
92226 +static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
92227
92228 static inline void *ptr_to_indirect(void *ptr)
92229 {
92230 diff --git a/lib/random32.c b/lib/random32.c
92231 index fa5da61..35fe9af 100644
92232 --- a/lib/random32.c
92233 +++ b/lib/random32.c
92234 @@ -42,7 +42,7 @@
92235 static void __init prandom_state_selftest(void);
92236 #endif
92237
92238 -static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
92239 +static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
92240
92241 /**
92242 * prandom_u32_state - seeded pseudo-random number generator.
92243 diff --git a/lib/rbtree.c b/lib/rbtree.c
92244 index 65f4eff..2cfa167 100644
92245 --- a/lib/rbtree.c
92246 +++ b/lib/rbtree.c
92247 @@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
92248 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
92249
92250 static const struct rb_augment_callbacks dummy_callbacks = {
92251 - dummy_propagate, dummy_copy, dummy_rotate
92252 + .propagate = dummy_propagate,
92253 + .copy = dummy_copy,
92254 + .rotate = dummy_rotate
92255 };
92256
92257 void rb_insert_color(struct rb_node *node, struct rb_root *root)
92258 diff --git a/lib/show_mem.c b/lib/show_mem.c
92259 index 0922579..9d7adb9 100644
92260 --- a/lib/show_mem.c
92261 +++ b/lib/show_mem.c
92262 @@ -44,6 +44,6 @@ void show_mem(unsigned int filter)
92263 quicklist_total_size());
92264 #endif
92265 #ifdef CONFIG_MEMORY_FAILURE
92266 - printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
92267 + printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
92268 #endif
92269 }
92270 diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
92271 index bb2b201..46abaf9 100644
92272 --- a/lib/strncpy_from_user.c
92273 +++ b/lib/strncpy_from_user.c
92274 @@ -21,7 +21,7 @@
92275 */
92276 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
92277 {
92278 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
92279 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
92280 long res = 0;
92281
92282 /*
92283 diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
92284 index a28df52..3d55877 100644
92285 --- a/lib/strnlen_user.c
92286 +++ b/lib/strnlen_user.c
92287 @@ -26,7 +26,7 @@
92288 */
92289 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
92290 {
92291 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
92292 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
92293 long align, res = 0;
92294 unsigned long c;
92295
92296 diff --git a/lib/swiotlb.c b/lib/swiotlb.c
92297 index b604b83..c0547f6 100644
92298 --- a/lib/swiotlb.c
92299 +++ b/lib/swiotlb.c
92300 @@ -674,7 +674,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
92301
92302 void
92303 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
92304 - dma_addr_t dev_addr)
92305 + dma_addr_t dev_addr, struct dma_attrs *attrs)
92306 {
92307 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
92308
92309 diff --git a/lib/usercopy.c b/lib/usercopy.c
92310 index 4f5b1dd..7cab418 100644
92311 --- a/lib/usercopy.c
92312 +++ b/lib/usercopy.c
92313 @@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
92314 WARN(1, "Buffer overflow detected!\n");
92315 }
92316 EXPORT_SYMBOL(copy_from_user_overflow);
92317 +
92318 +void copy_to_user_overflow(void)
92319 +{
92320 + WARN(1, "Buffer overflow detected!\n");
92321 +}
92322 +EXPORT_SYMBOL(copy_to_user_overflow);
92323 diff --git a/lib/vsprintf.c b/lib/vsprintf.c
92324 index 0648291..42bf42b 100644
92325 --- a/lib/vsprintf.c
92326 +++ b/lib/vsprintf.c
92327 @@ -16,6 +16,9 @@
92328 * - scnprintf and vscnprintf
92329 */
92330
92331 +#ifdef CONFIG_GRKERNSEC_HIDESYM
92332 +#define __INCLUDED_BY_HIDESYM 1
92333 +#endif
92334 #include <stdarg.h>
92335 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
92336 #include <linux/types.h>
92337 @@ -1183,7 +1186,11 @@ char *address_val(char *buf, char *end, const void *addr,
92338 return number(buf, end, num, spec);
92339 }
92340
92341 +#ifdef CONFIG_GRKERNSEC_HIDESYM
92342 +int kptr_restrict __read_mostly = 2;
92343 +#else
92344 int kptr_restrict __read_mostly;
92345 +#endif
92346
92347 /*
92348 * Show a '%p' thing. A kernel extension is that the '%p' is followed
92349 @@ -1196,6 +1203,7 @@ int kptr_restrict __read_mostly;
92350 * - 'f' For simple symbolic function names without offset
92351 * - 'S' For symbolic direct pointers with offset
92352 * - 's' For symbolic direct pointers without offset
92353 + * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
92354 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
92355 * - 'B' For backtraced symbolic direct pointers with offset
92356 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
92357 @@ -1263,12 +1271,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
92358
92359 if (!ptr && *fmt != 'K') {
92360 /*
92361 - * Print (null) with the same width as a pointer so it makes
92362 + * Print (nil) with the same width as a pointer so it makes
92363 * tabular output look nice.
92364 */
92365 if (spec.field_width == -1)
92366 spec.field_width = default_width;
92367 - return string(buf, end, "(null)", spec);
92368 + return string(buf, end, "(nil)", spec);
92369 }
92370
92371 switch (*fmt) {
92372 @@ -1278,6 +1286,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
92373 /* Fallthrough */
92374 case 'S':
92375 case 's':
92376 +#ifdef CONFIG_GRKERNSEC_HIDESYM
92377 + break;
92378 +#else
92379 + return symbol_string(buf, end, ptr, spec, fmt);
92380 +#endif
92381 + case 'A':
92382 case 'B':
92383 return symbol_string(buf, end, ptr, spec, fmt);
92384 case 'R':
92385 @@ -1333,6 +1347,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
92386 va_end(va);
92387 return buf;
92388 }
92389 + case 'P':
92390 + break;
92391 case 'K':
92392 /*
92393 * %pK cannot be used in IRQ context because its test
92394 @@ -1390,6 +1406,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
92395 ((const struct file *)ptr)->f_path.dentry,
92396 spec, fmt);
92397 }
92398 +
92399 +#ifdef CONFIG_GRKERNSEC_HIDESYM
92400 + /* 'P' = approved pointers to copy to userland,
92401 + as in the /proc/kallsyms case, as we make it display nothing
92402 + for non-root users, and the real contents for root users
92403 + Also ignore 'K' pointers, since we force their NULLing for non-root users
92404 + above
92405 + */
92406 + if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'K' && is_usercopy_object(buf)) {
92407 + printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
92408 + dump_stack();
92409 + ptr = NULL;
92410 + }
92411 +#endif
92412 +
92413 spec.flags |= SMALL;
92414 if (spec.field_width == -1) {
92415 spec.field_width = default_width;
92416 @@ -2089,11 +2120,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
92417 typeof(type) value; \
92418 if (sizeof(type) == 8) { \
92419 args = PTR_ALIGN(args, sizeof(u32)); \
92420 - *(u32 *)&value = *(u32 *)args; \
92421 - *((u32 *)&value + 1) = *(u32 *)(args + 4); \
92422 + *(u32 *)&value = *(const u32 *)args; \
92423 + *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
92424 } else { \
92425 args = PTR_ALIGN(args, sizeof(type)); \
92426 - value = *(typeof(type) *)args; \
92427 + value = *(const typeof(type) *)args; \
92428 } \
92429 args += sizeof(type); \
92430 value; \
92431 @@ -2156,7 +2187,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
92432 case FORMAT_TYPE_STR: {
92433 const char *str_arg = args;
92434 args += strlen(str_arg) + 1;
92435 - str = string(str, end, (char *)str_arg, spec);
92436 + str = string(str, end, str_arg, spec);
92437 break;
92438 }
92439
92440 diff --git a/localversion-grsec b/localversion-grsec
92441 new file mode 100644
92442 index 0000000..7cd6065
92443 --- /dev/null
92444 +++ b/localversion-grsec
92445 @@ -0,0 +1 @@
92446 +-grsec
92447 diff --git a/mm/Kconfig b/mm/Kconfig
92448 index 2f42b9c..6095e14 100644
92449 --- a/mm/Kconfig
92450 +++ b/mm/Kconfig
92451 @@ -330,10 +330,11 @@ config KSM
92452 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
92453
92454 config DEFAULT_MMAP_MIN_ADDR
92455 - int "Low address space to protect from user allocation"
92456 + int "Low address space to protect from user allocation"
92457 depends on MMU
92458 - default 4096
92459 - help
92460 + default 32768 if ALPHA || ARM || PARISC || SPARC32
92461 + default 65536
92462 + help
92463 This is the portion of low virtual memory which should be protected
92464 from userspace allocation. Keeping a user from writing to low pages
92465 can help reduce the impact of kernel NULL pointer bugs.
92466 @@ -364,7 +365,7 @@ config MEMORY_FAILURE
92467
92468 config HWPOISON_INJECT
92469 tristate "HWPoison pages injector"
92470 - depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
92471 + depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
92472 select PROC_PAGE_MONITOR
92473
92474 config NOMMU_INITIAL_TRIM_EXCESS
92475 diff --git a/mm/backing-dev.c b/mm/backing-dev.c
92476 index 09d9591..165bb75 100644
92477 --- a/mm/backing-dev.c
92478 +++ b/mm/backing-dev.c
92479 @@ -12,7 +12,7 @@
92480 #include <linux/device.h>
92481 #include <trace/events/writeback.h>
92482
92483 -static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
92484 +static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
92485
92486 struct backing_dev_info default_backing_dev_info = {
92487 .name = "default",
92488 @@ -533,7 +533,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
92489 return err;
92490
92491 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
92492 - atomic_long_inc_return(&bdi_seq));
92493 + atomic_long_inc_return_unchecked(&bdi_seq));
92494 if (err) {
92495 bdi_destroy(bdi);
92496 return err;
92497 diff --git a/mm/filemap.c b/mm/filemap.c
92498 index 088358c..bb415bf 100644
92499 --- a/mm/filemap.c
92500 +++ b/mm/filemap.c
92501 @@ -2125,7 +2125,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
92502 struct address_space *mapping = file->f_mapping;
92503
92504 if (!mapping->a_ops->readpage)
92505 - return -ENOEXEC;
92506 + return -ENODEV;
92507 file_accessed(file);
92508 vma->vm_ops = &generic_file_vm_ops;
92509 return 0;
92510 @@ -2303,6 +2303,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
92511 *pos = i_size_read(inode);
92512
92513 if (limit != RLIM_INFINITY) {
92514 + gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
92515 if (*pos >= limit) {
92516 send_sig(SIGXFSZ, current, 0);
92517 return -EFBIG;
92518 diff --git a/mm/fremap.c b/mm/fremap.c
92519 index 34feba6..315fe78 100644
92520 --- a/mm/fremap.c
92521 +++ b/mm/fremap.c
92522 @@ -179,6 +179,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
92523 retry:
92524 vma = find_vma(mm, start);
92525
92526 +#ifdef CONFIG_PAX_SEGMEXEC
92527 + if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
92528 + goto out;
92529 +#endif
92530 +
92531 /*
92532 * Make sure the vma is shared, that it supports prefaulting,
92533 * and that the remapped range is valid and fully within
92534 diff --git a/mm/highmem.c b/mm/highmem.c
92535 index b32b70c..e512eb0 100644
92536 --- a/mm/highmem.c
92537 +++ b/mm/highmem.c
92538 @@ -138,8 +138,9 @@ static void flush_all_zero_pkmaps(void)
92539 * So no dangers, even with speculative execution.
92540 */
92541 page = pte_page(pkmap_page_table[i]);
92542 + pax_open_kernel();
92543 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
92544 -
92545 + pax_close_kernel();
92546 set_page_address(page, NULL);
92547 need_flush = 1;
92548 }
92549 @@ -198,9 +199,11 @@ start:
92550 }
92551 }
92552 vaddr = PKMAP_ADDR(last_pkmap_nr);
92553 +
92554 + pax_open_kernel();
92555 set_pte_at(&init_mm, vaddr,
92556 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
92557 -
92558 + pax_close_kernel();
92559 pkmap_count[last_pkmap_nr] = 1;
92560 set_page_address(page, (void *)vaddr);
92561
92562 diff --git a/mm/hugetlb.c b/mm/hugetlb.c
92563 index a646f15..f55da4c 100644
92564 --- a/mm/hugetlb.c
92565 +++ b/mm/hugetlb.c
92566 @@ -2107,6 +2107,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
92567 struct hstate *h = &default_hstate;
92568 unsigned long tmp;
92569 int ret;
92570 + ctl_table_no_const hugetlb_table;
92571
92572 if (!hugepages_supported())
92573 return -ENOTSUPP;
92574 @@ -2116,9 +2117,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
92575 if (write && h->order >= MAX_ORDER)
92576 return -EINVAL;
92577
92578 - table->data = &tmp;
92579 - table->maxlen = sizeof(unsigned long);
92580 - ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
92581 + hugetlb_table = *table;
92582 + hugetlb_table.data = &tmp;
92583 + hugetlb_table.maxlen = sizeof(unsigned long);
92584 + ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
92585 if (ret)
92586 goto out;
92587
92588 @@ -2163,6 +2165,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
92589 struct hstate *h = &default_hstate;
92590 unsigned long tmp;
92591 int ret;
92592 + ctl_table_no_const hugetlb_table;
92593
92594 if (!hugepages_supported())
92595 return -ENOTSUPP;
92596 @@ -2172,9 +2175,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
92597 if (write && h->order >= MAX_ORDER)
92598 return -EINVAL;
92599
92600 - table->data = &tmp;
92601 - table->maxlen = sizeof(unsigned long);
92602 - ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
92603 + hugetlb_table = *table;
92604 + hugetlb_table.data = &tmp;
92605 + hugetlb_table.maxlen = sizeof(unsigned long);
92606 + ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
92607 if (ret)
92608 goto out;
92609
92610 @@ -2654,6 +2658,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
92611 return 1;
92612 }
92613
92614 +#ifdef CONFIG_PAX_SEGMEXEC
92615 +static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
92616 +{
92617 + struct mm_struct *mm = vma->vm_mm;
92618 + struct vm_area_struct *vma_m;
92619 + unsigned long address_m;
92620 + pte_t *ptep_m;
92621 +
92622 + vma_m = pax_find_mirror_vma(vma);
92623 + if (!vma_m)
92624 + return;
92625 +
92626 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
92627 + address_m = address + SEGMEXEC_TASK_SIZE;
92628 + ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
92629 + get_page(page_m);
92630 + hugepage_add_anon_rmap(page_m, vma_m, address_m);
92631 + set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
92632 +}
92633 +#endif
92634 +
92635 /*
92636 * Hugetlb_cow() should be called with page lock of the original hugepage held.
92637 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
92638 @@ -2771,6 +2796,11 @@ retry_avoidcopy:
92639 make_huge_pte(vma, new_page, 1));
92640 page_remove_rmap(old_page);
92641 hugepage_add_new_anon_rmap(new_page, vma, address);
92642 +
92643 +#ifdef CONFIG_PAX_SEGMEXEC
92644 + pax_mirror_huge_pte(vma, address, new_page);
92645 +#endif
92646 +
92647 /* Make the old page be freed below */
92648 new_page = old_page;
92649 }
92650 @@ -2930,6 +2960,10 @@ retry:
92651 && (vma->vm_flags & VM_SHARED)));
92652 set_huge_pte_at(mm, address, ptep, new_pte);
92653
92654 +#ifdef CONFIG_PAX_SEGMEXEC
92655 + pax_mirror_huge_pte(vma, address, page);
92656 +#endif
92657 +
92658 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
92659 /* Optimization, do the COW without a second fault */
92660 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
92661 @@ -2996,6 +3030,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
92662 struct hstate *h = hstate_vma(vma);
92663 struct address_space *mapping;
92664
92665 +#ifdef CONFIG_PAX_SEGMEXEC
92666 + struct vm_area_struct *vma_m;
92667 +#endif
92668 +
92669 address &= huge_page_mask(h);
92670
92671 ptep = huge_pte_offset(mm, address);
92672 @@ -3009,6 +3047,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
92673 VM_FAULT_SET_HINDEX(hstate_index(h));
92674 }
92675
92676 +#ifdef CONFIG_PAX_SEGMEXEC
92677 + vma_m = pax_find_mirror_vma(vma);
92678 + if (vma_m) {
92679 + unsigned long address_m;
92680 +
92681 + if (vma->vm_start > vma_m->vm_start) {
92682 + address_m = address;
92683 + address -= SEGMEXEC_TASK_SIZE;
92684 + vma = vma_m;
92685 + h = hstate_vma(vma);
92686 + } else
92687 + address_m = address + SEGMEXEC_TASK_SIZE;
92688 +
92689 + if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
92690 + return VM_FAULT_OOM;
92691 + address_m &= HPAGE_MASK;
92692 + unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
92693 + }
92694 +#endif
92695 +
92696 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
92697 if (!ptep)
92698 return VM_FAULT_OOM;
92699 diff --git a/mm/internal.h b/mm/internal.h
92700 index 07b6736..ae8da20 100644
92701 --- a/mm/internal.h
92702 +++ b/mm/internal.h
92703 @@ -109,6 +109,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
92704 * in mm/page_alloc.c
92705 */
92706 extern void __free_pages_bootmem(struct page *page, unsigned int order);
92707 +extern void free_compound_page(struct page *page);
92708 extern void prep_compound_page(struct page *page, unsigned long order);
92709 #ifdef CONFIG_MEMORY_FAILURE
92710 extern bool is_free_buddy_page(struct page *page);
92711 @@ -367,7 +368,7 @@ extern u32 hwpoison_filter_enable;
92712
92713 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
92714 unsigned long, unsigned long,
92715 - unsigned long, unsigned long);
92716 + unsigned long, unsigned long) __intentional_overflow(-1);
92717
92718 extern void set_pageblock_order(void);
92719 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
92720 diff --git a/mm/iov_iter.c b/mm/iov_iter.c
92721 index 10e46cd..e3052f6 100644
92722 --- a/mm/iov_iter.c
92723 +++ b/mm/iov_iter.c
92724 @@ -87,7 +87,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
92725
92726 while (bytes) {
92727 char __user *buf = iov->iov_base + base;
92728 - int copy = min(bytes, iov->iov_len - base);
92729 + size_t copy = min(bytes, iov->iov_len - base);
92730
92731 base = 0;
92732 left = __copy_from_user_inatomic(vaddr, buf, copy);
92733 @@ -115,7 +115,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
92734
92735 kaddr = kmap_atomic(page);
92736 if (likely(i->nr_segs == 1)) {
92737 - int left;
92738 + size_t left;
92739 char __user *buf = i->iov->iov_base + i->iov_offset;
92740 left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
92741 copied = bytes - left;
92742 @@ -143,7 +143,7 @@ size_t iov_iter_copy_from_user(struct page *page,
92743
92744 kaddr = kmap(page);
92745 if (likely(i->nr_segs == 1)) {
92746 - int left;
92747 + size_t left;
92748 char __user *buf = i->iov->iov_base + i->iov_offset;
92749 left = __copy_from_user(kaddr + offset, buf, bytes);
92750 copied = bytes - left;
92751 @@ -173,7 +173,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
92752 * zero-length segments (without overruning the iovec).
92753 */
92754 while (bytes || unlikely(i->count && !iov->iov_len)) {
92755 - int copy;
92756 + size_t copy;
92757
92758 copy = min(bytes, iov->iov_len - base);
92759 BUG_ON(!i->count || i->count < copy);
92760 diff --git a/mm/kmemleak.c b/mm/kmemleak.c
92761 index 8d2fcdf..6dd9f1a 100644
92762 --- a/mm/kmemleak.c
92763 +++ b/mm/kmemleak.c
92764 @@ -364,7 +364,7 @@ static void print_unreferenced(struct seq_file *seq,
92765
92766 for (i = 0; i < object->trace_len; i++) {
92767 void *ptr = (void *)object->trace[i];
92768 - seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
92769 + seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
92770 }
92771 }
92772
92773 @@ -1871,7 +1871,7 @@ static int __init kmemleak_late_init(void)
92774 return -ENOMEM;
92775 }
92776
92777 - dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
92778 + dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
92779 &kmemleak_fops);
92780 if (!dentry)
92781 pr_warning("Failed to create the debugfs kmemleak file\n");
92782 diff --git a/mm/maccess.c b/mm/maccess.c
92783 index d53adf9..03a24bf 100644
92784 --- a/mm/maccess.c
92785 +++ b/mm/maccess.c
92786 @@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
92787 set_fs(KERNEL_DS);
92788 pagefault_disable();
92789 ret = __copy_from_user_inatomic(dst,
92790 - (__force const void __user *)src, size);
92791 + (const void __force_user *)src, size);
92792 pagefault_enable();
92793 set_fs(old_fs);
92794
92795 @@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
92796
92797 set_fs(KERNEL_DS);
92798 pagefault_disable();
92799 - ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
92800 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
92801 pagefault_enable();
92802 set_fs(old_fs);
92803
92804 diff --git a/mm/madvise.c b/mm/madvise.c
92805 index a402f8f..f5e5daa 100644
92806 --- a/mm/madvise.c
92807 +++ b/mm/madvise.c
92808 @@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
92809 pgoff_t pgoff;
92810 unsigned long new_flags = vma->vm_flags;
92811
92812 +#ifdef CONFIG_PAX_SEGMEXEC
92813 + struct vm_area_struct *vma_m;
92814 +#endif
92815 +
92816 switch (behavior) {
92817 case MADV_NORMAL:
92818 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
92819 @@ -126,6 +130,13 @@ success:
92820 /*
92821 * vm_flags is protected by the mmap_sem held in write mode.
92822 */
92823 +
92824 +#ifdef CONFIG_PAX_SEGMEXEC
92825 + vma_m = pax_find_mirror_vma(vma);
92826 + if (vma_m)
92827 + vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
92828 +#endif
92829 +
92830 vma->vm_flags = new_flags;
92831
92832 out:
92833 @@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
92834 struct vm_area_struct **prev,
92835 unsigned long start, unsigned long end)
92836 {
92837 +
92838 +#ifdef CONFIG_PAX_SEGMEXEC
92839 + struct vm_area_struct *vma_m;
92840 +#endif
92841 +
92842 *prev = vma;
92843 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
92844 return -EINVAL;
92845 @@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
92846 zap_page_range(vma, start, end - start, &details);
92847 } else
92848 zap_page_range(vma, start, end - start, NULL);
92849 +
92850 +#ifdef CONFIG_PAX_SEGMEXEC
92851 + vma_m = pax_find_mirror_vma(vma);
92852 + if (vma_m) {
92853 + if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
92854 + struct zap_details details = {
92855 + .nonlinear_vma = vma_m,
92856 + .last_index = ULONG_MAX,
92857 + };
92858 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
92859 + } else
92860 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
92861 + }
92862 +#endif
92863 +
92864 return 0;
92865 }
92866
92867 @@ -491,6 +522,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
92868 if (end < start)
92869 return error;
92870
92871 +#ifdef CONFIG_PAX_SEGMEXEC
92872 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
92873 + if (end > SEGMEXEC_TASK_SIZE)
92874 + return error;
92875 + } else
92876 +#endif
92877 +
92878 + if (end > TASK_SIZE)
92879 + return error;
92880 +
92881 error = 0;
92882 if (end == start)
92883 return error;
92884 diff --git a/mm/memory-failure.c b/mm/memory-failure.c
92885 index eb8fb72..ae36cf3 100644
92886 --- a/mm/memory-failure.c
92887 +++ b/mm/memory-failure.c
92888 @@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
92889
92890 int sysctl_memory_failure_recovery __read_mostly = 1;
92891
92892 -atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
92893 +atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
92894
92895 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
92896
92897 @@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
92898 pfn, t->comm, t->pid);
92899 si.si_signo = SIGBUS;
92900 si.si_errno = 0;
92901 - si.si_addr = (void *)addr;
92902 + si.si_addr = (void __user *)addr;
92903 #ifdef __ARCH_SI_TRAPNO
92904 si.si_trapno = trapno;
92905 #endif
92906 @@ -791,7 +791,7 @@ static struct page_state {
92907 unsigned long res;
92908 char *msg;
92909 int (*action)(struct page *p, unsigned long pfn);
92910 -} error_states[] = {
92911 +} __do_const error_states[] = {
92912 { reserved, reserved, "reserved kernel", me_kernel },
92913 /*
92914 * free pages are specially detected outside this table:
92915 @@ -1091,7 +1091,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
92916 nr_pages = 1 << compound_order(hpage);
92917 else /* normal page or thp */
92918 nr_pages = 1;
92919 - atomic_long_add(nr_pages, &num_poisoned_pages);
92920 + atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
92921
92922 /*
92923 * We need/can do nothing about count=0 pages.
92924 @@ -1120,7 +1120,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
92925 if (PageHWPoison(hpage)) {
92926 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
92927 || (p != hpage && TestSetPageHWPoison(hpage))) {
92928 - atomic_long_sub(nr_pages, &num_poisoned_pages);
92929 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
92930 unlock_page(hpage);
92931 return 0;
92932 }
92933 @@ -1186,14 +1186,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
92934 */
92935 if (!PageHWPoison(p)) {
92936 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
92937 - atomic_long_sub(nr_pages, &num_poisoned_pages);
92938 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
92939 put_page(hpage);
92940 res = 0;
92941 goto out;
92942 }
92943 if (hwpoison_filter(p)) {
92944 if (TestClearPageHWPoison(p))
92945 - atomic_long_sub(nr_pages, &num_poisoned_pages);
92946 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
92947 unlock_page(hpage);
92948 put_page(hpage);
92949 return 0;
92950 @@ -1415,7 +1415,7 @@ int unpoison_memory(unsigned long pfn)
92951 return 0;
92952 }
92953 if (TestClearPageHWPoison(p))
92954 - atomic_long_dec(&num_poisoned_pages);
92955 + atomic_long_dec_unchecked(&num_poisoned_pages);
92956 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
92957 return 0;
92958 }
92959 @@ -1429,7 +1429,7 @@ int unpoison_memory(unsigned long pfn)
92960 */
92961 if (TestClearPageHWPoison(page)) {
92962 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
92963 - atomic_long_sub(nr_pages, &num_poisoned_pages);
92964 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
92965 freeit = 1;
92966 if (PageHuge(page))
92967 clear_page_hwpoison_huge_page(page);
92968 @@ -1554,11 +1554,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
92969 if (PageHuge(page)) {
92970 set_page_hwpoison_huge_page(hpage);
92971 dequeue_hwpoisoned_huge_page(hpage);
92972 - atomic_long_add(1 << compound_order(hpage),
92973 + atomic_long_add_unchecked(1 << compound_order(hpage),
92974 &num_poisoned_pages);
92975 } else {
92976 SetPageHWPoison(page);
92977 - atomic_long_inc(&num_poisoned_pages);
92978 + atomic_long_inc_unchecked(&num_poisoned_pages);
92979 }
92980 }
92981 return ret;
92982 @@ -1597,7 +1597,7 @@ static int __soft_offline_page(struct page *page, int flags)
92983 put_page(page);
92984 pr_info("soft_offline: %#lx: invalidated\n", pfn);
92985 SetPageHWPoison(page);
92986 - atomic_long_inc(&num_poisoned_pages);
92987 + atomic_long_inc_unchecked(&num_poisoned_pages);
92988 return 0;
92989 }
92990
92991 @@ -1648,7 +1648,7 @@ static int __soft_offline_page(struct page *page, int flags)
92992 if (!is_free_buddy_page(page))
92993 pr_info("soft offline: %#lx: page leaked\n",
92994 pfn);
92995 - atomic_long_inc(&num_poisoned_pages);
92996 + atomic_long_inc_unchecked(&num_poisoned_pages);
92997 }
92998 } else {
92999 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
93000 @@ -1722,11 +1722,11 @@ int soft_offline_page(struct page *page, int flags)
93001 if (PageHuge(page)) {
93002 set_page_hwpoison_huge_page(hpage);
93003 dequeue_hwpoisoned_huge_page(hpage);
93004 - atomic_long_add(1 << compound_order(hpage),
93005 + atomic_long_add_unchecked(1 << compound_order(hpage),
93006 &num_poisoned_pages);
93007 } else {
93008 SetPageHWPoison(page);
93009 - atomic_long_inc(&num_poisoned_pages);
93010 + atomic_long_inc_unchecked(&num_poisoned_pages);
93011 }
93012 }
93013 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
93014 diff --git a/mm/memory.c b/mm/memory.c
93015 index e302ae1..c0ef712 100644
93016 --- a/mm/memory.c
93017 +++ b/mm/memory.c
93018 @@ -413,6 +413,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
93019 free_pte_range(tlb, pmd, addr);
93020 } while (pmd++, addr = next, addr != end);
93021
93022 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
93023 start &= PUD_MASK;
93024 if (start < floor)
93025 return;
93026 @@ -427,6 +428,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
93027 pmd = pmd_offset(pud, start);
93028 pud_clear(pud);
93029 pmd_free_tlb(tlb, pmd, start);
93030 +#endif
93031 +
93032 }
93033
93034 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
93035 @@ -446,6 +449,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
93036 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
93037 } while (pud++, addr = next, addr != end);
93038
93039 +#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
93040 start &= PGDIR_MASK;
93041 if (start < floor)
93042 return;
93043 @@ -460,6 +464,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
93044 pud = pud_offset(pgd, start);
93045 pgd_clear(pgd);
93046 pud_free_tlb(tlb, pud, start);
93047 +#endif
93048 +
93049 }
93050
93051 /*
93052 @@ -1652,12 +1658,6 @@ no_page_table:
93053 return page;
93054 }
93055
93056 -static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
93057 -{
93058 - return stack_guard_page_start(vma, addr) ||
93059 - stack_guard_page_end(vma, addr+PAGE_SIZE);
93060 -}
93061 -
93062 /**
93063 * __get_user_pages() - pin user pages in memory
93064 * @tsk: task_struct of target task
93065 @@ -1735,10 +1735,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
93066
93067 i = 0;
93068
93069 - do {
93070 + while (nr_pages) {
93071 struct vm_area_struct *vma;
93072
93073 - vma = find_extend_vma(mm, start);
93074 + vma = find_vma(mm, start);
93075 if (!vma && in_gate_area(mm, start)) {
93076 unsigned long pg = start & PAGE_MASK;
93077 pgd_t *pgd;
93078 @@ -1787,7 +1787,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
93079 goto next_page;
93080 }
93081
93082 - if (!vma)
93083 + if (!vma || start < vma->vm_start)
93084 goto efault;
93085 vm_flags = vma->vm_flags;
93086 if (vm_flags & (VM_IO | VM_PFNMAP))
93087 @@ -1848,11 +1848,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
93088 int ret;
93089 unsigned int fault_flags = 0;
93090
93091 - /* For mlock, just skip the stack guard page. */
93092 - if (foll_flags & FOLL_MLOCK) {
93093 - if (stack_guard_page(vma, start))
93094 - goto next_page;
93095 - }
93096 if (foll_flags & FOLL_WRITE)
93097 fault_flags |= FAULT_FLAG_WRITE;
93098 if (nonblocking)
93099 @@ -1932,7 +1927,7 @@ next_page:
93100 start += page_increm * PAGE_SIZE;
93101 nr_pages -= page_increm;
93102 } while (nr_pages && start < vma->vm_end);
93103 - } while (nr_pages);
93104 + }
93105 return i;
93106 efault:
93107 return i ? : -EFAULT;
93108 @@ -2145,6 +2140,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
93109 page_add_file_rmap(page);
93110 set_pte_at(mm, addr, pte, mk_pte(page, prot));
93111
93112 +#ifdef CONFIG_PAX_SEGMEXEC
93113 + pax_mirror_file_pte(vma, addr, page, ptl);
93114 +#endif
93115 +
93116 retval = 0;
93117 pte_unmap_unlock(pte, ptl);
93118 return retval;
93119 @@ -2189,9 +2188,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
93120 if (!page_count(page))
93121 return -EINVAL;
93122 if (!(vma->vm_flags & VM_MIXEDMAP)) {
93123 +
93124 +#ifdef CONFIG_PAX_SEGMEXEC
93125 + struct vm_area_struct *vma_m;
93126 +#endif
93127 +
93128 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
93129 BUG_ON(vma->vm_flags & VM_PFNMAP);
93130 vma->vm_flags |= VM_MIXEDMAP;
93131 +
93132 +#ifdef CONFIG_PAX_SEGMEXEC
93133 + vma_m = pax_find_mirror_vma(vma);
93134 + if (vma_m)
93135 + vma_m->vm_flags |= VM_MIXEDMAP;
93136 +#endif
93137 +
93138 }
93139 return insert_page(vma, addr, page, vma->vm_page_prot);
93140 }
93141 @@ -2274,6 +2285,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
93142 unsigned long pfn)
93143 {
93144 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
93145 + BUG_ON(vma->vm_mirror);
93146
93147 if (addr < vma->vm_start || addr >= vma->vm_end)
93148 return -EFAULT;
93149 @@ -2521,7 +2533,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
93150
93151 BUG_ON(pud_huge(*pud));
93152
93153 - pmd = pmd_alloc(mm, pud, addr);
93154 + pmd = (mm == &init_mm) ?
93155 + pmd_alloc_kernel(mm, pud, addr) :
93156 + pmd_alloc(mm, pud, addr);
93157 if (!pmd)
93158 return -ENOMEM;
93159 do {
93160 @@ -2541,7 +2555,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
93161 unsigned long next;
93162 int err;
93163
93164 - pud = pud_alloc(mm, pgd, addr);
93165 + pud = (mm == &init_mm) ?
93166 + pud_alloc_kernel(mm, pgd, addr) :
93167 + pud_alloc(mm, pgd, addr);
93168 if (!pud)
93169 return -ENOMEM;
93170 do {
93171 @@ -2663,6 +2679,186 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
93172 return ret;
93173 }
93174
93175 +#ifdef CONFIG_PAX_SEGMEXEC
93176 +static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
93177 +{
93178 + struct mm_struct *mm = vma->vm_mm;
93179 + spinlock_t *ptl;
93180 + pte_t *pte, entry;
93181 +
93182 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
93183 + entry = *pte;
93184 + if (!pte_present(entry)) {
93185 + if (!pte_none(entry)) {
93186 + BUG_ON(pte_file(entry));
93187 + free_swap_and_cache(pte_to_swp_entry(entry));
93188 + pte_clear_not_present_full(mm, address, pte, 0);
93189 + }
93190 + } else {
93191 + struct page *page;
93192 +
93193 + flush_cache_page(vma, address, pte_pfn(entry));
93194 + entry = ptep_clear_flush(vma, address, pte);
93195 + BUG_ON(pte_dirty(entry));
93196 + page = vm_normal_page(vma, address, entry);
93197 + if (page) {
93198 + update_hiwater_rss(mm);
93199 + if (PageAnon(page))
93200 + dec_mm_counter_fast(mm, MM_ANONPAGES);
93201 + else
93202 + dec_mm_counter_fast(mm, MM_FILEPAGES);
93203 + page_remove_rmap(page);
93204 + page_cache_release(page);
93205 + }
93206 + }
93207 + pte_unmap_unlock(pte, ptl);
93208 +}
93209 +
93210 +/* PaX: if vma is mirrored, synchronize the mirror's PTE
93211 + *
93212 + * the ptl of the lower mapped page is held on entry and is not released on exit
93213 + * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
93214 + */
93215 +static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
93216 +{
93217 + struct mm_struct *mm = vma->vm_mm;
93218 + unsigned long address_m;
93219 + spinlock_t *ptl_m;
93220 + struct vm_area_struct *vma_m;
93221 + pmd_t *pmd_m;
93222 + pte_t *pte_m, entry_m;
93223 +
93224 + BUG_ON(!page_m || !PageAnon(page_m));
93225 +
93226 + vma_m = pax_find_mirror_vma(vma);
93227 + if (!vma_m)
93228 + return;
93229 +
93230 + BUG_ON(!PageLocked(page_m));
93231 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
93232 + address_m = address + SEGMEXEC_TASK_SIZE;
93233 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
93234 + pte_m = pte_offset_map(pmd_m, address_m);
93235 + ptl_m = pte_lockptr(mm, pmd_m);
93236 + if (ptl != ptl_m) {
93237 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
93238 + if (!pte_none(*pte_m))
93239 + goto out;
93240 + }
93241 +
93242 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
93243 + page_cache_get(page_m);
93244 + page_add_anon_rmap(page_m, vma_m, address_m);
93245 + inc_mm_counter_fast(mm, MM_ANONPAGES);
93246 + set_pte_at(mm, address_m, pte_m, entry_m);
93247 + update_mmu_cache(vma_m, address_m, pte_m);
93248 +out:
93249 + if (ptl != ptl_m)
93250 + spin_unlock(ptl_m);
93251 + pte_unmap(pte_m);
93252 + unlock_page(page_m);
93253 +}
93254 +
93255 +void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
93256 +{
93257 + struct mm_struct *mm = vma->vm_mm;
93258 + unsigned long address_m;
93259 + spinlock_t *ptl_m;
93260 + struct vm_area_struct *vma_m;
93261 + pmd_t *pmd_m;
93262 + pte_t *pte_m, entry_m;
93263 +
93264 + BUG_ON(!page_m || PageAnon(page_m));
93265 +
93266 + vma_m = pax_find_mirror_vma(vma);
93267 + if (!vma_m)
93268 + return;
93269 +
93270 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
93271 + address_m = address + SEGMEXEC_TASK_SIZE;
93272 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
93273 + pte_m = pte_offset_map(pmd_m, address_m);
93274 + ptl_m = pte_lockptr(mm, pmd_m);
93275 + if (ptl != ptl_m) {
93276 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
93277 + if (!pte_none(*pte_m))
93278 + goto out;
93279 + }
93280 +
93281 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
93282 + page_cache_get(page_m);
93283 + page_add_file_rmap(page_m);
93284 + inc_mm_counter_fast(mm, MM_FILEPAGES);
93285 + set_pte_at(mm, address_m, pte_m, entry_m);
93286 + update_mmu_cache(vma_m, address_m, pte_m);
93287 +out:
93288 + if (ptl != ptl_m)
93289 + spin_unlock(ptl_m);
93290 + pte_unmap(pte_m);
93291 +}
93292 +
93293 +static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
93294 +{
93295 + struct mm_struct *mm = vma->vm_mm;
93296 + unsigned long address_m;
93297 + spinlock_t *ptl_m;
93298 + struct vm_area_struct *vma_m;
93299 + pmd_t *pmd_m;
93300 + pte_t *pte_m, entry_m;
93301 +
93302 + vma_m = pax_find_mirror_vma(vma);
93303 + if (!vma_m)
93304 + return;
93305 +
93306 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
93307 + address_m = address + SEGMEXEC_TASK_SIZE;
93308 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
93309 + pte_m = pte_offset_map(pmd_m, address_m);
93310 + ptl_m = pte_lockptr(mm, pmd_m);
93311 + if (ptl != ptl_m) {
93312 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
93313 + if (!pte_none(*pte_m))
93314 + goto out;
93315 + }
93316 +
93317 + entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
93318 + set_pte_at(mm, address_m, pte_m, entry_m);
93319 +out:
93320 + if (ptl != ptl_m)
93321 + spin_unlock(ptl_m);
93322 + pte_unmap(pte_m);
93323 +}
93324 +
93325 +static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
93326 +{
93327 + struct page *page_m;
93328 + pte_t entry;
93329 +
93330 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
93331 + goto out;
93332 +
93333 + entry = *pte;
93334 + page_m = vm_normal_page(vma, address, entry);
93335 + if (!page_m)
93336 + pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
93337 + else if (PageAnon(page_m)) {
93338 + if (pax_find_mirror_vma(vma)) {
93339 + pte_unmap_unlock(pte, ptl);
93340 + lock_page(page_m);
93341 + pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
93342 + if (pte_same(entry, *pte))
93343 + pax_mirror_anon_pte(vma, address, page_m, ptl);
93344 + else
93345 + unlock_page(page_m);
93346 + }
93347 + } else
93348 + pax_mirror_file_pte(vma, address, page_m, ptl);
93349 +
93350 +out:
93351 + pte_unmap_unlock(pte, ptl);
93352 +}
93353 +#endif
93354 +
93355 /*
93356 * This routine handles present pages, when users try to write
93357 * to a shared page. It is done by copying the page to a new address
93358 @@ -2860,6 +3056,12 @@ gotten:
93359 */
93360 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
93361 if (likely(pte_same(*page_table, orig_pte))) {
93362 +
93363 +#ifdef CONFIG_PAX_SEGMEXEC
93364 + if (pax_find_mirror_vma(vma))
93365 + BUG_ON(!trylock_page(new_page));
93366 +#endif
93367 +
93368 if (old_page) {
93369 if (!PageAnon(old_page)) {
93370 dec_mm_counter_fast(mm, MM_FILEPAGES);
93371 @@ -2911,6 +3113,10 @@ gotten:
93372 page_remove_rmap(old_page);
93373 }
93374
93375 +#ifdef CONFIG_PAX_SEGMEXEC
93376 + pax_mirror_anon_pte(vma, address, new_page, ptl);
93377 +#endif
93378 +
93379 /* Free the old page.. */
93380 new_page = old_page;
93381 ret |= VM_FAULT_WRITE;
93382 @@ -3184,6 +3390,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
93383 swap_free(entry);
93384 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
93385 try_to_free_swap(page);
93386 +
93387 +#ifdef CONFIG_PAX_SEGMEXEC
93388 + if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
93389 +#endif
93390 +
93391 unlock_page(page);
93392 if (page != swapcache) {
93393 /*
93394 @@ -3207,6 +3418,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
93395
93396 /* No need to invalidate - it was non-present before */
93397 update_mmu_cache(vma, address, page_table);
93398 +
93399 +#ifdef CONFIG_PAX_SEGMEXEC
93400 + pax_mirror_anon_pte(vma, address, page, ptl);
93401 +#endif
93402 +
93403 unlock:
93404 pte_unmap_unlock(page_table, ptl);
93405 out:
93406 @@ -3226,40 +3442,6 @@ out_release:
93407 }
93408
93409 /*
93410 - * This is like a special single-page "expand_{down|up}wards()",
93411 - * except we must first make sure that 'address{-|+}PAGE_SIZE'
93412 - * doesn't hit another vma.
93413 - */
93414 -static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
93415 -{
93416 - address &= PAGE_MASK;
93417 - if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
93418 - struct vm_area_struct *prev = vma->vm_prev;
93419 -
93420 - /*
93421 - * Is there a mapping abutting this one below?
93422 - *
93423 - * That's only ok if it's the same stack mapping
93424 - * that has gotten split..
93425 - */
93426 - if (prev && prev->vm_end == address)
93427 - return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
93428 -
93429 - expand_downwards(vma, address - PAGE_SIZE);
93430 - }
93431 - if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
93432 - struct vm_area_struct *next = vma->vm_next;
93433 -
93434 - /* As VM_GROWSDOWN but s/below/above/ */
93435 - if (next && next->vm_start == address + PAGE_SIZE)
93436 - return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
93437 -
93438 - expand_upwards(vma, address + PAGE_SIZE);
93439 - }
93440 - return 0;
93441 -}
93442 -
93443 -/*
93444 * We enter with non-exclusive mmap_sem (to exclude vma changes,
93445 * but allow concurrent faults), and pte mapped but not yet locked.
93446 * We return with mmap_sem still held, but pte unmapped and unlocked.
93447 @@ -3268,27 +3450,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
93448 unsigned long address, pte_t *page_table, pmd_t *pmd,
93449 unsigned int flags)
93450 {
93451 - struct page *page;
93452 + struct page *page = NULL;
93453 spinlock_t *ptl;
93454 pte_t entry;
93455
93456 - pte_unmap(page_table);
93457 -
93458 - /* Check if we need to add a guard page to the stack */
93459 - if (check_stack_guard_page(vma, address) < 0)
93460 - return VM_FAULT_SIGBUS;
93461 -
93462 - /* Use the zero-page for reads */
93463 if (!(flags & FAULT_FLAG_WRITE)) {
93464 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
93465 vma->vm_page_prot));
93466 - page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
93467 + ptl = pte_lockptr(mm, pmd);
93468 + spin_lock(ptl);
93469 if (!pte_none(*page_table))
93470 goto unlock;
93471 goto setpte;
93472 }
93473
93474 /* Allocate our own private page. */
93475 + pte_unmap(page_table);
93476 +
93477 if (unlikely(anon_vma_prepare(vma)))
93478 goto oom;
93479 page = alloc_zeroed_user_highpage_movable(vma, address);
93480 @@ -3312,6 +3490,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
93481 if (!pte_none(*page_table))
93482 goto release;
93483
93484 +#ifdef CONFIG_PAX_SEGMEXEC
93485 + if (pax_find_mirror_vma(vma))
93486 + BUG_ON(!trylock_page(page));
93487 +#endif
93488 +
93489 inc_mm_counter_fast(mm, MM_ANONPAGES);
93490 page_add_new_anon_rmap(page, vma, address);
93491 setpte:
93492 @@ -3319,6 +3502,12 @@ setpte:
93493
93494 /* No need to invalidate - it was non-present before */
93495 update_mmu_cache(vma, address, page_table);
93496 +
93497 +#ifdef CONFIG_PAX_SEGMEXEC
93498 + if (page)
93499 + pax_mirror_anon_pte(vma, address, page, ptl);
93500 +#endif
93501 +
93502 unlock:
93503 pte_unmap_unlock(page_table, ptl);
93504 return 0;
93505 @@ -3535,6 +3724,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
93506 return ret;
93507 }
93508 do_set_pte(vma, address, fault_page, pte, false, false);
93509 +
93510 +#ifdef CONFIG_PAX_SEGMEXEC
93511 + pax_mirror_file_pte(vma, address, fault_page, ptl);
93512 +#endif
93513 +
93514 unlock_page(fault_page);
93515 unlock_out:
93516 pte_unmap_unlock(pte, ptl);
93517 @@ -3576,7 +3770,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
93518 page_cache_release(fault_page);
93519 goto uncharge_out;
93520 }
93521 +
93522 +#ifdef CONFIG_PAX_SEGMEXEC
93523 + if (pax_find_mirror_vma(vma))
93524 + BUG_ON(!trylock_page(new_page));
93525 +#endif
93526 +
93527 do_set_pte(vma, address, new_page, pte, true, true);
93528 +
93529 +#ifdef CONFIG_PAX_SEGMEXEC
93530 + pax_mirror_anon_pte(vma, address, new_page, ptl);
93531 +#endif
93532 +
93533 pte_unmap_unlock(pte, ptl);
93534 unlock_page(fault_page);
93535 page_cache_release(fault_page);
93536 @@ -3624,6 +3829,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
93537 return ret;
93538 }
93539 do_set_pte(vma, address, fault_page, pte, true, false);
93540 +
93541 +#ifdef CONFIG_PAX_SEGMEXEC
93542 + pax_mirror_file_pte(vma, address, fault_page, ptl);
93543 +#endif
93544 +
93545 pte_unmap_unlock(pte, ptl);
93546
93547 if (set_page_dirty(fault_page))
93548 @@ -3854,6 +4064,12 @@ static int handle_pte_fault(struct mm_struct *mm,
93549 if (flags & FAULT_FLAG_WRITE)
93550 flush_tlb_fix_spurious_fault(vma, address);
93551 }
93552 +
93553 +#ifdef CONFIG_PAX_SEGMEXEC
93554 + pax_mirror_pte(vma, address, pte, pmd, ptl);
93555 + return 0;
93556 +#endif
93557 +
93558 unlock:
93559 pte_unmap_unlock(pte, ptl);
93560 return 0;
93561 @@ -3870,9 +4086,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
93562 pmd_t *pmd;
93563 pte_t *pte;
93564
93565 +#ifdef CONFIG_PAX_SEGMEXEC
93566 + struct vm_area_struct *vma_m;
93567 +#endif
93568 +
93569 if (unlikely(is_vm_hugetlb_page(vma)))
93570 return hugetlb_fault(mm, vma, address, flags);
93571
93572 +#ifdef CONFIG_PAX_SEGMEXEC
93573 + vma_m = pax_find_mirror_vma(vma);
93574 + if (vma_m) {
93575 + unsigned long address_m;
93576 + pgd_t *pgd_m;
93577 + pud_t *pud_m;
93578 + pmd_t *pmd_m;
93579 +
93580 + if (vma->vm_start > vma_m->vm_start) {
93581 + address_m = address;
93582 + address -= SEGMEXEC_TASK_SIZE;
93583 + vma = vma_m;
93584 + } else
93585 + address_m = address + SEGMEXEC_TASK_SIZE;
93586 +
93587 + pgd_m = pgd_offset(mm, address_m);
93588 + pud_m = pud_alloc(mm, pgd_m, address_m);
93589 + if (!pud_m)
93590 + return VM_FAULT_OOM;
93591 + pmd_m = pmd_alloc(mm, pud_m, address_m);
93592 + if (!pmd_m)
93593 + return VM_FAULT_OOM;
93594 + if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
93595 + return VM_FAULT_OOM;
93596 + pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
93597 + }
93598 +#endif
93599 +
93600 pgd = pgd_offset(mm, address);
93601 pud = pud_alloc(mm, pgd, address);
93602 if (!pud)
93603 @@ -4000,6 +4248,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
93604 spin_unlock(&mm->page_table_lock);
93605 return 0;
93606 }
93607 +
93608 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
93609 +{
93610 + pud_t *new = pud_alloc_one(mm, address);
93611 + if (!new)
93612 + return -ENOMEM;
93613 +
93614 + smp_wmb(); /* See comment in __pte_alloc */
93615 +
93616 + spin_lock(&mm->page_table_lock);
93617 + if (pgd_present(*pgd)) /* Another has populated it */
93618 + pud_free(mm, new);
93619 + else
93620 + pgd_populate_kernel(mm, pgd, new);
93621 + spin_unlock(&mm->page_table_lock);
93622 + return 0;
93623 +}
93624 #endif /* __PAGETABLE_PUD_FOLDED */
93625
93626 #ifndef __PAGETABLE_PMD_FOLDED
93627 @@ -4030,6 +4295,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
93628 spin_unlock(&mm->page_table_lock);
93629 return 0;
93630 }
93631 +
93632 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
93633 +{
93634 + pmd_t *new = pmd_alloc_one(mm, address);
93635 + if (!new)
93636 + return -ENOMEM;
93637 +
93638 + smp_wmb(); /* See comment in __pte_alloc */
93639 +
93640 + spin_lock(&mm->page_table_lock);
93641 +#ifndef __ARCH_HAS_4LEVEL_HACK
93642 + if (pud_present(*pud)) /* Another has populated it */
93643 + pmd_free(mm, new);
93644 + else
93645 + pud_populate_kernel(mm, pud, new);
93646 +#else
93647 + if (pgd_present(*pud)) /* Another has populated it */
93648 + pmd_free(mm, new);
93649 + else
93650 + pgd_populate_kernel(mm, pud, new);
93651 +#endif /* __ARCH_HAS_4LEVEL_HACK */
93652 + spin_unlock(&mm->page_table_lock);
93653 + return 0;
93654 +}
93655 #endif /* __PAGETABLE_PMD_FOLDED */
93656
93657 #if !defined(__HAVE_ARCH_GATE_AREA)
93658 @@ -4043,7 +4332,7 @@ static int __init gate_vma_init(void)
93659 gate_vma.vm_start = FIXADDR_USER_START;
93660 gate_vma.vm_end = FIXADDR_USER_END;
93661 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
93662 - gate_vma.vm_page_prot = __P101;
93663 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
93664
93665 return 0;
93666 }
93667 @@ -4177,8 +4466,8 @@ out:
93668 return ret;
93669 }
93670
93671 -int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
93672 - void *buf, int len, int write)
93673 +ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
93674 + void *buf, size_t len, int write)
93675 {
93676 resource_size_t phys_addr;
93677 unsigned long prot = 0;
93678 @@ -4204,8 +4493,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
93679 * Access another process' address space as given in mm. If non-NULL, use the
93680 * given task for page fault accounting.
93681 */
93682 -static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
93683 - unsigned long addr, void *buf, int len, int write)
93684 +static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
93685 + unsigned long addr, void *buf, size_t len, int write)
93686 {
93687 struct vm_area_struct *vma;
93688 void *old_buf = buf;
93689 @@ -4213,7 +4502,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
93690 down_read(&mm->mmap_sem);
93691 /* ignore errors, just check how much was successfully transferred */
93692 while (len) {
93693 - int bytes, ret, offset;
93694 + ssize_t bytes, ret, offset;
93695 void *maddr;
93696 struct page *page = NULL;
93697
93698 @@ -4272,8 +4561,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
93699 *
93700 * The caller must hold a reference on @mm.
93701 */
93702 -int access_remote_vm(struct mm_struct *mm, unsigned long addr,
93703 - void *buf, int len, int write)
93704 +ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
93705 + void *buf, size_t len, int write)
93706 {
93707 return __access_remote_vm(NULL, mm, addr, buf, len, write);
93708 }
93709 @@ -4283,11 +4572,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
93710 * Source/target buffer must be kernel space,
93711 * Do not walk the page table directly, use get_user_pages
93712 */
93713 -int access_process_vm(struct task_struct *tsk, unsigned long addr,
93714 - void *buf, int len, int write)
93715 +ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
93716 + void *buf, size_t len, int write)
93717 {
93718 struct mm_struct *mm;
93719 - int ret;
93720 + ssize_t ret;
93721
93722 mm = get_task_mm(tsk);
93723 if (!mm)
93724 diff --git a/mm/mempolicy.c b/mm/mempolicy.c
93725 index 35f9f91..bed4575 100644
93726 --- a/mm/mempolicy.c
93727 +++ b/mm/mempolicy.c
93728 @@ -747,6 +747,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
93729 unsigned long vmstart;
93730 unsigned long vmend;
93731
93732 +#ifdef CONFIG_PAX_SEGMEXEC
93733 + struct vm_area_struct *vma_m;
93734 +#endif
93735 +
93736 vma = find_vma(mm, start);
93737 if (!vma || vma->vm_start > start)
93738 return -EFAULT;
93739 @@ -790,6 +794,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
93740 err = vma_replace_policy(vma, new_pol);
93741 if (err)
93742 goto out;
93743 +
93744 +#ifdef CONFIG_PAX_SEGMEXEC
93745 + vma_m = pax_find_mirror_vma(vma);
93746 + if (vma_m) {
93747 + err = vma_replace_policy(vma_m, new_pol);
93748 + if (err)
93749 + goto out;
93750 + }
93751 +#endif
93752 +
93753 }
93754
93755 out:
93756 @@ -1222,6 +1236,17 @@ static long do_mbind(unsigned long start, unsigned long len,
93757
93758 if (end < start)
93759 return -EINVAL;
93760 +
93761 +#ifdef CONFIG_PAX_SEGMEXEC
93762 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
93763 + if (end > SEGMEXEC_TASK_SIZE)
93764 + return -EINVAL;
93765 + } else
93766 +#endif
93767 +
93768 + if (end > TASK_SIZE)
93769 + return -EINVAL;
93770 +
93771 if (end == start)
93772 return 0;
93773
93774 @@ -1447,8 +1472,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
93775 */
93776 tcred = __task_cred(task);
93777 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
93778 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
93779 - !capable(CAP_SYS_NICE)) {
93780 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
93781 rcu_read_unlock();
93782 err = -EPERM;
93783 goto out_put;
93784 @@ -1479,6 +1503,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
93785 goto out;
93786 }
93787
93788 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
93789 + if (mm != current->mm &&
93790 + (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
93791 + mmput(mm);
93792 + err = -EPERM;
93793 + goto out;
93794 + }
93795 +#endif
93796 +
93797 err = do_migrate_pages(mm, old, new,
93798 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
93799
93800 diff --git a/mm/migrate.c b/mm/migrate.c
93801 index bed4880..a493f67 100644
93802 --- a/mm/migrate.c
93803 +++ b/mm/migrate.c
93804 @@ -1485,8 +1485,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
93805 */
93806 tcred = __task_cred(task);
93807 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
93808 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
93809 - !capable(CAP_SYS_NICE)) {
93810 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
93811 rcu_read_unlock();
93812 err = -EPERM;
93813 goto out;
93814 diff --git a/mm/mlock.c b/mm/mlock.c
93815 index b1eb536..091d154 100644
93816 --- a/mm/mlock.c
93817 +++ b/mm/mlock.c
93818 @@ -14,6 +14,7 @@
93819 #include <linux/pagevec.h>
93820 #include <linux/mempolicy.h>
93821 #include <linux/syscalls.h>
93822 +#include <linux/security.h>
93823 #include <linux/sched.h>
93824 #include <linux/export.h>
93825 #include <linux/rmap.h>
93826 @@ -606,7 +607,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
93827 {
93828 unsigned long nstart, end, tmp;
93829 struct vm_area_struct * vma, * prev;
93830 - int error;
93831 + int error = 0;
93832
93833 VM_BUG_ON(start & ~PAGE_MASK);
93834 VM_BUG_ON(len != PAGE_ALIGN(len));
93835 @@ -615,6 +616,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
93836 return -EINVAL;
93837 if (end == start)
93838 return 0;
93839 + if (end > TASK_SIZE)
93840 + return -EINVAL;
93841 +
93842 vma = find_vma(current->mm, start);
93843 if (!vma || vma->vm_start > start)
93844 return -ENOMEM;
93845 @@ -626,6 +630,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
93846 for (nstart = start ; ; ) {
93847 vm_flags_t newflags;
93848
93849 +#ifdef CONFIG_PAX_SEGMEXEC
93850 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
93851 + break;
93852 +#endif
93853 +
93854 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
93855
93856 newflags = vma->vm_flags & ~VM_LOCKED;
93857 @@ -739,6 +748,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
93858 locked += current->mm->locked_vm;
93859
93860 /* check against resource limits */
93861 + gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
93862 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
93863 error = do_mlock(start, len, 1);
93864
93865 @@ -776,6 +786,11 @@ static int do_mlockall(int flags)
93866 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
93867 vm_flags_t newflags;
93868
93869 +#ifdef CONFIG_PAX_SEGMEXEC
93870 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
93871 + break;
93872 +#endif
93873 +
93874 newflags = vma->vm_flags & ~VM_LOCKED;
93875 if (flags & MCL_CURRENT)
93876 newflags |= VM_LOCKED;
93877 @@ -807,8 +822,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
93878 lock_limit >>= PAGE_SHIFT;
93879
93880 ret = -ENOMEM;
93881 +
93882 + gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
93883 +
93884 down_write(&current->mm->mmap_sem);
93885 -
93886 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
93887 capable(CAP_IPC_LOCK))
93888 ret = do_mlockall(flags);
93889 diff --git a/mm/mmap.c b/mm/mmap.c
93890 index b1202cf..ee487f8 100644
93891 --- a/mm/mmap.c
93892 +++ b/mm/mmap.c
93893 @@ -37,6 +37,7 @@
93894 #include <linux/sched/sysctl.h>
93895 #include <linux/notifier.h>
93896 #include <linux/memory.h>
93897 +#include <linux/random.h>
93898
93899 #include <asm/uaccess.h>
93900 #include <asm/cacheflush.h>
93901 @@ -53,6 +54,16 @@
93902 #define arch_rebalance_pgtables(addr, len) (addr)
93903 #endif
93904
93905 +static inline void verify_mm_writelocked(struct mm_struct *mm)
93906 +{
93907 +#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
93908 + if (unlikely(down_read_trylock(&mm->mmap_sem))) {
93909 + up_read(&mm->mmap_sem);
93910 + BUG();
93911 + }
93912 +#endif
93913 +}
93914 +
93915 static void unmap_region(struct mm_struct *mm,
93916 struct vm_area_struct *vma, struct vm_area_struct *prev,
93917 unsigned long start, unsigned long end);
93918 @@ -72,16 +83,25 @@ static void unmap_region(struct mm_struct *mm,
93919 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
93920 *
93921 */
93922 -pgprot_t protection_map[16] = {
93923 +pgprot_t protection_map[16] __read_only = {
93924 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
93925 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
93926 };
93927
93928 -pgprot_t vm_get_page_prot(unsigned long vm_flags)
93929 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
93930 {
93931 - return __pgprot(pgprot_val(protection_map[vm_flags &
93932 + pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
93933 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
93934 pgprot_val(arch_vm_get_page_prot(vm_flags)));
93935 +
93936 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
93937 + if (!(__supported_pte_mask & _PAGE_NX) &&
93938 + (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
93939 + (vm_flags & (VM_READ | VM_WRITE)))
93940 + prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
93941 +#endif
93942 +
93943 + return prot;
93944 }
93945 EXPORT_SYMBOL(vm_get_page_prot);
93946
93947 @@ -91,6 +111,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
93948 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
93949 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
93950 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
93951 +unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
93952 /*
93953 * Make sure vm_committed_as in one cacheline and not cacheline shared with
93954 * other variables. It can be updated by several CPUs frequently.
93955 @@ -247,6 +268,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
93956 struct vm_area_struct *next = vma->vm_next;
93957
93958 might_sleep();
93959 + BUG_ON(vma->vm_mirror);
93960 if (vma->vm_ops && vma->vm_ops->close)
93961 vma->vm_ops->close(vma);
93962 if (vma->vm_file)
93963 @@ -291,6 +313,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
93964 * not page aligned -Ram Gupta
93965 */
93966 rlim = rlimit(RLIMIT_DATA);
93967 + gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
93968 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
93969 (mm->end_data - mm->start_data) > rlim)
93970 goto out;
93971 @@ -942,6 +965,12 @@ static int
93972 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
93973 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
93974 {
93975 +
93976 +#ifdef CONFIG_PAX_SEGMEXEC
93977 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
93978 + return 0;
93979 +#endif
93980 +
93981 if (is_mergeable_vma(vma, file, vm_flags) &&
93982 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
93983 if (vma->vm_pgoff == vm_pgoff)
93984 @@ -961,6 +990,12 @@ static int
93985 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
93986 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
93987 {
93988 +
93989 +#ifdef CONFIG_PAX_SEGMEXEC
93990 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
93991 + return 0;
93992 +#endif
93993 +
93994 if (is_mergeable_vma(vma, file, vm_flags) &&
93995 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
93996 pgoff_t vm_pglen;
93997 @@ -1003,13 +1038,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
93998 struct vm_area_struct *vma_merge(struct mm_struct *mm,
93999 struct vm_area_struct *prev, unsigned long addr,
94000 unsigned long end, unsigned long vm_flags,
94001 - struct anon_vma *anon_vma, struct file *file,
94002 + struct anon_vma *anon_vma, struct file *file,
94003 pgoff_t pgoff, struct mempolicy *policy)
94004 {
94005 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
94006 struct vm_area_struct *area, *next;
94007 int err;
94008
94009 +#ifdef CONFIG_PAX_SEGMEXEC
94010 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
94011 + struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
94012 +
94013 + BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
94014 +#endif
94015 +
94016 /*
94017 * We later require that vma->vm_flags == vm_flags,
94018 * so this tests vma->vm_flags & VM_SPECIAL, too.
94019 @@ -1025,6 +1067,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
94020 if (next && next->vm_end == end) /* cases 6, 7, 8 */
94021 next = next->vm_next;
94022
94023 +#ifdef CONFIG_PAX_SEGMEXEC
94024 + if (prev)
94025 + prev_m = pax_find_mirror_vma(prev);
94026 + if (area)
94027 + area_m = pax_find_mirror_vma(area);
94028 + if (next)
94029 + next_m = pax_find_mirror_vma(next);
94030 +#endif
94031 +
94032 /*
94033 * Can it merge with the predecessor?
94034 */
94035 @@ -1044,9 +1095,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
94036 /* cases 1, 6 */
94037 err = vma_adjust(prev, prev->vm_start,
94038 next->vm_end, prev->vm_pgoff, NULL);
94039 - } else /* cases 2, 5, 7 */
94040 +
94041 +#ifdef CONFIG_PAX_SEGMEXEC
94042 + if (!err && prev_m)
94043 + err = vma_adjust(prev_m, prev_m->vm_start,
94044 + next_m->vm_end, prev_m->vm_pgoff, NULL);
94045 +#endif
94046 +
94047 + } else { /* cases 2, 5, 7 */
94048 err = vma_adjust(prev, prev->vm_start,
94049 end, prev->vm_pgoff, NULL);
94050 +
94051 +#ifdef CONFIG_PAX_SEGMEXEC
94052 + if (!err && prev_m)
94053 + err = vma_adjust(prev_m, prev_m->vm_start,
94054 + end_m, prev_m->vm_pgoff, NULL);
94055 +#endif
94056 +
94057 + }
94058 if (err)
94059 return NULL;
94060 khugepaged_enter_vma_merge(prev);
94061 @@ -1060,12 +1126,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
94062 mpol_equal(policy, vma_policy(next)) &&
94063 can_vma_merge_before(next, vm_flags,
94064 anon_vma, file, pgoff+pglen)) {
94065 - if (prev && addr < prev->vm_end) /* case 4 */
94066 + if (prev && addr < prev->vm_end) { /* case 4 */
94067 err = vma_adjust(prev, prev->vm_start,
94068 addr, prev->vm_pgoff, NULL);
94069 - else /* cases 3, 8 */
94070 +
94071 +#ifdef CONFIG_PAX_SEGMEXEC
94072 + if (!err && prev_m)
94073 + err = vma_adjust(prev_m, prev_m->vm_start,
94074 + addr_m, prev_m->vm_pgoff, NULL);
94075 +#endif
94076 +
94077 + } else { /* cases 3, 8 */
94078 err = vma_adjust(area, addr, next->vm_end,
94079 next->vm_pgoff - pglen, NULL);
94080 +
94081 +#ifdef CONFIG_PAX_SEGMEXEC
94082 + if (!err && area_m)
94083 + err = vma_adjust(area_m, addr_m, next_m->vm_end,
94084 + next_m->vm_pgoff - pglen, NULL);
94085 +#endif
94086 +
94087 + }
94088 if (err)
94089 return NULL;
94090 khugepaged_enter_vma_merge(area);
94091 @@ -1174,8 +1255,10 @@ none:
94092 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
94093 struct file *file, long pages)
94094 {
94095 - const unsigned long stack_flags
94096 - = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
94097 +
94098 +#ifdef CONFIG_PAX_RANDMMAP
94099 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
94100 +#endif
94101
94102 mm->total_vm += pages;
94103
94104 @@ -1183,7 +1266,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
94105 mm->shared_vm += pages;
94106 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
94107 mm->exec_vm += pages;
94108 - } else if (flags & stack_flags)
94109 + } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
94110 mm->stack_vm += pages;
94111 }
94112 #endif /* CONFIG_PROC_FS */
94113 @@ -1213,6 +1296,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
94114 locked += mm->locked_vm;
94115 lock_limit = rlimit(RLIMIT_MEMLOCK);
94116 lock_limit >>= PAGE_SHIFT;
94117 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
94118 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
94119 return -EAGAIN;
94120 }
94121 @@ -1239,7 +1323,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
94122 * (the exception is when the underlying filesystem is noexec
94123 * mounted, in which case we dont add PROT_EXEC.)
94124 */
94125 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
94126 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
94127 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
94128 prot |= PROT_EXEC;
94129
94130 @@ -1265,7 +1349,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
94131 /* Obtain the address to map to. we verify (or select) it and ensure
94132 * that it represents a valid section of the address space.
94133 */
94134 - addr = get_unmapped_area(file, addr, len, pgoff, flags);
94135 + addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
94136 if (addr & ~PAGE_MASK)
94137 return addr;
94138
94139 @@ -1276,6 +1360,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
94140 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
94141 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
94142
94143 +#ifdef CONFIG_PAX_MPROTECT
94144 + if (mm->pax_flags & MF_PAX_MPROTECT) {
94145 +
94146 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
94147 + if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
94148 + mm->binfmt->handle_mmap)
94149 + mm->binfmt->handle_mmap(file);
94150 +#endif
94151 +
94152 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
94153 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
94154 + gr_log_rwxmmap(file);
94155 +
94156 +#ifdef CONFIG_PAX_EMUPLT
94157 + vm_flags &= ~VM_EXEC;
94158 +#else
94159 + return -EPERM;
94160 +#endif
94161 +
94162 + }
94163 +
94164 + if (!(vm_flags & VM_EXEC))
94165 + vm_flags &= ~VM_MAYEXEC;
94166 +#else
94167 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
94168 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
94169 +#endif
94170 + else
94171 + vm_flags &= ~VM_MAYWRITE;
94172 + }
94173 +#endif
94174 +
94175 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
94176 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
94177 + vm_flags &= ~VM_PAGEEXEC;
94178 +#endif
94179 +
94180 if (flags & MAP_LOCKED)
94181 if (!can_do_mlock())
94182 return -EPERM;
94183 @@ -1363,6 +1484,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
94184 vm_flags |= VM_NORESERVE;
94185 }
94186
94187 + if (!gr_acl_handle_mmap(file, prot))
94188 + return -EACCES;
94189 +
94190 addr = mmap_region(file, addr, len, vm_flags, pgoff);
94191 if (!IS_ERR_VALUE(addr) &&
94192 ((vm_flags & VM_LOCKED) ||
94193 @@ -1456,7 +1580,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
94194 vm_flags_t vm_flags = vma->vm_flags;
94195
94196 /* If it was private or non-writable, the write bit is already clear */
94197 - if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
94198 + if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
94199 return 0;
94200
94201 /* The backer wishes to know when pages are first written to? */
94202 @@ -1502,7 +1626,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
94203 struct rb_node **rb_link, *rb_parent;
94204 unsigned long charged = 0;
94205
94206 +#ifdef CONFIG_PAX_SEGMEXEC
94207 + struct vm_area_struct *vma_m = NULL;
94208 +#endif
94209 +
94210 + /*
94211 + * mm->mmap_sem is required to protect against another thread
94212 + * changing the mappings in case we sleep.
94213 + */
94214 + verify_mm_writelocked(mm);
94215 +
94216 /* Check against address space limit. */
94217 +
94218 +#ifdef CONFIG_PAX_RANDMMAP
94219 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
94220 +#endif
94221 +
94222 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
94223 unsigned long nr_pages;
94224
94225 @@ -1521,11 +1660,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
94226
94227 /* Clear old maps */
94228 error = -ENOMEM;
94229 -munmap_back:
94230 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
94231 if (do_munmap(mm, addr, len))
94232 return -ENOMEM;
94233 - goto munmap_back;
94234 + BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
94235 }
94236
94237 /*
94238 @@ -1556,6 +1694,16 @@ munmap_back:
94239 goto unacct_error;
94240 }
94241
94242 +#ifdef CONFIG_PAX_SEGMEXEC
94243 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
94244 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
94245 + if (!vma_m) {
94246 + error = -ENOMEM;
94247 + goto free_vma;
94248 + }
94249 + }
94250 +#endif
94251 +
94252 vma->vm_mm = mm;
94253 vma->vm_start = addr;
94254 vma->vm_end = addr + len;
94255 @@ -1575,6 +1723,13 @@ munmap_back:
94256 if (error)
94257 goto unmap_and_free_vma;
94258
94259 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
94260 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
94261 + vma->vm_flags |= VM_PAGEEXEC;
94262 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
94263 + }
94264 +#endif
94265 +
94266 /* Can addr have changed??
94267 *
94268 * Answer: Yes, several device drivers can do it in their
94269 @@ -1608,6 +1763,12 @@ munmap_back:
94270 }
94271
94272 vma_link(mm, vma, prev, rb_link, rb_parent);
94273 +
94274 +#ifdef CONFIG_PAX_SEGMEXEC
94275 + if (vma_m)
94276 + BUG_ON(pax_mirror_vma(vma_m, vma));
94277 +#endif
94278 +
94279 /* Once vma denies write, undo our temporary denial count */
94280 if (vm_flags & VM_DENYWRITE)
94281 allow_write_access(file);
94282 @@ -1616,6 +1777,7 @@ out:
94283 perf_event_mmap(vma);
94284
94285 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
94286 + track_exec_limit(mm, addr, addr + len, vm_flags);
94287 if (vm_flags & VM_LOCKED) {
94288 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
94289 vma == get_gate_vma(current->mm)))
94290 @@ -1648,6 +1810,12 @@ unmap_and_free_vma:
94291 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
94292 charged = 0;
94293 free_vma:
94294 +
94295 +#ifdef CONFIG_PAX_SEGMEXEC
94296 + if (vma_m)
94297 + kmem_cache_free(vm_area_cachep, vma_m);
94298 +#endif
94299 +
94300 kmem_cache_free(vm_area_cachep, vma);
94301 unacct_error:
94302 if (charged)
94303 @@ -1655,7 +1823,63 @@ unacct_error:
94304 return error;
94305 }
94306
94307 -unsigned long unmapped_area(struct vm_unmapped_area_info *info)
94308 +#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
94309 +unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
94310 +{
94311 + if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
94312 + return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
94313 +
94314 + return 0;
94315 +}
94316 +#endif
94317 +
94318 +bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
94319 +{
94320 + if (!vma) {
94321 +#ifdef CONFIG_STACK_GROWSUP
94322 + if (addr > sysctl_heap_stack_gap)
94323 + vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
94324 + else
94325 + vma = find_vma(current->mm, 0);
94326 + if (vma && (vma->vm_flags & VM_GROWSUP))
94327 + return false;
94328 +#endif
94329 + return true;
94330 + }
94331 +
94332 + if (addr + len > vma->vm_start)
94333 + return false;
94334 +
94335 + if (vma->vm_flags & VM_GROWSDOWN)
94336 + return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
94337 +#ifdef CONFIG_STACK_GROWSUP
94338 + else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
94339 + return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
94340 +#endif
94341 + else if (offset)
94342 + return offset <= vma->vm_start - addr - len;
94343 +
94344 + return true;
94345 +}
94346 +
94347 +unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
94348 +{
94349 + if (vma->vm_start < len)
94350 + return -ENOMEM;
94351 +
94352 + if (!(vma->vm_flags & VM_GROWSDOWN)) {
94353 + if (offset <= vma->vm_start - len)
94354 + return vma->vm_start - len - offset;
94355 + else
94356 + return -ENOMEM;
94357 + }
94358 +
94359 + if (sysctl_heap_stack_gap <= vma->vm_start - len)
94360 + return vma->vm_start - len - sysctl_heap_stack_gap;
94361 + return -ENOMEM;
94362 +}
94363 +
94364 +unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
94365 {
94366 /*
94367 * We implement the search by looking for an rbtree node that
94368 @@ -1703,11 +1927,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
94369 }
94370 }
94371
94372 - gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
94373 + gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
94374 check_current:
94375 /* Check if current node has a suitable gap */
94376 if (gap_start > high_limit)
94377 return -ENOMEM;
94378 +
94379 + if (gap_end - gap_start > info->threadstack_offset)
94380 + gap_start += info->threadstack_offset;
94381 + else
94382 + gap_start = gap_end;
94383 +
94384 + if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
94385 + if (gap_end - gap_start > sysctl_heap_stack_gap)
94386 + gap_start += sysctl_heap_stack_gap;
94387 + else
94388 + gap_start = gap_end;
94389 + }
94390 + if (vma->vm_flags & VM_GROWSDOWN) {
94391 + if (gap_end - gap_start > sysctl_heap_stack_gap)
94392 + gap_end -= sysctl_heap_stack_gap;
94393 + else
94394 + gap_end = gap_start;
94395 + }
94396 if (gap_end >= low_limit && gap_end - gap_start >= length)
94397 goto found;
94398
94399 @@ -1757,7 +1999,7 @@ found:
94400 return gap_start;
94401 }
94402
94403 -unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
94404 +unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
94405 {
94406 struct mm_struct *mm = current->mm;
94407 struct vm_area_struct *vma;
94408 @@ -1811,6 +2053,24 @@ check_current:
94409 gap_end = vma->vm_start;
94410 if (gap_end < low_limit)
94411 return -ENOMEM;
94412 +
94413 + if (gap_end - gap_start > info->threadstack_offset)
94414 + gap_end -= info->threadstack_offset;
94415 + else
94416 + gap_end = gap_start;
94417 +
94418 + if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
94419 + if (gap_end - gap_start > sysctl_heap_stack_gap)
94420 + gap_start += sysctl_heap_stack_gap;
94421 + else
94422 + gap_start = gap_end;
94423 + }
94424 + if (vma->vm_flags & VM_GROWSDOWN) {
94425 + if (gap_end - gap_start > sysctl_heap_stack_gap)
94426 + gap_end -= sysctl_heap_stack_gap;
94427 + else
94428 + gap_end = gap_start;
94429 + }
94430 if (gap_start <= high_limit && gap_end - gap_start >= length)
94431 goto found;
94432
94433 @@ -1874,6 +2134,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
94434 struct mm_struct *mm = current->mm;
94435 struct vm_area_struct *vma;
94436 struct vm_unmapped_area_info info;
94437 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
94438
94439 if (len > TASK_SIZE - mmap_min_addr)
94440 return -ENOMEM;
94441 @@ -1881,11 +2142,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
94442 if (flags & MAP_FIXED)
94443 return addr;
94444
94445 +#ifdef CONFIG_PAX_RANDMMAP
94446 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
94447 +#endif
94448 +
94449 if (addr) {
94450 addr = PAGE_ALIGN(addr);
94451 vma = find_vma(mm, addr);
94452 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
94453 - (!vma || addr + len <= vma->vm_start))
94454 + check_heap_stack_gap(vma, addr, len, offset))
94455 return addr;
94456 }
94457
94458 @@ -1894,6 +2159,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
94459 info.low_limit = mm->mmap_base;
94460 info.high_limit = TASK_SIZE;
94461 info.align_mask = 0;
94462 + info.threadstack_offset = offset;
94463 return vm_unmapped_area(&info);
94464 }
94465 #endif
94466 @@ -1912,6 +2178,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
94467 struct mm_struct *mm = current->mm;
94468 unsigned long addr = addr0;
94469 struct vm_unmapped_area_info info;
94470 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
94471
94472 /* requested length too big for entire address space */
94473 if (len > TASK_SIZE - mmap_min_addr)
94474 @@ -1920,12 +2187,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
94475 if (flags & MAP_FIXED)
94476 return addr;
94477
94478 +#ifdef CONFIG_PAX_RANDMMAP
94479 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
94480 +#endif
94481 +
94482 /* requesting a specific address */
94483 if (addr) {
94484 addr = PAGE_ALIGN(addr);
94485 vma = find_vma(mm, addr);
94486 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
94487 - (!vma || addr + len <= vma->vm_start))
94488 + check_heap_stack_gap(vma, addr, len, offset))
94489 return addr;
94490 }
94491
94492 @@ -1934,6 +2205,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
94493 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
94494 info.high_limit = mm->mmap_base;
94495 info.align_mask = 0;
94496 + info.threadstack_offset = offset;
94497 addr = vm_unmapped_area(&info);
94498
94499 /*
94500 @@ -1946,6 +2218,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
94501 VM_BUG_ON(addr != -ENOMEM);
94502 info.flags = 0;
94503 info.low_limit = TASK_UNMAPPED_BASE;
94504 +
94505 +#ifdef CONFIG_PAX_RANDMMAP
94506 + if (mm->pax_flags & MF_PAX_RANDMMAP)
94507 + info.low_limit += mm->delta_mmap;
94508 +#endif
94509 +
94510 info.high_limit = TASK_SIZE;
94511 addr = vm_unmapped_area(&info);
94512 }
94513 @@ -2046,6 +2324,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
94514 return vma;
94515 }
94516
94517 +#ifdef CONFIG_PAX_SEGMEXEC
94518 +struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
94519 +{
94520 + struct vm_area_struct *vma_m;
94521 +
94522 + BUG_ON(!vma || vma->vm_start >= vma->vm_end);
94523 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
94524 + BUG_ON(vma->vm_mirror);
94525 + return NULL;
94526 + }
94527 + BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
94528 + vma_m = vma->vm_mirror;
94529 + BUG_ON(!vma_m || vma_m->vm_mirror != vma);
94530 + BUG_ON(vma->vm_file != vma_m->vm_file);
94531 + BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
94532 + BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
94533 + BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
94534 + BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
94535 + return vma_m;
94536 +}
94537 +#endif
94538 +
94539 /*
94540 * Verify that the stack growth is acceptable and
94541 * update accounting. This is shared with both the
94542 @@ -2062,6 +2362,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
94543 return -ENOMEM;
94544
94545 /* Stack limit test */
94546 + gr_learn_resource(current, RLIMIT_STACK, size, 1);
94547 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
94548 return -ENOMEM;
94549
94550 @@ -2072,6 +2373,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
94551 locked = mm->locked_vm + grow;
94552 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
94553 limit >>= PAGE_SHIFT;
94554 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
94555 if (locked > limit && !capable(CAP_IPC_LOCK))
94556 return -ENOMEM;
94557 }
94558 @@ -2101,37 +2403,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
94559 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
94560 * vma is the last one with address > vma->vm_end. Have to extend vma.
94561 */
94562 +#ifndef CONFIG_IA64
94563 +static
94564 +#endif
94565 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
94566 {
94567 int error;
94568 + bool locknext;
94569
94570 if (!(vma->vm_flags & VM_GROWSUP))
94571 return -EFAULT;
94572
94573 + /* Also guard against wrapping around to address 0. */
94574 + if (address < PAGE_ALIGN(address+1))
94575 + address = PAGE_ALIGN(address+1);
94576 + else
94577 + return -ENOMEM;
94578 +
94579 /*
94580 * We must make sure the anon_vma is allocated
94581 * so that the anon_vma locking is not a noop.
94582 */
94583 if (unlikely(anon_vma_prepare(vma)))
94584 return -ENOMEM;
94585 + locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
94586 + if (locknext && anon_vma_prepare(vma->vm_next))
94587 + return -ENOMEM;
94588 vma_lock_anon_vma(vma);
94589 + if (locknext)
94590 + vma_lock_anon_vma(vma->vm_next);
94591
94592 /*
94593 * vma->vm_start/vm_end cannot change under us because the caller
94594 * is required to hold the mmap_sem in read mode. We need the
94595 - * anon_vma lock to serialize against concurrent expand_stacks.
94596 - * Also guard against wrapping around to address 0.
94597 + * anon_vma locks to serialize against concurrent expand_stacks
94598 + * and expand_upwards.
94599 */
94600 - if (address < PAGE_ALIGN(address+4))
94601 - address = PAGE_ALIGN(address+4);
94602 - else {
94603 - vma_unlock_anon_vma(vma);
94604 - return -ENOMEM;
94605 - }
94606 error = 0;
94607
94608 /* Somebody else might have raced and expanded it already */
94609 - if (address > vma->vm_end) {
94610 + 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)
94611 + error = -ENOMEM;
94612 + else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
94613 unsigned long size, grow;
94614
94615 size = address - vma->vm_start;
94616 @@ -2166,6 +2479,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
94617 }
94618 }
94619 }
94620 + if (locknext)
94621 + vma_unlock_anon_vma(vma->vm_next);
94622 vma_unlock_anon_vma(vma);
94623 khugepaged_enter_vma_merge(vma);
94624 validate_mm(vma->vm_mm);
94625 @@ -2180,6 +2495,8 @@ int expand_downwards(struct vm_area_struct *vma,
94626 unsigned long address)
94627 {
94628 int error;
94629 + bool lockprev = false;
94630 + struct vm_area_struct *prev;
94631
94632 /*
94633 * We must make sure the anon_vma is allocated
94634 @@ -2193,6 +2510,15 @@ int expand_downwards(struct vm_area_struct *vma,
94635 if (error)
94636 return error;
94637
94638 + prev = vma->vm_prev;
94639 +#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
94640 + lockprev = prev && (prev->vm_flags & VM_GROWSUP);
94641 +#endif
94642 + if (lockprev && anon_vma_prepare(prev))
94643 + return -ENOMEM;
94644 + if (lockprev)
94645 + vma_lock_anon_vma(prev);
94646 +
94647 vma_lock_anon_vma(vma);
94648
94649 /*
94650 @@ -2202,9 +2528,17 @@ int expand_downwards(struct vm_area_struct *vma,
94651 */
94652
94653 /* Somebody else might have raced and expanded it already */
94654 - if (address < vma->vm_start) {
94655 + if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
94656 + error = -ENOMEM;
94657 + else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
94658 unsigned long size, grow;
94659
94660 +#ifdef CONFIG_PAX_SEGMEXEC
94661 + struct vm_area_struct *vma_m;
94662 +
94663 + vma_m = pax_find_mirror_vma(vma);
94664 +#endif
94665 +
94666 size = vma->vm_end - address;
94667 grow = (vma->vm_start - address) >> PAGE_SHIFT;
94668
94669 @@ -2229,13 +2563,27 @@ int expand_downwards(struct vm_area_struct *vma,
94670 vma->vm_pgoff -= grow;
94671 anon_vma_interval_tree_post_update_vma(vma);
94672 vma_gap_update(vma);
94673 +
94674 +#ifdef CONFIG_PAX_SEGMEXEC
94675 + if (vma_m) {
94676 + anon_vma_interval_tree_pre_update_vma(vma_m);
94677 + vma_m->vm_start -= grow << PAGE_SHIFT;
94678 + vma_m->vm_pgoff -= grow;
94679 + anon_vma_interval_tree_post_update_vma(vma_m);
94680 + vma_gap_update(vma_m);
94681 + }
94682 +#endif
94683 +
94684 spin_unlock(&vma->vm_mm->page_table_lock);
94685
94686 + track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
94687 perf_event_mmap(vma);
94688 }
94689 }
94690 }
94691 vma_unlock_anon_vma(vma);
94692 + if (lockprev)
94693 + vma_unlock_anon_vma(prev);
94694 khugepaged_enter_vma_merge(vma);
94695 validate_mm(vma->vm_mm);
94696 return error;
94697 @@ -2333,6 +2681,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
94698 do {
94699 long nrpages = vma_pages(vma);
94700
94701 +#ifdef CONFIG_PAX_SEGMEXEC
94702 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
94703 + vma = remove_vma(vma);
94704 + continue;
94705 + }
94706 +#endif
94707 +
94708 if (vma->vm_flags & VM_ACCOUNT)
94709 nr_accounted += nrpages;
94710 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
94711 @@ -2377,6 +2732,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
94712 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
94713 vma->vm_prev = NULL;
94714 do {
94715 +
94716 +#ifdef CONFIG_PAX_SEGMEXEC
94717 + if (vma->vm_mirror) {
94718 + BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
94719 + vma->vm_mirror->vm_mirror = NULL;
94720 + vma->vm_mirror->vm_flags &= ~VM_EXEC;
94721 + vma->vm_mirror = NULL;
94722 + }
94723 +#endif
94724 +
94725 vma_rb_erase(vma, &mm->mm_rb);
94726 mm->map_count--;
94727 tail_vma = vma;
94728 @@ -2404,14 +2769,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
94729 struct vm_area_struct *new;
94730 int err = -ENOMEM;
94731
94732 +#ifdef CONFIG_PAX_SEGMEXEC
94733 + struct vm_area_struct *vma_m, *new_m = NULL;
94734 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
94735 +#endif
94736 +
94737 if (is_vm_hugetlb_page(vma) && (addr &
94738 ~(huge_page_mask(hstate_vma(vma)))))
94739 return -EINVAL;
94740
94741 +#ifdef CONFIG_PAX_SEGMEXEC
94742 + vma_m = pax_find_mirror_vma(vma);
94743 +#endif
94744 +
94745 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
94746 if (!new)
94747 goto out_err;
94748
94749 +#ifdef CONFIG_PAX_SEGMEXEC
94750 + if (vma_m) {
94751 + new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
94752 + if (!new_m) {
94753 + kmem_cache_free(vm_area_cachep, new);
94754 + goto out_err;
94755 + }
94756 + }
94757 +#endif
94758 +
94759 /* most fields are the same, copy all, and then fixup */
94760 *new = *vma;
94761
94762 @@ -2424,6 +2808,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
94763 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
94764 }
94765
94766 +#ifdef CONFIG_PAX_SEGMEXEC
94767 + if (vma_m) {
94768 + *new_m = *vma_m;
94769 + INIT_LIST_HEAD(&new_m->anon_vma_chain);
94770 + new_m->vm_mirror = new;
94771 + new->vm_mirror = new_m;
94772 +
94773 + if (new_below)
94774 + new_m->vm_end = addr_m;
94775 + else {
94776 + new_m->vm_start = addr_m;
94777 + new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
94778 + }
94779 + }
94780 +#endif
94781 +
94782 err = vma_dup_policy(vma, new);
94783 if (err)
94784 goto out_free_vma;
94785 @@ -2443,6 +2843,38 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
94786 else
94787 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
94788
94789 +#ifdef CONFIG_PAX_SEGMEXEC
94790 + if (!err && vma_m) {
94791 + struct mempolicy *pol = vma_policy(new);
94792 +
94793 + if (anon_vma_clone(new_m, vma_m))
94794 + goto out_free_mpol;
94795 +
94796 + mpol_get(pol);
94797 + set_vma_policy(new_m, pol);
94798 +
94799 + if (new_m->vm_file)
94800 + get_file(new_m->vm_file);
94801 +
94802 + if (new_m->vm_ops && new_m->vm_ops->open)
94803 + new_m->vm_ops->open(new_m);
94804 +
94805 + if (new_below)
94806 + err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
94807 + ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
94808 + else
94809 + err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
94810 +
94811 + if (err) {
94812 + if (new_m->vm_ops && new_m->vm_ops->close)
94813 + new_m->vm_ops->close(new_m);
94814 + if (new_m->vm_file)
94815 + fput(new_m->vm_file);
94816 + mpol_put(pol);
94817 + }
94818 + }
94819 +#endif
94820 +
94821 /* Success. */
94822 if (!err)
94823 return 0;
94824 @@ -2452,10 +2884,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
94825 new->vm_ops->close(new);
94826 if (new->vm_file)
94827 fput(new->vm_file);
94828 - unlink_anon_vmas(new);
94829 out_free_mpol:
94830 mpol_put(vma_policy(new));
94831 out_free_vma:
94832 +
94833 +#ifdef CONFIG_PAX_SEGMEXEC
94834 + if (new_m) {
94835 + unlink_anon_vmas(new_m);
94836 + kmem_cache_free(vm_area_cachep, new_m);
94837 + }
94838 +#endif
94839 +
94840 + unlink_anon_vmas(new);
94841 kmem_cache_free(vm_area_cachep, new);
94842 out_err:
94843 return err;
94844 @@ -2468,6 +2908,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
94845 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
94846 unsigned long addr, int new_below)
94847 {
94848 +
94849 +#ifdef CONFIG_PAX_SEGMEXEC
94850 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
94851 + BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
94852 + if (mm->map_count >= sysctl_max_map_count-1)
94853 + return -ENOMEM;
94854 + } else
94855 +#endif
94856 +
94857 if (mm->map_count >= sysctl_max_map_count)
94858 return -ENOMEM;
94859
94860 @@ -2479,11 +2928,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
94861 * work. This now handles partial unmappings.
94862 * Jeremy Fitzhardinge <jeremy@goop.org>
94863 */
94864 +#ifdef CONFIG_PAX_SEGMEXEC
94865 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
94866 {
94867 + int ret = __do_munmap(mm, start, len);
94868 + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
94869 + return ret;
94870 +
94871 + return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
94872 +}
94873 +
94874 +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
94875 +#else
94876 +int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
94877 +#endif
94878 +{
94879 unsigned long end;
94880 struct vm_area_struct *vma, *prev, *last;
94881
94882 + /*
94883 + * mm->mmap_sem is required to protect against another thread
94884 + * changing the mappings in case we sleep.
94885 + */
94886 + verify_mm_writelocked(mm);
94887 +
94888 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
94889 return -EINVAL;
94890
94891 @@ -2558,6 +3026,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
94892 /* Fix up all other VM information */
94893 remove_vma_list(mm, vma);
94894
94895 + track_exec_limit(mm, start, end, 0UL);
94896 +
94897 return 0;
94898 }
94899
94900 @@ -2566,6 +3036,13 @@ int vm_munmap(unsigned long start, size_t len)
94901 int ret;
94902 struct mm_struct *mm = current->mm;
94903
94904 +
94905 +#ifdef CONFIG_PAX_SEGMEXEC
94906 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
94907 + (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
94908 + return -EINVAL;
94909 +#endif
94910 +
94911 down_write(&mm->mmap_sem);
94912 ret = do_munmap(mm, start, len);
94913 up_write(&mm->mmap_sem);
94914 @@ -2579,16 +3056,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
94915 return vm_munmap(addr, len);
94916 }
94917
94918 -static inline void verify_mm_writelocked(struct mm_struct *mm)
94919 -{
94920 -#ifdef CONFIG_DEBUG_VM
94921 - if (unlikely(down_read_trylock(&mm->mmap_sem))) {
94922 - WARN_ON(1);
94923 - up_read(&mm->mmap_sem);
94924 - }
94925 -#endif
94926 -}
94927 -
94928 /*
94929 * this is really a simplified "do_mmap". it only handles
94930 * anonymous maps. eventually we may be able to do some
94931 @@ -2602,6 +3069,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94932 struct rb_node ** rb_link, * rb_parent;
94933 pgoff_t pgoff = addr >> PAGE_SHIFT;
94934 int error;
94935 + unsigned long charged;
94936
94937 len = PAGE_ALIGN(len);
94938 if (!len)
94939 @@ -2609,10 +3077,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94940
94941 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
94942
94943 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
94944 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
94945 + flags &= ~VM_EXEC;
94946 +
94947 +#ifdef CONFIG_PAX_MPROTECT
94948 + if (mm->pax_flags & MF_PAX_MPROTECT)
94949 + flags &= ~VM_MAYEXEC;
94950 +#endif
94951 +
94952 + }
94953 +#endif
94954 +
94955 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
94956 if (error & ~PAGE_MASK)
94957 return error;
94958
94959 + charged = len >> PAGE_SHIFT;
94960 +
94961 error = mlock_future_check(mm, mm->def_flags, len);
94962 if (error)
94963 return error;
94964 @@ -2626,21 +3108,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94965 /*
94966 * Clear old maps. this also does some error checking for us
94967 */
94968 - munmap_back:
94969 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
94970 if (do_munmap(mm, addr, len))
94971 return -ENOMEM;
94972 - goto munmap_back;
94973 + BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
94974 }
94975
94976 /* Check against address space limits *after* clearing old maps... */
94977 - if (!may_expand_vm(mm, len >> PAGE_SHIFT))
94978 + if (!may_expand_vm(mm, charged))
94979 return -ENOMEM;
94980
94981 if (mm->map_count > sysctl_max_map_count)
94982 return -ENOMEM;
94983
94984 - if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
94985 + if (security_vm_enough_memory_mm(mm, charged))
94986 return -ENOMEM;
94987
94988 /* Can we just expand an old private anonymous mapping? */
94989 @@ -2654,7 +3135,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94990 */
94991 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
94992 if (!vma) {
94993 - vm_unacct_memory(len >> PAGE_SHIFT);
94994 + vm_unacct_memory(charged);
94995 return -ENOMEM;
94996 }
94997
94998 @@ -2668,10 +3149,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94999 vma_link(mm, vma, prev, rb_link, rb_parent);
95000 out:
95001 perf_event_mmap(vma);
95002 - mm->total_vm += len >> PAGE_SHIFT;
95003 + mm->total_vm += charged;
95004 if (flags & VM_LOCKED)
95005 - mm->locked_vm += (len >> PAGE_SHIFT);
95006 + mm->locked_vm += charged;
95007 vma->vm_flags |= VM_SOFTDIRTY;
95008 + track_exec_limit(mm, addr, addr + len, flags);
95009 return addr;
95010 }
95011
95012 @@ -2733,6 +3215,7 @@ void exit_mmap(struct mm_struct *mm)
95013 while (vma) {
95014 if (vma->vm_flags & VM_ACCOUNT)
95015 nr_accounted += vma_pages(vma);
95016 + vma->vm_mirror = NULL;
95017 vma = remove_vma(vma);
95018 }
95019 vm_unacct_memory(nr_accounted);
95020 @@ -2750,6 +3233,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
95021 struct vm_area_struct *prev;
95022 struct rb_node **rb_link, *rb_parent;
95023
95024 +#ifdef CONFIG_PAX_SEGMEXEC
95025 + struct vm_area_struct *vma_m = NULL;
95026 +#endif
95027 +
95028 + if (security_mmap_addr(vma->vm_start))
95029 + return -EPERM;
95030 +
95031 /*
95032 * The vm_pgoff of a purely anonymous vma should be irrelevant
95033 * until its first write fault, when page's anon_vma and index
95034 @@ -2773,7 +3263,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
95035 security_vm_enough_memory_mm(mm, vma_pages(vma)))
95036 return -ENOMEM;
95037
95038 +#ifdef CONFIG_PAX_SEGMEXEC
95039 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
95040 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
95041 + if (!vma_m)
95042 + return -ENOMEM;
95043 + }
95044 +#endif
95045 +
95046 vma_link(mm, vma, prev, rb_link, rb_parent);
95047 +
95048 +#ifdef CONFIG_PAX_SEGMEXEC
95049 + if (vma_m)
95050 + BUG_ON(pax_mirror_vma(vma_m, vma));
95051 +#endif
95052 +
95053 return 0;
95054 }
95055
95056 @@ -2792,6 +3296,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
95057 struct rb_node **rb_link, *rb_parent;
95058 bool faulted_in_anon_vma = true;
95059
95060 + BUG_ON(vma->vm_mirror);
95061 +
95062 /*
95063 * If anonymous vma has not yet been faulted, update new pgoff
95064 * to match new location, to increase its chance of merging.
95065 @@ -2856,6 +3362,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
95066 return NULL;
95067 }
95068
95069 +#ifdef CONFIG_PAX_SEGMEXEC
95070 +long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
95071 +{
95072 + struct vm_area_struct *prev_m;
95073 + struct rb_node **rb_link_m, *rb_parent_m;
95074 + struct mempolicy *pol_m;
95075 +
95076 + BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
95077 + BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
95078 + BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
95079 + *vma_m = *vma;
95080 + INIT_LIST_HEAD(&vma_m->anon_vma_chain);
95081 + if (anon_vma_clone(vma_m, vma))
95082 + return -ENOMEM;
95083 + pol_m = vma_policy(vma_m);
95084 + mpol_get(pol_m);
95085 + set_vma_policy(vma_m, pol_m);
95086 + vma_m->vm_start += SEGMEXEC_TASK_SIZE;
95087 + vma_m->vm_end += SEGMEXEC_TASK_SIZE;
95088 + vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
95089 + vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
95090 + if (vma_m->vm_file)
95091 + get_file(vma_m->vm_file);
95092 + if (vma_m->vm_ops && vma_m->vm_ops->open)
95093 + vma_m->vm_ops->open(vma_m);
95094 + BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
95095 + vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
95096 + vma_m->vm_mirror = vma;
95097 + vma->vm_mirror = vma_m;
95098 + return 0;
95099 +}
95100 +#endif
95101 +
95102 /*
95103 * Return true if the calling process may expand its vm space by the passed
95104 * number of pages
95105 @@ -2867,6 +3406,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
95106
95107 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
95108
95109 + gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
95110 if (cur + npages > lim)
95111 return 0;
95112 return 1;
95113 @@ -2937,6 +3477,22 @@ struct vm_area_struct *_install_special_mapping(struct mm_struct *mm,
95114 vma->vm_start = addr;
95115 vma->vm_end = addr + len;
95116
95117 +#ifdef CONFIG_PAX_MPROTECT
95118 + if (mm->pax_flags & MF_PAX_MPROTECT) {
95119 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
95120 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
95121 + return ERR_PTR(-EPERM);
95122 + if (!(vm_flags & VM_EXEC))
95123 + vm_flags &= ~VM_MAYEXEC;
95124 +#else
95125 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
95126 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
95127 +#endif
95128 + else
95129 + vm_flags &= ~VM_MAYWRITE;
95130 + }
95131 +#endif
95132 +
95133 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
95134 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
95135
95136 diff --git a/mm/mprotect.c b/mm/mprotect.c
95137 index c43d557..0b7ccd2 100644
95138 --- a/mm/mprotect.c
95139 +++ b/mm/mprotect.c
95140 @@ -24,10 +24,18 @@
95141 #include <linux/migrate.h>
95142 #include <linux/perf_event.h>
95143 #include <linux/ksm.h>
95144 +#include <linux/sched/sysctl.h>
95145 +
95146 +#ifdef CONFIG_PAX_MPROTECT
95147 +#include <linux/elf.h>
95148 +#include <linux/binfmts.h>
95149 +#endif
95150 +
95151 #include <asm/uaccess.h>
95152 #include <asm/pgtable.h>
95153 #include <asm/cacheflush.h>
95154 #include <asm/tlbflush.h>
95155 +#include <asm/mmu_context.h>
95156
95157 #ifndef pgprot_modify
95158 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
95159 @@ -256,6 +264,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
95160 return pages;
95161 }
95162
95163 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
95164 +/* called while holding the mmap semaphor for writing except stack expansion */
95165 +void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
95166 +{
95167 + unsigned long oldlimit, newlimit = 0UL;
95168 +
95169 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
95170 + return;
95171 +
95172 + spin_lock(&mm->page_table_lock);
95173 + oldlimit = mm->context.user_cs_limit;
95174 + if ((prot & VM_EXEC) && oldlimit < end)
95175 + /* USER_CS limit moved up */
95176 + newlimit = end;
95177 + else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
95178 + /* USER_CS limit moved down */
95179 + newlimit = start;
95180 +
95181 + if (newlimit) {
95182 + mm->context.user_cs_limit = newlimit;
95183 +
95184 +#ifdef CONFIG_SMP
95185 + wmb();
95186 + cpus_clear(mm->context.cpu_user_cs_mask);
95187 + cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
95188 +#endif
95189 +
95190 + set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
95191 + }
95192 + spin_unlock(&mm->page_table_lock);
95193 + if (newlimit == end) {
95194 + struct vm_area_struct *vma = find_vma(mm, oldlimit);
95195 +
95196 + for (; vma && vma->vm_start < end; vma = vma->vm_next)
95197 + if (is_vm_hugetlb_page(vma))
95198 + hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
95199 + else
95200 + change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
95201 + }
95202 +}
95203 +#endif
95204 +
95205 int
95206 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
95207 unsigned long start, unsigned long end, unsigned long newflags)
95208 @@ -268,11 +318,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
95209 int error;
95210 int dirty_accountable = 0;
95211
95212 +#ifdef CONFIG_PAX_SEGMEXEC
95213 + struct vm_area_struct *vma_m = NULL;
95214 + unsigned long start_m, end_m;
95215 +
95216 + start_m = start + SEGMEXEC_TASK_SIZE;
95217 + end_m = end + SEGMEXEC_TASK_SIZE;
95218 +#endif
95219 +
95220 if (newflags == oldflags) {
95221 *pprev = vma;
95222 return 0;
95223 }
95224
95225 + if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
95226 + struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
95227 +
95228 + if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
95229 + return -ENOMEM;
95230 +
95231 + if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
95232 + return -ENOMEM;
95233 + }
95234 +
95235 /*
95236 * If we make a private mapping writable we increase our commit;
95237 * but (without finer accounting) cannot reduce our commit if we
95238 @@ -289,6 +357,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
95239 }
95240 }
95241
95242 +#ifdef CONFIG_PAX_SEGMEXEC
95243 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
95244 + if (start != vma->vm_start) {
95245 + error = split_vma(mm, vma, start, 1);
95246 + if (error)
95247 + goto fail;
95248 + BUG_ON(!*pprev || (*pprev)->vm_next == vma);
95249 + *pprev = (*pprev)->vm_next;
95250 + }
95251 +
95252 + if (end != vma->vm_end) {
95253 + error = split_vma(mm, vma, end, 0);
95254 + if (error)
95255 + goto fail;
95256 + }
95257 +
95258 + if (pax_find_mirror_vma(vma)) {
95259 + error = __do_munmap(mm, start_m, end_m - start_m);
95260 + if (error)
95261 + goto fail;
95262 + } else {
95263 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
95264 + if (!vma_m) {
95265 + error = -ENOMEM;
95266 + goto fail;
95267 + }
95268 + vma->vm_flags = newflags;
95269 + error = pax_mirror_vma(vma_m, vma);
95270 + if (error) {
95271 + vma->vm_flags = oldflags;
95272 + goto fail;
95273 + }
95274 + }
95275 + }
95276 +#endif
95277 +
95278 /*
95279 * First try to merge with previous and/or next vma.
95280 */
95281 @@ -319,9 +423,21 @@ success:
95282 * vm_flags and vm_page_prot are protected by the mmap_sem
95283 * held in write mode.
95284 */
95285 +
95286 +#ifdef CONFIG_PAX_SEGMEXEC
95287 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
95288 + pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
95289 +#endif
95290 +
95291 vma->vm_flags = newflags;
95292 +
95293 +#ifdef CONFIG_PAX_MPROTECT
95294 + if (mm->binfmt && mm->binfmt->handle_mprotect)
95295 + mm->binfmt->handle_mprotect(vma, newflags);
95296 +#endif
95297 +
95298 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
95299 - vm_get_page_prot(newflags));
95300 + vm_get_page_prot(vma->vm_flags));
95301
95302 if (vma_wants_writenotify(vma)) {
95303 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
95304 @@ -360,6 +476,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
95305 end = start + len;
95306 if (end <= start)
95307 return -ENOMEM;
95308 +
95309 +#ifdef CONFIG_PAX_SEGMEXEC
95310 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
95311 + if (end > SEGMEXEC_TASK_SIZE)
95312 + return -EINVAL;
95313 + } else
95314 +#endif
95315 +
95316 + if (end > TASK_SIZE)
95317 + return -EINVAL;
95318 +
95319 if (!arch_validate_prot(prot))
95320 return -EINVAL;
95321
95322 @@ -367,7 +494,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
95323 /*
95324 * Does the application expect PROT_READ to imply PROT_EXEC:
95325 */
95326 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
95327 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
95328 prot |= PROT_EXEC;
95329
95330 vm_flags = calc_vm_prot_bits(prot);
95331 @@ -399,6 +526,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
95332 if (start > vma->vm_start)
95333 prev = vma;
95334
95335 +#ifdef CONFIG_PAX_MPROTECT
95336 + if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
95337 + current->mm->binfmt->handle_mprotect(vma, vm_flags);
95338 +#endif
95339 +
95340 for (nstart = start ; ; ) {
95341 unsigned long newflags;
95342
95343 @@ -409,6 +541,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
95344
95345 /* newflags >> 4 shift VM_MAY% in place of VM_% */
95346 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
95347 + if (prot & (PROT_WRITE | PROT_EXEC))
95348 + gr_log_rwxmprotect(vma);
95349 +
95350 + error = -EACCES;
95351 + goto out;
95352 + }
95353 +
95354 + if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
95355 error = -EACCES;
95356 goto out;
95357 }
95358 @@ -423,6 +563,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
95359 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
95360 if (error)
95361 goto out;
95362 +
95363 + track_exec_limit(current->mm, nstart, tmp, vm_flags);
95364 +
95365 nstart = tmp;
95366
95367 if (nstart < prev->vm_end)
95368 diff --git a/mm/mremap.c b/mm/mremap.c
95369 index 05f1180..c3cde48 100644
95370 --- a/mm/mremap.c
95371 +++ b/mm/mremap.c
95372 @@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
95373 continue;
95374 pte = ptep_get_and_clear(mm, old_addr, old_pte);
95375 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
95376 +
95377 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
95378 + if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
95379 + pte = pte_exprotect(pte);
95380 +#endif
95381 +
95382 pte = move_soft_dirty_pte(pte);
95383 set_pte_at(mm, new_addr, new_pte, pte);
95384 }
95385 @@ -344,6 +350,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
95386 if (is_vm_hugetlb_page(vma))
95387 goto Einval;
95388
95389 +#ifdef CONFIG_PAX_SEGMEXEC
95390 + if (pax_find_mirror_vma(vma))
95391 + goto Einval;
95392 +#endif
95393 +
95394 /* We can't remap across vm area boundaries */
95395 if (old_len > vma->vm_end - addr)
95396 goto Efault;
95397 @@ -399,20 +410,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
95398 unsigned long ret = -EINVAL;
95399 unsigned long charged = 0;
95400 unsigned long map_flags;
95401 + unsigned long pax_task_size = TASK_SIZE;
95402
95403 if (new_addr & ~PAGE_MASK)
95404 goto out;
95405
95406 - if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
95407 +#ifdef CONFIG_PAX_SEGMEXEC
95408 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
95409 + pax_task_size = SEGMEXEC_TASK_SIZE;
95410 +#endif
95411 +
95412 + pax_task_size -= PAGE_SIZE;
95413 +
95414 + if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
95415 goto out;
95416
95417 /* Check if the location we're moving into overlaps the
95418 * old location at all, and fail if it does.
95419 */
95420 - if ((new_addr <= addr) && (new_addr+new_len) > addr)
95421 - goto out;
95422 -
95423 - if ((addr <= new_addr) && (addr+old_len) > new_addr)
95424 + if (addr + old_len > new_addr && new_addr + new_len > addr)
95425 goto out;
95426
95427 ret = do_munmap(mm, new_addr, new_len);
95428 @@ -481,6 +497,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
95429 unsigned long ret = -EINVAL;
95430 unsigned long charged = 0;
95431 bool locked = false;
95432 + unsigned long pax_task_size = TASK_SIZE;
95433
95434 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
95435 return ret;
95436 @@ -502,6 +519,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
95437 if (!new_len)
95438 return ret;
95439
95440 +#ifdef CONFIG_PAX_SEGMEXEC
95441 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
95442 + pax_task_size = SEGMEXEC_TASK_SIZE;
95443 +#endif
95444 +
95445 + pax_task_size -= PAGE_SIZE;
95446 +
95447 + if (new_len > pax_task_size || addr > pax_task_size-new_len ||
95448 + old_len > pax_task_size || addr > pax_task_size-old_len)
95449 + return ret;
95450 +
95451 down_write(&current->mm->mmap_sem);
95452
95453 if (flags & MREMAP_FIXED) {
95454 @@ -552,6 +580,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
95455 new_addr = addr;
95456 }
95457 ret = addr;
95458 + track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
95459 goto out;
95460 }
95461 }
95462 @@ -575,7 +604,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
95463 goto out;
95464 }
95465
95466 + map_flags = vma->vm_flags;
95467 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
95468 + if (!(ret & ~PAGE_MASK)) {
95469 + track_exec_limit(current->mm, addr, addr + old_len, 0UL);
95470 + track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
95471 + }
95472 }
95473 out:
95474 if (ret & ~PAGE_MASK)
95475 diff --git a/mm/nommu.c b/mm/nommu.c
95476 index 431fd7c..8674512 100644
95477 --- a/mm/nommu.c
95478 +++ b/mm/nommu.c
95479 @@ -67,7 +67,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
95480 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
95481 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
95482 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
95483 -int heap_stack_gap = 0;
95484
95485 atomic_long_t mmap_pages_allocated;
95486
95487 @@ -854,15 +853,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
95488 EXPORT_SYMBOL(find_vma);
95489
95490 /*
95491 - * find a VMA
95492 - * - we don't extend stack VMAs under NOMMU conditions
95493 - */
95494 -struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
95495 -{
95496 - return find_vma(mm, addr);
95497 -}
95498 -
95499 -/*
95500 * expand a stack to a given address
95501 * - not supported under NOMMU conditions
95502 */
95503 @@ -1569,6 +1559,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
95504
95505 /* most fields are the same, copy all, and then fixup */
95506 *new = *vma;
95507 + INIT_LIST_HEAD(&new->anon_vma_chain);
95508 *region = *vma->vm_region;
95509 new->vm_region = region;
95510
95511 @@ -2004,8 +1995,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
95512 }
95513 EXPORT_SYMBOL(generic_file_remap_pages);
95514
95515 -static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
95516 - unsigned long addr, void *buf, int len, int write)
95517 +static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
95518 + unsigned long addr, void *buf, size_t len, int write)
95519 {
95520 struct vm_area_struct *vma;
95521
95522 @@ -2046,8 +2037,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
95523 *
95524 * The caller must hold a reference on @mm.
95525 */
95526 -int access_remote_vm(struct mm_struct *mm, unsigned long addr,
95527 - void *buf, int len, int write)
95528 +ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
95529 + void *buf, size_t len, int write)
95530 {
95531 return __access_remote_vm(NULL, mm, addr, buf, len, write);
95532 }
95533 @@ -2056,7 +2047,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
95534 * Access another process' address space.
95535 * - source/target buffer must be kernel space
95536 */
95537 -int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
95538 +ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
95539 {
95540 struct mm_struct *mm;
95541
95542 diff --git a/mm/page-writeback.c b/mm/page-writeback.c
95543 index 154af21..86e447f 100644
95544 --- a/mm/page-writeback.c
95545 +++ b/mm/page-writeback.c
95546 @@ -685,7 +685,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
95547 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
95548 * - the bdi dirty thresh drops quickly due to change of JBOD workload
95549 */
95550 -static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
95551 +static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
95552 unsigned long thresh,
95553 unsigned long bg_thresh,
95554 unsigned long dirty,
95555 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
95556 index d64f5f9..9005ab5 100644
95557 --- a/mm/page_alloc.c
95558 +++ b/mm/page_alloc.c
95559 @@ -61,6 +61,7 @@
95560 #include <linux/page-debug-flags.h>
95561 #include <linux/hugetlb.h>
95562 #include <linux/sched/rt.h>
95563 +#include <linux/random.h>
95564
95565 #include <asm/sections.h>
95566 #include <asm/tlbflush.h>
95567 @@ -356,7 +357,7 @@ out:
95568 * This usage means that zero-order pages may not be compound.
95569 */
95570
95571 -static void free_compound_page(struct page *page)
95572 +void free_compound_page(struct page *page)
95573 {
95574 __free_pages_ok(page, compound_order(page));
95575 }
95576 @@ -730,6 +731,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
95577 int i;
95578 int bad = 0;
95579
95580 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
95581 + unsigned long index = 1UL << order;
95582 +#endif
95583 +
95584 trace_mm_page_free(page, order);
95585 kmemcheck_free_shadow(page, order);
95586
95587 @@ -746,6 +751,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
95588 debug_check_no_obj_freed(page_address(page),
95589 PAGE_SIZE << order);
95590 }
95591 +
95592 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
95593 + for (; index; --index)
95594 + sanitize_highpage(page + index - 1);
95595 +#endif
95596 +
95597 arch_free_page(page, order);
95598 kernel_map_pages(page, 1 << order, 0);
95599
95600 @@ -768,6 +779,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
95601 local_irq_restore(flags);
95602 }
95603
95604 +#ifdef CONFIG_PAX_LATENT_ENTROPY
95605 +bool __meminitdata extra_latent_entropy;
95606 +
95607 +static int __init setup_pax_extra_latent_entropy(char *str)
95608 +{
95609 + extra_latent_entropy = true;
95610 + return 0;
95611 +}
95612 +early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
95613 +
95614 +volatile u64 latent_entropy __latent_entropy;
95615 +EXPORT_SYMBOL(latent_entropy);
95616 +#endif
95617 +
95618 void __init __free_pages_bootmem(struct page *page, unsigned int order)
95619 {
95620 unsigned int nr_pages = 1 << order;
95621 @@ -783,6 +808,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
95622 __ClearPageReserved(p);
95623 set_page_count(p, 0);
95624
95625 +#ifdef CONFIG_PAX_LATENT_ENTROPY
95626 + if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
95627 + u64 hash = 0;
95628 + size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
95629 + const u64 *data = lowmem_page_address(page);
95630 +
95631 + for (index = 0; index < end; index++)
95632 + hash ^= hash + data[index];
95633 + latent_entropy ^= hash;
95634 + add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
95635 + }
95636 +#endif
95637 +
95638 page_zone(page)->managed_pages += nr_pages;
95639 set_page_refcounted(page);
95640 __free_pages(page, order);
95641 @@ -911,8 +949,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
95642 arch_alloc_page(page, order);
95643 kernel_map_pages(page, 1 << order, 1);
95644
95645 +#ifndef CONFIG_PAX_MEMORY_SANITIZE
95646 if (gfp_flags & __GFP_ZERO)
95647 prep_zero_page(page, order, gfp_flags);
95648 +#endif
95649
95650 if (order && (gfp_flags & __GFP_COMP))
95651 prep_compound_page(page, order);
95652 @@ -2415,7 +2455,7 @@ static void reset_alloc_batches(struct zonelist *zonelist,
95653 continue;
95654 mod_zone_page_state(zone, NR_ALLOC_BATCH,
95655 high_wmark_pages(zone) - low_wmark_pages(zone) -
95656 - atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
95657 + atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
95658 }
95659 }
95660
95661 diff --git a/mm/page_io.c b/mm/page_io.c
95662 index 7c59ef6..1358905 100644
95663 --- a/mm/page_io.c
95664 +++ b/mm/page_io.c
95665 @@ -260,7 +260,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
95666 struct file *swap_file = sis->swap_file;
95667 struct address_space *mapping = swap_file->f_mapping;
95668 struct iovec iov = {
95669 - .iov_base = kmap(page),
95670 + .iov_base = (void __force_user *)kmap(page),
95671 .iov_len = PAGE_SIZE,
95672 };
95673
95674 diff --git a/mm/percpu.c b/mm/percpu.c
95675 index 2ddf9a9..f8fc075 100644
95676 --- a/mm/percpu.c
95677 +++ b/mm/percpu.c
95678 @@ -123,7 +123,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
95679 static unsigned int pcpu_high_unit_cpu __read_mostly;
95680
95681 /* the address of the first chunk which starts with the kernel static area */
95682 -void *pcpu_base_addr __read_mostly;
95683 +void *pcpu_base_addr __read_only;
95684 EXPORT_SYMBOL_GPL(pcpu_base_addr);
95685
95686 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
95687 diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
95688 index 8505c92..946bfc9 100644
95689 --- a/mm/process_vm_access.c
95690 +++ b/mm/process_vm_access.c
95691 @@ -13,6 +13,7 @@
95692 #include <linux/uio.h>
95693 #include <linux/sched.h>
95694 #include <linux/highmem.h>
95695 +#include <linux/security.h>
95696 #include <linux/ptrace.h>
95697 #include <linux/slab.h>
95698 #include <linux/syscalls.h>
95699 @@ -161,19 +162,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
95700 ssize_t iov_len;
95701 size_t total_len = iov_iter_count(iter);
95702
95703 + return -ENOSYS; // PaX: until properly audited
95704 +
95705 /*
95706 * Work out how many pages of struct pages we're going to need
95707 * when eventually calling get_user_pages
95708 */
95709 for (i = 0; i < riovcnt; i++) {
95710 iov_len = rvec[i].iov_len;
95711 - if (iov_len > 0) {
95712 - nr_pages_iov = ((unsigned long)rvec[i].iov_base
95713 - + iov_len)
95714 - / PAGE_SIZE - (unsigned long)rvec[i].iov_base
95715 - / PAGE_SIZE + 1;
95716 - nr_pages = max(nr_pages, nr_pages_iov);
95717 - }
95718 + if (iov_len <= 0)
95719 + continue;
95720 + nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
95721 + (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
95722 + nr_pages = max(nr_pages, nr_pages_iov);
95723 }
95724
95725 if (nr_pages == 0)
95726 @@ -201,6 +202,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
95727 goto free_proc_pages;
95728 }
95729
95730 + if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
95731 + rc = -EPERM;
95732 + goto put_task_struct;
95733 + }
95734 +
95735 mm = mm_access(task, PTRACE_MODE_ATTACH);
95736 if (!mm || IS_ERR(mm)) {
95737 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
95738 diff --git a/mm/rmap.c b/mm/rmap.c
95739 index 14d1e28..3777962 100644
95740 --- a/mm/rmap.c
95741 +++ b/mm/rmap.c
95742 @@ -164,6 +164,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
95743 struct anon_vma *anon_vma = vma->anon_vma;
95744 struct anon_vma_chain *avc;
95745
95746 +#ifdef CONFIG_PAX_SEGMEXEC
95747 + struct anon_vma_chain *avc_m = NULL;
95748 +#endif
95749 +
95750 might_sleep();
95751 if (unlikely(!anon_vma)) {
95752 struct mm_struct *mm = vma->vm_mm;
95753 @@ -173,6 +177,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
95754 if (!avc)
95755 goto out_enomem;
95756
95757 +#ifdef CONFIG_PAX_SEGMEXEC
95758 + avc_m = anon_vma_chain_alloc(GFP_KERNEL);
95759 + if (!avc_m)
95760 + goto out_enomem_free_avc;
95761 +#endif
95762 +
95763 anon_vma = find_mergeable_anon_vma(vma);
95764 allocated = NULL;
95765 if (!anon_vma) {
95766 @@ -186,6 +196,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
95767 /* page_table_lock to protect against threads */
95768 spin_lock(&mm->page_table_lock);
95769 if (likely(!vma->anon_vma)) {
95770 +
95771 +#ifdef CONFIG_PAX_SEGMEXEC
95772 + struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
95773 +
95774 + if (vma_m) {
95775 + BUG_ON(vma_m->anon_vma);
95776 + vma_m->anon_vma = anon_vma;
95777 + anon_vma_chain_link(vma_m, avc_m, anon_vma);
95778 + avc_m = NULL;
95779 + }
95780 +#endif
95781 +
95782 vma->anon_vma = anon_vma;
95783 anon_vma_chain_link(vma, avc, anon_vma);
95784 allocated = NULL;
95785 @@ -196,12 +218,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
95786
95787 if (unlikely(allocated))
95788 put_anon_vma(allocated);
95789 +
95790 +#ifdef CONFIG_PAX_SEGMEXEC
95791 + if (unlikely(avc_m))
95792 + anon_vma_chain_free(avc_m);
95793 +#endif
95794 +
95795 if (unlikely(avc))
95796 anon_vma_chain_free(avc);
95797 }
95798 return 0;
95799
95800 out_enomem_free_avc:
95801 +
95802 +#ifdef CONFIG_PAX_SEGMEXEC
95803 + if (avc_m)
95804 + anon_vma_chain_free(avc_m);
95805 +#endif
95806 +
95807 anon_vma_chain_free(avc);
95808 out_enomem:
95809 return -ENOMEM;
95810 @@ -237,7 +271,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
95811 * Attach the anon_vmas from src to dst.
95812 * Returns 0 on success, -ENOMEM on failure.
95813 */
95814 -int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
95815 +int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
95816 {
95817 struct anon_vma_chain *avc, *pavc;
95818 struct anon_vma *root = NULL;
95819 @@ -270,7 +304,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
95820 * the corresponding VMA in the parent process is attached to.
95821 * Returns 0 on success, non-zero on failure.
95822 */
95823 -int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
95824 +int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
95825 {
95826 struct anon_vma_chain *avc;
95827 struct anon_vma *anon_vma;
95828 @@ -374,8 +408,10 @@ static void anon_vma_ctor(void *data)
95829 void __init anon_vma_init(void)
95830 {
95831 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
95832 - 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
95833 - anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
95834 + 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
95835 + anon_vma_ctor);
95836 + anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
95837 + SLAB_PANIC|SLAB_NO_SANITIZE);
95838 }
95839
95840 /*
95841 diff --git a/mm/shmem.c b/mm/shmem.c
95842 index a2801ba..b8651e6 100644
95843 --- a/mm/shmem.c
95844 +++ b/mm/shmem.c
95845 @@ -33,7 +33,7 @@
95846 #include <linux/swap.h>
95847 #include <linux/aio.h>
95848
95849 -static struct vfsmount *shm_mnt;
95850 +struct vfsmount *shm_mnt;
95851
95852 #ifdef CONFIG_SHMEM
95853 /*
95854 @@ -77,14 +77,15 @@ static struct vfsmount *shm_mnt;
95855 #define BOGO_DIRENT_SIZE 20
95856
95857 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
95858 -#define SHORT_SYMLINK_LEN 128
95859 +#define SHORT_SYMLINK_LEN 64
95860
95861 /*
95862 - * shmem_fallocate and shmem_writepage communicate via inode->i_private
95863 - * (with i_mutex making sure that it has only one user at a time):
95864 - * we would prefer not to enlarge the shmem inode just for that.
95865 + * shmem_fallocate communicates with shmem_fault or shmem_writepage via
95866 + * inode->i_private (with i_mutex making sure that it has only one user at
95867 + * a time): we would prefer not to enlarge the shmem inode just for that.
95868 */
95869 struct shmem_falloc {
95870 + int mode; /* FALLOC_FL mode currently operating */
95871 pgoff_t start; /* start of range currently being fallocated */
95872 pgoff_t next; /* the next page offset to be fallocated */
95873 pgoff_t nr_falloced; /* how many new pages have been fallocated */
95874 @@ -759,6 +760,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
95875 spin_lock(&inode->i_lock);
95876 shmem_falloc = inode->i_private;
95877 if (shmem_falloc &&
95878 + !shmem_falloc->mode &&
95879 index >= shmem_falloc->start &&
95880 index < shmem_falloc->next)
95881 shmem_falloc->nr_unswapped++;
95882 @@ -1233,6 +1235,43 @@ static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
95883 int error;
95884 int ret = VM_FAULT_LOCKED;
95885
95886 + /*
95887 + * Trinity finds that probing a hole which tmpfs is punching can
95888 + * prevent the hole-punch from ever completing: which in turn
95889 + * locks writers out with its hold on i_mutex. So refrain from
95890 + * faulting pages into the hole while it's being punched, and
95891 + * wait on i_mutex to be released if vmf->flags permits,
95892 + */
95893 + if (unlikely(inode->i_private)) {
95894 + struct shmem_falloc *shmem_falloc;
95895 + spin_lock(&inode->i_lock);
95896 + shmem_falloc = inode->i_private;
95897 + if (!shmem_falloc ||
95898 + shmem_falloc->mode != FALLOC_FL_PUNCH_HOLE ||
95899 + vmf->pgoff < shmem_falloc->start ||
95900 + vmf->pgoff >= shmem_falloc->next)
95901 + shmem_falloc = NULL;
95902 + spin_unlock(&inode->i_lock);
95903 + /*
95904 + * i_lock has protected us from taking shmem_falloc seriously
95905 + * once return from shmem_fallocate() went back up that stack.
95906 + * i_lock does not serialize with i_mutex at all, but it does
95907 + * not matter if sometimes we wait unnecessarily, or sometimes
95908 + * miss out on waiting: we just need to make those cases rare.
95909 + */
95910 + if (shmem_falloc) {
95911 + if ((vmf->flags & FAULT_FLAG_ALLOW_RETRY) &&
95912 + !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) {
95913 + up_read(&vma->vm_mm->mmap_sem);
95914 + mutex_lock(&inode->i_mutex);
95915 + mutex_unlock(&inode->i_mutex);
95916 + return VM_FAULT_RETRY;
95917 + }
95918 + /* cond_resched? Leave that to GUP or return to user */
95919 + return VM_FAULT_NOPAGE;
95920 + }
95921 + }
95922 +
95923 error = shmem_getpage(inode, vmf->pgoff, &vmf->page, SGP_CACHE, &ret);
95924 if (error)
95925 return ((error == -ENOMEM) ? VM_FAULT_OOM : VM_FAULT_SIGBUS);
95926 @@ -1733,18 +1772,26 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,
95927
95928 mutex_lock(&inode->i_mutex);
95929
95930 + shmem_falloc.mode = mode & ~FALLOC_FL_KEEP_SIZE;
95931 +
95932 if (mode & FALLOC_FL_PUNCH_HOLE) {
95933 struct address_space *mapping = file->f_mapping;
95934 loff_t unmap_start = round_up(offset, PAGE_SIZE);
95935 loff_t unmap_end = round_down(offset + len, PAGE_SIZE) - 1;
95936
95937 + shmem_falloc.start = unmap_start >> PAGE_SHIFT;
95938 + shmem_falloc.next = (unmap_end + 1) >> PAGE_SHIFT;
95939 + spin_lock(&inode->i_lock);
95940 + inode->i_private = &shmem_falloc;
95941 + spin_unlock(&inode->i_lock);
95942 +
95943 if ((u64)unmap_end > (u64)unmap_start)
95944 unmap_mapping_range(mapping, unmap_start,
95945 1 + unmap_end - unmap_start, 0);
95946 shmem_truncate_range(inode, offset, offset + len - 1);
95947 /* No need to unmap again: hole-punching leaves COWed pages */
95948 error = 0;
95949 - goto out;
95950 + goto undone;
95951 }
95952
95953 /* We need to check rlimit even when FALLOC_FL_KEEP_SIZE */
95954 @@ -2138,6 +2185,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
95955 static int shmem_xattr_validate(const char *name)
95956 {
95957 struct { const char *prefix; size_t len; } arr[] = {
95958 +
95959 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
95960 + { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
95961 +#endif
95962 +
95963 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
95964 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
95965 };
95966 @@ -2193,6 +2245,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
95967 if (err)
95968 return err;
95969
95970 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
95971 + if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
95972 + if (strcmp(name, XATTR_NAME_PAX_FLAGS))
95973 + return -EOPNOTSUPP;
95974 + if (size > 8)
95975 + return -EINVAL;
95976 + }
95977 +#endif
95978 +
95979 return simple_xattr_set(&info->xattrs, name, value, size, flags);
95980 }
95981
95982 @@ -2505,8 +2566,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
95983 int err = -ENOMEM;
95984
95985 /* Round up to L1_CACHE_BYTES to resist false sharing */
95986 - sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
95987 - L1_CACHE_BYTES), GFP_KERNEL);
95988 + sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
95989 if (!sbinfo)
95990 return -ENOMEM;
95991
95992 diff --git a/mm/slab.c b/mm/slab.c
95993 index 9432556..e0dc685 100644
95994 --- a/mm/slab.c
95995 +++ b/mm/slab.c
95996 @@ -311,10 +311,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
95997 if ((x)->max_freeable < i) \
95998 (x)->max_freeable = i; \
95999 } while (0)
96000 -#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
96001 -#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
96002 -#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
96003 -#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
96004 +#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
96005 +#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
96006 +#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
96007 +#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
96008 +#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
96009 +#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
96010 #else
96011 #define STATS_INC_ACTIVE(x) do { } while (0)
96012 #define STATS_DEC_ACTIVE(x) do { } while (0)
96013 @@ -331,6 +333,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
96014 #define STATS_INC_ALLOCMISS(x) do { } while (0)
96015 #define STATS_INC_FREEHIT(x) do { } while (0)
96016 #define STATS_INC_FREEMISS(x) do { } while (0)
96017 +#define STATS_INC_SANITIZED(x) do { } while (0)
96018 +#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
96019 #endif
96020
96021 #if DEBUG
96022 @@ -447,7 +451,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
96023 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
96024 */
96025 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
96026 - const struct page *page, void *obj)
96027 + const struct page *page, const void *obj)
96028 {
96029 u32 offset = (obj - page->s_mem);
96030 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
96031 @@ -1558,12 +1562,12 @@ void __init kmem_cache_init(void)
96032 */
96033
96034 kmalloc_caches[INDEX_AC] = create_kmalloc_cache("kmalloc-ac",
96035 - kmalloc_size(INDEX_AC), ARCH_KMALLOC_FLAGS);
96036 + kmalloc_size(INDEX_AC), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
96037
96038 if (INDEX_AC != INDEX_NODE)
96039 kmalloc_caches[INDEX_NODE] =
96040 create_kmalloc_cache("kmalloc-node",
96041 - kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
96042 + kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
96043
96044 slab_early_init = 0;
96045
96046 @@ -3525,6 +3529,21 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
96047 struct array_cache *ac = cpu_cache_get(cachep);
96048
96049 check_irq_off();
96050 +
96051 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
96052 + if (pax_sanitize_slab) {
96053 + if (!(cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))) {
96054 + memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
96055 +
96056 + if (cachep->ctor)
96057 + cachep->ctor(objp);
96058 +
96059 + STATS_INC_SANITIZED(cachep);
96060 + } else
96061 + STATS_INC_NOT_SANITIZED(cachep);
96062 + }
96063 +#endif
96064 +
96065 kmemleak_free_recursive(objp, cachep->flags);
96066 objp = cache_free_debugcheck(cachep, objp, caller);
96067
96068 @@ -3748,6 +3767,7 @@ void kfree(const void *objp)
96069
96070 if (unlikely(ZERO_OR_NULL_PTR(objp)))
96071 return;
96072 + VM_BUG_ON(!virt_addr_valid(objp));
96073 local_irq_save(flags);
96074 kfree_debugcheck(objp);
96075 c = virt_to_cache(objp);
96076 @@ -4189,14 +4209,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
96077 }
96078 /* cpu stats */
96079 {
96080 - unsigned long allochit = atomic_read(&cachep->allochit);
96081 - unsigned long allocmiss = atomic_read(&cachep->allocmiss);
96082 - unsigned long freehit = atomic_read(&cachep->freehit);
96083 - unsigned long freemiss = atomic_read(&cachep->freemiss);
96084 + unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
96085 + unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
96086 + unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
96087 + unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
96088
96089 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
96090 allochit, allocmiss, freehit, freemiss);
96091 }
96092 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
96093 + {
96094 + unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
96095 + unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
96096 +
96097 + seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
96098 + }
96099 +#endif
96100 #endif
96101 }
96102
96103 @@ -4417,13 +4445,69 @@ static const struct file_operations proc_slabstats_operations = {
96104 static int __init slab_proc_init(void)
96105 {
96106 #ifdef CONFIG_DEBUG_SLAB_LEAK
96107 - proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
96108 + proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
96109 #endif
96110 return 0;
96111 }
96112 module_init(slab_proc_init);
96113 #endif
96114
96115 +bool is_usercopy_object(const void *ptr)
96116 +{
96117 + struct page *page;
96118 + struct kmem_cache *cachep;
96119 +
96120 + if (ZERO_OR_NULL_PTR(ptr))
96121 + return false;
96122 +
96123 + if (!slab_is_available())
96124 + return false;
96125 +
96126 + if (!virt_addr_valid(ptr))
96127 + return false;
96128 +
96129 + page = virt_to_head_page(ptr);
96130 +
96131 + if (!PageSlab(page))
96132 + return false;
96133 +
96134 + cachep = page->slab_cache;
96135 + return cachep->flags & SLAB_USERCOPY;
96136 +}
96137 +
96138 +#ifdef CONFIG_PAX_USERCOPY
96139 +const char *check_heap_object(const void *ptr, unsigned long n)
96140 +{
96141 + struct page *page;
96142 + struct kmem_cache *cachep;
96143 + unsigned int objnr;
96144 + unsigned long offset;
96145 +
96146 + if (ZERO_OR_NULL_PTR(ptr))
96147 + return "<null>";
96148 +
96149 + if (!virt_addr_valid(ptr))
96150 + return NULL;
96151 +
96152 + page = virt_to_head_page(ptr);
96153 +
96154 + if (!PageSlab(page))
96155 + return NULL;
96156 +
96157 + cachep = page->slab_cache;
96158 + if (!(cachep->flags & SLAB_USERCOPY))
96159 + return cachep->name;
96160 +
96161 + objnr = obj_to_index(cachep, page, ptr);
96162 + BUG_ON(objnr >= cachep->num);
96163 + offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
96164 + if (offset <= cachep->object_size && n <= cachep->object_size - offset)
96165 + return NULL;
96166 +
96167 + return cachep->name;
96168 +}
96169 +#endif
96170 +
96171 /**
96172 * ksize - get the actual amount of memory allocated for a given object
96173 * @objp: Pointer to the object
96174 diff --git a/mm/slab.h b/mm/slab.h
96175 index 6bd4c35..97565a1 100644
96176 --- a/mm/slab.h
96177 +++ b/mm/slab.h
96178 @@ -32,6 +32,15 @@ extern struct list_head slab_caches;
96179 /* The slab cache that manages slab cache information */
96180 extern struct kmem_cache *kmem_cache;
96181
96182 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
96183 +#ifdef CONFIG_X86_64
96184 +#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
96185 +#else
96186 +#define PAX_MEMORY_SANITIZE_VALUE '\xff'
96187 +#endif
96188 +extern bool pax_sanitize_slab;
96189 +#endif
96190 +
96191 unsigned long calculate_alignment(unsigned long flags,
96192 unsigned long align, unsigned long size);
96193
96194 @@ -67,7 +76,8 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
96195
96196 /* Legal flag mask for kmem_cache_create(), for various configurations */
96197 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
96198 - SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
96199 + SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
96200 + SLAB_USERCOPY | SLAB_NO_SANITIZE)
96201
96202 #if defined(CONFIG_DEBUG_SLAB)
96203 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
96204 @@ -245,6 +255,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
96205 return s;
96206
96207 page = virt_to_head_page(x);
96208 +
96209 + BUG_ON(!PageSlab(page));
96210 +
96211 cachep = page->slab_cache;
96212 if (slab_equal_or_root(cachep, s))
96213 return cachep;
96214 diff --git a/mm/slab_common.c b/mm/slab_common.c
96215 index 102cc6f..c7aab3d 100644
96216 --- a/mm/slab_common.c
96217 +++ b/mm/slab_common.c
96218 @@ -23,11 +23,22 @@
96219
96220 #include "slab.h"
96221
96222 -enum slab_state slab_state;
96223 +enum slab_state slab_state __read_only;
96224 LIST_HEAD(slab_caches);
96225 DEFINE_MUTEX(slab_mutex);
96226 struct kmem_cache *kmem_cache;
96227
96228 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
96229 +bool pax_sanitize_slab __read_only = true;
96230 +static int __init pax_sanitize_slab_setup(char *str)
96231 +{
96232 + pax_sanitize_slab = !!simple_strtol(str, NULL, 0);
96233 + printk("%sabled PaX slab sanitization\n", pax_sanitize_slab ? "En" : "Dis");
96234 + return 1;
96235 +}
96236 +__setup("pax_sanitize_slab=", pax_sanitize_slab_setup);
96237 +#endif
96238 +
96239 #ifdef CONFIG_DEBUG_VM
96240 static int kmem_cache_sanity_check(const char *name, size_t size)
96241 {
96242 @@ -158,7 +169,7 @@ do_kmem_cache_create(char *name, size_t object_size, size_t size, size_t align,
96243 if (err)
96244 goto out_free_cache;
96245
96246 - s->refcount = 1;
96247 + atomic_set(&s->refcount, 1);
96248 list_add(&s->list, &slab_caches);
96249 memcg_register_cache(s);
96250 out:
96251 @@ -334,8 +345,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
96252 get_online_cpus();
96253 mutex_lock(&slab_mutex);
96254
96255 - s->refcount--;
96256 - if (s->refcount)
96257 + if (!atomic_dec_and_test(&s->refcount))
96258 goto out_unlock;
96259
96260 if (kmem_cache_destroy_memcg_children(s) != 0)
96261 @@ -358,7 +368,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
96262 rcu_barrier();
96263
96264 memcg_free_cache_params(s);
96265 -#ifdef SLAB_SUPPORTS_SYSFS
96266 +#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96267 sysfs_slab_remove(s);
96268 #else
96269 slab_kmem_cache_release(s);
96270 @@ -393,7 +403,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
96271 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
96272 name, size, err);
96273
96274 - s->refcount = -1; /* Exempt from merging for now */
96275 + atomic_set(&s->refcount, -1); /* Exempt from merging for now */
96276 }
96277
96278 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
96279 @@ -406,7 +416,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
96280
96281 create_boot_cache(s, name, size, flags);
96282 list_add(&s->list, &slab_caches);
96283 - s->refcount = 1;
96284 + atomic_set(&s->refcount, 1);
96285 return s;
96286 }
96287
96288 @@ -418,6 +428,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
96289 EXPORT_SYMBOL(kmalloc_dma_caches);
96290 #endif
96291
96292 +#ifdef CONFIG_PAX_USERCOPY_SLABS
96293 +struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
96294 +EXPORT_SYMBOL(kmalloc_usercopy_caches);
96295 +#endif
96296 +
96297 /*
96298 * Conversion table for small slabs sizes / 8 to the index in the
96299 * kmalloc array. This is necessary for slabs < 192 since we have non power
96300 @@ -482,6 +497,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
96301 return kmalloc_dma_caches[index];
96302
96303 #endif
96304 +
96305 +#ifdef CONFIG_PAX_USERCOPY_SLABS
96306 + if (unlikely((flags & GFP_USERCOPY)))
96307 + return kmalloc_usercopy_caches[index];
96308 +
96309 +#endif
96310 +
96311 return kmalloc_caches[index];
96312 }
96313
96314 @@ -538,7 +560,7 @@ void __init create_kmalloc_caches(unsigned long flags)
96315 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
96316 if (!kmalloc_caches[i]) {
96317 kmalloc_caches[i] = create_kmalloc_cache(NULL,
96318 - 1 << i, flags);
96319 + 1 << i, SLAB_USERCOPY | flags);
96320 }
96321
96322 /*
96323 @@ -547,10 +569,10 @@ void __init create_kmalloc_caches(unsigned long flags)
96324 * earlier power of two caches
96325 */
96326 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
96327 - kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
96328 + kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
96329
96330 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
96331 - kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
96332 + kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
96333 }
96334
96335 /* Kmalloc array is now usable */
96336 @@ -583,6 +605,23 @@ void __init create_kmalloc_caches(unsigned long flags)
96337 }
96338 }
96339 #endif
96340 +
96341 +#ifdef CONFIG_PAX_USERCOPY_SLABS
96342 + for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
96343 + struct kmem_cache *s = kmalloc_caches[i];
96344 +
96345 + if (s) {
96346 + int size = kmalloc_size(i);
96347 + char *n = kasprintf(GFP_NOWAIT,
96348 + "usercopy-kmalloc-%d", size);
96349 +
96350 + BUG_ON(!n);
96351 + kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
96352 + size, SLAB_USERCOPY | flags);
96353 + }
96354 + }
96355 +#endif
96356 +
96357 }
96358 #endif /* !CONFIG_SLOB */
96359
96360 @@ -623,6 +662,9 @@ void print_slabinfo_header(struct seq_file *m)
96361 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
96362 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
96363 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
96364 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
96365 + seq_puts(m, " : pax <sanitized> <not_sanitized>");
96366 +#endif
96367 #endif
96368 seq_putc(m, '\n');
96369 }
96370 diff --git a/mm/slob.c b/mm/slob.c
96371 index 730cad4..8cfd442 100644
96372 --- a/mm/slob.c
96373 +++ b/mm/slob.c
96374 @@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
96375 /*
96376 * Return the size of a slob block.
96377 */
96378 -static slobidx_t slob_units(slob_t *s)
96379 +static slobidx_t slob_units(const slob_t *s)
96380 {
96381 if (s->units > 0)
96382 return s->units;
96383 @@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
96384 /*
96385 * Return the next free slob block pointer after this one.
96386 */
96387 -static slob_t *slob_next(slob_t *s)
96388 +static slob_t *slob_next(const slob_t *s)
96389 {
96390 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
96391 slobidx_t next;
96392 @@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
96393 /*
96394 * Returns true if s is the last free block in its page.
96395 */
96396 -static int slob_last(slob_t *s)
96397 +static int slob_last(const slob_t *s)
96398 {
96399 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
96400 }
96401
96402 -static void *slob_new_pages(gfp_t gfp, int order, int node)
96403 +static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
96404 {
96405 - void *page;
96406 + struct page *page;
96407
96408 #ifdef CONFIG_NUMA
96409 if (node != NUMA_NO_NODE)
96410 @@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
96411 if (!page)
96412 return NULL;
96413
96414 - return page_address(page);
96415 + __SetPageSlab(page);
96416 + return page;
96417 }
96418
96419 -static void slob_free_pages(void *b, int order)
96420 +static void slob_free_pages(struct page *sp, int order)
96421 {
96422 if (current->reclaim_state)
96423 current->reclaim_state->reclaimed_slab += 1 << order;
96424 - free_pages((unsigned long)b, order);
96425 + __ClearPageSlab(sp);
96426 + page_mapcount_reset(sp);
96427 + sp->private = 0;
96428 + __free_pages(sp, order);
96429 }
96430
96431 /*
96432 @@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
96433
96434 /* Not enough space: must allocate a new page */
96435 if (!b) {
96436 - b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
96437 - if (!b)
96438 + sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
96439 + if (!sp)
96440 return NULL;
96441 - sp = virt_to_page(b);
96442 - __SetPageSlab(sp);
96443 + b = page_address(sp);
96444
96445 spin_lock_irqsave(&slob_lock, flags);
96446 sp->units = SLOB_UNITS(PAGE_SIZE);
96447 sp->freelist = b;
96448 + sp->private = 0;
96449 INIT_LIST_HEAD(&sp->lru);
96450 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
96451 set_slob_page_free(sp, slob_list);
96452 @@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
96453 if (slob_page_free(sp))
96454 clear_slob_page_free(sp);
96455 spin_unlock_irqrestore(&slob_lock, flags);
96456 - __ClearPageSlab(sp);
96457 - page_mapcount_reset(sp);
96458 - slob_free_pages(b, 0);
96459 + slob_free_pages(sp, 0);
96460 return;
96461 }
96462
96463 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
96464 + if (pax_sanitize_slab)
96465 + memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
96466 +#endif
96467 +
96468 if (!slob_page_free(sp)) {
96469 /* This slob page is about to become partially free. Easy! */
96470 sp->units = units;
96471 @@ -424,11 +431,10 @@ out:
96472 */
96473
96474 static __always_inline void *
96475 -__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
96476 +__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
96477 {
96478 - unsigned int *m;
96479 - int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
96480 - void *ret;
96481 + slob_t *m;
96482 + void *ret = NULL;
96483
96484 gfp &= gfp_allowed_mask;
96485
96486 @@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
96487
96488 if (!m)
96489 return NULL;
96490 - *m = size;
96491 + BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
96492 + BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
96493 + m[0].units = size;
96494 + m[1].units = align;
96495 ret = (void *)m + align;
96496
96497 trace_kmalloc_node(caller, ret,
96498 size, size + align, gfp, node);
96499 } else {
96500 unsigned int order = get_order(size);
96501 + struct page *page;
96502
96503 if (likely(order))
96504 gfp |= __GFP_COMP;
96505 - ret = slob_new_pages(gfp, order, node);
96506 + page = slob_new_pages(gfp, order, node);
96507 + if (page) {
96508 + ret = page_address(page);
96509 + page->private = size;
96510 + }
96511
96512 trace_kmalloc_node(caller, ret,
96513 size, PAGE_SIZE << order, gfp, node);
96514 }
96515
96516 - kmemleak_alloc(ret, size, 1, gfp);
96517 + return ret;
96518 +}
96519 +
96520 +static __always_inline void *
96521 +__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
96522 +{
96523 + int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
96524 + void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
96525 +
96526 + if (!ZERO_OR_NULL_PTR(ret))
96527 + kmemleak_alloc(ret, size, 1, gfp);
96528 return ret;
96529 }
96530
96531 @@ -493,34 +517,112 @@ void kfree(const void *block)
96532 return;
96533 kmemleak_free(block);
96534
96535 + VM_BUG_ON(!virt_addr_valid(block));
96536 sp = virt_to_page(block);
96537 - if (PageSlab(sp)) {
96538 + VM_BUG_ON(!PageSlab(sp));
96539 + if (!sp->private) {
96540 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
96541 - unsigned int *m = (unsigned int *)(block - align);
96542 - slob_free(m, *m + align);
96543 - } else
96544 + slob_t *m = (slob_t *)(block - align);
96545 + slob_free(m, m[0].units + align);
96546 + } else {
96547 + __ClearPageSlab(sp);
96548 + page_mapcount_reset(sp);
96549 + sp->private = 0;
96550 __free_pages(sp, compound_order(sp));
96551 + }
96552 }
96553 EXPORT_SYMBOL(kfree);
96554
96555 +bool is_usercopy_object(const void *ptr)
96556 +{
96557 + if (!slab_is_available())
96558 + return false;
96559 +
96560 + // PAX: TODO
96561 +
96562 + return false;
96563 +}
96564 +
96565 +#ifdef CONFIG_PAX_USERCOPY
96566 +const char *check_heap_object(const void *ptr, unsigned long n)
96567 +{
96568 + struct page *page;
96569 + const slob_t *free;
96570 + const void *base;
96571 + unsigned long flags;
96572 +
96573 + if (ZERO_OR_NULL_PTR(ptr))
96574 + return "<null>";
96575 +
96576 + if (!virt_addr_valid(ptr))
96577 + return NULL;
96578 +
96579 + page = virt_to_head_page(ptr);
96580 + if (!PageSlab(page))
96581 + return NULL;
96582 +
96583 + if (page->private) {
96584 + base = page;
96585 + if (base <= ptr && n <= page->private - (ptr - base))
96586 + return NULL;
96587 + return "<slob>";
96588 + }
96589 +
96590 + /* some tricky double walking to find the chunk */
96591 + spin_lock_irqsave(&slob_lock, flags);
96592 + base = (void *)((unsigned long)ptr & PAGE_MASK);
96593 + free = page->freelist;
96594 +
96595 + while (!slob_last(free) && (void *)free <= ptr) {
96596 + base = free + slob_units(free);
96597 + free = slob_next(free);
96598 + }
96599 +
96600 + while (base < (void *)free) {
96601 + slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
96602 + int size = SLOB_UNIT * SLOB_UNITS(m + align);
96603 + int offset;
96604 +
96605 + if (ptr < base + align)
96606 + break;
96607 +
96608 + offset = ptr - base - align;
96609 + if (offset >= m) {
96610 + base += size;
96611 + continue;
96612 + }
96613 +
96614 + if (n > m - offset)
96615 + break;
96616 +
96617 + spin_unlock_irqrestore(&slob_lock, flags);
96618 + return NULL;
96619 + }
96620 +
96621 + spin_unlock_irqrestore(&slob_lock, flags);
96622 + return "<slob>";
96623 +}
96624 +#endif
96625 +
96626 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
96627 size_t ksize(const void *block)
96628 {
96629 struct page *sp;
96630 int align;
96631 - unsigned int *m;
96632 + slob_t *m;
96633
96634 BUG_ON(!block);
96635 if (unlikely(block == ZERO_SIZE_PTR))
96636 return 0;
96637
96638 sp = virt_to_page(block);
96639 - if (unlikely(!PageSlab(sp)))
96640 - return PAGE_SIZE << compound_order(sp);
96641 + VM_BUG_ON(!PageSlab(sp));
96642 + if (sp->private)
96643 + return sp->private;
96644
96645 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
96646 - m = (unsigned int *)(block - align);
96647 - return SLOB_UNITS(*m) * SLOB_UNIT;
96648 + m = (slob_t *)(block - align);
96649 + return SLOB_UNITS(m[0].units) * SLOB_UNIT;
96650 }
96651 EXPORT_SYMBOL(ksize);
96652
96653 @@ -536,23 +638,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
96654
96655 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
96656 {
96657 - void *b;
96658 + void *b = NULL;
96659
96660 flags &= gfp_allowed_mask;
96661
96662 lockdep_trace_alloc(flags);
96663
96664 +#ifdef CONFIG_PAX_USERCOPY_SLABS
96665 + b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
96666 +#else
96667 if (c->size < PAGE_SIZE) {
96668 b = slob_alloc(c->size, flags, c->align, node);
96669 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
96670 SLOB_UNITS(c->size) * SLOB_UNIT,
96671 flags, node);
96672 } else {
96673 - b = slob_new_pages(flags, get_order(c->size), node);
96674 + struct page *sp;
96675 +
96676 + sp = slob_new_pages(flags, get_order(c->size), node);
96677 + if (sp) {
96678 + b = page_address(sp);
96679 + sp->private = c->size;
96680 + }
96681 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
96682 PAGE_SIZE << get_order(c->size),
96683 flags, node);
96684 }
96685 +#endif
96686
96687 if (b && c->ctor)
96688 c->ctor(b);
96689 @@ -584,10 +696,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
96690
96691 static void __kmem_cache_free(void *b, int size)
96692 {
96693 - if (size < PAGE_SIZE)
96694 + struct page *sp;
96695 +
96696 + sp = virt_to_page(b);
96697 + BUG_ON(!PageSlab(sp));
96698 + if (!sp->private)
96699 slob_free(b, size);
96700 else
96701 - slob_free_pages(b, get_order(size));
96702 + slob_free_pages(sp, get_order(size));
96703 }
96704
96705 static void kmem_rcu_free(struct rcu_head *head)
96706 @@ -600,17 +716,31 @@ static void kmem_rcu_free(struct rcu_head *head)
96707
96708 void kmem_cache_free(struct kmem_cache *c, void *b)
96709 {
96710 + int size = c->size;
96711 +
96712 +#ifdef CONFIG_PAX_USERCOPY_SLABS
96713 + if (size + c->align < PAGE_SIZE) {
96714 + size += c->align;
96715 + b -= c->align;
96716 + }
96717 +#endif
96718 +
96719 kmemleak_free_recursive(b, c->flags);
96720 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
96721 struct slob_rcu *slob_rcu;
96722 - slob_rcu = b + (c->size - sizeof(struct slob_rcu));
96723 - slob_rcu->size = c->size;
96724 + slob_rcu = b + (size - sizeof(struct slob_rcu));
96725 + slob_rcu->size = size;
96726 call_rcu(&slob_rcu->head, kmem_rcu_free);
96727 } else {
96728 - __kmem_cache_free(b, c->size);
96729 + __kmem_cache_free(b, size);
96730 }
96731
96732 +#ifdef CONFIG_PAX_USERCOPY_SLABS
96733 + trace_kfree(_RET_IP_, b);
96734 +#else
96735 trace_kmem_cache_free(_RET_IP_, b);
96736 +#endif
96737 +
96738 }
96739 EXPORT_SYMBOL(kmem_cache_free);
96740
96741 diff --git a/mm/slub.c b/mm/slub.c
96742 index 2b1ce69..4a2193f 100644
96743 --- a/mm/slub.c
96744 +++ b/mm/slub.c
96745 @@ -207,7 +207,7 @@ struct track {
96746
96747 enum track_item { TRACK_ALLOC, TRACK_FREE };
96748
96749 -#ifdef CONFIG_SYSFS
96750 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96751 static int sysfs_slab_add(struct kmem_cache *);
96752 static int sysfs_slab_alias(struct kmem_cache *, const char *);
96753 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
96754 @@ -546,7 +546,7 @@ static void print_track(const char *s, struct track *t)
96755 if (!t->addr)
96756 return;
96757
96758 - printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
96759 + printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
96760 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
96761 #ifdef CONFIG_STACKTRACE
96762 {
96763 @@ -2666,6 +2666,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
96764
96765 slab_free_hook(s, x);
96766
96767 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
96768 + if (pax_sanitize_slab && !(s->flags & SLAB_NO_SANITIZE)) {
96769 + memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
96770 + if (s->ctor)
96771 + s->ctor(x);
96772 + }
96773 +#endif
96774 +
96775 redo:
96776 /*
96777 * Determine the currently cpus per cpu slab.
96778 @@ -2733,7 +2741,7 @@ static int slub_min_objects;
96779 * Merge control. If this is set then no merging of slab caches will occur.
96780 * (Could be removed. This was introduced to pacify the merge skeptics.)
96781 */
96782 -static int slub_nomerge;
96783 +static int slub_nomerge = 1;
96784
96785 /*
96786 * Calculate the order of allocation given an slab object size.
96787 @@ -3014,6 +3022,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
96788 s->inuse = size;
96789
96790 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
96791 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
96792 + (pax_sanitize_slab && !(flags & SLAB_NO_SANITIZE)) ||
96793 +#endif
96794 s->ctor)) {
96795 /*
96796 * Relocate free pointer after the object if it is not
96797 @@ -3343,6 +3354,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
96798 EXPORT_SYMBOL(__kmalloc_node);
96799 #endif
96800
96801 +bool is_usercopy_object(const void *ptr)
96802 +{
96803 + struct page *page;
96804 + struct kmem_cache *s;
96805 +
96806 + if (ZERO_OR_NULL_PTR(ptr))
96807 + return false;
96808 +
96809 + if (!slab_is_available())
96810 + return false;
96811 +
96812 + if (!virt_addr_valid(ptr))
96813 + return false;
96814 +
96815 + page = virt_to_head_page(ptr);
96816 +
96817 + if (!PageSlab(page))
96818 + return false;
96819 +
96820 + s = page->slab_cache;
96821 + return s->flags & SLAB_USERCOPY;
96822 +}
96823 +
96824 +#ifdef CONFIG_PAX_USERCOPY
96825 +const char *check_heap_object(const void *ptr, unsigned long n)
96826 +{
96827 + struct page *page;
96828 + struct kmem_cache *s;
96829 + unsigned long offset;
96830 +
96831 + if (ZERO_OR_NULL_PTR(ptr))
96832 + return "<null>";
96833 +
96834 + if (!virt_addr_valid(ptr))
96835 + return NULL;
96836 +
96837 + page = virt_to_head_page(ptr);
96838 +
96839 + if (!PageSlab(page))
96840 + return NULL;
96841 +
96842 + s = page->slab_cache;
96843 + if (!(s->flags & SLAB_USERCOPY))
96844 + return s->name;
96845 +
96846 + offset = (ptr - page_address(page)) % s->size;
96847 + if (offset <= s->object_size && n <= s->object_size - offset)
96848 + return NULL;
96849 +
96850 + return s->name;
96851 +}
96852 +#endif
96853 +
96854 size_t ksize(const void *object)
96855 {
96856 struct page *page;
96857 @@ -3371,6 +3435,7 @@ void kfree(const void *x)
96858 if (unlikely(ZERO_OR_NULL_PTR(x)))
96859 return;
96860
96861 + VM_BUG_ON(!virt_addr_valid(x));
96862 page = virt_to_head_page(x);
96863 if (unlikely(!PageSlab(page))) {
96864 BUG_ON(!PageCompound(page));
96865 @@ -3679,7 +3744,7 @@ static int slab_unmergeable(struct kmem_cache *s)
96866 /*
96867 * We may have set a slab to be unmergeable during bootstrap.
96868 */
96869 - if (s->refcount < 0)
96870 + if (atomic_read(&s->refcount) < 0)
96871 return 1;
96872
96873 return 0;
96874 @@ -3736,7 +3801,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
96875 int i;
96876 struct kmem_cache *c;
96877
96878 - s->refcount++;
96879 + atomic_inc(&s->refcount);
96880
96881 /*
96882 * Adjust the object sizes so that we clear
96883 @@ -3755,7 +3820,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
96884 }
96885
96886 if (sysfs_slab_alias(s, name)) {
96887 - s->refcount--;
96888 + atomic_dec(&s->refcount);
96889 s = NULL;
96890 }
96891 }
96892 @@ -3872,7 +3937,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
96893 }
96894 #endif
96895
96896 -#ifdef CONFIG_SYSFS
96897 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96898 static int count_inuse(struct page *page)
96899 {
96900 return page->inuse;
96901 @@ -4156,7 +4221,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
96902 len += sprintf(buf + len, "%7ld ", l->count);
96903
96904 if (l->addr)
96905 +#ifdef CONFIG_GRKERNSEC_HIDESYM
96906 + len += sprintf(buf + len, "%pS", NULL);
96907 +#else
96908 len += sprintf(buf + len, "%pS", (void *)l->addr);
96909 +#endif
96910 else
96911 len += sprintf(buf + len, "<not-available>");
96912
96913 @@ -4261,12 +4330,12 @@ static void resiliency_test(void)
96914 validate_slab_cache(kmalloc_caches[9]);
96915 }
96916 #else
96917 -#ifdef CONFIG_SYSFS
96918 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96919 static void resiliency_test(void) {};
96920 #endif
96921 #endif
96922
96923 -#ifdef CONFIG_SYSFS
96924 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96925 enum slab_stat_type {
96926 SL_ALL, /* All slabs */
96927 SL_PARTIAL, /* Only partially allocated slabs */
96928 @@ -4506,13 +4575,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
96929 {
96930 if (!s->ctor)
96931 return 0;
96932 +#ifdef CONFIG_GRKERNSEC_HIDESYM
96933 + return sprintf(buf, "%pS\n", NULL);
96934 +#else
96935 return sprintf(buf, "%pS\n", s->ctor);
96936 +#endif
96937 }
96938 SLAB_ATTR_RO(ctor);
96939
96940 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
96941 {
96942 - return sprintf(buf, "%d\n", s->refcount - 1);
96943 + return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
96944 }
96945 SLAB_ATTR_RO(aliases);
96946
96947 @@ -4600,6 +4673,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
96948 SLAB_ATTR_RO(cache_dma);
96949 #endif
96950
96951 +#ifdef CONFIG_PAX_USERCOPY_SLABS
96952 +static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
96953 +{
96954 + return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
96955 +}
96956 +SLAB_ATTR_RO(usercopy);
96957 +#endif
96958 +
96959 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
96960 {
96961 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
96962 @@ -4934,6 +5015,9 @@ static struct attribute *slab_attrs[] = {
96963 #ifdef CONFIG_ZONE_DMA
96964 &cache_dma_attr.attr,
96965 #endif
96966 +#ifdef CONFIG_PAX_USERCOPY_SLABS
96967 + &usercopy_attr.attr,
96968 +#endif
96969 #ifdef CONFIG_NUMA
96970 &remote_node_defrag_ratio_attr.attr,
96971 #endif
96972 @@ -5184,6 +5268,7 @@ static char *create_unique_id(struct kmem_cache *s)
96973 return name;
96974 }
96975
96976 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96977 static int sysfs_slab_add(struct kmem_cache *s)
96978 {
96979 int err;
96980 @@ -5257,6 +5342,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
96981 kobject_del(&s->kobj);
96982 kobject_put(&s->kobj);
96983 }
96984 +#endif
96985
96986 /*
96987 * Need to buffer aliases during bootup until sysfs becomes
96988 @@ -5270,6 +5356,7 @@ struct saved_alias {
96989
96990 static struct saved_alias *alias_list;
96991
96992 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96993 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
96994 {
96995 struct saved_alias *al;
96996 @@ -5292,6 +5379,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
96997 alias_list = al;
96998 return 0;
96999 }
97000 +#endif
97001
97002 static int __init slab_sysfs_init(void)
97003 {
97004 diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
97005 index 4cba9c2..b4f9fcc 100644
97006 --- a/mm/sparse-vmemmap.c
97007 +++ b/mm/sparse-vmemmap.c
97008 @@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
97009 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
97010 if (!p)
97011 return NULL;
97012 - pud_populate(&init_mm, pud, p);
97013 + pud_populate_kernel(&init_mm, pud, p);
97014 }
97015 return pud;
97016 }
97017 @@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
97018 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
97019 if (!p)
97020 return NULL;
97021 - pgd_populate(&init_mm, pgd, p);
97022 + pgd_populate_kernel(&init_mm, pgd, p);
97023 }
97024 return pgd;
97025 }
97026 diff --git a/mm/sparse.c b/mm/sparse.c
97027 index d1b48b6..6e8590e 100644
97028 --- a/mm/sparse.c
97029 +++ b/mm/sparse.c
97030 @@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
97031
97032 for (i = 0; i < PAGES_PER_SECTION; i++) {
97033 if (PageHWPoison(&memmap[i])) {
97034 - atomic_long_sub(1, &num_poisoned_pages);
97035 + atomic_long_sub_unchecked(1, &num_poisoned_pages);
97036 ClearPageHWPoison(&memmap[i]);
97037 }
97038 }
97039 diff --git a/mm/swap.c b/mm/swap.c
97040 index 9ce43ba..43bdc4c 100644
97041 --- a/mm/swap.c
97042 +++ b/mm/swap.c
97043 @@ -31,6 +31,7 @@
97044 #include <linux/memcontrol.h>
97045 #include <linux/gfp.h>
97046 #include <linux/uio.h>
97047 +#include <linux/hugetlb.h>
97048
97049 #include "internal.h"
97050
97051 @@ -76,6 +77,8 @@ static void __put_compound_page(struct page *page)
97052
97053 __page_cache_release(page);
97054 dtor = get_compound_page_dtor(page);
97055 + if (!PageHuge(page))
97056 + BUG_ON(dtor != free_compound_page);
97057 (*dtor)(page);
97058 }
97059
97060 diff --git a/mm/swapfile.c b/mm/swapfile.c
97061 index 4a7f7e6..22cddf5 100644
97062 --- a/mm/swapfile.c
97063 +++ b/mm/swapfile.c
97064 @@ -66,7 +66,7 @@ static DEFINE_MUTEX(swapon_mutex);
97065
97066 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
97067 /* Activity counter to indicate that a swapon or swapoff has occurred */
97068 -static atomic_t proc_poll_event = ATOMIC_INIT(0);
97069 +static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
97070
97071 static inline unsigned char swap_count(unsigned char ent)
97072 {
97073 @@ -1959,7 +1959,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
97074 spin_unlock(&swap_lock);
97075
97076 err = 0;
97077 - atomic_inc(&proc_poll_event);
97078 + atomic_inc_unchecked(&proc_poll_event);
97079 wake_up_interruptible(&proc_poll_wait);
97080
97081 out_dput:
97082 @@ -1976,8 +1976,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
97083
97084 poll_wait(file, &proc_poll_wait, wait);
97085
97086 - if (seq->poll_event != atomic_read(&proc_poll_event)) {
97087 - seq->poll_event = atomic_read(&proc_poll_event);
97088 + if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
97089 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
97090 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
97091 }
97092
97093 @@ -2075,7 +2075,7 @@ static int swaps_open(struct inode *inode, struct file *file)
97094 return ret;
97095
97096 seq = file->private_data;
97097 - seq->poll_event = atomic_read(&proc_poll_event);
97098 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
97099 return 0;
97100 }
97101
97102 @@ -2534,7 +2534,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
97103 (frontswap_map) ? "FS" : "");
97104
97105 mutex_unlock(&swapon_mutex);
97106 - atomic_inc(&proc_poll_event);
97107 + atomic_inc_unchecked(&proc_poll_event);
97108 wake_up_interruptible(&proc_poll_wait);
97109
97110 if (S_ISREG(inode->i_mode))
97111 diff --git a/mm/util.c b/mm/util.c
97112 index d5ea733..e8953f9 100644
97113 --- a/mm/util.c
97114 +++ b/mm/util.c
97115 @@ -299,6 +299,12 @@ done:
97116 void arch_pick_mmap_layout(struct mm_struct *mm)
97117 {
97118 mm->mmap_base = TASK_UNMAPPED_BASE;
97119 +
97120 +#ifdef CONFIG_PAX_RANDMMAP
97121 + if (mm->pax_flags & MF_PAX_RANDMMAP)
97122 + mm->mmap_base += mm->delta_mmap;
97123 +#endif
97124 +
97125 mm->get_unmapped_area = arch_get_unmapped_area;
97126 }
97127 #endif
97128 @@ -475,6 +481,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
97129 if (!mm->arg_end)
97130 goto out_mm; /* Shh! No looking before we're done */
97131
97132 + if (gr_acl_handle_procpidmem(task))
97133 + goto out_mm;
97134 +
97135 len = mm->arg_end - mm->arg_start;
97136
97137 if (len > buflen)
97138 diff --git a/mm/vmalloc.c b/mm/vmalloc.c
97139 index bf233b2..1dfa1bc 100644
97140 --- a/mm/vmalloc.c
97141 +++ b/mm/vmalloc.c
97142 @@ -40,6 +40,21 @@ struct vfree_deferred {
97143 };
97144 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
97145
97146 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97147 +struct stack_deferred_llist {
97148 + struct llist_head list;
97149 + void *stack;
97150 + void *lowmem_stack;
97151 +};
97152 +
97153 +struct stack_deferred {
97154 + struct stack_deferred_llist list;
97155 + struct work_struct wq;
97156 +};
97157 +
97158 +static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
97159 +#endif
97160 +
97161 static void __vunmap(const void *, int);
97162
97163 static void free_work(struct work_struct *w)
97164 @@ -47,12 +62,30 @@ static void free_work(struct work_struct *w)
97165 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
97166 struct llist_node *llnode = llist_del_all(&p->list);
97167 while (llnode) {
97168 - void *p = llnode;
97169 + void *x = llnode;
97170 llnode = llist_next(llnode);
97171 - __vunmap(p, 1);
97172 + __vunmap(x, 1);
97173 }
97174 }
97175
97176 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97177 +static void unmap_work(struct work_struct *w)
97178 +{
97179 + struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
97180 + struct llist_node *llnode = llist_del_all(&p->list.list);
97181 + while (llnode) {
97182 + struct stack_deferred_llist *x =
97183 + llist_entry((struct llist_head *)llnode,
97184 + struct stack_deferred_llist, list);
97185 + void *stack = ACCESS_ONCE(x->stack);
97186 + void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
97187 + llnode = llist_next(llnode);
97188 + __vunmap(stack, 0);
97189 + free_memcg_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
97190 + }
97191 +}
97192 +#endif
97193 +
97194 /*** Page table manipulation functions ***/
97195
97196 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
97197 @@ -61,8 +94,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
97198
97199 pte = pte_offset_kernel(pmd, addr);
97200 do {
97201 - pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
97202 - WARN_ON(!pte_none(ptent) && !pte_present(ptent));
97203 +
97204 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
97205 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
97206 + BUG_ON(!pte_exec(*pte));
97207 + set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
97208 + continue;
97209 + }
97210 +#endif
97211 +
97212 + {
97213 + pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
97214 + WARN_ON(!pte_none(ptent) && !pte_present(ptent));
97215 + }
97216 } while (pte++, addr += PAGE_SIZE, addr != end);
97217 }
97218
97219 @@ -122,16 +166,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
97220 pte = pte_alloc_kernel(pmd, addr);
97221 if (!pte)
97222 return -ENOMEM;
97223 +
97224 + pax_open_kernel();
97225 do {
97226 struct page *page = pages[*nr];
97227
97228 - if (WARN_ON(!pte_none(*pte)))
97229 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
97230 + if (pgprot_val(prot) & _PAGE_NX)
97231 +#endif
97232 +
97233 + if (!pte_none(*pte)) {
97234 + pax_close_kernel();
97235 + WARN_ON(1);
97236 return -EBUSY;
97237 - if (WARN_ON(!page))
97238 + }
97239 + if (!page) {
97240 + pax_close_kernel();
97241 + WARN_ON(1);
97242 return -ENOMEM;
97243 + }
97244 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
97245 (*nr)++;
97246 } while (pte++, addr += PAGE_SIZE, addr != end);
97247 + pax_close_kernel();
97248 return 0;
97249 }
97250
97251 @@ -141,7 +198,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
97252 pmd_t *pmd;
97253 unsigned long next;
97254
97255 - pmd = pmd_alloc(&init_mm, pud, addr);
97256 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
97257 if (!pmd)
97258 return -ENOMEM;
97259 do {
97260 @@ -158,7 +215,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
97261 pud_t *pud;
97262 unsigned long next;
97263
97264 - pud = pud_alloc(&init_mm, pgd, addr);
97265 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
97266 if (!pud)
97267 return -ENOMEM;
97268 do {
97269 @@ -218,6 +275,12 @@ int is_vmalloc_or_module_addr(const void *x)
97270 if (addr >= MODULES_VADDR && addr < MODULES_END)
97271 return 1;
97272 #endif
97273 +
97274 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
97275 + if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
97276 + return 1;
97277 +#endif
97278 +
97279 return is_vmalloc_addr(x);
97280 }
97281
97282 @@ -238,8 +301,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
97283
97284 if (!pgd_none(*pgd)) {
97285 pud_t *pud = pud_offset(pgd, addr);
97286 +#ifdef CONFIG_X86
97287 + if (!pud_large(*pud))
97288 +#endif
97289 if (!pud_none(*pud)) {
97290 pmd_t *pmd = pmd_offset(pud, addr);
97291 +#ifdef CONFIG_X86
97292 + if (!pmd_large(*pmd))
97293 +#endif
97294 if (!pmd_none(*pmd)) {
97295 pte_t *ptep, pte;
97296
97297 @@ -1183,13 +1252,23 @@ void __init vmalloc_init(void)
97298 for_each_possible_cpu(i) {
97299 struct vmap_block_queue *vbq;
97300 struct vfree_deferred *p;
97301 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97302 + struct stack_deferred *p2;
97303 +#endif
97304
97305 vbq = &per_cpu(vmap_block_queue, i);
97306 spin_lock_init(&vbq->lock);
97307 INIT_LIST_HEAD(&vbq->free);
97308 +
97309 p = &per_cpu(vfree_deferred, i);
97310 init_llist_head(&p->list);
97311 INIT_WORK(&p->wq, free_work);
97312 +
97313 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97314 + p2 = &per_cpu(stack_deferred, i);
97315 + init_llist_head(&p2->list.list);
97316 + INIT_WORK(&p2->wq, unmap_work);
97317 +#endif
97318 }
97319
97320 /* Import existing vmlist entries. */
97321 @@ -1317,6 +1396,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
97322 struct vm_struct *area;
97323
97324 BUG_ON(in_interrupt());
97325 +
97326 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
97327 + if (flags & VM_KERNEXEC) {
97328 + if (start != VMALLOC_START || end != VMALLOC_END)
97329 + return NULL;
97330 + start = (unsigned long)MODULES_EXEC_VADDR;
97331 + end = (unsigned long)MODULES_EXEC_END;
97332 + }
97333 +#endif
97334 +
97335 if (flags & VM_IOREMAP)
97336 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
97337
97338 @@ -1522,6 +1611,23 @@ void vunmap(const void *addr)
97339 }
97340 EXPORT_SYMBOL(vunmap);
97341
97342 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97343 +void unmap_process_stacks(struct task_struct *task)
97344 +{
97345 + if (unlikely(in_interrupt())) {
97346 + struct stack_deferred *p = &__get_cpu_var(stack_deferred);
97347 + struct stack_deferred_llist *list = task->stack;
97348 + list->stack = task->stack;
97349 + list->lowmem_stack = task->lowmem_stack;
97350 + if (llist_add((struct llist_node *)&list->list, &p->list.list))
97351 + schedule_work(&p->wq);
97352 + } else {
97353 + __vunmap(task->stack, 0);
97354 + free_memcg_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
97355 + }
97356 +}
97357 +#endif
97358 +
97359 /**
97360 * vmap - map an array of pages into virtually contiguous space
97361 * @pages: array of page pointers
97362 @@ -1542,6 +1648,11 @@ void *vmap(struct page **pages, unsigned int count,
97363 if (count > totalram_pages)
97364 return NULL;
97365
97366 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
97367 + if (!(pgprot_val(prot) & _PAGE_NX))
97368 + flags |= VM_KERNEXEC;
97369 +#endif
97370 +
97371 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
97372 __builtin_return_address(0));
97373 if (!area)
97374 @@ -1642,6 +1753,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
97375 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
97376 goto fail;
97377
97378 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
97379 + if (!(pgprot_val(prot) & _PAGE_NX))
97380 + area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
97381 + VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
97382 + else
97383 +#endif
97384 +
97385 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
97386 start, end, node, gfp_mask, caller);
97387 if (!area)
97388 @@ -1818,10 +1936,9 @@ EXPORT_SYMBOL(vzalloc_node);
97389 * For tight control over page level allocator and protection flags
97390 * use __vmalloc() instead.
97391 */
97392 -
97393 void *vmalloc_exec(unsigned long size)
97394 {
97395 - return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
97396 + return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
97397 NUMA_NO_NODE, __builtin_return_address(0));
97398 }
97399
97400 @@ -2128,6 +2245,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
97401 {
97402 struct vm_struct *area;
97403
97404 + BUG_ON(vma->vm_mirror);
97405 +
97406 size = PAGE_ALIGN(size);
97407
97408 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
97409 @@ -2610,7 +2729,11 @@ static int s_show(struct seq_file *m, void *p)
97410 v->addr, v->addr + v->size, v->size);
97411
97412 if (v->caller)
97413 +#ifdef CONFIG_GRKERNSEC_HIDESYM
97414 + seq_printf(m, " %pK", v->caller);
97415 +#else
97416 seq_printf(m, " %pS", v->caller);
97417 +#endif
97418
97419 if (v->nr_pages)
97420 seq_printf(m, " pages=%d", v->nr_pages);
97421 diff --git a/mm/vmstat.c b/mm/vmstat.c
97422 index 302dd07..3841f1c 100644
97423 --- a/mm/vmstat.c
97424 +++ b/mm/vmstat.c
97425 @@ -20,6 +20,7 @@
97426 #include <linux/writeback.h>
97427 #include <linux/compaction.h>
97428 #include <linux/mm_inline.h>
97429 +#include <linux/grsecurity.h>
97430
97431 #include "internal.h"
97432
97433 @@ -79,7 +80,7 @@ void vm_events_fold_cpu(int cpu)
97434 *
97435 * vm_stat contains the global counters
97436 */
97437 -atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
97438 +atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
97439 EXPORT_SYMBOL(vm_stat);
97440
97441 #ifdef CONFIG_SMP
97442 @@ -423,7 +424,7 @@ static inline void fold_diff(int *diff)
97443
97444 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
97445 if (diff[i])
97446 - atomic_long_add(diff[i], &vm_stat[i]);
97447 + atomic_long_add_unchecked(diff[i], &vm_stat[i]);
97448 }
97449
97450 /*
97451 @@ -455,7 +456,7 @@ static void refresh_cpu_vm_stats(void)
97452 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
97453 if (v) {
97454
97455 - atomic_long_add(v, &zone->vm_stat[i]);
97456 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
97457 global_diff[i] += v;
97458 #ifdef CONFIG_NUMA
97459 /* 3 seconds idle till flush */
97460 @@ -517,7 +518,7 @@ void cpu_vm_stats_fold(int cpu)
97461
97462 v = p->vm_stat_diff[i];
97463 p->vm_stat_diff[i] = 0;
97464 - atomic_long_add(v, &zone->vm_stat[i]);
97465 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
97466 global_diff[i] += v;
97467 }
97468 }
97469 @@ -537,8 +538,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
97470 if (pset->vm_stat_diff[i]) {
97471 int v = pset->vm_stat_diff[i];
97472 pset->vm_stat_diff[i] = 0;
97473 - atomic_long_add(v, &zone->vm_stat[i]);
97474 - atomic_long_add(v, &vm_stat[i]);
97475 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
97476 + atomic_long_add_unchecked(v, &vm_stat[i]);
97477 }
97478 }
97479 #endif
97480 @@ -1156,10 +1157,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
97481 stat_items_size += sizeof(struct vm_event_state);
97482 #endif
97483
97484 - v = kmalloc(stat_items_size, GFP_KERNEL);
97485 + v = kzalloc(stat_items_size, GFP_KERNEL);
97486 m->private = v;
97487 if (!v)
97488 return ERR_PTR(-ENOMEM);
97489 +
97490 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
97491 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
97492 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
97493 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
97494 + && !in_group_p(grsec_proc_gid)
97495 +#endif
97496 + )
97497 + return (unsigned long *)m->private + *pos;
97498 +#endif
97499 +#endif
97500 +
97501 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
97502 v[i] = global_page_state(i);
97503 v += NR_VM_ZONE_STAT_ITEMS;
97504 @@ -1308,10 +1321,16 @@ static int __init setup_vmstat(void)
97505 cpu_notifier_register_done();
97506 #endif
97507 #ifdef CONFIG_PROC_FS
97508 - proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
97509 - proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
97510 - proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
97511 - proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
97512 + {
97513 + mode_t gr_mode = S_IRUGO;
97514 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
97515 + gr_mode = S_IRUSR;
97516 +#endif
97517 + proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
97518 + proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
97519 + proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
97520 + proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
97521 + }
97522 #endif
97523 return 0;
97524 }
97525 diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
97526 index 44ebd5c..1f732bae 100644
97527 --- a/net/8021q/vlan.c
97528 +++ b/net/8021q/vlan.c
97529 @@ -475,7 +475,7 @@ out:
97530 return NOTIFY_DONE;
97531 }
97532
97533 -static struct notifier_block vlan_notifier_block __read_mostly = {
97534 +static struct notifier_block vlan_notifier_block = {
97535 .notifier_call = vlan_device_event,
97536 };
97537
97538 @@ -550,8 +550,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
97539 err = -EPERM;
97540 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
97541 break;
97542 - if ((args.u.name_type >= 0) &&
97543 - (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
97544 + if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
97545 struct vlan_net *vn;
97546
97547 vn = net_generic(net, vlan_net_id);
97548 diff --git a/net/9p/client.c b/net/9p/client.c
97549 index 0004cba..feba240 100644
97550 --- a/net/9p/client.c
97551 +++ b/net/9p/client.c
97552 @@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
97553 len - inline_len);
97554 } else {
97555 err = copy_from_user(ename + inline_len,
97556 - uidata, len - inline_len);
97557 + (char __force_user *)uidata, len - inline_len);
97558 if (err) {
97559 err = -EFAULT;
97560 goto out_err;
97561 @@ -1571,7 +1571,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
97562 kernel_buf = 1;
97563 indata = data;
97564 } else
97565 - indata = (__force char *)udata;
97566 + indata = (__force_kernel char *)udata;
97567 /*
97568 * response header len is 11
97569 * PDU Header(7) + IO Size (4)
97570 @@ -1646,7 +1646,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
97571 kernel_buf = 1;
97572 odata = data;
97573 } else
97574 - odata = (char *)udata;
97575 + odata = (char __force_kernel *)udata;
97576 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
97577 P9_ZC_HDR_SZ, kernel_buf, "dqd",
97578 fid->fid, offset, rsize);
97579 diff --git a/net/9p/mod.c b/net/9p/mod.c
97580 index 6ab36ae..6f1841b 100644
97581 --- a/net/9p/mod.c
97582 +++ b/net/9p/mod.c
97583 @@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
97584 void v9fs_register_trans(struct p9_trans_module *m)
97585 {
97586 spin_lock(&v9fs_trans_lock);
97587 - list_add_tail(&m->list, &v9fs_trans_list);
97588 + pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
97589 spin_unlock(&v9fs_trans_lock);
97590 }
97591 EXPORT_SYMBOL(v9fs_register_trans);
97592 @@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
97593 void v9fs_unregister_trans(struct p9_trans_module *m)
97594 {
97595 spin_lock(&v9fs_trans_lock);
97596 - list_del_init(&m->list);
97597 + pax_list_del_init((struct list_head *)&m->list);
97598 spin_unlock(&v9fs_trans_lock);
97599 }
97600 EXPORT_SYMBOL(v9fs_unregister_trans);
97601 diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
97602 index 80d08f6..de63fd1 100644
97603 --- a/net/9p/trans_fd.c
97604 +++ b/net/9p/trans_fd.c
97605 @@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
97606 oldfs = get_fs();
97607 set_fs(get_ds());
97608 /* The cast to a user pointer is valid due to the set_fs() */
97609 - ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
97610 + ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
97611 set_fs(oldfs);
97612
97613 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
97614 diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
97615 index af46bc4..f9adfcd 100644
97616 --- a/net/appletalk/atalk_proc.c
97617 +++ b/net/appletalk/atalk_proc.c
97618 @@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
97619 struct proc_dir_entry *p;
97620 int rc = -ENOMEM;
97621
97622 - atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
97623 + atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
97624 if (!atalk_proc_dir)
97625 goto out;
97626
97627 diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
97628 index 876fbe8..8bbea9f 100644
97629 --- a/net/atm/atm_misc.c
97630 +++ b/net/atm/atm_misc.c
97631 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
97632 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
97633 return 1;
97634 atm_return(vcc, truesize);
97635 - atomic_inc(&vcc->stats->rx_drop);
97636 + atomic_inc_unchecked(&vcc->stats->rx_drop);
97637 return 0;
97638 }
97639 EXPORT_SYMBOL(atm_charge);
97640 @@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
97641 }
97642 }
97643 atm_return(vcc, guess);
97644 - atomic_inc(&vcc->stats->rx_drop);
97645 + atomic_inc_unchecked(&vcc->stats->rx_drop);
97646 return NULL;
97647 }
97648 EXPORT_SYMBOL(atm_alloc_charge);
97649 @@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
97650
97651 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
97652 {
97653 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
97654 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
97655 __SONET_ITEMS
97656 #undef __HANDLE_ITEM
97657 }
97658 @@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
97659
97660 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
97661 {
97662 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
97663 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
97664 __SONET_ITEMS
97665 #undef __HANDLE_ITEM
97666 }
97667 diff --git a/net/atm/lec.c b/net/atm/lec.c
97668 index 4c5b8ba..95f7005 100644
97669 --- a/net/atm/lec.c
97670 +++ b/net/atm/lec.c
97671 @@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
97672 }
97673
97674 static struct lane2_ops lane2_ops = {
97675 - lane2_resolve, /* resolve, spec 3.1.3 */
97676 - lane2_associate_req, /* associate_req, spec 3.1.4 */
97677 - NULL /* associate indicator, spec 3.1.5 */
97678 + .resolve = lane2_resolve,
97679 + .associate_req = lane2_associate_req,
97680 + .associate_indicator = NULL
97681 };
97682
97683 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
97684 diff --git a/net/atm/lec.h b/net/atm/lec.h
97685 index 4149db1..f2ab682 100644
97686 --- a/net/atm/lec.h
97687 +++ b/net/atm/lec.h
97688 @@ -48,7 +48,7 @@ struct lane2_ops {
97689 const u8 *tlvs, u32 sizeoftlvs);
97690 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
97691 const u8 *tlvs, u32 sizeoftlvs);
97692 -};
97693 +} __no_const;
97694
97695 /*
97696 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
97697 diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
97698 index d1b2d9a..d549f7f 100644
97699 --- a/net/atm/mpoa_caches.c
97700 +++ b/net/atm/mpoa_caches.c
97701 @@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
97702
97703
97704 static struct in_cache_ops ingress_ops = {
97705 - in_cache_add_entry, /* add_entry */
97706 - in_cache_get, /* get */
97707 - in_cache_get_with_mask, /* get_with_mask */
97708 - in_cache_get_by_vcc, /* get_by_vcc */
97709 - in_cache_put, /* put */
97710 - in_cache_remove_entry, /* remove_entry */
97711 - cache_hit, /* cache_hit */
97712 - clear_count_and_expired, /* clear_count */
97713 - check_resolving_entries, /* check_resolving */
97714 - refresh_entries, /* refresh */
97715 - in_destroy_cache /* destroy_cache */
97716 + .add_entry = in_cache_add_entry,
97717 + .get = in_cache_get,
97718 + .get_with_mask = in_cache_get_with_mask,
97719 + .get_by_vcc = in_cache_get_by_vcc,
97720 + .put = in_cache_put,
97721 + .remove_entry = in_cache_remove_entry,
97722 + .cache_hit = cache_hit,
97723 + .clear_count = clear_count_and_expired,
97724 + .check_resolving = check_resolving_entries,
97725 + .refresh = refresh_entries,
97726 + .destroy_cache = in_destroy_cache
97727 };
97728
97729 static struct eg_cache_ops egress_ops = {
97730 - eg_cache_add_entry, /* add_entry */
97731 - eg_cache_get_by_cache_id, /* get_by_cache_id */
97732 - eg_cache_get_by_tag, /* get_by_tag */
97733 - eg_cache_get_by_vcc, /* get_by_vcc */
97734 - eg_cache_get_by_src_ip, /* get_by_src_ip */
97735 - eg_cache_put, /* put */
97736 - eg_cache_remove_entry, /* remove_entry */
97737 - update_eg_cache_entry, /* update */
97738 - clear_expired, /* clear_expired */
97739 - eg_destroy_cache /* destroy_cache */
97740 + .add_entry = eg_cache_add_entry,
97741 + .get_by_cache_id = eg_cache_get_by_cache_id,
97742 + .get_by_tag = eg_cache_get_by_tag,
97743 + .get_by_vcc = eg_cache_get_by_vcc,
97744 + .get_by_src_ip = eg_cache_get_by_src_ip,
97745 + .put = eg_cache_put,
97746 + .remove_entry = eg_cache_remove_entry,
97747 + .update = update_eg_cache_entry,
97748 + .clear_expired = clear_expired,
97749 + .destroy_cache = eg_destroy_cache
97750 };
97751
97752
97753 diff --git a/net/atm/proc.c b/net/atm/proc.c
97754 index bbb6461..cf04016 100644
97755 --- a/net/atm/proc.c
97756 +++ b/net/atm/proc.c
97757 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
97758 const struct k_atm_aal_stats *stats)
97759 {
97760 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
97761 - atomic_read(&stats->tx), atomic_read(&stats->tx_err),
97762 - atomic_read(&stats->rx), atomic_read(&stats->rx_err),
97763 - atomic_read(&stats->rx_drop));
97764 + atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
97765 + atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
97766 + atomic_read_unchecked(&stats->rx_drop));
97767 }
97768
97769 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
97770 diff --git a/net/atm/resources.c b/net/atm/resources.c
97771 index 0447d5d..3cf4728 100644
97772 --- a/net/atm/resources.c
97773 +++ b/net/atm/resources.c
97774 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
97775 static void copy_aal_stats(struct k_atm_aal_stats *from,
97776 struct atm_aal_stats *to)
97777 {
97778 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
97779 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
97780 __AAL_STAT_ITEMS
97781 #undef __HANDLE_ITEM
97782 }
97783 @@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
97784 static void subtract_aal_stats(struct k_atm_aal_stats *from,
97785 struct atm_aal_stats *to)
97786 {
97787 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
97788 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
97789 __AAL_STAT_ITEMS
97790 #undef __HANDLE_ITEM
97791 }
97792 diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
97793 index 919a5ce..cc6b444 100644
97794 --- a/net/ax25/sysctl_net_ax25.c
97795 +++ b/net/ax25/sysctl_net_ax25.c
97796 @@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
97797 {
97798 char path[sizeof("net/ax25/") + IFNAMSIZ];
97799 int k;
97800 - struct ctl_table *table;
97801 + ctl_table_no_const *table;
97802
97803 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
97804 if (!table)
97805 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
97806 index f04224c..f326579 100644
97807 --- a/net/batman-adv/bat_iv_ogm.c
97808 +++ b/net/batman-adv/bat_iv_ogm.c
97809 @@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
97810
97811 /* randomize initial seqno to avoid collision */
97812 get_random_bytes(&random_seqno, sizeof(random_seqno));
97813 - atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
97814 + atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
97815
97816 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
97817 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
97818 @@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
97819 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
97820
97821 /* change sequence number to network order */
97822 - seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
97823 + seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
97824 batadv_ogm_packet->seqno = htonl(seqno);
97825 - atomic_inc(&hard_iface->bat_iv.ogm_seqno);
97826 + atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
97827
97828 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
97829
97830 @@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
97831 return;
97832
97833 /* could be changed by schedule_own_packet() */
97834 - if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
97835 + if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
97836
97837 if (ogm_packet->flags & BATADV_DIRECTLINK)
97838 has_directlink_flag = true;
97839 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
97840 index f14e54a..66f3e2e 100644
97841 --- a/net/batman-adv/fragmentation.c
97842 +++ b/net/batman-adv/fragmentation.c
97843 @@ -446,7 +446,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
97844 frag_header.packet_type = BATADV_UNICAST_FRAG;
97845 frag_header.version = BATADV_COMPAT_VERSION;
97846 frag_header.ttl = BATADV_TTL;
97847 - frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
97848 + frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
97849 frag_header.reserved = 0;
97850 frag_header.no = 0;
97851 frag_header.total_size = htons(skb->len);
97852 diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
97853 index 744a59b..8fd037c 100644
97854 --- a/net/batman-adv/soft-interface.c
97855 +++ b/net/batman-adv/soft-interface.c
97856 @@ -296,7 +296,7 @@ send:
97857 primary_if->net_dev->dev_addr);
97858
97859 /* set broadcast sequence number */
97860 - seqno = atomic_inc_return(&bat_priv->bcast_seqno);
97861 + seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
97862 bcast_packet->seqno = htonl(seqno);
97863
97864 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
97865 @@ -729,7 +729,7 @@ static int batadv_softif_init_late(struct net_device *dev)
97866 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
97867
97868 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
97869 - atomic_set(&bat_priv->bcast_seqno, 1);
97870 + atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
97871 atomic_set(&bat_priv->tt.vn, 0);
97872 atomic_set(&bat_priv->tt.local_changes, 0);
97873 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
97874 @@ -743,7 +743,7 @@ static int batadv_softif_init_late(struct net_device *dev)
97875
97876 /* randomize initial seqno to avoid collision */
97877 get_random_bytes(&random_seqno, sizeof(random_seqno));
97878 - atomic_set(&bat_priv->frag_seqno, random_seqno);
97879 + atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
97880
97881 bat_priv->primary_if = NULL;
97882 bat_priv->num_ifaces = 0;
97883 diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
97884 index 34891a5..3cfece0 100644
97885 --- a/net/batman-adv/types.h
97886 +++ b/net/batman-adv/types.h
97887 @@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
97888 struct batadv_hard_iface_bat_iv {
97889 unsigned char *ogm_buff;
97890 int ogm_buff_len;
97891 - atomic_t ogm_seqno;
97892 + atomic_unchecked_t ogm_seqno;
97893 };
97894
97895 /**
97896 @@ -766,7 +766,7 @@ struct batadv_priv {
97897 atomic_t bonding;
97898 atomic_t fragmentation;
97899 atomic_t packet_size_max;
97900 - atomic_t frag_seqno;
97901 + atomic_unchecked_t frag_seqno;
97902 #ifdef CONFIG_BATMAN_ADV_BLA
97903 atomic_t bridge_loop_avoidance;
97904 #endif
97905 @@ -785,7 +785,7 @@ struct batadv_priv {
97906 #endif
97907 uint32_t isolation_mark;
97908 uint32_t isolation_mark_mask;
97909 - atomic_t bcast_seqno;
97910 + atomic_unchecked_t bcast_seqno;
97911 atomic_t bcast_queue_left;
97912 atomic_t batman_queue_left;
97913 char num_ifaces;
97914 diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
97915 index b9a418e..2af862a 100644
97916 --- a/net/bluetooth/hci_sock.c
97917 +++ b/net/bluetooth/hci_sock.c
97918 @@ -1053,7 +1053,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
97919 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
97920 }
97921
97922 - len = min_t(unsigned int, len, sizeof(uf));
97923 + len = min((size_t)len, sizeof(uf));
97924 if (copy_from_user(&uf, optval, len)) {
97925 err = -EFAULT;
97926 break;
97927 diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
97928 index 1c97b7a..9171d69 100644
97929 --- a/net/bluetooth/l2cap_core.c
97930 +++ b/net/bluetooth/l2cap_core.c
97931 @@ -3542,8 +3542,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
97932 break;
97933
97934 case L2CAP_CONF_RFC:
97935 - if (olen == sizeof(rfc))
97936 - memcpy(&rfc, (void *)val, olen);
97937 + if (olen != sizeof(rfc))
97938 + break;
97939 +
97940 + memcpy(&rfc, (void *)val, olen);
97941
97942 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
97943 rfc.mode != chan->mode)
97944 diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
97945 index e137869..33f3ebd 100644
97946 --- a/net/bluetooth/l2cap_sock.c
97947 +++ b/net/bluetooth/l2cap_sock.c
97948 @@ -628,7 +628,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
97949 struct sock *sk = sock->sk;
97950 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
97951 struct l2cap_options opts;
97952 - int len, err = 0;
97953 + int err = 0;
97954 + size_t len = optlen;
97955 u32 opt;
97956
97957 BT_DBG("sk %p", sk);
97958 @@ -655,7 +656,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
97959 opts.max_tx = chan->max_tx;
97960 opts.txwin_size = chan->tx_win;
97961
97962 - len = min_t(unsigned int, sizeof(opts), optlen);
97963 + len = min(sizeof(opts), len);
97964 if (copy_from_user((char *) &opts, optval, len)) {
97965 err = -EFAULT;
97966 break;
97967 @@ -742,7 +743,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
97968 struct bt_security sec;
97969 struct bt_power pwr;
97970 struct l2cap_conn *conn;
97971 - int len, err = 0;
97972 + int err = 0;
97973 + size_t len = optlen;
97974 u32 opt;
97975
97976 BT_DBG("sk %p", sk);
97977 @@ -766,7 +768,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
97978
97979 sec.level = BT_SECURITY_LOW;
97980
97981 - len = min_t(unsigned int, sizeof(sec), optlen);
97982 + len = min(sizeof(sec), len);
97983 if (copy_from_user((char *) &sec, optval, len)) {
97984 err = -EFAULT;
97985 break;
97986 @@ -861,7 +863,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
97987
97988 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
97989
97990 - len = min_t(unsigned int, sizeof(pwr), optlen);
97991 + len = min(sizeof(pwr), len);
97992 if (copy_from_user((char *) &pwr, optval, len)) {
97993 err = -EFAULT;
97994 break;
97995 diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
97996 index c603a5e..7f08991 100644
97997 --- a/net/bluetooth/rfcomm/sock.c
97998 +++ b/net/bluetooth/rfcomm/sock.c
97999 @@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
98000 struct sock *sk = sock->sk;
98001 struct bt_security sec;
98002 int err = 0;
98003 - size_t len;
98004 + size_t len = optlen;
98005 u32 opt;
98006
98007 BT_DBG("sk %p", sk);
98008 @@ -709,7 +709,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
98009
98010 sec.level = BT_SECURITY_LOW;
98011
98012 - len = min_t(unsigned int, sizeof(sec), optlen);
98013 + len = min(sizeof(sec), len);
98014 if (copy_from_user((char *) &sec, optval, len)) {
98015 err = -EFAULT;
98016 break;
98017 diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
98018 index 403ec09..a21a003 100644
98019 --- a/net/bluetooth/rfcomm/tty.c
98020 +++ b/net/bluetooth/rfcomm/tty.c
98021 @@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
98022 BT_DBG("tty %p id %d", tty, tty->index);
98023
98024 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
98025 - dev->channel, dev->port.count);
98026 + dev->channel, atomic_read(&dev->port.count));
98027
98028 err = tty_port_open(&dev->port, tty, filp);
98029 if (err)
98030 @@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
98031 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
98032
98033 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
98034 - dev->port.count);
98035 + atomic_read(&dev->port.count));
98036
98037 tty_port_close(&dev->port, tty, filp);
98038 }
98039 diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
98040 index 1059ed3..d70846a 100644
98041 --- a/net/bridge/netfilter/ebtables.c
98042 +++ b/net/bridge/netfilter/ebtables.c
98043 @@ -1524,7 +1524,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
98044 tmp.valid_hooks = t->table->valid_hooks;
98045 }
98046 mutex_unlock(&ebt_mutex);
98047 - if (copy_to_user(user, &tmp, *len) != 0) {
98048 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
98049 BUGPRINT("c2u Didn't work\n");
98050 ret = -EFAULT;
98051 break;
98052 @@ -2330,7 +2330,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
98053 goto out;
98054 tmp.valid_hooks = t->valid_hooks;
98055
98056 - if (copy_to_user(user, &tmp, *len) != 0) {
98057 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
98058 ret = -EFAULT;
98059 break;
98060 }
98061 @@ -2341,7 +2341,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
98062 tmp.entries_size = t->table->entries_size;
98063 tmp.valid_hooks = t->table->valid_hooks;
98064
98065 - if (copy_to_user(user, &tmp, *len) != 0) {
98066 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
98067 ret = -EFAULT;
98068 break;
98069 }
98070 diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
98071 index 0f45522..dab651f 100644
98072 --- a/net/caif/cfctrl.c
98073 +++ b/net/caif/cfctrl.c
98074 @@ -10,6 +10,7 @@
98075 #include <linux/spinlock.h>
98076 #include <linux/slab.h>
98077 #include <linux/pkt_sched.h>
98078 +#include <linux/sched.h>
98079 #include <net/caif/caif_layer.h>
98080 #include <net/caif/cfpkt.h>
98081 #include <net/caif/cfctrl.h>
98082 @@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
98083 memset(&dev_info, 0, sizeof(dev_info));
98084 dev_info.id = 0xff;
98085 cfsrvl_init(&this->serv, 0, &dev_info, false);
98086 - atomic_set(&this->req_seq_no, 1);
98087 - atomic_set(&this->rsp_seq_no, 1);
98088 + atomic_set_unchecked(&this->req_seq_no, 1);
98089 + atomic_set_unchecked(&this->rsp_seq_no, 1);
98090 this->serv.layer.receive = cfctrl_recv;
98091 sprintf(this->serv.layer.name, "ctrl");
98092 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
98093 @@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
98094 struct cfctrl_request_info *req)
98095 {
98096 spin_lock_bh(&ctrl->info_list_lock);
98097 - atomic_inc(&ctrl->req_seq_no);
98098 - req->sequence_no = atomic_read(&ctrl->req_seq_no);
98099 + atomic_inc_unchecked(&ctrl->req_seq_no);
98100 + req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
98101 list_add_tail(&req->list, &ctrl->list);
98102 spin_unlock_bh(&ctrl->info_list_lock);
98103 }
98104 @@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
98105 if (p != first)
98106 pr_warn("Requests are not received in order\n");
98107
98108 - atomic_set(&ctrl->rsp_seq_no,
98109 + atomic_set_unchecked(&ctrl->rsp_seq_no,
98110 p->sequence_no);
98111 list_del(&p->list);
98112 goto out;
98113 diff --git a/net/can/af_can.c b/net/can/af_can.c
98114 index a27f8aa..67174a3 100644
98115 --- a/net/can/af_can.c
98116 +++ b/net/can/af_can.c
98117 @@ -863,7 +863,7 @@ static const struct net_proto_family can_family_ops = {
98118 };
98119
98120 /* notifier block for netdevice event */
98121 -static struct notifier_block can_netdev_notifier __read_mostly = {
98122 +static struct notifier_block can_netdev_notifier = {
98123 .notifier_call = can_notifier,
98124 };
98125
98126 diff --git a/net/can/bcm.c b/net/can/bcm.c
98127 index dcb75c0..24b1b43 100644
98128 --- a/net/can/bcm.c
98129 +++ b/net/can/bcm.c
98130 @@ -1624,7 +1624,7 @@ static int __init bcm_module_init(void)
98131 }
98132
98133 /* create /proc/net/can-bcm directory */
98134 - proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
98135 + proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
98136 return 0;
98137 }
98138
98139 diff --git a/net/can/gw.c b/net/can/gw.c
98140 index 050a211..bb9fe33 100644
98141 --- a/net/can/gw.c
98142 +++ b/net/can/gw.c
98143 @@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
98144 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
98145
98146 static HLIST_HEAD(cgw_list);
98147 -static struct notifier_block notifier;
98148
98149 static struct kmem_cache *cgw_cache __read_mostly;
98150
98151 @@ -947,6 +946,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
98152 return err;
98153 }
98154
98155 +static struct notifier_block notifier = {
98156 + .notifier_call = cgw_notifier
98157 +};
98158 +
98159 static __init int cgw_module_init(void)
98160 {
98161 /* sanitize given module parameter */
98162 @@ -962,7 +965,6 @@ static __init int cgw_module_init(void)
98163 return -ENOMEM;
98164
98165 /* set notifier */
98166 - notifier.notifier_call = cgw_notifier;
98167 register_netdevice_notifier(&notifier);
98168
98169 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
98170 diff --git a/net/can/proc.c b/net/can/proc.c
98171 index b543470..d2ddae2 100644
98172 --- a/net/can/proc.c
98173 +++ b/net/can/proc.c
98174 @@ -468,7 +468,7 @@ static void can_remove_proc_readentry(const char *name)
98175 void can_init_proc(void)
98176 {
98177 /* create /proc/net/can directory */
98178 - can_dir = proc_mkdir("can", init_net.proc_net);
98179 + can_dir = proc_mkdir_restrict("can", init_net.proc_net);
98180
98181 if (!can_dir) {
98182 printk(KERN_INFO "can: failed to create /proc/net/can . "
98183 diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
98184 index 1948d59..9e854d5 100644
98185 --- a/net/ceph/messenger.c
98186 +++ b/net/ceph/messenger.c
98187 @@ -187,7 +187,7 @@ static void con_fault(struct ceph_connection *con);
98188 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
98189
98190 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
98191 -static atomic_t addr_str_seq = ATOMIC_INIT(0);
98192 +static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
98193
98194 static struct page *zero_page; /* used in certain error cases */
98195
98196 @@ -198,7 +198,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
98197 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
98198 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
98199
98200 - i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
98201 + i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
98202 s = addr_str[i];
98203
98204 switch (ss->ss_family) {
98205 diff --git a/net/compat.c b/net/compat.c
98206 index 9a76eaf..5b8ccfd 100644
98207 --- a/net/compat.c
98208 +++ b/net/compat.c
98209 @@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
98210 return -EFAULT;
98211 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
98212 kmsg->msg_namelen = sizeof(struct sockaddr_storage);
98213 - kmsg->msg_name = compat_ptr(tmp1);
98214 - kmsg->msg_iov = compat_ptr(tmp2);
98215 - kmsg->msg_control = compat_ptr(tmp3);
98216 + kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
98217 + kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
98218 + kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
98219 return 0;
98220 }
98221
98222 @@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
98223
98224 if (kern_msg->msg_namelen) {
98225 if (mode == VERIFY_READ) {
98226 - int err = move_addr_to_kernel(kern_msg->msg_name,
98227 + int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
98228 kern_msg->msg_namelen,
98229 kern_address);
98230 if (err < 0)
98231 @@ -99,7 +99,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
98232 kern_msg->msg_name = NULL;
98233
98234 tot_len = iov_from_user_compat_to_kern(kern_iov,
98235 - (struct compat_iovec __user *)kern_msg->msg_iov,
98236 + (struct compat_iovec __force_user *)kern_msg->msg_iov,
98237 kern_msg->msg_iovlen);
98238 if (tot_len >= 0)
98239 kern_msg->msg_iov = kern_iov;
98240 @@ -119,20 +119,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
98241
98242 #define CMSG_COMPAT_FIRSTHDR(msg) \
98243 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
98244 - (struct compat_cmsghdr __user *)((msg)->msg_control) : \
98245 + (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
98246 (struct compat_cmsghdr __user *)NULL)
98247
98248 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
98249 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
98250 (ucmlen) <= (unsigned long) \
98251 ((mhdr)->msg_controllen - \
98252 - ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
98253 + ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
98254
98255 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
98256 struct compat_cmsghdr __user *cmsg, int cmsg_len)
98257 {
98258 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
98259 - if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
98260 + if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
98261 msg->msg_controllen)
98262 return NULL;
98263 return (struct compat_cmsghdr __user *)ptr;
98264 @@ -222,7 +222,7 @@ Efault:
98265
98266 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
98267 {
98268 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
98269 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
98270 struct compat_cmsghdr cmhdr;
98271 struct compat_timeval ctv;
98272 struct compat_timespec cts[3];
98273 @@ -278,7 +278,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
98274
98275 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
98276 {
98277 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
98278 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
98279 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
98280 int fdnum = scm->fp->count;
98281 struct file **fp = scm->fp->fp;
98282 @@ -366,7 +366,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
98283 return -EFAULT;
98284 old_fs = get_fs();
98285 set_fs(KERNEL_DS);
98286 - err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
98287 + err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
98288 set_fs(old_fs);
98289
98290 return err;
98291 @@ -427,7 +427,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
98292 len = sizeof(ktime);
98293 old_fs = get_fs();
98294 set_fs(KERNEL_DS);
98295 - err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
98296 + err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
98297 set_fs(old_fs);
98298
98299 if (!err) {
98300 @@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
98301 case MCAST_JOIN_GROUP:
98302 case MCAST_LEAVE_GROUP:
98303 {
98304 - struct compat_group_req __user *gr32 = (void *)optval;
98305 + struct compat_group_req __user *gr32 = (void __user *)optval;
98306 struct group_req __user *kgr =
98307 compat_alloc_user_space(sizeof(struct group_req));
98308 u32 interface;
98309 @@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
98310 case MCAST_BLOCK_SOURCE:
98311 case MCAST_UNBLOCK_SOURCE:
98312 {
98313 - struct compat_group_source_req __user *gsr32 = (void *)optval;
98314 + struct compat_group_source_req __user *gsr32 = (void __user *)optval;
98315 struct group_source_req __user *kgsr = compat_alloc_user_space(
98316 sizeof(struct group_source_req));
98317 u32 interface;
98318 @@ -612,7 +612,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
98319 }
98320 case MCAST_MSFILTER:
98321 {
98322 - struct compat_group_filter __user *gf32 = (void *)optval;
98323 + struct compat_group_filter __user *gf32 = (void __user *)optval;
98324 struct group_filter __user *kgf;
98325 u32 interface, fmode, numsrc;
98326
98327 @@ -650,7 +650,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
98328 char __user *optval, int __user *optlen,
98329 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
98330 {
98331 - struct compat_group_filter __user *gf32 = (void *)optval;
98332 + struct compat_group_filter __user *gf32 = (void __user *)optval;
98333 struct group_filter __user *kgf;
98334 int __user *koptlen;
98335 u32 interface, fmode, numsrc;
98336 @@ -803,7 +803,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
98337
98338 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
98339 return -EINVAL;
98340 - if (copy_from_user(a, args, nas[call]))
98341 + if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
98342 return -EFAULT;
98343 a0 = a[0];
98344 a1 = a[1];
98345 diff --git a/net/core/datagram.c b/net/core/datagram.c
98346 index a16ed7b..eb44d17 100644
98347 --- a/net/core/datagram.c
98348 +++ b/net/core/datagram.c
98349 @@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
98350 }
98351
98352 kfree_skb(skb);
98353 - atomic_inc(&sk->sk_drops);
98354 + atomic_inc_unchecked(&sk->sk_drops);
98355 sk_mem_reclaim_partial(sk);
98356
98357 return err;
98358 diff --git a/net/core/dev.c b/net/core/dev.c
98359 index a30bef1..51d3e33 100644
98360 --- a/net/core/dev.c
98361 +++ b/net/core/dev.c
98362 @@ -1683,14 +1683,14 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
98363 {
98364 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
98365 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
98366 - atomic_long_inc(&dev->rx_dropped);
98367 + atomic_long_inc_unchecked(&dev->rx_dropped);
98368 kfree_skb(skb);
98369 return NET_RX_DROP;
98370 }
98371 }
98372
98373 if (unlikely(!is_skb_forwardable(dev, skb))) {
98374 - atomic_long_inc(&dev->rx_dropped);
98375 + atomic_long_inc_unchecked(&dev->rx_dropped);
98376 kfree_skb(skb);
98377 return NET_RX_DROP;
98378 }
98379 @@ -2463,7 +2463,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
98380
98381 struct dev_gso_cb {
98382 void (*destructor)(struct sk_buff *skb);
98383 -};
98384 +} __no_const;
98385
98386 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
98387
98388 @@ -2893,7 +2893,7 @@ recursion_alert:
98389 rc = -ENETDOWN;
98390 rcu_read_unlock_bh();
98391
98392 - atomic_long_inc(&dev->tx_dropped);
98393 + atomic_long_inc_unchecked(&dev->tx_dropped);
98394 kfree_skb(skb);
98395 return rc;
98396 out:
98397 @@ -3237,7 +3237,7 @@ enqueue:
98398
98399 local_irq_restore(flags);
98400
98401 - atomic_long_inc(&skb->dev->rx_dropped);
98402 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
98403 kfree_skb(skb);
98404 return NET_RX_DROP;
98405 }
98406 @@ -3314,7 +3314,7 @@ int netif_rx_ni(struct sk_buff *skb)
98407 }
98408 EXPORT_SYMBOL(netif_rx_ni);
98409
98410 -static void net_tx_action(struct softirq_action *h)
98411 +static __latent_entropy void net_tx_action(void)
98412 {
98413 struct softnet_data *sd = &__get_cpu_var(softnet_data);
98414
98415 @@ -3647,7 +3647,7 @@ ncls:
98416 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
98417 } else {
98418 drop:
98419 - atomic_long_inc(&skb->dev->rx_dropped);
98420 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
98421 kfree_skb(skb);
98422 /* Jamal, now you will not able to escape explaining
98423 * me how you were going to use this. :-)
98424 @@ -4366,7 +4366,7 @@ void netif_napi_del(struct napi_struct *napi)
98425 }
98426 EXPORT_SYMBOL(netif_napi_del);
98427
98428 -static void net_rx_action(struct softirq_action *h)
98429 +static __latent_entropy void net_rx_action(void)
98430 {
98431 struct softnet_data *sd = &__get_cpu_var(softnet_data);
98432 unsigned long time_limit = jiffies + 2;
98433 @@ -6366,8 +6366,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
98434 } else {
98435 netdev_stats_to_stats64(storage, &dev->stats);
98436 }
98437 - storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
98438 - storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
98439 + storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
98440 + storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
98441 return storage;
98442 }
98443 EXPORT_SYMBOL(dev_get_stats);
98444 diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
98445 index cf999e0..c59a975 100644
98446 --- a/net/core/dev_ioctl.c
98447 +++ b/net/core/dev_ioctl.c
98448 @@ -366,9 +366,13 @@ void dev_load(struct net *net, const char *name)
98449 if (no_module && capable(CAP_NET_ADMIN))
98450 no_module = request_module("netdev-%s", name);
98451 if (no_module && capable(CAP_SYS_MODULE)) {
98452 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
98453 + ___request_module(true, "grsec_modharden_netdev", "%s", name);
98454 +#else
98455 if (!request_module("%s", name))
98456 pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
98457 name);
98458 +#endif
98459 }
98460 }
98461 EXPORT_SYMBOL(dev_load);
98462 diff --git a/net/core/dst.c b/net/core/dst.c
98463 index 80d6286..a028409 100644
98464 --- a/net/core/dst.c
98465 +++ b/net/core/dst.c
98466 @@ -269,6 +269,15 @@ again:
98467 }
98468 EXPORT_SYMBOL(dst_destroy);
98469
98470 +static void dst_destroy_rcu(struct rcu_head *head)
98471 +{
98472 + struct dst_entry *dst = container_of(head, struct dst_entry, rcu_head);
98473 +
98474 + dst = dst_destroy(dst);
98475 + if (dst)
98476 + __dst_free(dst);
98477 +}
98478 +
98479 void dst_release(struct dst_entry *dst)
98480 {
98481 if (dst) {
98482 @@ -276,11 +285,8 @@ void dst_release(struct dst_entry *dst)
98483
98484 newrefcnt = atomic_dec_return(&dst->__refcnt);
98485 WARN_ON(newrefcnt < 0);
98486 - if (unlikely(dst->flags & DST_NOCACHE) && !newrefcnt) {
98487 - dst = dst_destroy(dst);
98488 - if (dst)
98489 - __dst_free(dst);
98490 - }
98491 + if (unlikely(dst->flags & DST_NOCACHE) && !newrefcnt)
98492 + call_rcu(&dst->rcu_head, dst_destroy_rcu);
98493 }
98494 }
98495 EXPORT_SYMBOL(dst_release);
98496 diff --git a/net/core/filter.c b/net/core/filter.c
98497 index 4aec7b9..5cf605c 100644
98498 --- a/net/core/filter.c
98499 +++ b/net/core/filter.c
98500 @@ -1121,7 +1121,11 @@ do_pass:
98501 break;
98502
98503 default:
98504 - goto err;
98505 + WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
98506 + fp->code, fp->jt, fp->jf, fp->k);
98507 + kfree(addrs);
98508 + BUG();
98509 + return -EINVAL;
98510 }
98511
98512 insn++;
98513 @@ -1170,7 +1174,7 @@ static int check_load_and_stores(struct sock_filter *filter, int flen)
98514 u16 *masks, memvalid = 0; /* one bit per cell, 16 cells */
98515 int pc, ret = 0;
98516
98517 - BUILD_BUG_ON(BPF_MEMWORDS > 16);
98518 + BUILD_BUG_ON(BPF_MEMWORDS != 16);
98519 masks = kmalloc(flen * sizeof(*masks), GFP_KERNEL);
98520 if (!masks)
98521 return -ENOMEM;
98522 @@ -1605,7 +1609,7 @@ int sk_unattached_filter_create(struct sk_filter **pfp,
98523 if (!fp)
98524 return -ENOMEM;
98525
98526 - memcpy(fp->insns, fprog->filter, fsize);
98527 + memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
98528
98529 atomic_set(&fp->refcnt, 1);
98530 fp->len = fprog->len;
98531 diff --git a/net/core/flow.c b/net/core/flow.c
98532 index a0348fd..6951c76 100644
98533 --- a/net/core/flow.c
98534 +++ b/net/core/flow.c
98535 @@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
98536 static int flow_entry_valid(struct flow_cache_entry *fle,
98537 struct netns_xfrm *xfrm)
98538 {
98539 - if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
98540 + if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
98541 return 0;
98542 if (fle->object && !fle->object->ops->check(fle->object))
98543 return 0;
98544 @@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
98545 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
98546 fcp->hash_count++;
98547 }
98548 - } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
98549 + } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
98550 flo = fle->object;
98551 if (!flo)
98552 goto ret_object;
98553 @@ -263,7 +263,7 @@ nocache:
98554 }
98555 flo = resolver(net, key, family, dir, flo, ctx);
98556 if (fle) {
98557 - fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
98558 + fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
98559 if (!IS_ERR(flo))
98560 fle->object = flo;
98561 else
98562 diff --git a/net/core/iovec.c b/net/core/iovec.c
98563 index b618694..192bbba 100644
98564 --- a/net/core/iovec.c
98565 +++ b/net/core/iovec.c
98566 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
98567 if (m->msg_namelen) {
98568 if (mode == VERIFY_READ) {
98569 void __user *namep;
98570 - namep = (void __user __force *) m->msg_name;
98571 + namep = (void __force_user *) m->msg_name;
98572 err = move_addr_to_kernel(namep, m->msg_namelen,
98573 address);
98574 if (err < 0)
98575 @@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
98576 }
98577
98578 size = m->msg_iovlen * sizeof(struct iovec);
98579 - if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
98580 + if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
98581 return -EFAULT;
98582
98583 m->msg_iov = iov;
98584 diff --git a/net/core/neighbour.c b/net/core/neighbour.c
98585 index 32d872e..487e769 100644
98586 --- a/net/core/neighbour.c
98587 +++ b/net/core/neighbour.c
98588 @@ -2825,7 +2825,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
98589 void __user *buffer, size_t *lenp, loff_t *ppos)
98590 {
98591 int size, ret;
98592 - struct ctl_table tmp = *ctl;
98593 + ctl_table_no_const tmp = *ctl;
98594
98595 tmp.extra1 = &zero;
98596 tmp.extra2 = &unres_qlen_max;
98597 @@ -2887,7 +2887,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
98598 void __user *buffer,
98599 size_t *lenp, loff_t *ppos)
98600 {
98601 - struct ctl_table tmp = *ctl;
98602 + ctl_table_no_const tmp = *ctl;
98603 int ret;
98604
98605 tmp.extra1 = &zero;
98606 @@ -3059,11 +3059,12 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
98607 memset(&t->neigh_vars[NEIGH_VAR_GC_INTERVAL], 0,
98608 sizeof(t->neigh_vars[NEIGH_VAR_GC_INTERVAL]));
98609 } else {
98610 + struct neigh_table *ntable = container_of(p, struct neigh_table, parms);
98611 dev_name_source = "default";
98612 - t->neigh_vars[NEIGH_VAR_GC_INTERVAL].data = (int *)(p + 1);
98613 - t->neigh_vars[NEIGH_VAR_GC_THRESH1].data = (int *)(p + 1) + 1;
98614 - t->neigh_vars[NEIGH_VAR_GC_THRESH2].data = (int *)(p + 1) + 2;
98615 - t->neigh_vars[NEIGH_VAR_GC_THRESH3].data = (int *)(p + 1) + 3;
98616 + t->neigh_vars[NEIGH_VAR_GC_INTERVAL].data = &ntable->gc_interval;
98617 + t->neigh_vars[NEIGH_VAR_GC_THRESH1].data = &ntable->gc_thresh1;
98618 + t->neigh_vars[NEIGH_VAR_GC_THRESH2].data = &ntable->gc_thresh2;
98619 + t->neigh_vars[NEIGH_VAR_GC_THRESH3].data = &ntable->gc_thresh3;
98620 }
98621
98622 if (handler) {
98623 diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
98624 index 2bf8329..2eb1423 100644
98625 --- a/net/core/net-procfs.c
98626 +++ b/net/core/net-procfs.c
98627 @@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
98628 struct rtnl_link_stats64 temp;
98629 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
98630
98631 - seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
98632 + if (gr_proc_is_restricted())
98633 + seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
98634 + "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
98635 + dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
98636 + 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
98637 + else
98638 + seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
98639 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
98640 dev->name, stats->rx_bytes, stats->rx_packets,
98641 stats->rx_errors,
98642 @@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
98643 return 0;
98644 }
98645
98646 -static const struct seq_operations dev_seq_ops = {
98647 +const struct seq_operations dev_seq_ops = {
98648 .start = dev_seq_start,
98649 .next = dev_seq_next,
98650 .stop = dev_seq_stop,
98651 @@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
98652
98653 static int softnet_seq_open(struct inode *inode, struct file *file)
98654 {
98655 - return seq_open(file, &softnet_seq_ops);
98656 + return seq_open_restrict(file, &softnet_seq_ops);
98657 }
98658
98659 static const struct file_operations softnet_seq_fops = {
98660 @@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
98661 else
98662 seq_printf(seq, "%04x", ntohs(pt->type));
98663
98664 +#ifdef CONFIG_GRKERNSEC_HIDESYM
98665 + seq_printf(seq, " %-8s %pf\n",
98666 + pt->dev ? pt->dev->name : "", NULL);
98667 +#else
98668 seq_printf(seq, " %-8s %pf\n",
98669 pt->dev ? pt->dev->name : "", pt->func);
98670 +#endif
98671 }
98672
98673 return 0;
98674 diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
98675 index 1cac29e..fb482f3 100644
98676 --- a/net/core/net-sysfs.c
98677 +++ b/net/core/net-sysfs.c
98678 @@ -259,7 +259,7 @@ static ssize_t carrier_changes_show(struct device *dev,
98679 {
98680 struct net_device *netdev = to_net_dev(dev);
98681 return sprintf(buf, fmt_dec,
98682 - atomic_read(&netdev->carrier_changes));
98683 + atomic_read_unchecked(&netdev->carrier_changes));
98684 }
98685 static DEVICE_ATTR_RO(carrier_changes);
98686
98687 diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
98688 index 7c8ffd9..0cb3687 100644
98689 --- a/net/core/net_namespace.c
98690 +++ b/net/core/net_namespace.c
98691 @@ -443,7 +443,7 @@ static int __register_pernet_operations(struct list_head *list,
98692 int error;
98693 LIST_HEAD(net_exit_list);
98694
98695 - list_add_tail(&ops->list, list);
98696 + pax_list_add_tail((struct list_head *)&ops->list, list);
98697 if (ops->init || (ops->id && ops->size)) {
98698 for_each_net(net) {
98699 error = ops_init(ops, net);
98700 @@ -456,7 +456,7 @@ static int __register_pernet_operations(struct list_head *list,
98701
98702 out_undo:
98703 /* If I have an error cleanup all namespaces I initialized */
98704 - list_del(&ops->list);
98705 + pax_list_del((struct list_head *)&ops->list);
98706 ops_exit_list(ops, &net_exit_list);
98707 ops_free_list(ops, &net_exit_list);
98708 return error;
98709 @@ -467,7 +467,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
98710 struct net *net;
98711 LIST_HEAD(net_exit_list);
98712
98713 - list_del(&ops->list);
98714 + pax_list_del((struct list_head *)&ops->list);
98715 for_each_net(net)
98716 list_add_tail(&net->exit_list, &net_exit_list);
98717 ops_exit_list(ops, &net_exit_list);
98718 @@ -601,7 +601,7 @@ int register_pernet_device(struct pernet_operations *ops)
98719 mutex_lock(&net_mutex);
98720 error = register_pernet_operations(&pernet_list, ops);
98721 if (!error && (first_device == &pernet_list))
98722 - first_device = &ops->list;
98723 + first_device = (struct list_head *)&ops->list;
98724 mutex_unlock(&net_mutex);
98725 return error;
98726 }
98727 diff --git a/net/core/netpoll.c b/net/core/netpoll.c
98728 index e33937f..b2b4981 100644
98729 --- a/net/core/netpoll.c
98730 +++ b/net/core/netpoll.c
98731 @@ -382,7 +382,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
98732 struct udphdr *udph;
98733 struct iphdr *iph;
98734 struct ethhdr *eth;
98735 - static atomic_t ip_ident;
98736 + static atomic_unchecked_t ip_ident;
98737 struct ipv6hdr *ip6h;
98738
98739 udp_len = len + sizeof(*udph);
98740 @@ -453,7 +453,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
98741 put_unaligned(0x45, (unsigned char *)iph);
98742 iph->tos = 0;
98743 put_unaligned(htons(ip_len), &(iph->tot_len));
98744 - iph->id = htons(atomic_inc_return(&ip_ident));
98745 + iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
98746 iph->frag_off = 0;
98747 iph->ttl = 64;
98748 iph->protocol = IPPROTO_UDP;
98749 diff --git a/net/core/pktgen.c b/net/core/pktgen.c
98750 index 0304f98..ddfead6 100644
98751 --- a/net/core/pktgen.c
98752 +++ b/net/core/pktgen.c
98753 @@ -3725,7 +3725,7 @@ static int __net_init pg_net_init(struct net *net)
98754 pn->net = net;
98755 INIT_LIST_HEAD(&pn->pktgen_threads);
98756 pn->pktgen_exiting = false;
98757 - pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
98758 + pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
98759 if (!pn->proc_dir) {
98760 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
98761 return -ENODEV;
98762 diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
98763 index 1999ed8..1e6e58a 100644
98764 --- a/net/core/rtnetlink.c
98765 +++ b/net/core/rtnetlink.c
98766 @@ -58,7 +58,7 @@ struct rtnl_link {
98767 rtnl_doit_func doit;
98768 rtnl_dumpit_func dumpit;
98769 rtnl_calcit_func calcit;
98770 -};
98771 +} __no_const;
98772
98773 static DEFINE_MUTEX(rtnl_mutex);
98774
98775 @@ -299,10 +299,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
98776 if (rtnl_link_ops_get(ops->kind))
98777 return -EEXIST;
98778
98779 - if (!ops->dellink)
98780 - ops->dellink = unregister_netdevice_queue;
98781 + if (!ops->dellink) {
98782 + pax_open_kernel();
98783 + *(void **)&ops->dellink = unregister_netdevice_queue;
98784 + pax_close_kernel();
98785 + }
98786
98787 - list_add_tail(&ops->list, &link_ops);
98788 + pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
98789 return 0;
98790 }
98791 EXPORT_SYMBOL_GPL(__rtnl_link_register);
98792 @@ -349,7 +352,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
98793 for_each_net(net) {
98794 __rtnl_kill_links(net, ops);
98795 }
98796 - list_del(&ops->list);
98797 + pax_list_del((struct list_head *)&ops->list);
98798 }
98799 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
98800
98801 @@ -1008,7 +1011,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
98802 (dev->ifalias &&
98803 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
98804 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
98805 - atomic_read(&dev->carrier_changes)))
98806 + atomic_read_unchecked(&dev->carrier_changes)))
98807 goto nla_put_failure;
98808
98809 if (1) {
98810 diff --git a/net/core/scm.c b/net/core/scm.c
98811 index b442e7e..6f5b5a2 100644
98812 --- a/net/core/scm.c
98813 +++ b/net/core/scm.c
98814 @@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
98815 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
98816 {
98817 struct cmsghdr __user *cm
98818 - = (__force struct cmsghdr __user *)msg->msg_control;
98819 + = (struct cmsghdr __force_user *)msg->msg_control;
98820 struct cmsghdr cmhdr;
98821 int cmlen = CMSG_LEN(len);
98822 int err;
98823 @@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
98824 err = -EFAULT;
98825 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
98826 goto out;
98827 - if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
98828 + if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
98829 goto out;
98830 cmlen = CMSG_SPACE(len);
98831 if (msg->msg_controllen < cmlen)
98832 @@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
98833 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
98834 {
98835 struct cmsghdr __user *cm
98836 - = (__force struct cmsghdr __user*)msg->msg_control;
98837 + = (struct cmsghdr __force_user *)msg->msg_control;
98838
98839 int fdmax = 0;
98840 int fdnum = scm->fp->count;
98841 @@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
98842 if (fdnum < fdmax)
98843 fdmax = fdnum;
98844
98845 - for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
98846 + for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
98847 i++, cmfptr++)
98848 {
98849 struct socket *sock;
98850 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
98851 index 8383b2b..6397efb 100644
98852 --- a/net/core/skbuff.c
98853 +++ b/net/core/skbuff.c
98854 @@ -2003,7 +2003,7 @@ EXPORT_SYMBOL(__skb_checksum);
98855 __wsum skb_checksum(const struct sk_buff *skb, int offset,
98856 int len, __wsum csum)
98857 {
98858 - const struct skb_checksum_ops ops = {
98859 + static const struct skb_checksum_ops ops = {
98860 .update = csum_partial_ext,
98861 .combine = csum_block_add_ext,
98862 };
98863 @@ -3220,13 +3220,15 @@ void __init skb_init(void)
98864 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
98865 sizeof(struct sk_buff),
98866 0,
98867 - SLAB_HWCACHE_ALIGN|SLAB_PANIC,
98868 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|
98869 + SLAB_NO_SANITIZE,
98870 NULL);
98871 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
98872 (2*sizeof(struct sk_buff)) +
98873 sizeof(atomic_t),
98874 0,
98875 - SLAB_HWCACHE_ALIGN|SLAB_PANIC,
98876 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|
98877 + SLAB_NO_SANITIZE,
98878 NULL);
98879 }
98880
98881 diff --git a/net/core/sock.c b/net/core/sock.c
98882 index 664ee42..aaf9e6e 100644
98883 --- a/net/core/sock.c
98884 +++ b/net/core/sock.c
98885 @@ -442,7 +442,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
98886 struct sk_buff_head *list = &sk->sk_receive_queue;
98887
98888 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
98889 - atomic_inc(&sk->sk_drops);
98890 + atomic_inc_unchecked(&sk->sk_drops);
98891 trace_sock_rcvqueue_full(sk, skb);
98892 return -ENOMEM;
98893 }
98894 @@ -452,7 +452,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
98895 return err;
98896
98897 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
98898 - atomic_inc(&sk->sk_drops);
98899 + atomic_inc_unchecked(&sk->sk_drops);
98900 return -ENOBUFS;
98901 }
98902
98903 @@ -472,7 +472,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
98904 skb_dst_force(skb);
98905
98906 spin_lock_irqsave(&list->lock, flags);
98907 - skb->dropcount = atomic_read(&sk->sk_drops);
98908 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
98909 __skb_queue_tail(list, skb);
98910 spin_unlock_irqrestore(&list->lock, flags);
98911
98912 @@ -492,7 +492,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
98913 skb->dev = NULL;
98914
98915 if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {
98916 - atomic_inc(&sk->sk_drops);
98917 + atomic_inc_unchecked(&sk->sk_drops);
98918 goto discard_and_relse;
98919 }
98920 if (nested)
98921 @@ -510,7 +510,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
98922 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
98923 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
98924 bh_unlock_sock(sk);
98925 - atomic_inc(&sk->sk_drops);
98926 + atomic_inc_unchecked(&sk->sk_drops);
98927 goto discard_and_relse;
98928 }
98929
98930 @@ -998,12 +998,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
98931 struct timeval tm;
98932 } v;
98933
98934 - int lv = sizeof(int);
98935 - int len;
98936 + unsigned int lv = sizeof(int);
98937 + unsigned int len;
98938
98939 if (get_user(len, optlen))
98940 return -EFAULT;
98941 - if (len < 0)
98942 + if (len > INT_MAX)
98943 return -EINVAL;
98944
98945 memset(&v, 0, sizeof(v));
98946 @@ -1155,11 +1155,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
98947
98948 case SO_PEERNAME:
98949 {
98950 - char address[128];
98951 + char address[_K_SS_MAXSIZE];
98952
98953 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
98954 return -ENOTCONN;
98955 - if (lv < len)
98956 + if (lv < len || sizeof address < len)
98957 return -EINVAL;
98958 if (copy_to_user(optval, address, len))
98959 return -EFAULT;
98960 @@ -1240,7 +1240,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
98961
98962 if (len > lv)
98963 len = lv;
98964 - if (copy_to_user(optval, &v, len))
98965 + if (len > sizeof(v) || copy_to_user(optval, &v, len))
98966 return -EFAULT;
98967 lenout:
98968 if (put_user(len, optlen))
98969 @@ -2375,7 +2375,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
98970 */
98971 smp_wmb();
98972 atomic_set(&sk->sk_refcnt, 1);
98973 - atomic_set(&sk->sk_drops, 0);
98974 + atomic_set_unchecked(&sk->sk_drops, 0);
98975 }
98976 EXPORT_SYMBOL(sock_init_data);
98977
98978 @@ -2503,6 +2503,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
98979 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
98980 int level, int type)
98981 {
98982 + struct sock_extended_err ee;
98983 struct sock_exterr_skb *serr;
98984 struct sk_buff *skb, *skb2;
98985 int copied, err;
98986 @@ -2524,7 +2525,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
98987 sock_recv_timestamp(msg, sk, skb);
98988
98989 serr = SKB_EXT_ERR(skb);
98990 - put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
98991 + ee = serr->ee;
98992 + put_cmsg(msg, level, type, sizeof ee, &ee);
98993
98994 msg->msg_flags |= MSG_ERRQUEUE;
98995 err = copied;
98996 diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
98997 index a4216a4..1c07687 100644
98998 --- a/net/core/sock_diag.c
98999 +++ b/net/core/sock_diag.c
99000 @@ -9,26 +9,33 @@
99001 #include <linux/inet_diag.h>
99002 #include <linux/sock_diag.h>
99003
99004 -static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
99005 +static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
99006 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
99007 static DEFINE_MUTEX(sock_diag_table_mutex);
99008
99009 int sock_diag_check_cookie(void *sk, __u32 *cookie)
99010 {
99011 +#ifndef CONFIG_GRKERNSEC_HIDESYM
99012 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
99013 cookie[1] != INET_DIAG_NOCOOKIE) &&
99014 ((u32)(unsigned long)sk != cookie[0] ||
99015 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
99016 return -ESTALE;
99017 else
99018 +#endif
99019 return 0;
99020 }
99021 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
99022
99023 void sock_diag_save_cookie(void *sk, __u32 *cookie)
99024 {
99025 +#ifdef CONFIG_GRKERNSEC_HIDESYM
99026 + cookie[0] = 0;
99027 + cookie[1] = 0;
99028 +#else
99029 cookie[0] = (u32)(unsigned long)sk;
99030 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
99031 +#endif
99032 }
99033 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
99034
99035 @@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
99036 mutex_lock(&sock_diag_table_mutex);
99037 if (sock_diag_handlers[hndl->family])
99038 err = -EBUSY;
99039 - else
99040 + else {
99041 + pax_open_kernel();
99042 sock_diag_handlers[hndl->family] = hndl;
99043 + pax_close_kernel();
99044 + }
99045 mutex_unlock(&sock_diag_table_mutex);
99046
99047 return err;
99048 @@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
99049
99050 mutex_lock(&sock_diag_table_mutex);
99051 BUG_ON(sock_diag_handlers[family] != hnld);
99052 + pax_open_kernel();
99053 sock_diag_handlers[family] = NULL;
99054 + pax_close_kernel();
99055 mutex_unlock(&sock_diag_table_mutex);
99056 }
99057 EXPORT_SYMBOL_GPL(sock_diag_unregister);
99058 diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
99059 index cf9cd13..8b56af3 100644
99060 --- a/net/core/sysctl_net_core.c
99061 +++ b/net/core/sysctl_net_core.c
99062 @@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
99063 {
99064 unsigned int orig_size, size;
99065 int ret, i;
99066 - struct ctl_table tmp = {
99067 + ctl_table_no_const tmp = {
99068 .data = &size,
99069 .maxlen = sizeof(size),
99070 .mode = table->mode
99071 @@ -200,7 +200,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
99072 void __user *buffer, size_t *lenp, loff_t *ppos)
99073 {
99074 char id[IFNAMSIZ];
99075 - struct ctl_table tbl = {
99076 + ctl_table_no_const tbl = {
99077 .data = id,
99078 .maxlen = IFNAMSIZ,
99079 };
99080 @@ -379,13 +379,12 @@ static struct ctl_table netns_core_table[] = {
99081
99082 static __net_init int sysctl_core_net_init(struct net *net)
99083 {
99084 - struct ctl_table *tbl;
99085 + ctl_table_no_const *tbl = NULL;
99086
99087 net->core.sysctl_somaxconn = SOMAXCONN;
99088
99089 - tbl = netns_core_table;
99090 if (!net_eq(net, &init_net)) {
99091 - tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
99092 + tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
99093 if (tbl == NULL)
99094 goto err_dup;
99095
99096 @@ -395,17 +394,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
99097 if (net->user_ns != &init_user_ns) {
99098 tbl[0].procname = NULL;
99099 }
99100 - }
99101 -
99102 - net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
99103 + net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
99104 + } else
99105 + net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
99106 if (net->core.sysctl_hdr == NULL)
99107 goto err_reg;
99108
99109 return 0;
99110
99111 err_reg:
99112 - if (tbl != netns_core_table)
99113 - kfree(tbl);
99114 + kfree(tbl);
99115 err_dup:
99116 return -ENOMEM;
99117 }
99118 @@ -420,7 +418,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
99119 kfree(tbl);
99120 }
99121
99122 -static __net_initdata struct pernet_operations sysctl_core_ops = {
99123 +static __net_initconst struct pernet_operations sysctl_core_ops = {
99124 .init = sysctl_core_net_init,
99125 .exit = sysctl_core_net_exit,
99126 };
99127 diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
99128 index 4c04848..f575934 100644
99129 --- a/net/decnet/af_decnet.c
99130 +++ b/net/decnet/af_decnet.c
99131 @@ -465,6 +465,7 @@ static struct proto dn_proto = {
99132 .sysctl_rmem = sysctl_decnet_rmem,
99133 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
99134 .obj_size = sizeof(struct dn_sock),
99135 + .slab_flags = SLAB_USERCOPY,
99136 };
99137
99138 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
99139 diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
99140 index 3b726f3..1af6368 100644
99141 --- a/net/decnet/dn_dev.c
99142 +++ b/net/decnet/dn_dev.c
99143 @@ -200,7 +200,7 @@ static struct dn_dev_sysctl_table {
99144 .extra1 = &min_t3,
99145 .extra2 = &max_t3
99146 },
99147 - {0}
99148 + { }
99149 },
99150 };
99151
99152 diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
99153 index 5325b54..a0d4d69 100644
99154 --- a/net/decnet/sysctl_net_decnet.c
99155 +++ b/net/decnet/sysctl_net_decnet.c
99156 @@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
99157
99158 if (len > *lenp) len = *lenp;
99159
99160 - if (copy_to_user(buffer, addr, len))
99161 + if (len > sizeof addr || copy_to_user(buffer, addr, len))
99162 return -EFAULT;
99163
99164 *lenp = len;
99165 @@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
99166
99167 if (len > *lenp) len = *lenp;
99168
99169 - if (copy_to_user(buffer, devname, len))
99170 + if (len > sizeof devname || copy_to_user(buffer, devname, len))
99171 return -EFAULT;
99172
99173 *lenp = len;
99174 diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
99175 index ef2d543..5b9b73f 100644
99176 --- a/net/ieee802154/reassembly.c
99177 +++ b/net/ieee802154/reassembly.c
99178 @@ -434,12 +434,11 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
99179
99180 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
99181 {
99182 - struct ctl_table *table;
99183 + ctl_table_no_const *table = NULL;
99184 struct ctl_table_header *hdr;
99185
99186 - table = lowpan_frags_ns_ctl_table;
99187 if (!net_eq(net, &init_net)) {
99188 - table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
99189 + table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
99190 GFP_KERNEL);
99191 if (table == NULL)
99192 goto err_alloc;
99193 @@ -452,9 +451,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
99194 /* Don't export sysctls to unprivileged users */
99195 if (net->user_ns != &init_user_ns)
99196 table[0].procname = NULL;
99197 - }
99198 -
99199 - hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
99200 + hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
99201 + } else
99202 + hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
99203 if (hdr == NULL)
99204 goto err_reg;
99205
99206 @@ -462,8 +461,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
99207 return 0;
99208
99209 err_reg:
99210 - if (!net_eq(net, &init_net))
99211 - kfree(table);
99212 + kfree(table);
99213 err_alloc:
99214 return -ENOMEM;
99215 }
99216 diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
99217 index 6d6dd34..e5c9bec 100644
99218 --- a/net/ipv4/af_inet.c
99219 +++ b/net/ipv4/af_inet.c
99220 @@ -1736,13 +1736,9 @@ static int __init inet_init(void)
99221
99222 BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb));
99223
99224 - sysctl_local_reserved_ports = kzalloc(65536 / 8, GFP_KERNEL);
99225 - if (!sysctl_local_reserved_ports)
99226 - goto out;
99227 -
99228 rc = proto_register(&tcp_prot, 1);
99229 if (rc)
99230 - goto out_free_reserved_ports;
99231 + goto out;
99232
99233 rc = proto_register(&udp_prot, 1);
99234 if (rc)
99235 @@ -1852,8 +1848,6 @@ out_unregister_udp_proto:
99236 proto_unregister(&udp_prot);
99237 out_unregister_tcp_proto:
99238 proto_unregister(&tcp_prot);
99239 -out_free_reserved_ports:
99240 - kfree(sysctl_local_reserved_ports);
99241 goto out;
99242 }
99243
99244 diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
99245 index bdbf68b..deb4759 100644
99246 --- a/net/ipv4/devinet.c
99247 +++ b/net/ipv4/devinet.c
99248 @@ -1543,7 +1543,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
99249 idx = 0;
99250 head = &net->dev_index_head[h];
99251 rcu_read_lock();
99252 - cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
99253 + cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
99254 net->dev_base_seq;
99255 hlist_for_each_entry_rcu(dev, head, index_hlist) {
99256 if (idx < s_idx)
99257 @@ -1861,7 +1861,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
99258 idx = 0;
99259 head = &net->dev_index_head[h];
99260 rcu_read_lock();
99261 - cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
99262 + cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
99263 net->dev_base_seq;
99264 hlist_for_each_entry_rcu(dev, head, index_hlist) {
99265 if (idx < s_idx)
99266 @@ -2096,7 +2096,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
99267 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
99268 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
99269
99270 -static struct devinet_sysctl_table {
99271 +static const struct devinet_sysctl_table {
99272 struct ctl_table_header *sysctl_header;
99273 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
99274 } devinet_sysctl = {
99275 @@ -2218,7 +2218,7 @@ static __net_init int devinet_init_net(struct net *net)
99276 int err;
99277 struct ipv4_devconf *all, *dflt;
99278 #ifdef CONFIG_SYSCTL
99279 - struct ctl_table *tbl = ctl_forward_entry;
99280 + ctl_table_no_const *tbl = NULL;
99281 struct ctl_table_header *forw_hdr;
99282 #endif
99283
99284 @@ -2236,7 +2236,7 @@ static __net_init int devinet_init_net(struct net *net)
99285 goto err_alloc_dflt;
99286
99287 #ifdef CONFIG_SYSCTL
99288 - tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
99289 + tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
99290 if (tbl == NULL)
99291 goto err_alloc_ctl;
99292
99293 @@ -2256,7 +2256,10 @@ static __net_init int devinet_init_net(struct net *net)
99294 goto err_reg_dflt;
99295
99296 err = -ENOMEM;
99297 - forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
99298 + if (!net_eq(net, &init_net))
99299 + forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
99300 + else
99301 + forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
99302 if (forw_hdr == NULL)
99303 goto err_reg_ctl;
99304 net->ipv4.forw_hdr = forw_hdr;
99305 @@ -2272,8 +2275,7 @@ err_reg_ctl:
99306 err_reg_dflt:
99307 __devinet_sysctl_unregister(all);
99308 err_reg_all:
99309 - if (tbl != ctl_forward_entry)
99310 - kfree(tbl);
99311 + kfree(tbl);
99312 err_alloc_ctl:
99313 #endif
99314 if (dflt != &ipv4_devconf_dflt)
99315 diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
99316 index 255aa99..45c78f8 100644
99317 --- a/net/ipv4/fib_frontend.c
99318 +++ b/net/ipv4/fib_frontend.c
99319 @@ -1015,12 +1015,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
99320 #ifdef CONFIG_IP_ROUTE_MULTIPATH
99321 fib_sync_up(dev);
99322 #endif
99323 - atomic_inc(&net->ipv4.dev_addr_genid);
99324 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
99325 rt_cache_flush(dev_net(dev));
99326 break;
99327 case NETDEV_DOWN:
99328 fib_del_ifaddr(ifa, NULL);
99329 - atomic_inc(&net->ipv4.dev_addr_genid);
99330 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
99331 if (ifa->ifa_dev->ifa_list == NULL) {
99332 /* Last address was deleted from this interface.
99333 * Disable IP.
99334 @@ -1058,7 +1058,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
99335 #ifdef CONFIG_IP_ROUTE_MULTIPATH
99336 fib_sync_up(dev);
99337 #endif
99338 - atomic_inc(&net->ipv4.dev_addr_genid);
99339 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
99340 rt_cache_flush(net);
99341 break;
99342 case NETDEV_DOWN:
99343 diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
99344 index b10cd43a..22327f9 100644
99345 --- a/net/ipv4/fib_semantics.c
99346 +++ b/net/ipv4/fib_semantics.c
99347 @@ -768,7 +768,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
99348 nh->nh_saddr = inet_select_addr(nh->nh_dev,
99349 nh->nh_gw,
99350 nh->nh_parent->fib_scope);
99351 - nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
99352 + nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
99353
99354 return nh->nh_saddr;
99355 }
99356 diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
99357 index a56b8e6..5be2a30 100644
99358 --- a/net/ipv4/inet_connection_sock.c
99359 +++ b/net/ipv4/inet_connection_sock.c
99360 @@ -29,7 +29,7 @@ const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n";
99361 EXPORT_SYMBOL(inet_csk_timer_bug_msg);
99362 #endif
99363
99364 -unsigned long *sysctl_local_reserved_ports;
99365 +unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
99366 EXPORT_SYMBOL(sysctl_local_reserved_ports);
99367
99368 void inet_get_local_port_range(struct net *net, int *low, int *high)
99369 diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
99370 index 8b9cf27..0d8d592 100644
99371 --- a/net/ipv4/inet_hashtables.c
99372 +++ b/net/ipv4/inet_hashtables.c
99373 @@ -18,6 +18,7 @@
99374 #include <linux/sched.h>
99375 #include <linux/slab.h>
99376 #include <linux/wait.h>
99377 +#include <linux/security.h>
99378
99379 #include <net/inet_connection_sock.h>
99380 #include <net/inet_hashtables.h>
99381 @@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
99382 return inet_ehashfn(net, laddr, lport, faddr, fport);
99383 }
99384
99385 +extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
99386 +
99387 /*
99388 * Allocate and initialize a new local port bind bucket.
99389 * The bindhash mutex for snum's hash chain must be held here.
99390 @@ -554,6 +557,8 @@ ok:
99391 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
99392 spin_unlock(&head->lock);
99393
99394 + gr_update_task_in_ip_table(current, inet_sk(sk));
99395 +
99396 if (tw) {
99397 inet_twsk_deschedule(tw, death_row);
99398 while (twrefcnt) {
99399 diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
99400 index 48f4244..f56d83a 100644
99401 --- a/net/ipv4/inetpeer.c
99402 +++ b/net/ipv4/inetpeer.c
99403 @@ -496,8 +496,8 @@ relookup:
99404 if (p) {
99405 p->daddr = *daddr;
99406 atomic_set(&p->refcnt, 1);
99407 - atomic_set(&p->rid, 0);
99408 - atomic_set(&p->ip_id_count,
99409 + atomic_set_unchecked(&p->rid, 0);
99410 + atomic_set_unchecked(&p->ip_id_count,
99411 (daddr->family == AF_INET) ?
99412 secure_ip_id(daddr->addr.a4) :
99413 secure_ipv6_id(daddr->addr.a6));
99414 diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
99415 index ed32313..3762abe 100644
99416 --- a/net/ipv4/ip_fragment.c
99417 +++ b/net/ipv4/ip_fragment.c
99418 @@ -284,7 +284,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
99419 return 0;
99420
99421 start = qp->rid;
99422 - end = atomic_inc_return(&peer->rid);
99423 + end = atomic_inc_return_unchecked(&peer->rid);
99424 qp->rid = end;
99425
99426 rc = qp->q.fragments && (end - start) > max;
99427 @@ -761,12 +761,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
99428
99429 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
99430 {
99431 - struct ctl_table *table;
99432 + ctl_table_no_const *table = NULL;
99433 struct ctl_table_header *hdr;
99434
99435 - table = ip4_frags_ns_ctl_table;
99436 if (!net_eq(net, &init_net)) {
99437 - table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
99438 + table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
99439 if (table == NULL)
99440 goto err_alloc;
99441
99442 @@ -777,9 +776,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
99443 /* Don't export sysctls to unprivileged users */
99444 if (net->user_ns != &init_user_ns)
99445 table[0].procname = NULL;
99446 - }
99447 + hdr = register_net_sysctl(net, "net/ipv4", table);
99448 + } else
99449 + hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
99450
99451 - hdr = register_net_sysctl(net, "net/ipv4", table);
99452 if (hdr == NULL)
99453 goto err_reg;
99454
99455 @@ -787,8 +787,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
99456 return 0;
99457
99458 err_reg:
99459 - if (!net_eq(net, &init_net))
99460 - kfree(table);
99461 + kfree(table);
99462 err_alloc:
99463 return -ENOMEM;
99464 }
99465 diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
99466 index 94213c8..8bdb342 100644
99467 --- a/net/ipv4/ip_gre.c
99468 +++ b/net/ipv4/ip_gre.c
99469 @@ -115,7 +115,7 @@ static bool log_ecn_error = true;
99470 module_param(log_ecn_error, bool, 0644);
99471 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
99472
99473 -static struct rtnl_link_ops ipgre_link_ops __read_mostly;
99474 +static struct rtnl_link_ops ipgre_link_ops;
99475 static int ipgre_tunnel_init(struct net_device *dev);
99476
99477 static int ipgre_net_id __read_mostly;
99478 @@ -732,7 +732,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
99479 [IFLA_GRE_PMTUDISC] = { .type = NLA_U8 },
99480 };
99481
99482 -static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
99483 +static struct rtnl_link_ops ipgre_link_ops = {
99484 .kind = "gre",
99485 .maxtype = IFLA_GRE_MAX,
99486 .policy = ipgre_policy,
99487 @@ -746,7 +746,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
99488 .fill_info = ipgre_fill_info,
99489 };
99490
99491 -static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
99492 +static struct rtnl_link_ops ipgre_tap_ops = {
99493 .kind = "gretap",
99494 .maxtype = IFLA_GRE_MAX,
99495 .policy = ipgre_policy,
99496 diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
99497 index 64741b9..6f334a2 100644
99498 --- a/net/ipv4/ip_sockglue.c
99499 +++ b/net/ipv4/ip_sockglue.c
99500 @@ -1188,7 +1188,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
99501 len = min_t(unsigned int, len, opt->optlen);
99502 if (put_user(len, optlen))
99503 return -EFAULT;
99504 - if (copy_to_user(optval, opt->__data, len))
99505 + if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
99506 + copy_to_user(optval, opt->__data, len))
99507 return -EFAULT;
99508 return 0;
99509 }
99510 @@ -1319,7 +1320,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
99511 if (sk->sk_type != SOCK_STREAM)
99512 return -ENOPROTOOPT;
99513
99514 - msg.msg_control = optval;
99515 + msg.msg_control = (void __force_kernel *)optval;
99516 msg.msg_controllen = len;
99517 msg.msg_flags = flags;
99518
99519 diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
99520 index 2acc233..b93143f 100644
99521 --- a/net/ipv4/ip_tunnel.c
99522 +++ b/net/ipv4/ip_tunnel.c
99523 @@ -73,12 +73,7 @@ static void __tunnel_dst_set(struct ip_tunnel_dst *idst,
99524 {
99525 struct dst_entry *old_dst;
99526
99527 - if (dst) {
99528 - if (dst->flags & DST_NOCACHE)
99529 - dst = NULL;
99530 - else
99531 - dst_clone(dst);
99532 - }
99533 + dst_clone(dst);
99534 old_dst = xchg((__force struct dst_entry **)&idst->dst, dst);
99535 dst_release(old_dst);
99536 }
99537 @@ -108,13 +103,14 @@ static struct rtable *tunnel_rtable_get(struct ip_tunnel *t, u32 cookie)
99538
99539 rcu_read_lock();
99540 dst = rcu_dereference(this_cpu_ptr(t->dst_cache)->dst);
99541 + if (dst && !atomic_inc_not_zero(&dst->__refcnt))
99542 + dst = NULL;
99543 if (dst) {
99544 if (dst->obsolete && dst->ops->check(dst, cookie) == NULL) {
99545 - rcu_read_unlock();
99546 tunnel_dst_reset(t);
99547 - return NULL;
99548 + dst_release(dst);
99549 + dst = NULL;
99550 }
99551 - dst_hold(dst);
99552 }
99553 rcu_read_unlock();
99554 return (struct rtable *)dst;
99555 diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
99556 index 13ef00f..8ffca25 100644
99557 --- a/net/ipv4/ip_vti.c
99558 +++ b/net/ipv4/ip_vti.c
99559 @@ -45,7 +45,7 @@
99560 #include <net/net_namespace.h>
99561 #include <net/netns/generic.h>
99562
99563 -static struct rtnl_link_ops vti_link_ops __read_mostly;
99564 +static struct rtnl_link_ops vti_link_ops;
99565
99566 static int vti_net_id __read_mostly;
99567 static int vti_tunnel_init(struct net_device *dev);
99568 @@ -513,7 +513,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
99569 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
99570 };
99571
99572 -static struct rtnl_link_ops vti_link_ops __read_mostly = {
99573 +static struct rtnl_link_ops vti_link_ops = {
99574 .kind = "vti",
99575 .maxtype = IFLA_VTI_MAX,
99576 .policy = vti_policy,
99577 diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
99578 index b3e86ea..18ce98c 100644
99579 --- a/net/ipv4/ipconfig.c
99580 +++ b/net/ipv4/ipconfig.c
99581 @@ -334,7 +334,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
99582
99583 mm_segment_t oldfs = get_fs();
99584 set_fs(get_ds());
99585 - res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
99586 + res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
99587 set_fs(oldfs);
99588 return res;
99589 }
99590 @@ -345,7 +345,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
99591
99592 mm_segment_t oldfs = get_fs();
99593 set_fs(get_ds());
99594 - res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
99595 + res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
99596 set_fs(oldfs);
99597 return res;
99598 }
99599 @@ -356,7 +356,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
99600
99601 mm_segment_t oldfs = get_fs();
99602 set_fs(get_ds());
99603 - res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
99604 + res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
99605 set_fs(oldfs);
99606 return res;
99607 }
99608 diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
99609 index 62eaa00..29b2dc2 100644
99610 --- a/net/ipv4/ipip.c
99611 +++ b/net/ipv4/ipip.c
99612 @@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
99613 static int ipip_net_id __read_mostly;
99614
99615 static int ipip_tunnel_init(struct net_device *dev);
99616 -static struct rtnl_link_ops ipip_link_ops __read_mostly;
99617 +static struct rtnl_link_ops ipip_link_ops;
99618
99619 static int ipip_err(struct sk_buff *skb, u32 info)
99620 {
99621 @@ -409,7 +409,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
99622 [IFLA_IPTUN_PMTUDISC] = { .type = NLA_U8 },
99623 };
99624
99625 -static struct rtnl_link_ops ipip_link_ops __read_mostly = {
99626 +static struct rtnl_link_ops ipip_link_ops = {
99627 .kind = "ipip",
99628 .maxtype = IFLA_IPTUN_MAX,
99629 .policy = ipip_policy,
99630 diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
99631 index f95b6f9..2ee2097 100644
99632 --- a/net/ipv4/netfilter/arp_tables.c
99633 +++ b/net/ipv4/netfilter/arp_tables.c
99634 @@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
99635 #endif
99636
99637 static int get_info(struct net *net, void __user *user,
99638 - const int *len, int compat)
99639 + int len, int compat)
99640 {
99641 char name[XT_TABLE_MAXNAMELEN];
99642 struct xt_table *t;
99643 int ret;
99644
99645 - if (*len != sizeof(struct arpt_getinfo)) {
99646 - duprintf("length %u != %Zu\n", *len,
99647 + if (len != sizeof(struct arpt_getinfo)) {
99648 + duprintf("length %u != %Zu\n", len,
99649 sizeof(struct arpt_getinfo));
99650 return -EINVAL;
99651 }
99652 @@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
99653 info.size = private->size;
99654 strcpy(info.name, name);
99655
99656 - if (copy_to_user(user, &info, *len) != 0)
99657 + if (copy_to_user(user, &info, len) != 0)
99658 ret = -EFAULT;
99659 else
99660 ret = 0;
99661 @@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
99662
99663 switch (cmd) {
99664 case ARPT_SO_GET_INFO:
99665 - ret = get_info(sock_net(sk), user, len, 1);
99666 + ret = get_info(sock_net(sk), user, *len, 1);
99667 break;
99668 case ARPT_SO_GET_ENTRIES:
99669 ret = compat_get_entries(sock_net(sk), user, len);
99670 @@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
99671
99672 switch (cmd) {
99673 case ARPT_SO_GET_INFO:
99674 - ret = get_info(sock_net(sk), user, len, 0);
99675 + ret = get_info(sock_net(sk), user, *len, 0);
99676 break;
99677
99678 case ARPT_SO_GET_ENTRIES:
99679 diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
99680 index 99e810f..3711b81 100644
99681 --- a/net/ipv4/netfilter/ip_tables.c
99682 +++ b/net/ipv4/netfilter/ip_tables.c
99683 @@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
99684 #endif
99685
99686 static int get_info(struct net *net, void __user *user,
99687 - const int *len, int compat)
99688 + int len, int compat)
99689 {
99690 char name[XT_TABLE_MAXNAMELEN];
99691 struct xt_table *t;
99692 int ret;
99693
99694 - if (*len != sizeof(struct ipt_getinfo)) {
99695 - duprintf("length %u != %zu\n", *len,
99696 + if (len != sizeof(struct ipt_getinfo)) {
99697 + duprintf("length %u != %zu\n", len,
99698 sizeof(struct ipt_getinfo));
99699 return -EINVAL;
99700 }
99701 @@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
99702 info.size = private->size;
99703 strcpy(info.name, name);
99704
99705 - if (copy_to_user(user, &info, *len) != 0)
99706 + if (copy_to_user(user, &info, len) != 0)
99707 ret = -EFAULT;
99708 else
99709 ret = 0;
99710 @@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
99711
99712 switch (cmd) {
99713 case IPT_SO_GET_INFO:
99714 - ret = get_info(sock_net(sk), user, len, 1);
99715 + ret = get_info(sock_net(sk), user, *len, 1);
99716 break;
99717 case IPT_SO_GET_ENTRIES:
99718 ret = compat_get_entries(sock_net(sk), user, len);
99719 @@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
99720
99721 switch (cmd) {
99722 case IPT_SO_GET_INFO:
99723 - ret = get_info(sock_net(sk), user, len, 0);
99724 + ret = get_info(sock_net(sk), user, *len, 0);
99725 break;
99726
99727 case IPT_SO_GET_ENTRIES:
99728 diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
99729 index 2510c02..cfb34fa 100644
99730 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
99731 +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
99732 @@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
99733 spin_lock_init(&cn->lock);
99734
99735 #ifdef CONFIG_PROC_FS
99736 - cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
99737 + cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
99738 if (!cn->procdir) {
99739 pr_err("Unable to proc dir entry\n");
99740 return -ENOMEM;
99741 diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
99742 index 044a0dd..e0c1971 100644
99743 --- a/net/ipv4/ping.c
99744 +++ b/net/ipv4/ping.c
99745 @@ -59,7 +59,7 @@ struct ping_table {
99746 };
99747
99748 static struct ping_table ping_table;
99749 -struct pingv6_ops pingv6_ops;
99750 +struct pingv6_ops *pingv6_ops;
99751 EXPORT_SYMBOL_GPL(pingv6_ops);
99752
99753 static u16 ping_port_rover;
99754 @@ -348,7 +348,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
99755 return -ENODEV;
99756 }
99757 }
99758 - has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
99759 + has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
99760 scoped);
99761 rcu_read_unlock();
99762
99763 @@ -556,7 +556,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
99764 }
99765 #if IS_ENABLED(CONFIG_IPV6)
99766 } else if (skb->protocol == htons(ETH_P_IPV6)) {
99767 - harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
99768 + harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
99769 #endif
99770 }
99771
99772 @@ -574,7 +574,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
99773 info, (u8 *)icmph);
99774 #if IS_ENABLED(CONFIG_IPV6)
99775 } else if (family == AF_INET6) {
99776 - pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
99777 + pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
99778 info, (u8 *)icmph);
99779 #endif
99780 }
99781 @@ -844,6 +844,8 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99782 {
99783 struct inet_sock *isk = inet_sk(sk);
99784 int family = sk->sk_family;
99785 + struct sockaddr_in *sin;
99786 + struct sockaddr_in6 *sin6;
99787 struct sk_buff *skb;
99788 int copied, err;
99789
99790 @@ -853,12 +855,19 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99791 if (flags & MSG_OOB)
99792 goto out;
99793
99794 + if (addr_len) {
99795 + if (family == AF_INET)
99796 + *addr_len = sizeof(*sin);
99797 + else if (family == AF_INET6 && addr_len)
99798 + *addr_len = sizeof(*sin6);
99799 + }
99800 +
99801 if (flags & MSG_ERRQUEUE) {
99802 if (family == AF_INET) {
99803 return ip_recv_error(sk, msg, len, addr_len);
99804 #if IS_ENABLED(CONFIG_IPV6)
99805 } else if (family == AF_INET6) {
99806 - return pingv6_ops.ipv6_recv_error(sk, msg, len,
99807 + return pingv6_ops->ipv6_recv_error(sk, msg, len,
99808 addr_len);
99809 #endif
99810 }
99811 @@ -890,7 +899,6 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99812 sin->sin_port = 0 /* skb->h.uh->source */;
99813 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
99814 memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
99815 - *addr_len = sizeof(*sin);
99816 }
99817
99818 if (isk->cmsg_flags)
99819 @@ -912,14 +920,13 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99820 sin6->sin6_scope_id =
99821 ipv6_iface_scope_id(&sin6->sin6_addr,
99822 IP6CB(skb)->iif);
99823 - *addr_len = sizeof(*sin6);
99824 }
99825
99826 if (inet6_sk(sk)->rxopt.all)
99827 - pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
99828 + pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
99829 if (skb->protocol == htons(ETH_P_IPV6) &&
99830 inet6_sk(sk)->rxopt.all)
99831 - pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
99832 + pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
99833 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
99834 ip_cmsg_recv(msg, skb);
99835 #endif
99836 @@ -1111,7 +1118,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
99837 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
99838 0, sock_i_ino(sp),
99839 atomic_read(&sp->sk_refcnt), sp,
99840 - atomic_read(&sp->sk_drops));
99841 + atomic_read_unchecked(&sp->sk_drops));
99842 }
99843
99844 static int ping_v4_seq_show(struct seq_file *seq, void *v)
99845 diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
99846 index a9dbe58..46f577f 100644
99847 --- a/net/ipv4/raw.c
99848 +++ b/net/ipv4/raw.c
99849 @@ -311,7 +311,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
99850 int raw_rcv(struct sock *sk, struct sk_buff *skb)
99851 {
99852 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
99853 - atomic_inc(&sk->sk_drops);
99854 + atomic_inc_unchecked(&sk->sk_drops);
99855 kfree_skb(skb);
99856 return NET_RX_DROP;
99857 }
99858 @@ -696,6 +696,9 @@ static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99859 if (flags & MSG_OOB)
99860 goto out;
99861
99862 + if (addr_len)
99863 + *addr_len = sizeof(*sin);
99864 +
99865 if (flags & MSG_ERRQUEUE) {
99866 err = ip_recv_error(sk, msg, len, addr_len);
99867 goto out;
99868 @@ -723,7 +726,6 @@ static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99869 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
99870 sin->sin_port = 0;
99871 memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
99872 - *addr_len = sizeof(*sin);
99873 }
99874 if (inet->cmsg_flags)
99875 ip_cmsg_recv(msg, skb);
99876 @@ -748,16 +750,20 @@ static int raw_init(struct sock *sk)
99877
99878 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
99879 {
99880 + struct icmp_filter filter;
99881 +
99882 if (optlen > sizeof(struct icmp_filter))
99883 optlen = sizeof(struct icmp_filter);
99884 - if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
99885 + if (copy_from_user(&filter, optval, optlen))
99886 return -EFAULT;
99887 + raw_sk(sk)->filter = filter;
99888 return 0;
99889 }
99890
99891 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
99892 {
99893 int len, ret = -EFAULT;
99894 + struct icmp_filter filter;
99895
99896 if (get_user(len, optlen))
99897 goto out;
99898 @@ -767,8 +773,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
99899 if (len > sizeof(struct icmp_filter))
99900 len = sizeof(struct icmp_filter);
99901 ret = -EFAULT;
99902 - if (put_user(len, optlen) ||
99903 - copy_to_user(optval, &raw_sk(sk)->filter, len))
99904 + filter = raw_sk(sk)->filter;
99905 + if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
99906 goto out;
99907 ret = 0;
99908 out: return ret;
99909 @@ -997,7 +1003,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
99910 0, 0L, 0,
99911 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
99912 0, sock_i_ino(sp),
99913 - atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
99914 + atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
99915 }
99916
99917 static int raw_seq_show(struct seq_file *seq, void *v)
99918 diff --git a/net/ipv4/route.c b/net/ipv4/route.c
99919 index 5e676be..f6c62f1 100644
99920 --- a/net/ipv4/route.c
99921 +++ b/net/ipv4/route.c
99922 @@ -227,7 +227,7 @@ static const struct seq_operations rt_cache_seq_ops = {
99923
99924 static int rt_cache_seq_open(struct inode *inode, struct file *file)
99925 {
99926 - return seq_open(file, &rt_cache_seq_ops);
99927 + return seq_open_restrict(file, &rt_cache_seq_ops);
99928 }
99929
99930 static const struct file_operations rt_cache_seq_fops = {
99931 @@ -318,7 +318,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
99932
99933 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
99934 {
99935 - return seq_open(file, &rt_cpu_seq_ops);
99936 + return seq_open_restrict(file, &rt_cpu_seq_ops);
99937 }
99938
99939 static const struct file_operations rt_cpu_seq_fops = {
99940 @@ -356,7 +356,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
99941
99942 static int rt_acct_proc_open(struct inode *inode, struct file *file)
99943 {
99944 - return single_open(file, rt_acct_proc_show, NULL);
99945 + return single_open_restrict(file, rt_acct_proc_show, NULL);
99946 }
99947
99948 static const struct file_operations rt_acct_proc_fops = {
99949 @@ -2610,34 +2610,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
99950 .maxlen = sizeof(int),
99951 .mode = 0200,
99952 .proc_handler = ipv4_sysctl_rtcache_flush,
99953 + .extra1 = &init_net,
99954 },
99955 { },
99956 };
99957
99958 static __net_init int sysctl_route_net_init(struct net *net)
99959 {
99960 - struct ctl_table *tbl;
99961 + ctl_table_no_const *tbl = NULL;
99962
99963 - tbl = ipv4_route_flush_table;
99964 if (!net_eq(net, &init_net)) {
99965 - tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
99966 + tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
99967 if (tbl == NULL)
99968 goto err_dup;
99969
99970 /* Don't export sysctls to unprivileged users */
99971 if (net->user_ns != &init_user_ns)
99972 tbl[0].procname = NULL;
99973 - }
99974 - tbl[0].extra1 = net;
99975 + tbl[0].extra1 = net;
99976 + net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
99977 + } else
99978 + net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
99979
99980 - net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
99981 if (net->ipv4.route_hdr == NULL)
99982 goto err_reg;
99983 return 0;
99984
99985 err_reg:
99986 - if (tbl != ipv4_route_flush_table)
99987 - kfree(tbl);
99988 + kfree(tbl);
99989 err_dup:
99990 return -ENOMEM;
99991 }
99992 @@ -2660,8 +2660,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
99993
99994 static __net_init int rt_genid_init(struct net *net)
99995 {
99996 - atomic_set(&net->ipv4.rt_genid, 0);
99997 - atomic_set(&net->fnhe_genid, 0);
99998 + atomic_set_unchecked(&net->ipv4.rt_genid, 0);
99999 + atomic_set_unchecked(&net->fnhe_genid, 0);
100000 get_random_bytes(&net->ipv4.dev_addr_genid,
100001 sizeof(net->ipv4.dev_addr_genid));
100002 return 0;
100003 diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
100004 index 5cde8f2..5f5684e 100644
100005 --- a/net/ipv4/sysctl_net_ipv4.c
100006 +++ b/net/ipv4/sysctl_net_ipv4.c
100007 @@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
100008 container_of(table->data, struct net, ipv4.ip_local_ports.range);
100009 int ret;
100010 int range[2];
100011 - struct ctl_table tmp = {
100012 + ctl_table_no_const tmp = {
100013 .data = &range,
100014 .maxlen = sizeof(range),
100015 .mode = table->mode,
100016 @@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
100017 int ret;
100018 gid_t urange[2];
100019 kgid_t low, high;
100020 - struct ctl_table tmp = {
100021 + ctl_table_no_const tmp = {
100022 .data = &urange,
100023 .maxlen = sizeof(urange),
100024 .mode = table->mode,
100025 @@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
100026 void __user *buffer, size_t *lenp, loff_t *ppos)
100027 {
100028 char val[TCP_CA_NAME_MAX];
100029 - struct ctl_table tbl = {
100030 + ctl_table_no_const tbl = {
100031 .data = val,
100032 .maxlen = TCP_CA_NAME_MAX,
100033 };
100034 @@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
100035 void __user *buffer, size_t *lenp,
100036 loff_t *ppos)
100037 {
100038 - struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
100039 + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
100040 int ret;
100041
100042 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
100043 @@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
100044 void __user *buffer, size_t *lenp,
100045 loff_t *ppos)
100046 {
100047 - struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
100048 + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
100049 int ret;
100050
100051 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
100052 @@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
100053 void __user *buffer, size_t *lenp,
100054 loff_t *ppos)
100055 {
100056 - struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
100057 + ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
100058 struct tcp_fastopen_context *ctxt;
100059 int ret;
100060 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
100061 @@ -438,7 +438,7 @@ static struct ctl_table ipv4_table[] = {
100062 },
100063 {
100064 .procname = "ip_local_reserved_ports",
100065 - .data = NULL, /* initialized in sysctl_ipv4_init */
100066 + .data = sysctl_local_reserved_ports,
100067 .maxlen = 65536,
100068 .mode = 0644,
100069 .proc_handler = proc_do_large_bitmap,
100070 @@ -843,13 +843,12 @@ static struct ctl_table ipv4_net_table[] = {
100071
100072 static __net_init int ipv4_sysctl_init_net(struct net *net)
100073 {
100074 - struct ctl_table *table;
100075 + ctl_table_no_const *table = NULL;
100076
100077 - table = ipv4_net_table;
100078 if (!net_eq(net, &init_net)) {
100079 int i;
100080
100081 - table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
100082 + table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
100083 if (table == NULL)
100084 goto err_alloc;
100085
100086 @@ -858,15 +857,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
100087 table[i].data += (void *)net - (void *)&init_net;
100088 }
100089
100090 - net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
100091 + if (!net_eq(net, &init_net))
100092 + net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
100093 + else
100094 + net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
100095 if (net->ipv4.ipv4_hdr == NULL)
100096 goto err_reg;
100097
100098 return 0;
100099
100100 err_reg:
100101 - if (!net_eq(net, &init_net))
100102 - kfree(table);
100103 + kfree(table);
100104 err_alloc:
100105 return -ENOMEM;
100106 }
100107 @@ -888,16 +889,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
100108 static __init int sysctl_ipv4_init(void)
100109 {
100110 struct ctl_table_header *hdr;
100111 - struct ctl_table *i;
100112 -
100113 - for (i = ipv4_table; i->procname; i++) {
100114 - if (strcmp(i->procname, "ip_local_reserved_ports") == 0) {
100115 - i->data = sysctl_local_reserved_ports;
100116 - break;
100117 - }
100118 - }
100119 - if (!i->procname)
100120 - return -EINVAL;
100121
100122 hdr = register_net_sysctl(&init_net, "net/ipv4", ipv4_table);
100123 if (hdr == NULL)
100124 diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
100125 index 3a26b3b..8bbe4ae 100644
100126 --- a/net/ipv4/tcp_input.c
100127 +++ b/net/ipv4/tcp_input.c
100128 @@ -754,7 +754,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
100129 * without any lock. We want to make sure compiler wont store
100130 * intermediate values in this location.
100131 */
100132 - ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
100133 + ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
100134 sk->sk_max_pacing_rate);
100135 }
100136
100137 @@ -4478,7 +4478,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
100138 * simplifies code)
100139 */
100140 static void
100141 -tcp_collapse(struct sock *sk, struct sk_buff_head *list,
100142 +__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
100143 struct sk_buff *head, struct sk_buff *tail,
100144 u32 start, u32 end)
100145 {
100146 @@ -5558,6 +5558,7 @@ discard:
100147 tcp_paws_reject(&tp->rx_opt, 0))
100148 goto discard_and_undo;
100149
100150 +#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
100151 if (th->syn) {
100152 /* We see SYN without ACK. It is attempt of
100153 * simultaneous connect with crossed SYNs.
100154 @@ -5608,6 +5609,7 @@ discard:
100155 goto discard;
100156 #endif
100157 }
100158 +#endif
100159 /* "fifth, if neither of the SYN or RST bits is set then
100160 * drop the segment and return."
100161 */
100162 @@ -5654,7 +5656,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
100163 goto discard;
100164
100165 if (th->syn) {
100166 - if (th->fin)
100167 + if (th->fin || th->urg || th->psh)
100168 goto discard;
100169 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
100170 return 1;
100171 diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
100172 index 438f3b9..bc9e1ad 100644
100173 --- a/net/ipv4/tcp_ipv4.c
100174 +++ b/net/ipv4/tcp_ipv4.c
100175 @@ -91,6 +91,10 @@ int sysctl_tcp_low_latency __read_mostly;
100176 EXPORT_SYMBOL(sysctl_tcp_low_latency);
100177
100178
100179 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100180 +extern int grsec_enable_blackhole;
100181 +#endif
100182 +
100183 #ifdef CONFIG_TCP_MD5SIG
100184 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
100185 __be32 daddr, __be32 saddr, const struct tcphdr *th);
100186 @@ -1829,6 +1833,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
100187 return 0;
100188
100189 reset:
100190 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100191 + if (!grsec_enable_blackhole)
100192 +#endif
100193 tcp_v4_send_reset(rsk, skb);
100194 discard:
100195 kfree_skb(skb);
100196 @@ -1974,12 +1981,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
100197 TCP_SKB_CB(skb)->sacked = 0;
100198
100199 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
100200 - if (!sk)
100201 + if (!sk) {
100202 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100203 + ret = 1;
100204 +#endif
100205 goto no_tcp_socket;
100206 -
100207 + }
100208 process:
100209 - if (sk->sk_state == TCP_TIME_WAIT)
100210 + if (sk->sk_state == TCP_TIME_WAIT) {
100211 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100212 + ret = 2;
100213 +#endif
100214 goto do_time_wait;
100215 + }
100216
100217 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
100218 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
100219 @@ -2033,6 +2047,10 @@ csum_error:
100220 bad_packet:
100221 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
100222 } else {
100223 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100224 + if (!grsec_enable_blackhole || (ret == 1 &&
100225 + (skb->dev->flags & IFF_LOOPBACK)))
100226 +#endif
100227 tcp_v4_send_reset(NULL, skb);
100228 }
100229
100230 diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
100231 index 05c1b15..3e9344b 100644
100232 --- a/net/ipv4/tcp_minisocks.c
100233 +++ b/net/ipv4/tcp_minisocks.c
100234 @@ -27,6 +27,10 @@
100235 #include <net/inet_common.h>
100236 #include <net/xfrm.h>
100237
100238 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100239 +extern int grsec_enable_blackhole;
100240 +#endif
100241 +
100242 int sysctl_tcp_syncookies __read_mostly = 1;
100243 EXPORT_SYMBOL(sysctl_tcp_syncookies);
100244
100245 @@ -709,7 +713,10 @@ embryonic_reset:
100246 * avoid becoming vulnerable to outside attack aiming at
100247 * resetting legit local connections.
100248 */
100249 - req->rsk_ops->send_reset(sk, skb);
100250 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100251 + if (!grsec_enable_blackhole)
100252 +#endif
100253 + req->rsk_ops->send_reset(sk, skb);
100254 } else if (fastopen) { /* received a valid RST pkt */
100255 reqsk_fastopen_remove(sk, req, true);
100256 tcp_reset(sk);
100257 diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
100258 index 3b66610..bfbe23a 100644
100259 --- a/net/ipv4/tcp_probe.c
100260 +++ b/net/ipv4/tcp_probe.c
100261 @@ -238,7 +238,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
100262 if (cnt + width >= len)
100263 break;
100264
100265 - if (copy_to_user(buf + cnt, tbuf, width))
100266 + if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
100267 return -EFAULT;
100268 cnt += width;
100269 }
100270 diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
100271 index 286227a..c495a76 100644
100272 --- a/net/ipv4/tcp_timer.c
100273 +++ b/net/ipv4/tcp_timer.c
100274 @@ -22,6 +22,10 @@
100275 #include <linux/gfp.h>
100276 #include <net/tcp.h>
100277
100278 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100279 +extern int grsec_lastack_retries;
100280 +#endif
100281 +
100282 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
100283 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
100284 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
100285 @@ -192,6 +196,13 @@ static int tcp_write_timeout(struct sock *sk)
100286 }
100287 }
100288
100289 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100290 + if ((sk->sk_state == TCP_LAST_ACK) &&
100291 + (grsec_lastack_retries > 0) &&
100292 + (grsec_lastack_retries < retry_until))
100293 + retry_until = grsec_lastack_retries;
100294 +#endif
100295 +
100296 if (retransmits_timed_out(sk, retry_until,
100297 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
100298 /* Has it gone just too far? */
100299 diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
100300 index 54a5fe9..78fea00 100644
100301 --- a/net/ipv4/udp.c
100302 +++ b/net/ipv4/udp.c
100303 @@ -87,6 +87,7 @@
100304 #include <linux/types.h>
100305 #include <linux/fcntl.h>
100306 #include <linux/module.h>
100307 +#include <linux/security.h>
100308 #include <linux/socket.h>
100309 #include <linux/sockios.h>
100310 #include <linux/igmp.h>
100311 @@ -113,6 +114,10 @@
100312 #include <net/busy_poll.h>
100313 #include "udp_impl.h"
100314
100315 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100316 +extern int grsec_enable_blackhole;
100317 +#endif
100318 +
100319 struct udp_table udp_table __read_mostly;
100320 EXPORT_SYMBOL(udp_table);
100321
100322 @@ -615,6 +620,9 @@ found:
100323 return s;
100324 }
100325
100326 +extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
100327 +extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
100328 +
100329 /*
100330 * This routine is called by the ICMP module when it gets some
100331 * sort of error condition. If err < 0 then the socket should
100332 @@ -914,9 +922,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
100333 dport = usin->sin_port;
100334 if (dport == 0)
100335 return -EINVAL;
100336 +
100337 + err = gr_search_udp_sendmsg(sk, usin);
100338 + if (err)
100339 + return err;
100340 } else {
100341 if (sk->sk_state != TCP_ESTABLISHED)
100342 return -EDESTADDRREQ;
100343 +
100344 + err = gr_search_udp_sendmsg(sk, NULL);
100345 + if (err)
100346 + return err;
100347 +
100348 daddr = inet->inet_daddr;
100349 dport = inet->inet_dport;
100350 /* Open fast path for connected socket.
100351 @@ -1164,7 +1181,7 @@ static unsigned int first_packet_length(struct sock *sk)
100352 IS_UDPLITE(sk));
100353 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
100354 IS_UDPLITE(sk));
100355 - atomic_inc(&sk->sk_drops);
100356 + atomic_inc_unchecked(&sk->sk_drops);
100357 __skb_unlink(skb, rcvq);
100358 __skb_queue_tail(&list_kill, skb);
100359 }
100360 @@ -1235,6 +1252,12 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
100361 int is_udplite = IS_UDPLITE(sk);
100362 bool slow;
100363
100364 + /*
100365 + * Check any passed addresses
100366 + */
100367 + if (addr_len)
100368 + *addr_len = sizeof(*sin);
100369 +
100370 if (flags & MSG_ERRQUEUE)
100371 return ip_recv_error(sk, msg, len, addr_len);
100372
100373 @@ -1244,6 +1267,10 @@ try_again:
100374 if (!skb)
100375 goto out;
100376
100377 + err = gr_search_udp_recvmsg(sk, skb);
100378 + if (err)
100379 + goto out_free;
100380 +
100381 ulen = skb->len - sizeof(struct udphdr);
100382 copied = len;
100383 if (copied > ulen)
100384 @@ -1277,7 +1304,7 @@ try_again:
100385 if (unlikely(err)) {
100386 trace_kfree_skb(skb, udp_recvmsg);
100387 if (!peeked) {
100388 - atomic_inc(&sk->sk_drops);
100389 + atomic_inc_unchecked(&sk->sk_drops);
100390 UDP_INC_STATS_USER(sock_net(sk),
100391 UDP_MIB_INERRORS, is_udplite);
100392 }
100393 @@ -1296,7 +1323,6 @@ try_again:
100394 sin->sin_port = udp_hdr(skb)->source;
100395 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
100396 memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
100397 - *addr_len = sizeof(*sin);
100398 }
100399 if (inet->cmsg_flags)
100400 ip_cmsg_recv(msg, skb);
100401 @@ -1567,7 +1593,7 @@ csum_error:
100402 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
100403 drop:
100404 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
100405 - atomic_inc(&sk->sk_drops);
100406 + atomic_inc_unchecked(&sk->sk_drops);
100407 kfree_skb(skb);
100408 return -1;
100409 }
100410 @@ -1586,7 +1612,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
100411 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
100412
100413 if (!skb1) {
100414 - atomic_inc(&sk->sk_drops);
100415 + atomic_inc_unchecked(&sk->sk_drops);
100416 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
100417 IS_UDPLITE(sk));
100418 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
100419 @@ -1787,6 +1813,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
100420 goto csum_error;
100421
100422 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
100423 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100424 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
100425 +#endif
100426 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
100427
100428 /*
100429 @@ -2355,7 +2384,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
100430 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
100431 0, sock_i_ino(sp),
100432 atomic_read(&sp->sk_refcnt), sp,
100433 - atomic_read(&sp->sk_drops));
100434 + atomic_read_unchecked(&sp->sk_drops));
100435 }
100436
100437 int udp4_seq_show(struct seq_file *seq, void *v)
100438 diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
100439 index 6156f68..d6ab46d 100644
100440 --- a/net/ipv4/xfrm4_policy.c
100441 +++ b/net/ipv4/xfrm4_policy.c
100442 @@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
100443 fl4->flowi4_tos = iph->tos;
100444 }
100445
100446 -static inline int xfrm4_garbage_collect(struct dst_ops *ops)
100447 +static int xfrm4_garbage_collect(struct dst_ops *ops)
100448 {
100449 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
100450
100451 - xfrm4_policy_afinfo.garbage_collect(net);
100452 + xfrm_garbage_collect_deferred(net);
100453 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
100454 }
100455
100456 @@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
100457
100458 static int __net_init xfrm4_net_init(struct net *net)
100459 {
100460 - struct ctl_table *table;
100461 + ctl_table_no_const *table = NULL;
100462 struct ctl_table_header *hdr;
100463
100464 - table = xfrm4_policy_table;
100465 if (!net_eq(net, &init_net)) {
100466 - table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
100467 + table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
100468 if (!table)
100469 goto err_alloc;
100470
100471 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
100472 - }
100473 -
100474 - hdr = register_net_sysctl(net, "net/ipv4", table);
100475 + hdr = register_net_sysctl(net, "net/ipv4", table);
100476 + } else
100477 + hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
100478 if (!hdr)
100479 goto err_reg;
100480
100481 @@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
100482 return 0;
100483
100484 err_reg:
100485 - if (!net_eq(net, &init_net))
100486 - kfree(table);
100487 + kfree(table);
100488 err_alloc:
100489 return -ENOMEM;
100490 }
100491 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
100492 index 6c7fa08..8a31430 100644
100493 --- a/net/ipv6/addrconf.c
100494 +++ b/net/ipv6/addrconf.c
100495 @@ -598,7 +598,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
100496 idx = 0;
100497 head = &net->dev_index_head[h];
100498 rcu_read_lock();
100499 - cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
100500 + cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
100501 net->dev_base_seq;
100502 hlist_for_each_entry_rcu(dev, head, index_hlist) {
100503 if (idx < s_idx)
100504 @@ -2395,7 +2395,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
100505 p.iph.ihl = 5;
100506 p.iph.protocol = IPPROTO_IPV6;
100507 p.iph.ttl = 64;
100508 - ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
100509 + ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
100510
100511 if (ops->ndo_do_ioctl) {
100512 mm_segment_t oldfs = get_fs();
100513 @@ -3528,16 +3528,23 @@ static const struct file_operations if6_fops = {
100514 .release = seq_release_net,
100515 };
100516
100517 +extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
100518 +extern void unregister_ipv6_seq_ops_addr(void);
100519 +
100520 static int __net_init if6_proc_net_init(struct net *net)
100521 {
100522 - if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
100523 + register_ipv6_seq_ops_addr(&if6_seq_ops);
100524 + if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
100525 + unregister_ipv6_seq_ops_addr();
100526 return -ENOMEM;
100527 + }
100528 return 0;
100529 }
100530
100531 static void __net_exit if6_proc_net_exit(struct net *net)
100532 {
100533 remove_proc_entry("if_inet6", net->proc_net);
100534 + unregister_ipv6_seq_ops_addr();
100535 }
100536
100537 static struct pernet_operations if6_proc_net_ops = {
100538 @@ -4146,7 +4153,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
100539 s_ip_idx = ip_idx = cb->args[2];
100540
100541 rcu_read_lock();
100542 - cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
100543 + cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
100544 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
100545 idx = 0;
100546 head = &net->dev_index_head[h];
100547 @@ -4758,7 +4765,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
100548 dst_free(&ifp->rt->dst);
100549 break;
100550 }
100551 - atomic_inc(&net->ipv6.dev_addr_genid);
100552 + atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
100553 rt_genid_bump_ipv6(net);
100554 }
100555
100556 @@ -4779,7 +4786,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
100557 int *valp = ctl->data;
100558 int val = *valp;
100559 loff_t pos = *ppos;
100560 - struct ctl_table lctl;
100561 + ctl_table_no_const lctl;
100562 int ret;
100563
100564 /*
100565 @@ -4864,7 +4871,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
100566 int *valp = ctl->data;
100567 int val = *valp;
100568 loff_t pos = *ppos;
100569 - struct ctl_table lctl;
100570 + ctl_table_no_const lctl;
100571 int ret;
100572
100573 /*
100574 diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
100575 index d935889..2f64330 100644
100576 --- a/net/ipv6/af_inet6.c
100577 +++ b/net/ipv6/af_inet6.c
100578 @@ -776,7 +776,7 @@ static int __net_init inet6_net_init(struct net *net)
100579 net->ipv6.sysctl.bindv6only = 0;
100580 net->ipv6.sysctl.icmpv6_time = 1*HZ;
100581 net->ipv6.sysctl.flowlabel_consistency = 1;
100582 - atomic_set(&net->ipv6.rt_genid, 0);
100583 + atomic_set_unchecked(&net->ipv6.rt_genid, 0);
100584
100585 err = ipv6_init_mibs(net);
100586 if (err)
100587 diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
100588 index c3bf2d2..1f00573 100644
100589 --- a/net/ipv6/datagram.c
100590 +++ b/net/ipv6/datagram.c
100591 @@ -938,5 +938,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
100592 0,
100593 sock_i_ino(sp),
100594 atomic_read(&sp->sk_refcnt), sp,
100595 - atomic_read(&sp->sk_drops));
100596 + atomic_read_unchecked(&sp->sk_drops));
100597 }
100598 diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
100599 index 7b32652..0bc348b 100644
100600 --- a/net/ipv6/icmp.c
100601 +++ b/net/ipv6/icmp.c
100602 @@ -1005,7 +1005,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
100603
100604 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
100605 {
100606 - struct ctl_table *table;
100607 + ctl_table_no_const *table;
100608
100609 table = kmemdup(ipv6_icmp_table_template,
100610 sizeof(ipv6_icmp_table_template),
100611 diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
100612 index 9d92146..d986c6a 100644
100613 --- a/net/ipv6/ip6_gre.c
100614 +++ b/net/ipv6/ip6_gre.c
100615 @@ -71,7 +71,7 @@ struct ip6gre_net {
100616 struct net_device *fb_tunnel_dev;
100617 };
100618
100619 -static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
100620 +static struct rtnl_link_ops ip6gre_link_ops;
100621 static int ip6gre_tunnel_init(struct net_device *dev);
100622 static void ip6gre_tunnel_setup(struct net_device *dev);
100623 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
100624 @@ -1291,7 +1291,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
100625 }
100626
100627
100628 -static struct inet6_protocol ip6gre_protocol __read_mostly = {
100629 +static struct inet6_protocol ip6gre_protocol = {
100630 .handler = ip6gre_rcv,
100631 .err_handler = ip6gre_err,
100632 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
100633 @@ -1636,7 +1636,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
100634 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
100635 };
100636
100637 -static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
100638 +static struct rtnl_link_ops ip6gre_link_ops = {
100639 .kind = "ip6gre",
100640 .maxtype = IFLA_GRE_MAX,
100641 .policy = ip6gre_policy,
100642 @@ -1650,7 +1650,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
100643 .fill_info = ip6gre_fill_info,
100644 };
100645
100646 -static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
100647 +static struct rtnl_link_ops ip6gre_tap_ops = {
100648 .kind = "ip6gretap",
100649 .maxtype = IFLA_GRE_MAX,
100650 .policy = ip6gre_policy,
100651 diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
100652 index afa0824..04ba530 100644
100653 --- a/net/ipv6/ip6_tunnel.c
100654 +++ b/net/ipv6/ip6_tunnel.c
100655 @@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
100656
100657 static int ip6_tnl_dev_init(struct net_device *dev);
100658 static void ip6_tnl_dev_setup(struct net_device *dev);
100659 -static struct rtnl_link_ops ip6_link_ops __read_mostly;
100660 +static struct rtnl_link_ops ip6_link_ops;
100661
100662 static int ip6_tnl_net_id __read_mostly;
100663 struct ip6_tnl_net {
100664 @@ -1708,7 +1708,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
100665 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
100666 };
100667
100668 -static struct rtnl_link_ops ip6_link_ops __read_mostly = {
100669 +static struct rtnl_link_ops ip6_link_ops = {
100670 .kind = "ip6tnl",
100671 .maxtype = IFLA_IPTUN_MAX,
100672 .policy = ip6_tnl_policy,
100673 diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
100674 index 6cc9f93..6e5bb7c 100644
100675 --- a/net/ipv6/ip6_vti.c
100676 +++ b/net/ipv6/ip6_vti.c
100677 @@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
100678
100679 static int vti6_dev_init(struct net_device *dev);
100680 static void vti6_dev_setup(struct net_device *dev);
100681 -static struct rtnl_link_ops vti6_link_ops __read_mostly;
100682 +static struct rtnl_link_ops vti6_link_ops;
100683
100684 static int vti6_net_id __read_mostly;
100685 struct vti6_net {
100686 @@ -980,7 +980,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
100687 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
100688 };
100689
100690 -static struct rtnl_link_ops vti6_link_ops __read_mostly = {
100691 +static struct rtnl_link_ops vti6_link_ops = {
100692 .kind = "vti6",
100693 .maxtype = IFLA_VTI_MAX,
100694 .policy = vti6_policy,
100695 diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
100696 index edb58af..78de133 100644
100697 --- a/net/ipv6/ipv6_sockglue.c
100698 +++ b/net/ipv6/ipv6_sockglue.c
100699 @@ -991,7 +991,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
100700 if (sk->sk_type != SOCK_STREAM)
100701 return -ENOPROTOOPT;
100702
100703 - msg.msg_control = optval;
100704 + msg.msg_control = (void __force_kernel *)optval;
100705 msg.msg_controllen = len;
100706 msg.msg_flags = flags;
100707
100708 diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
100709 index e080fbb..412b3cf 100644
100710 --- a/net/ipv6/netfilter/ip6_tables.c
100711 +++ b/net/ipv6/netfilter/ip6_tables.c
100712 @@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
100713 #endif
100714
100715 static int get_info(struct net *net, void __user *user,
100716 - const int *len, int compat)
100717 + int len, int compat)
100718 {
100719 char name[XT_TABLE_MAXNAMELEN];
100720 struct xt_table *t;
100721 int ret;
100722
100723 - if (*len != sizeof(struct ip6t_getinfo)) {
100724 - duprintf("length %u != %zu\n", *len,
100725 + if (len != sizeof(struct ip6t_getinfo)) {
100726 + duprintf("length %u != %zu\n", len,
100727 sizeof(struct ip6t_getinfo));
100728 return -EINVAL;
100729 }
100730 @@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
100731 info.size = private->size;
100732 strcpy(info.name, name);
100733
100734 - if (copy_to_user(user, &info, *len) != 0)
100735 + if (copy_to_user(user, &info, len) != 0)
100736 ret = -EFAULT;
100737 else
100738 ret = 0;
100739 @@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
100740
100741 switch (cmd) {
100742 case IP6T_SO_GET_INFO:
100743 - ret = get_info(sock_net(sk), user, len, 1);
100744 + ret = get_info(sock_net(sk), user, *len, 1);
100745 break;
100746 case IP6T_SO_GET_ENTRIES:
100747 ret = compat_get_entries(sock_net(sk), user, len);
100748 @@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
100749
100750 switch (cmd) {
100751 case IP6T_SO_GET_INFO:
100752 - ret = get_info(sock_net(sk), user, len, 0);
100753 + ret = get_info(sock_net(sk), user, *len, 0);
100754 break;
100755
100756 case IP6T_SO_GET_ENTRIES:
100757 diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
100758 index 767ab8d..c5ec70a 100644
100759 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c
100760 +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
100761 @@ -90,12 +90,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
100762
100763 static int nf_ct_frag6_sysctl_register(struct net *net)
100764 {
100765 - struct ctl_table *table;
100766 + ctl_table_no_const *table = NULL;
100767 struct ctl_table_header *hdr;
100768
100769 - table = nf_ct_frag6_sysctl_table;
100770 if (!net_eq(net, &init_net)) {
100771 - table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
100772 + table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
100773 GFP_KERNEL);
100774 if (table == NULL)
100775 goto err_alloc;
100776 @@ -103,9 +102,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
100777 table[0].data = &net->nf_frag.frags.timeout;
100778 table[1].data = &net->nf_frag.frags.low_thresh;
100779 table[2].data = &net->nf_frag.frags.high_thresh;
100780 - }
100781 -
100782 - hdr = register_net_sysctl(net, "net/netfilter", table);
100783 + hdr = register_net_sysctl(net, "net/netfilter", table);
100784 + } else
100785 + hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
100786 if (hdr == NULL)
100787 goto err_reg;
100788
100789 @@ -113,8 +112,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
100790 return 0;
100791
100792 err_reg:
100793 - if (!net_eq(net, &init_net))
100794 - kfree(table);
100795 + kfree(table);
100796 err_alloc:
100797 return -ENOMEM;
100798 }
100799 diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
100800 index 56596ce..c734618 100644
100801 --- a/net/ipv6/output_core.c
100802 +++ b/net/ipv6/output_core.c
100803 @@ -10,7 +10,7 @@
100804
100805 void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
100806 {
100807 - static atomic_t ipv6_fragmentation_id;
100808 + static atomic_unchecked_t ipv6_fragmentation_id;
100809 struct in6_addr addr;
100810 int ident;
100811
100812 @@ -26,7 +26,7 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
100813 return;
100814 }
100815 #endif
100816 - ident = atomic_inc_return(&ipv6_fragmentation_id);
100817 + ident = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
100818
100819 addr = rt->rt6i_dst.addr;
100820 addr.s6_addr32[0] ^= (__force __be32)ident;
100821 diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
100822 index bda7429..469b26b 100644
100823 --- a/net/ipv6/ping.c
100824 +++ b/net/ipv6/ping.c
100825 @@ -246,6 +246,24 @@ static struct pernet_operations ping_v6_net_ops = {
100826 };
100827 #endif
100828
100829 +static struct pingv6_ops real_pingv6_ops = {
100830 + .ipv6_recv_error = ipv6_recv_error,
100831 + .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
100832 + .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
100833 + .icmpv6_err_convert = icmpv6_err_convert,
100834 + .ipv6_icmp_error = ipv6_icmp_error,
100835 + .ipv6_chk_addr = ipv6_chk_addr,
100836 +};
100837 +
100838 +static struct pingv6_ops dummy_pingv6_ops = {
100839 + .ipv6_recv_error = dummy_ipv6_recv_error,
100840 + .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
100841 + .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
100842 + .icmpv6_err_convert = dummy_icmpv6_err_convert,
100843 + .ipv6_icmp_error = dummy_ipv6_icmp_error,
100844 + .ipv6_chk_addr = dummy_ipv6_chk_addr,
100845 +};
100846 +
100847 int __init pingv6_init(void)
100848 {
100849 #ifdef CONFIG_PROC_FS
100850 @@ -253,13 +271,7 @@ int __init pingv6_init(void)
100851 if (ret)
100852 return ret;
100853 #endif
100854 - pingv6_ops.ipv6_recv_error = ipv6_recv_error;
100855 - pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
100856 - pingv6_ops.ip6_datagram_recv_specific_ctl =
100857 - ip6_datagram_recv_specific_ctl;
100858 - pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
100859 - pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
100860 - pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
100861 + pingv6_ops = &real_pingv6_ops;
100862 return inet6_register_protosw(&pingv6_protosw);
100863 }
100864
100865 @@ -268,14 +280,9 @@ int __init pingv6_init(void)
100866 */
100867 void pingv6_exit(void)
100868 {
100869 - pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
100870 - pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
100871 - pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
100872 - pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
100873 - pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
100874 - pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
100875 #ifdef CONFIG_PROC_FS
100876 unregister_pernet_subsys(&ping_v6_net_ops);
100877 #endif
100878 + pingv6_ops = &dummy_pingv6_ops;
100879 inet6_unregister_protosw(&pingv6_protosw);
100880 }
100881 diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
100882 index 091d066..139d410 100644
100883 --- a/net/ipv6/proc.c
100884 +++ b/net/ipv6/proc.c
100885 @@ -309,7 +309,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
100886 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
100887 goto proc_snmp6_fail;
100888
100889 - net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
100890 + net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
100891 if (!net->mib.proc_net_devsnmp6)
100892 goto proc_dev_snmp6_fail;
100893 return 0;
100894 diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
100895 index 1f29996..46fe0c7 100644
100896 --- a/net/ipv6/raw.c
100897 +++ b/net/ipv6/raw.c
100898 @@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
100899 {
100900 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
100901 skb_checksum_complete(skb)) {
100902 - atomic_inc(&sk->sk_drops);
100903 + atomic_inc_unchecked(&sk->sk_drops);
100904 kfree_skb(skb);
100905 return NET_RX_DROP;
100906 }
100907 @@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
100908 struct raw6_sock *rp = raw6_sk(sk);
100909
100910 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
100911 - atomic_inc(&sk->sk_drops);
100912 + atomic_inc_unchecked(&sk->sk_drops);
100913 kfree_skb(skb);
100914 return NET_RX_DROP;
100915 }
100916 @@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
100917
100918 if (inet->hdrincl) {
100919 if (skb_checksum_complete(skb)) {
100920 - atomic_inc(&sk->sk_drops);
100921 + atomic_inc_unchecked(&sk->sk_drops);
100922 kfree_skb(skb);
100923 return NET_RX_DROP;
100924 }
100925 @@ -469,6 +469,9 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk,
100926 if (flags & MSG_OOB)
100927 return -EOPNOTSUPP;
100928
100929 + if (addr_len)
100930 + *addr_len=sizeof(*sin6);
100931 +
100932 if (flags & MSG_ERRQUEUE)
100933 return ipv6_recv_error(sk, msg, len, addr_len);
100934
100935 @@ -507,7 +510,6 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk,
100936 sin6->sin6_flowinfo = 0;
100937 sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr,
100938 IP6CB(skb)->iif);
100939 - *addr_len = sizeof(*sin6);
100940 }
100941
100942 sock_recv_ts_and_drops(msg, sk, skb);
100943 @@ -610,7 +612,7 @@ out:
100944 return err;
100945 }
100946
100947 -static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
100948 +static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
100949 struct flowi6 *fl6, struct dst_entry **dstp,
100950 unsigned int flags)
100951 {
100952 @@ -922,12 +924,15 @@ do_confirm:
100953 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
100954 char __user *optval, int optlen)
100955 {
100956 + struct icmp6_filter filter;
100957 +
100958 switch (optname) {
100959 case ICMPV6_FILTER:
100960 if (optlen > sizeof(struct icmp6_filter))
100961 optlen = sizeof(struct icmp6_filter);
100962 - if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
100963 + if (copy_from_user(&filter, optval, optlen))
100964 return -EFAULT;
100965 + raw6_sk(sk)->filter = filter;
100966 return 0;
100967 default:
100968 return -ENOPROTOOPT;
100969 @@ -940,6 +945,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
100970 char __user *optval, int __user *optlen)
100971 {
100972 int len;
100973 + struct icmp6_filter filter;
100974
100975 switch (optname) {
100976 case ICMPV6_FILTER:
100977 @@ -951,7 +957,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
100978 len = sizeof(struct icmp6_filter);
100979 if (put_user(len, optlen))
100980 return -EFAULT;
100981 - if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
100982 + filter = raw6_sk(sk)->filter;
100983 + if (len > sizeof filter || copy_to_user(optval, &filter, len))
100984 return -EFAULT;
100985 return 0;
100986 default:
100987 diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
100988 index cc85a9b..526a133 100644
100989 --- a/net/ipv6/reassembly.c
100990 +++ b/net/ipv6/reassembly.c
100991 @@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
100992
100993 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
100994 {
100995 - struct ctl_table *table;
100996 + ctl_table_no_const *table = NULL;
100997 struct ctl_table_header *hdr;
100998
100999 - table = ip6_frags_ns_ctl_table;
101000 if (!net_eq(net, &init_net)) {
101001 - table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
101002 + table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
101003 if (table == NULL)
101004 goto err_alloc;
101005
101006 @@ -642,9 +641,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
101007 /* Don't export sysctls to unprivileged users */
101008 if (net->user_ns != &init_user_ns)
101009 table[0].procname = NULL;
101010 - }
101011 + hdr = register_net_sysctl(net, "net/ipv6", table);
101012 + } else
101013 + hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
101014
101015 - hdr = register_net_sysctl(net, "net/ipv6", table);
101016 if (hdr == NULL)
101017 goto err_reg;
101018
101019 @@ -652,8 +652,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
101020 return 0;
101021
101022 err_reg:
101023 - if (!net_eq(net, &init_net))
101024 - kfree(table);
101025 + kfree(table);
101026 err_alloc:
101027 return -ENOMEM;
101028 }
101029 diff --git a/net/ipv6/route.c b/net/ipv6/route.c
101030 index 6ebdb7b6..f225ab1 100644
101031 --- a/net/ipv6/route.c
101032 +++ b/net/ipv6/route.c
101033 @@ -2971,7 +2971,7 @@ struct ctl_table ipv6_route_table_template[] = {
101034
101035 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
101036 {
101037 - struct ctl_table *table;
101038 + ctl_table_no_const *table;
101039
101040 table = kmemdup(ipv6_route_table_template,
101041 sizeof(ipv6_route_table_template),
101042 diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
101043 index 4f40817..54dcbef 100644
101044 --- a/net/ipv6/sit.c
101045 +++ b/net/ipv6/sit.c
101046 @@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
101047 static void ipip6_dev_free(struct net_device *dev);
101048 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
101049 __be32 *v4dst);
101050 -static struct rtnl_link_ops sit_link_ops __read_mostly;
101051 +static struct rtnl_link_ops sit_link_ops;
101052
101053 static int sit_net_id __read_mostly;
101054 struct sit_net {
101055 @@ -1661,7 +1661,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
101056 unregister_netdevice_queue(dev, head);
101057 }
101058
101059 -static struct rtnl_link_ops sit_link_ops __read_mostly = {
101060 +static struct rtnl_link_ops sit_link_ops = {
101061 .kind = "sit",
101062 .maxtype = IFLA_IPTUN_MAX,
101063 .policy = ipip6_policy,
101064 diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
101065 index 7f405a1..eabef92 100644
101066 --- a/net/ipv6/sysctl_net_ipv6.c
101067 +++ b/net/ipv6/sysctl_net_ipv6.c
101068 @@ -54,7 +54,7 @@ static struct ctl_table ipv6_rotable[] = {
101069
101070 static int __net_init ipv6_sysctl_net_init(struct net *net)
101071 {
101072 - struct ctl_table *ipv6_table;
101073 + ctl_table_no_const *ipv6_table;
101074 struct ctl_table *ipv6_route_table;
101075 struct ctl_table *ipv6_icmp_table;
101076 int err;
101077 diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
101078 index e289830..79a5718 100644
101079 --- a/net/ipv6/tcp_ipv6.c
101080 +++ b/net/ipv6/tcp_ipv6.c
101081 @@ -102,6 +102,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
101082 inet6_sk(sk)->rx_dst_cookie = rt->rt6i_node->fn_sernum;
101083 }
101084
101085 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
101086 +extern int grsec_enable_blackhole;
101087 +#endif
101088 +
101089 static void tcp_v6_hash(struct sock *sk)
101090 {
101091 if (sk->sk_state != TCP_CLOSE) {
101092 @@ -1416,6 +1420,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
101093 return 0;
101094
101095 reset:
101096 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
101097 + if (!grsec_enable_blackhole)
101098 +#endif
101099 tcp_v6_send_reset(sk, skb);
101100 discard:
101101 if (opt_skb)
101102 @@ -1500,12 +1507,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
101103 TCP_SKB_CB(skb)->sacked = 0;
101104
101105 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
101106 - if (!sk)
101107 + if (!sk) {
101108 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
101109 + ret = 1;
101110 +#endif
101111 goto no_tcp_socket;
101112 + }
101113
101114 process:
101115 - if (sk->sk_state == TCP_TIME_WAIT)
101116 + if (sk->sk_state == TCP_TIME_WAIT) {
101117 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
101118 + ret = 2;
101119 +#endif
101120 goto do_time_wait;
101121 + }
101122
101123 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
101124 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
101125 @@ -1557,6 +1572,10 @@ csum_error:
101126 bad_packet:
101127 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
101128 } else {
101129 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
101130 + if (!grsec_enable_blackhole || (ret == 1 &&
101131 + (skb->dev->flags & IFF_LOOPBACK)))
101132 +#endif
101133 tcp_v6_send_reset(NULL, skb);
101134 }
101135
101136 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
101137 index 20b63d2..13be908 100644
101138 --- a/net/ipv6/udp.c
101139 +++ b/net/ipv6/udp.c
101140 @@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
101141 udp_ipv6_hash_secret + net_hash_mix(net));
101142 }
101143
101144 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
101145 +extern int grsec_enable_blackhole;
101146 +#endif
101147 +
101148 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
101149 {
101150 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
101151 @@ -392,6 +396,9 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk,
101152 int is_udp4;
101153 bool slow;
101154
101155 + if (addr_len)
101156 + *addr_len = sizeof(struct sockaddr_in6);
101157 +
101158 if (flags & MSG_ERRQUEUE)
101159 return ipv6_recv_error(sk, msg, len, addr_len);
101160
101161 @@ -435,7 +442,7 @@ try_again:
101162 if (unlikely(err)) {
101163 trace_kfree_skb(skb, udpv6_recvmsg);
101164 if (!peeked) {
101165 - atomic_inc(&sk->sk_drops);
101166 + atomic_inc_unchecked(&sk->sk_drops);
101167 if (is_udp4)
101168 UDP_INC_STATS_USER(sock_net(sk),
101169 UDP_MIB_INERRORS,
101170 @@ -475,7 +482,7 @@ try_again:
101171 ipv6_iface_scope_id(&sin6->sin6_addr,
101172 IP6CB(skb)->iif);
101173 }
101174 - *addr_len = sizeof(*sin6);
101175 +
101176 }
101177
101178 if (np->rxopt.all)
101179 @@ -690,7 +697,7 @@ csum_error:
101180 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
101181 drop:
101182 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
101183 - atomic_inc(&sk->sk_drops);
101184 + atomic_inc_unchecked(&sk->sk_drops);
101185 kfree_skb(skb);
101186 return -1;
101187 }
101188 @@ -747,7 +754,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
101189 if (likely(skb1 == NULL))
101190 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
101191 if (!skb1) {
101192 - atomic_inc(&sk->sk_drops);
101193 + atomic_inc_unchecked(&sk->sk_drops);
101194 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
101195 IS_UDPLITE(sk));
101196 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
101197 @@ -886,6 +893,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
101198 goto csum_error;
101199
101200 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
101201 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
101202 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
101203 +#endif
101204 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
101205
101206 kfree_skb(skb);
101207 diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
101208 index 2a0bbda..d75ca57 100644
101209 --- a/net/ipv6/xfrm6_policy.c
101210 +++ b/net/ipv6/xfrm6_policy.c
101211 @@ -212,11 +212,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
101212 }
101213 }
101214
101215 -static inline int xfrm6_garbage_collect(struct dst_ops *ops)
101216 +static int xfrm6_garbage_collect(struct dst_ops *ops)
101217 {
101218 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
101219
101220 - xfrm6_policy_afinfo.garbage_collect(net);
101221 + xfrm_garbage_collect_deferred(net);
101222 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
101223 }
101224
101225 @@ -329,19 +329,19 @@ static struct ctl_table xfrm6_policy_table[] = {
101226
101227 static int __net_init xfrm6_net_init(struct net *net)
101228 {
101229 - struct ctl_table *table;
101230 + ctl_table_no_const *table = NULL;
101231 struct ctl_table_header *hdr;
101232
101233 - table = xfrm6_policy_table;
101234 if (!net_eq(net, &init_net)) {
101235 - table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
101236 + table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
101237 if (!table)
101238 goto err_alloc;
101239
101240 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
101241 - }
101242 + hdr = register_net_sysctl(net, "net/ipv6", table);
101243 + } else
101244 + hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
101245
101246 - hdr = register_net_sysctl(net, "net/ipv6", table);
101247 if (!hdr)
101248 goto err_reg;
101249
101250 @@ -349,8 +349,7 @@ static int __net_init xfrm6_net_init(struct net *net)
101251 return 0;
101252
101253 err_reg:
101254 - if (!net_eq(net, &init_net))
101255 - kfree(table);
101256 + kfree(table);
101257 err_alloc:
101258 return -ENOMEM;
101259 }
101260 diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
101261 index e15c16a..7cf07aa 100644
101262 --- a/net/ipx/ipx_proc.c
101263 +++ b/net/ipx/ipx_proc.c
101264 @@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
101265 struct proc_dir_entry *p;
101266 int rc = -ENOMEM;
101267
101268 - ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
101269 + ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
101270
101271 if (!ipx_proc_dir)
101272 goto out;
101273 diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
101274 index 2ba8b97..6d33010 100644
101275 --- a/net/irda/ircomm/ircomm_tty.c
101276 +++ b/net/irda/ircomm/ircomm_tty.c
101277 @@ -317,11 +317,11 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
101278 add_wait_queue(&port->open_wait, &wait);
101279
101280 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
101281 - __FILE__, __LINE__, tty->driver->name, port->count);
101282 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
101283
101284 spin_lock_irqsave(&port->lock, flags);
101285 if (!tty_hung_up_p(filp))
101286 - port->count--;
101287 + atomic_dec(&port->count);
101288 port->blocked_open++;
101289 spin_unlock_irqrestore(&port->lock, flags);
101290
101291 @@ -356,7 +356,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
101292 }
101293
101294 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
101295 - __FILE__, __LINE__, tty->driver->name, port->count);
101296 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
101297
101298 schedule();
101299 }
101300 @@ -366,12 +366,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
101301
101302 spin_lock_irqsave(&port->lock, flags);
101303 if (!tty_hung_up_p(filp))
101304 - port->count++;
101305 + atomic_inc(&port->count);
101306 port->blocked_open--;
101307 spin_unlock_irqrestore(&port->lock, flags);
101308
101309 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
101310 - __FILE__, __LINE__, tty->driver->name, port->count);
101311 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
101312
101313 if (!retval)
101314 port->flags |= ASYNC_NORMAL_ACTIVE;
101315 @@ -445,12 +445,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
101316
101317 /* ++ is not atomic, so this should be protected - Jean II */
101318 spin_lock_irqsave(&self->port.lock, flags);
101319 - self->port.count++;
101320 + atomic_inc(&self->port.count);
101321 spin_unlock_irqrestore(&self->port.lock, flags);
101322 tty_port_tty_set(&self->port, tty);
101323
101324 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
101325 - self->line, self->port.count);
101326 + self->line, atomic_read(&self->port.count));
101327
101328 /* Not really used by us, but lets do it anyway */
101329 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
101330 @@ -987,7 +987,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
101331 tty_kref_put(port->tty);
101332 }
101333 port->tty = NULL;
101334 - port->count = 0;
101335 + atomic_set(&port->count, 0);
101336 spin_unlock_irqrestore(&port->lock, flags);
101337
101338 wake_up_interruptible(&port->open_wait);
101339 @@ -1344,7 +1344,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
101340 seq_putc(m, '\n');
101341
101342 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
101343 - seq_printf(m, "Open count: %d\n", self->port.count);
101344 + seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
101345 seq_printf(m, "Max data size: %d\n", self->max_data_size);
101346 seq_printf(m, "Max header size: %d\n", self->max_header_size);
101347
101348 diff --git a/net/irda/irproc.c b/net/irda/irproc.c
101349 index b9ac598..f88cc56 100644
101350 --- a/net/irda/irproc.c
101351 +++ b/net/irda/irproc.c
101352 @@ -66,7 +66,7 @@ void __init irda_proc_register(void)
101353 {
101354 int i;
101355
101356 - proc_irda = proc_mkdir("irda", init_net.proc_net);
101357 + proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
101358 if (proc_irda == NULL)
101359 return;
101360
101361 diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
101362 index 8c9d730..66c6305 100644
101363 --- a/net/iucv/af_iucv.c
101364 +++ b/net/iucv/af_iucv.c
101365 @@ -773,10 +773,10 @@ static int iucv_sock_autobind(struct sock *sk)
101366
101367 write_lock_bh(&iucv_sk_list.lock);
101368
101369 - sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
101370 + sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
101371 while (__iucv_get_sock_by_name(name)) {
101372 sprintf(name, "%08x",
101373 - atomic_inc_return(&iucv_sk_list.autobind_name));
101374 + atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
101375 }
101376
101377 write_unlock_bh(&iucv_sk_list.lock);
101378 diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
101379 index da78793..bdd78cf 100644
101380 --- a/net/iucv/iucv.c
101381 +++ b/net/iucv/iucv.c
101382 @@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
101383 return NOTIFY_OK;
101384 }
101385
101386 -static struct notifier_block __refdata iucv_cpu_notifier = {
101387 +static struct notifier_block iucv_cpu_notifier = {
101388 .notifier_call = iucv_cpu_notify,
101389 };
101390
101391 diff --git a/net/key/af_key.c b/net/key/af_key.c
101392 index f3c8307..7127791 100644
101393 --- a/net/key/af_key.c
101394 +++ b/net/key/af_key.c
101395 @@ -3070,10 +3070,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
101396 static u32 get_acqseq(void)
101397 {
101398 u32 res;
101399 - static atomic_t acqseq;
101400 + static atomic_unchecked_t acqseq;
101401
101402 do {
101403 - res = atomic_inc_return(&acqseq);
101404 + res = atomic_inc_return_unchecked(&acqseq);
101405 } while (!res);
101406 return res;
101407 }
101408 diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
101409 index 76125c5..e474828 100644
101410 --- a/net/l2tp/l2tp_eth.c
101411 +++ b/net/l2tp/l2tp_eth.c
101412 @@ -42,12 +42,12 @@ struct l2tp_eth {
101413 struct sock *tunnel_sock;
101414 struct l2tp_session *session;
101415 struct list_head list;
101416 - atomic_long_t tx_bytes;
101417 - atomic_long_t tx_packets;
101418 - atomic_long_t tx_dropped;
101419 - atomic_long_t rx_bytes;
101420 - atomic_long_t rx_packets;
101421 - atomic_long_t rx_errors;
101422 + atomic_long_unchecked_t tx_bytes;
101423 + atomic_long_unchecked_t tx_packets;
101424 + atomic_long_unchecked_t tx_dropped;
101425 + atomic_long_unchecked_t rx_bytes;
101426 + atomic_long_unchecked_t rx_packets;
101427 + atomic_long_unchecked_t rx_errors;
101428 };
101429
101430 /* via l2tp_session_priv() */
101431 @@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
101432 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
101433
101434 if (likely(ret == NET_XMIT_SUCCESS)) {
101435 - atomic_long_add(len, &priv->tx_bytes);
101436 - atomic_long_inc(&priv->tx_packets);
101437 + atomic_long_add_unchecked(len, &priv->tx_bytes);
101438 + atomic_long_inc_unchecked(&priv->tx_packets);
101439 } else {
101440 - atomic_long_inc(&priv->tx_dropped);
101441 + atomic_long_inc_unchecked(&priv->tx_dropped);
101442 }
101443 return NETDEV_TX_OK;
101444 }
101445 @@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
101446 {
101447 struct l2tp_eth *priv = netdev_priv(dev);
101448
101449 - stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
101450 - stats->tx_packets = atomic_long_read(&priv->tx_packets);
101451 - stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
101452 - stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
101453 - stats->rx_packets = atomic_long_read(&priv->rx_packets);
101454 - stats->rx_errors = atomic_long_read(&priv->rx_errors);
101455 + stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
101456 + stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
101457 + stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
101458 + stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
101459 + stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
101460 + stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
101461 return stats;
101462 }
101463
101464 @@ -166,15 +166,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
101465 nf_reset(skb);
101466
101467 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
101468 - atomic_long_inc(&priv->rx_packets);
101469 - atomic_long_add(data_len, &priv->rx_bytes);
101470 + atomic_long_inc_unchecked(&priv->rx_packets);
101471 + atomic_long_add_unchecked(data_len, &priv->rx_bytes);
101472 } else {
101473 - atomic_long_inc(&priv->rx_errors);
101474 + atomic_long_inc_unchecked(&priv->rx_errors);
101475 }
101476 return;
101477
101478 error:
101479 - atomic_long_inc(&priv->rx_errors);
101480 + atomic_long_inc_unchecked(&priv->rx_errors);
101481 kfree_skb(skb);
101482 }
101483
101484 diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
101485 index 3397fe6..861fd1a 100644
101486 --- a/net/l2tp/l2tp_ip.c
101487 +++ b/net/l2tp/l2tp_ip.c
101488 @@ -518,6 +518,9 @@ static int l2tp_ip_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m
101489 if (flags & MSG_OOB)
101490 goto out;
101491
101492 + if (addr_len)
101493 + *addr_len = sizeof(*sin);
101494 +
101495 skb = skb_recv_datagram(sk, flags, noblock, &err);
101496 if (!skb)
101497 goto out;
101498 @@ -540,7 +543,6 @@ static int l2tp_ip_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m
101499 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
101500 sin->sin_port = 0;
101501 memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
101502 - *addr_len = sizeof(*sin);
101503 }
101504 if (inet->cmsg_flags)
101505 ip_cmsg_recv(msg, skb);
101506 diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
101507 index 1a3c7e0..80f8b0c 100644
101508 --- a/net/llc/llc_proc.c
101509 +++ b/net/llc/llc_proc.c
101510 @@ -247,7 +247,7 @@ int __init llc_proc_init(void)
101511 int rc = -ENOMEM;
101512 struct proc_dir_entry *p;
101513
101514 - llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
101515 + llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
101516 if (!llc_proc_dir)
101517 goto out;
101518
101519 diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
101520 index aaa59d7..21a2c4a 100644
101521 --- a/net/mac80211/cfg.c
101522 +++ b/net/mac80211/cfg.c
101523 @@ -839,7 +839,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
101524 ret = ieee80211_vif_use_channel(sdata, chandef,
101525 IEEE80211_CHANCTX_EXCLUSIVE);
101526 }
101527 - } else if (local->open_count == local->monitors) {
101528 + } else if (local_read(&local->open_count) == local->monitors) {
101529 local->_oper_chandef = *chandef;
101530 ieee80211_hw_config(local, 0);
101531 }
101532 @@ -3440,7 +3440,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
101533 else
101534 local->probe_req_reg--;
101535
101536 - if (!local->open_count)
101537 + if (!local_read(&local->open_count))
101538 break;
101539
101540 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
101541 @@ -3903,8 +3903,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
101542 if (chanctx_conf) {
101543 *chandef = chanctx_conf->def;
101544 ret = 0;
101545 - } else if (local->open_count > 0 &&
101546 - local->open_count == local->monitors &&
101547 + } else if (local_read(&local->open_count) > 0 &&
101548 + local_read(&local->open_count) == local->monitors &&
101549 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
101550 if (local->use_chanctx)
101551 *chandef = local->monitor_chandef;
101552 diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
101553 index f169b6e..a5dc4eb 100644
101554 --- a/net/mac80211/ieee80211_i.h
101555 +++ b/net/mac80211/ieee80211_i.h
101556 @@ -28,6 +28,7 @@
101557 #include <net/ieee80211_radiotap.h>
101558 #include <net/cfg80211.h>
101559 #include <net/mac80211.h>
101560 +#include <asm/local.h>
101561 #include "key.h"
101562 #include "sta_info.h"
101563 #include "debug.h"
101564 @@ -999,7 +1000,7 @@ struct ieee80211_local {
101565 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
101566 spinlock_t queue_stop_reason_lock;
101567
101568 - int open_count;
101569 + local_t open_count;
101570 int monitors, cooked_mntrs;
101571 /* number of interfaces with corresponding FIF_ flags */
101572 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
101573 diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
101574 index 34799e0..b411290 100644
101575 --- a/net/mac80211/iface.c
101576 +++ b/net/mac80211/iface.c
101577 @@ -524,7 +524,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
101578 break;
101579 }
101580
101581 - if (local->open_count == 0) {
101582 + if (local_read(&local->open_count) == 0) {
101583 res = drv_start(local);
101584 if (res)
101585 goto err_del_bss;
101586 @@ -571,7 +571,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
101587 res = drv_add_interface(local, sdata);
101588 if (res)
101589 goto err_stop;
101590 - } else if (local->monitors == 0 && local->open_count == 0) {
101591 + } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
101592 res = ieee80211_add_virtual_monitor(local);
101593 if (res)
101594 goto err_stop;
101595 @@ -680,7 +680,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
101596 atomic_inc(&local->iff_promiscs);
101597
101598 if (coming_up)
101599 - local->open_count++;
101600 + local_inc(&local->open_count);
101601
101602 if (hw_reconf_flags)
101603 ieee80211_hw_config(local, hw_reconf_flags);
101604 @@ -718,7 +718,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
101605 err_del_interface:
101606 drv_remove_interface(local, sdata);
101607 err_stop:
101608 - if (!local->open_count)
101609 + if (!local_read(&local->open_count))
101610 drv_stop(local);
101611 err_del_bss:
101612 sdata->bss = NULL;
101613 @@ -871,7 +871,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
101614 }
101615
101616 if (going_down)
101617 - local->open_count--;
101618 + local_dec(&local->open_count);
101619
101620 switch (sdata->vif.type) {
101621 case NL80211_IFTYPE_AP_VLAN:
101622 @@ -930,7 +930,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
101623 }
101624 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
101625
101626 - if (local->open_count == 0)
101627 + if (local_read(&local->open_count) == 0)
101628 ieee80211_clear_tx_pending(local);
101629
101630 /*
101631 @@ -970,7 +970,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
101632
101633 ieee80211_recalc_ps(local, -1);
101634
101635 - if (local->open_count == 0) {
101636 + if (local_read(&local->open_count) == 0) {
101637 ieee80211_stop_device(local);
101638
101639 /* no reconfiguring after stop! */
101640 @@ -981,7 +981,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
101641 ieee80211_configure_filter(local);
101642 ieee80211_hw_config(local, hw_reconf_flags);
101643
101644 - if (local->monitors == local->open_count)
101645 + if (local->monitors == local_read(&local->open_count))
101646 ieee80211_add_virtual_monitor(local);
101647 }
101648
101649 diff --git a/net/mac80211/main.c b/net/mac80211/main.c
101650 index 4c1bf61..00b449b 100644
101651 --- a/net/mac80211/main.c
101652 +++ b/net/mac80211/main.c
101653 @@ -174,7 +174,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
101654 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
101655 IEEE80211_CONF_CHANGE_POWER);
101656
101657 - if (changed && local->open_count) {
101658 + if (changed && local_read(&local->open_count)) {
101659 ret = drv_config(local, changed);
101660 /*
101661 * Goal:
101662 diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
101663 index d478b88..8c8d157 100644
101664 --- a/net/mac80211/pm.c
101665 +++ b/net/mac80211/pm.c
101666 @@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
101667 struct ieee80211_sub_if_data *sdata;
101668 struct sta_info *sta;
101669
101670 - if (!local->open_count)
101671 + if (!local_read(&local->open_count))
101672 goto suspend;
101673
101674 ieee80211_scan_cancel(local);
101675 @@ -58,7 +58,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
101676 cancel_work_sync(&local->dynamic_ps_enable_work);
101677 del_timer_sync(&local->dynamic_ps_timer);
101678
101679 - local->wowlan = wowlan && local->open_count;
101680 + local->wowlan = wowlan && local_read(&local->open_count);
101681 if (local->wowlan) {
101682 int err = drv_suspend(local, wowlan);
101683 if (err < 0) {
101684 @@ -123,7 +123,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
101685 WARN_ON(!list_empty(&local->chanctx_list));
101686
101687 /* stop hardware - this must stop RX */
101688 - if (local->open_count)
101689 + if (local_read(&local->open_count))
101690 ieee80211_stop_device(local);
101691
101692 suspend:
101693 diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
101694 index 8fdadfd..a4f72b8 100644
101695 --- a/net/mac80211/rate.c
101696 +++ b/net/mac80211/rate.c
101697 @@ -720,7 +720,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
101698
101699 ASSERT_RTNL();
101700
101701 - if (local->open_count)
101702 + if (local_read(&local->open_count))
101703 return -EBUSY;
101704
101705 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
101706 diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
101707 index 6ff1346..936ca9a 100644
101708 --- a/net/mac80211/rc80211_pid_debugfs.c
101709 +++ b/net/mac80211/rc80211_pid_debugfs.c
101710 @@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
101711
101712 spin_unlock_irqrestore(&events->lock, status);
101713
101714 - if (copy_to_user(buf, pb, p))
101715 + if (p > sizeof(pb) || copy_to_user(buf, pb, p))
101716 return -EFAULT;
101717
101718 return p;
101719 diff --git a/net/mac80211/util.c b/net/mac80211/util.c
101720 index 3c36583..12887fe 100644
101721 --- a/net/mac80211/util.c
101722 +++ b/net/mac80211/util.c
101723 @@ -1509,7 +1509,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
101724 }
101725 #endif
101726 /* everything else happens only if HW was up & running */
101727 - if (!local->open_count)
101728 + if (!local_read(&local->open_count))
101729 goto wake_up;
101730
101731 /*
101732 @@ -1734,7 +1734,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
101733 local->in_reconfig = false;
101734 barrier();
101735
101736 - if (local->monitors == local->open_count && local->monitors > 0)
101737 + if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
101738 ieee80211_add_virtual_monitor(local);
101739
101740 /*
101741 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
101742 index e9410d1..77b6378 100644
101743 --- a/net/netfilter/Kconfig
101744 +++ b/net/netfilter/Kconfig
101745 @@ -1081,6 +1081,16 @@ config NETFILTER_XT_MATCH_ESP
101746
101747 To compile it as a module, choose M here. If unsure, say N.
101748
101749 +config NETFILTER_XT_MATCH_GRADM
101750 + tristate '"gradm" match support'
101751 + depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
101752 + depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
101753 + ---help---
101754 + The gradm match allows to match on grsecurity RBAC being enabled.
101755 + It is useful when iptables rules are applied early on bootup to
101756 + prevent connections to the machine (except from a trusted host)
101757 + while the RBAC system is disabled.
101758 +
101759 config NETFILTER_XT_MATCH_HASHLIMIT
101760 tristate '"hashlimit" match support'
101761 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
101762 diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
101763 index bffdad7..f9317d1 100644
101764 --- a/net/netfilter/Makefile
101765 +++ b/net/netfilter/Makefile
101766 @@ -133,6 +133,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
101767 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
101768 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
101769 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
101770 +obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
101771 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
101772 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
101773 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
101774 diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
101775 index 1172083..986f1c1 100644
101776 --- a/net/netfilter/ipset/ip_set_core.c
101777 +++ b/net/netfilter/ipset/ip_set_core.c
101778 @@ -1924,7 +1924,7 @@ done:
101779 return ret;
101780 }
101781
101782 -static struct nf_sockopt_ops so_set __read_mostly = {
101783 +static struct nf_sockopt_ops so_set = {
101784 .pf = PF_INET,
101785 .get_optmin = SO_IP_SET,
101786 .get_optmax = SO_IP_SET + 1,
101787 diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
101788 index a8eb0a8..86f2de4 100644
101789 --- a/net/netfilter/ipvs/ip_vs_conn.c
101790 +++ b/net/netfilter/ipvs/ip_vs_conn.c
101791 @@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
101792 /* Increase the refcnt counter of the dest */
101793 ip_vs_dest_hold(dest);
101794
101795 - conn_flags = atomic_read(&dest->conn_flags);
101796 + conn_flags = atomic_read_unchecked(&dest->conn_flags);
101797 if (cp->protocol != IPPROTO_UDP)
101798 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
101799 flags = cp->flags;
101800 @@ -900,7 +900,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
101801
101802 cp->control = NULL;
101803 atomic_set(&cp->n_control, 0);
101804 - atomic_set(&cp->in_pkts, 0);
101805 + atomic_set_unchecked(&cp->in_pkts, 0);
101806
101807 cp->packet_xmit = NULL;
101808 cp->app = NULL;
101809 @@ -1188,7 +1188,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
101810
101811 /* Don't drop the entry if its number of incoming packets is not
101812 located in [0, 8] */
101813 - i = atomic_read(&cp->in_pkts);
101814 + i = atomic_read_unchecked(&cp->in_pkts);
101815 if (i > 8 || i < 0) return 0;
101816
101817 if (!todrop_rate[i]) return 0;
101818 diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
101819 index 3d2d2c8..c87e4d3 100644
101820 --- a/net/netfilter/ipvs/ip_vs_core.c
101821 +++ b/net/netfilter/ipvs/ip_vs_core.c
101822 @@ -567,7 +567,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
101823 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
101824 /* do not touch skb anymore */
101825
101826 - atomic_inc(&cp->in_pkts);
101827 + atomic_inc_unchecked(&cp->in_pkts);
101828 ip_vs_conn_put(cp);
101829 return ret;
101830 }
101831 @@ -1711,7 +1711,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
101832 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
101833 pkts = sysctl_sync_threshold(ipvs);
101834 else
101835 - pkts = atomic_add_return(1, &cp->in_pkts);
101836 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
101837
101838 if (ipvs->sync_state & IP_VS_STATE_MASTER)
101839 ip_vs_sync_conn(net, cp, pkts);
101840 diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
101841 index c42e83d..a6a3f8b 100644
101842 --- a/net/netfilter/ipvs/ip_vs_ctl.c
101843 +++ b/net/netfilter/ipvs/ip_vs_ctl.c
101844 @@ -794,7 +794,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
101845 */
101846 ip_vs_rs_hash(ipvs, dest);
101847 }
101848 - atomic_set(&dest->conn_flags, conn_flags);
101849 + atomic_set_unchecked(&dest->conn_flags, conn_flags);
101850
101851 /* bind the service */
101852 old_svc = rcu_dereference_protected(dest->svc, 1);
101853 @@ -1654,7 +1654,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
101854 * align with netns init in ip_vs_control_net_init()
101855 */
101856
101857 -static struct ctl_table vs_vars[] = {
101858 +static ctl_table_no_const vs_vars[] __read_only = {
101859 {
101860 .procname = "amemthresh",
101861 .maxlen = sizeof(int),
101862 @@ -2075,7 +2075,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
101863 " %-7s %-6d %-10d %-10d\n",
101864 &dest->addr.in6,
101865 ntohs(dest->port),
101866 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
101867 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
101868 atomic_read(&dest->weight),
101869 atomic_read(&dest->activeconns),
101870 atomic_read(&dest->inactconns));
101871 @@ -2086,7 +2086,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
101872 "%-7s %-6d %-10d %-10d\n",
101873 ntohl(dest->addr.ip),
101874 ntohs(dest->port),
101875 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
101876 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
101877 atomic_read(&dest->weight),
101878 atomic_read(&dest->activeconns),
101879 atomic_read(&dest->inactconns));
101880 @@ -2564,7 +2564,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
101881
101882 entry.addr = dest->addr.ip;
101883 entry.port = dest->port;
101884 - entry.conn_flags = atomic_read(&dest->conn_flags);
101885 + entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
101886 entry.weight = atomic_read(&dest->weight);
101887 entry.u_threshold = dest->u_threshold;
101888 entry.l_threshold = dest->l_threshold;
101889 @@ -3107,7 +3107,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
101890 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
101891 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
101892 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
101893 - (atomic_read(&dest->conn_flags) &
101894 + (atomic_read_unchecked(&dest->conn_flags) &
101895 IP_VS_CONN_F_FWD_MASK)) ||
101896 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
101897 atomic_read(&dest->weight)) ||
101898 @@ -3697,7 +3697,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
101899 {
101900 int idx;
101901 struct netns_ipvs *ipvs = net_ipvs(net);
101902 - struct ctl_table *tbl;
101903 + ctl_table_no_const *tbl;
101904
101905 atomic_set(&ipvs->dropentry, 0);
101906 spin_lock_init(&ipvs->dropentry_lock);
101907 diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
101908 index 547ff33..c8c8117 100644
101909 --- a/net/netfilter/ipvs/ip_vs_lblc.c
101910 +++ b/net/netfilter/ipvs/ip_vs_lblc.c
101911 @@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
101912 * IPVS LBLC sysctl table
101913 */
101914 #ifdef CONFIG_SYSCTL
101915 -static struct ctl_table vs_vars_table[] = {
101916 +static ctl_table_no_const vs_vars_table[] __read_only = {
101917 {
101918 .procname = "lblc_expiration",
101919 .data = NULL,
101920 diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
101921 index 3f21a2f..a112e85 100644
101922 --- a/net/netfilter/ipvs/ip_vs_lblcr.c
101923 +++ b/net/netfilter/ipvs/ip_vs_lblcr.c
101924 @@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
101925 * IPVS LBLCR sysctl table
101926 */
101927
101928 -static struct ctl_table vs_vars_table[] = {
101929 +static ctl_table_no_const vs_vars_table[] __read_only = {
101930 {
101931 .procname = "lblcr_expiration",
101932 .data = NULL,
101933 diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
101934 index db80126..ef7110e 100644
101935 --- a/net/netfilter/ipvs/ip_vs_sync.c
101936 +++ b/net/netfilter/ipvs/ip_vs_sync.c
101937 @@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
101938 cp = cp->control;
101939 if (cp) {
101940 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
101941 - pkts = atomic_add_return(1, &cp->in_pkts);
101942 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
101943 else
101944 pkts = sysctl_sync_threshold(ipvs);
101945 ip_vs_sync_conn(net, cp->control, pkts);
101946 @@ -771,7 +771,7 @@ control:
101947 if (!cp)
101948 return;
101949 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
101950 - pkts = atomic_add_return(1, &cp->in_pkts);
101951 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
101952 else
101953 pkts = sysctl_sync_threshold(ipvs);
101954 goto sloop;
101955 @@ -895,7 +895,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
101956
101957 if (opt)
101958 memcpy(&cp->in_seq, opt, sizeof(*opt));
101959 - atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
101960 + atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
101961 cp->state = state;
101962 cp->old_state = cp->state;
101963 /*
101964 diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
101965 index c47444e..b0961c6 100644
101966 --- a/net/netfilter/ipvs/ip_vs_xmit.c
101967 +++ b/net/netfilter/ipvs/ip_vs_xmit.c
101968 @@ -1102,7 +1102,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
101969 else
101970 rc = NF_ACCEPT;
101971 /* do not touch skb anymore */
101972 - atomic_inc(&cp->in_pkts);
101973 + atomic_inc_unchecked(&cp->in_pkts);
101974 goto out;
101975 }
101976
101977 @@ -1194,7 +1194,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
101978 else
101979 rc = NF_ACCEPT;
101980 /* do not touch skb anymore */
101981 - atomic_inc(&cp->in_pkts);
101982 + atomic_inc_unchecked(&cp->in_pkts);
101983 goto out;
101984 }
101985
101986 diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
101987 index a4b5e2a..13b1de3 100644
101988 --- a/net/netfilter/nf_conntrack_acct.c
101989 +++ b/net/netfilter/nf_conntrack_acct.c
101990 @@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
101991 #ifdef CONFIG_SYSCTL
101992 static int nf_conntrack_acct_init_sysctl(struct net *net)
101993 {
101994 - struct ctl_table *table;
101995 + ctl_table_no_const *table;
101996
101997 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
101998 GFP_KERNEL);
101999 diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
102000 index 75421f2..0e69621 100644
102001 --- a/net/netfilter/nf_conntrack_core.c
102002 +++ b/net/netfilter/nf_conntrack_core.c
102003 @@ -1789,6 +1789,10 @@ void nf_conntrack_init_end(void)
102004 #define DYING_NULLS_VAL ((1<<30)+1)
102005 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
102006
102007 +#ifdef CONFIG_GRKERNSEC_HIDESYM
102008 +static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
102009 +#endif
102010 +
102011 int nf_conntrack_init_net(struct net *net)
102012 {
102013 int ret = -ENOMEM;
102014 @@ -1814,7 +1818,11 @@ int nf_conntrack_init_net(struct net *net)
102015 if (!net->ct.stat)
102016 goto err_pcpu_lists;
102017
102018 +#ifdef CONFIG_GRKERNSEC_HIDESYM
102019 + net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
102020 +#else
102021 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
102022 +#endif
102023 if (!net->ct.slabname)
102024 goto err_slabname;
102025
102026 diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
102027 index 1df1761..ce8b88a 100644
102028 --- a/net/netfilter/nf_conntrack_ecache.c
102029 +++ b/net/netfilter/nf_conntrack_ecache.c
102030 @@ -188,7 +188,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
102031 #ifdef CONFIG_SYSCTL
102032 static int nf_conntrack_event_init_sysctl(struct net *net)
102033 {
102034 - struct ctl_table *table;
102035 + ctl_table_no_const *table;
102036
102037 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
102038 GFP_KERNEL);
102039 diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
102040 index 5b3eae7..dd4b8fe 100644
102041 --- a/net/netfilter/nf_conntrack_helper.c
102042 +++ b/net/netfilter/nf_conntrack_helper.c
102043 @@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
102044
102045 static int nf_conntrack_helper_init_sysctl(struct net *net)
102046 {
102047 - struct ctl_table *table;
102048 + ctl_table_no_const *table;
102049
102050 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
102051 GFP_KERNEL);
102052 diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
102053 index b65d586..beec902 100644
102054 --- a/net/netfilter/nf_conntrack_proto.c
102055 +++ b/net/netfilter/nf_conntrack_proto.c
102056 @@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
102057
102058 static void
102059 nf_ct_unregister_sysctl(struct ctl_table_header **header,
102060 - struct ctl_table **table,
102061 + ctl_table_no_const **table,
102062 unsigned int users)
102063 {
102064 if (users > 0)
102065 diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
102066 index f641751..d3c5b51 100644
102067 --- a/net/netfilter/nf_conntrack_standalone.c
102068 +++ b/net/netfilter/nf_conntrack_standalone.c
102069 @@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
102070
102071 static int nf_conntrack_standalone_init_sysctl(struct net *net)
102072 {
102073 - struct ctl_table *table;
102074 + ctl_table_no_const *table;
102075
102076 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
102077 GFP_KERNEL);
102078 diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
102079 index 7a394df..bd91a8a 100644
102080 --- a/net/netfilter/nf_conntrack_timestamp.c
102081 +++ b/net/netfilter/nf_conntrack_timestamp.c
102082 @@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
102083 #ifdef CONFIG_SYSCTL
102084 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
102085 {
102086 - struct ctl_table *table;
102087 + ctl_table_no_const *table;
102088
102089 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
102090 GFP_KERNEL);
102091 diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
102092 index 85296d4..8becdec 100644
102093 --- a/net/netfilter/nf_log.c
102094 +++ b/net/netfilter/nf_log.c
102095 @@ -243,7 +243,7 @@ static const struct file_operations nflog_file_ops = {
102096
102097 #ifdef CONFIG_SYSCTL
102098 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
102099 -static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
102100 +static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
102101
102102 static int nf_log_proc_dostring(struct ctl_table *table, int write,
102103 void __user *buffer, size_t *lenp, loff_t *ppos)
102104 @@ -274,14 +274,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
102105 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
102106 mutex_unlock(&nf_log_mutex);
102107 } else {
102108 + ctl_table_no_const nf_log_table = *table;
102109 +
102110 mutex_lock(&nf_log_mutex);
102111 logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
102112 lockdep_is_held(&nf_log_mutex));
102113 if (!logger)
102114 - table->data = "NONE";
102115 + nf_log_table.data = "NONE";
102116 else
102117 - table->data = logger->name;
102118 - r = proc_dostring(table, write, buffer, lenp, ppos);
102119 + nf_log_table.data = logger->name;
102120 + r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
102121 mutex_unlock(&nf_log_mutex);
102122 }
102123
102124 diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
102125 index f042ae5..30ea486 100644
102126 --- a/net/netfilter/nf_sockopt.c
102127 +++ b/net/netfilter/nf_sockopt.c
102128 @@ -45,7 +45,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
102129 }
102130 }
102131
102132 - list_add(&reg->list, &nf_sockopts);
102133 + pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
102134 out:
102135 mutex_unlock(&nf_sockopt_mutex);
102136 return ret;
102137 @@ -55,7 +55,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
102138 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
102139 {
102140 mutex_lock(&nf_sockopt_mutex);
102141 - list_del(&reg->list);
102142 + pax_list_del((struct list_head *)&reg->list);
102143 mutex_unlock(&nf_sockopt_mutex);
102144 }
102145 EXPORT_SYMBOL(nf_unregister_sockopt);
102146 diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
102147 index d292c8d..9f1e166 100644
102148 --- a/net/netfilter/nfnetlink_log.c
102149 +++ b/net/netfilter/nfnetlink_log.c
102150 @@ -79,7 +79,7 @@ static int nfnl_log_net_id __read_mostly;
102151 struct nfnl_log_net {
102152 spinlock_t instances_lock;
102153 struct hlist_head instance_table[INSTANCE_BUCKETS];
102154 - atomic_t global_seq;
102155 + atomic_unchecked_t global_seq;
102156 };
102157
102158 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
102159 @@ -561,7 +561,7 @@ __build_packet_message(struct nfnl_log_net *log,
102160 /* global sequence number */
102161 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
102162 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
102163 - htonl(atomic_inc_return(&log->global_seq))))
102164 + htonl(atomic_inc_return_unchecked(&log->global_seq))))
102165 goto nla_put_failure;
102166
102167 if (data_len) {
102168 diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
102169 index 8a779be..1551d4c 100644
102170 --- a/net/netfilter/nft_compat.c
102171 +++ b/net/netfilter/nft_compat.c
102172 @@ -216,7 +216,7 @@ target_dump_info(struct sk_buff *skb, const struct xt_target *t, const void *in)
102173 /* We want to reuse existing compat_to_user */
102174 old_fs = get_fs();
102175 set_fs(KERNEL_DS);
102176 - t->compat_to_user(out, in);
102177 + t->compat_to_user((void __force_user *)out, in);
102178 set_fs(old_fs);
102179 ret = nla_put(skb, NFTA_TARGET_INFO, XT_ALIGN(t->targetsize), out);
102180 kfree(out);
102181 @@ -403,7 +403,7 @@ match_dump_info(struct sk_buff *skb, const struct xt_match *m, const void *in)
102182 /* We want to reuse existing compat_to_user */
102183 old_fs = get_fs();
102184 set_fs(KERNEL_DS);
102185 - m->compat_to_user(out, in);
102186 + m->compat_to_user((void __force_user *)out, in);
102187 set_fs(old_fs);
102188 ret = nla_put(skb, NFTA_MATCH_INFO, XT_ALIGN(m->matchsize), out);
102189 kfree(out);
102190 diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
102191 new file mode 100644
102192 index 0000000..c566332
102193 --- /dev/null
102194 +++ b/net/netfilter/xt_gradm.c
102195 @@ -0,0 +1,51 @@
102196 +/*
102197 + * gradm match for netfilter
102198 + * Copyright © Zbigniew Krzystolik, 2010
102199 + *
102200 + * This program is free software; you can redistribute it and/or modify
102201 + * it under the terms of the GNU General Public License; either version
102202 + * 2 or 3 as published by the Free Software Foundation.
102203 + */
102204 +#include <linux/module.h>
102205 +#include <linux/moduleparam.h>
102206 +#include <linux/skbuff.h>
102207 +#include <linux/netfilter/x_tables.h>
102208 +#include <linux/grsecurity.h>
102209 +#include <linux/netfilter/xt_gradm.h>
102210 +
102211 +static bool
102212 +gradm_mt(const struct sk_buff *skb, struct xt_action_param *par)
102213 +{
102214 + const struct xt_gradm_mtinfo *info = par->matchinfo;
102215 + bool retval = false;
102216 + if (gr_acl_is_enabled())
102217 + retval = true;
102218 + return retval ^ info->invflags;
102219 +}
102220 +
102221 +static struct xt_match gradm_mt_reg __read_mostly = {
102222 + .name = "gradm",
102223 + .revision = 0,
102224 + .family = NFPROTO_UNSPEC,
102225 + .match = gradm_mt,
102226 + .matchsize = XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
102227 + .me = THIS_MODULE,
102228 +};
102229 +
102230 +static int __init gradm_mt_init(void)
102231 +{
102232 + return xt_register_match(&gradm_mt_reg);
102233 +}
102234 +
102235 +static void __exit gradm_mt_exit(void)
102236 +{
102237 + xt_unregister_match(&gradm_mt_reg);
102238 +}
102239 +
102240 +module_init(gradm_mt_init);
102241 +module_exit(gradm_mt_exit);
102242 +MODULE_AUTHOR("Zbigniew Krzystolik <zbyniu@destrukcja.pl>");
102243 +MODULE_DESCRIPTION("Xtables: Grsecurity RBAC match");
102244 +MODULE_LICENSE("GPL");
102245 +MODULE_ALIAS("ipt_gradm");
102246 +MODULE_ALIAS("ip6t_gradm");
102247 diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
102248 index a3910fc..2d2ba14 100644
102249 --- a/net/netfilter/xt_hashlimit.c
102250 +++ b/net/netfilter/xt_hashlimit.c
102251 @@ -870,11 +870,11 @@ static int __net_init hashlimit_proc_net_init(struct net *net)
102252 {
102253 struct hashlimit_net *hashlimit_net = hashlimit_pernet(net);
102254
102255 - hashlimit_net->ipt_hashlimit = proc_mkdir("ipt_hashlimit", net->proc_net);
102256 + hashlimit_net->ipt_hashlimit = proc_mkdir_restrict("ipt_hashlimit", net->proc_net);
102257 if (!hashlimit_net->ipt_hashlimit)
102258 return -ENOMEM;
102259 #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
102260 - hashlimit_net->ip6t_hashlimit = proc_mkdir("ip6t_hashlimit", net->proc_net);
102261 + hashlimit_net->ip6t_hashlimit = proc_mkdir_restrict("ip6t_hashlimit", net->proc_net);
102262 if (!hashlimit_net->ip6t_hashlimit) {
102263 remove_proc_entry("ipt_hashlimit", net->proc_net);
102264 return -ENOMEM;
102265 diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
102266 index 1e657cf..1eb1c34 100644
102267 --- a/net/netfilter/xt_recent.c
102268 +++ b/net/netfilter/xt_recent.c
102269 @@ -618,7 +618,7 @@ static int __net_init recent_proc_net_init(struct net *net)
102270 {
102271 struct recent_net *recent_net = recent_pernet(net);
102272
102273 - recent_net->xt_recent = proc_mkdir("xt_recent", net->proc_net);
102274 + recent_net->xt_recent = proc_mkdir_restrict("xt_recent", net->proc_net);
102275 if (!recent_net->xt_recent)
102276 return -ENOMEM;
102277 return 0;
102278 diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
102279 index 11de55e..f25e448 100644
102280 --- a/net/netfilter/xt_statistic.c
102281 +++ b/net/netfilter/xt_statistic.c
102282 @@ -19,7 +19,7 @@
102283 #include <linux/module.h>
102284
102285 struct xt_statistic_priv {
102286 - atomic_t count;
102287 + atomic_unchecked_t count;
102288 } ____cacheline_aligned_in_smp;
102289
102290 MODULE_LICENSE("GPL");
102291 @@ -42,9 +42,9 @@ statistic_mt(const struct sk_buff *skb, struct xt_action_param *par)
102292 break;
102293 case XT_STATISTIC_MODE_NTH:
102294 do {
102295 - oval = atomic_read(&info->master->count);
102296 + oval = atomic_read_unchecked(&info->master->count);
102297 nval = (oval == info->u.nth.every) ? 0 : oval + 1;
102298 - } while (atomic_cmpxchg(&info->master->count, oval, nval) != oval);
102299 + } while (atomic_cmpxchg_unchecked(&info->master->count, oval, nval) != oval);
102300 if (nval == 0)
102301 ret = !ret;
102302 break;
102303 @@ -64,7 +64,7 @@ static int statistic_mt_check(const struct xt_mtchk_param *par)
102304 info->master = kzalloc(sizeof(*info->master), GFP_KERNEL);
102305 if (info->master == NULL)
102306 return -ENOMEM;
102307 - atomic_set(&info->master->count, info->u.nth.count);
102308 + atomic_set_unchecked(&info->master->count, info->u.nth.count);
102309
102310 return 0;
102311 }
102312 diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
102313 index f22757a..daf62a2 100644
102314 --- a/net/netlink/af_netlink.c
102315 +++ b/net/netlink/af_netlink.c
102316 @@ -257,7 +257,7 @@ static void netlink_overrun(struct sock *sk)
102317 sk->sk_error_report(sk);
102318 }
102319 }
102320 - atomic_inc(&sk->sk_drops);
102321 + atomic_inc_unchecked(&sk->sk_drops);
102322 }
102323
102324 static void netlink_rcv_wake(struct sock *sk)
102325 @@ -3028,7 +3028,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
102326 sk_wmem_alloc_get(s),
102327 nlk->cb_running,
102328 atomic_read(&s->sk_refcnt),
102329 - atomic_read(&s->sk_drops),
102330 + atomic_read_unchecked(&s->sk_drops),
102331 sock_i_ino(s)
102332 );
102333
102334 diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
102335 index ede50d1..d2468e6 100644
102336 --- a/net/netrom/af_netrom.c
102337 +++ b/net/netrom/af_netrom.c
102338 @@ -850,7 +850,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
102339 *uaddr_len = sizeof(struct full_sockaddr_ax25);
102340 } else {
102341 sax->fsa_ax25.sax25_family = AF_NETROM;
102342 - sax->fsa_ax25.sax25_ndigis = 0;
102343 sax->fsa_ax25.sax25_call = nr->source_addr;
102344 *uaddr_len = sizeof(struct sockaddr_ax25);
102345 }
102346 diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
102347 index b85c67c..27c3368 100644
102348 --- a/net/packet/af_packet.c
102349 +++ b/net/packet/af_packet.c
102350 @@ -275,7 +275,7 @@ static int packet_direct_xmit(struct sk_buff *skb)
102351
102352 return ret;
102353 drop:
102354 - atomic_long_inc(&dev->tx_dropped);
102355 + atomic_long_inc_unchecked(&dev->tx_dropped);
102356 kfree_skb(skb);
102357 return NET_XMIT_DROP;
102358 }
102359 @@ -1845,7 +1845,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
102360
102361 spin_lock(&sk->sk_receive_queue.lock);
102362 po->stats.stats1.tp_packets++;
102363 - skb->dropcount = atomic_read(&sk->sk_drops);
102364 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
102365 __skb_queue_tail(&sk->sk_receive_queue, skb);
102366 spin_unlock(&sk->sk_receive_queue.lock);
102367 sk->sk_data_ready(sk);
102368 @@ -1854,7 +1854,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
102369 drop_n_acct:
102370 spin_lock(&sk->sk_receive_queue.lock);
102371 po->stats.stats1.tp_drops++;
102372 - atomic_inc(&sk->sk_drops);
102373 + atomic_inc_unchecked(&sk->sk_drops);
102374 spin_unlock(&sk->sk_receive_queue.lock);
102375
102376 drop_n_restore:
102377 @@ -3459,7 +3459,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
102378 case PACKET_HDRLEN:
102379 if (len > sizeof(int))
102380 len = sizeof(int);
102381 - if (copy_from_user(&val, optval, len))
102382 + if (len > sizeof(val) || copy_from_user(&val, optval, len))
102383 return -EFAULT;
102384 switch (val) {
102385 case TPACKET_V1:
102386 @@ -3505,7 +3505,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
102387 len = lv;
102388 if (put_user(len, optlen))
102389 return -EFAULT;
102390 - if (copy_to_user(optval, data, len))
102391 + if (len > sizeof(st) || copy_to_user(optval, data, len))
102392 return -EFAULT;
102393 return 0;
102394 }
102395 diff --git a/net/phonet/pep.c b/net/phonet/pep.c
102396 index 70a547e..23477fe 100644
102397 --- a/net/phonet/pep.c
102398 +++ b/net/phonet/pep.c
102399 @@ -388,7 +388,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
102400
102401 case PNS_PEP_CTRL_REQ:
102402 if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) {
102403 - atomic_inc(&sk->sk_drops);
102404 + atomic_inc_unchecked(&sk->sk_drops);
102405 break;
102406 }
102407 __skb_pull(skb, 4);
102408 @@ -409,7 +409,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
102409 }
102410
102411 if (pn->rx_credits == 0) {
102412 - atomic_inc(&sk->sk_drops);
102413 + atomic_inc_unchecked(&sk->sk_drops);
102414 err = -ENOBUFS;
102415 break;
102416 }
102417 @@ -579,7 +579,7 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb)
102418 }
102419
102420 if (pn->rx_credits == 0) {
102421 - atomic_inc(&sk->sk_drops);
102422 + atomic_inc_unchecked(&sk->sk_drops);
102423 err = NET_RX_DROP;
102424 break;
102425 }
102426 diff --git a/net/phonet/socket.c b/net/phonet/socket.c
102427 index 008214a..bb68240 100644
102428 --- a/net/phonet/socket.c
102429 +++ b/net/phonet/socket.c
102430 @@ -611,7 +611,7 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
102431 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)),
102432 sock_i_ino(sk),
102433 atomic_read(&sk->sk_refcnt), sk,
102434 - atomic_read(&sk->sk_drops));
102435 + atomic_read_unchecked(&sk->sk_drops));
102436 }
102437 seq_pad(seq, '\n');
102438 return 0;
102439 diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c
102440 index c02a8c4..3c5b600 100644
102441 --- a/net/phonet/sysctl.c
102442 +++ b/net/phonet/sysctl.c
102443 @@ -67,7 +67,7 @@ static int proc_local_port_range(struct ctl_table *table, int write,
102444 {
102445 int ret;
102446 int range[2] = {local_port_range[0], local_port_range[1]};
102447 - struct ctl_table tmp = {
102448 + ctl_table_no_const tmp = {
102449 .data = &range,
102450 .maxlen = sizeof(range),
102451 .mode = table->mode,
102452 diff --git a/net/rds/cong.c b/net/rds/cong.c
102453 index e5b65ac..f3b6fb7 100644
102454 --- a/net/rds/cong.c
102455 +++ b/net/rds/cong.c
102456 @@ -78,7 +78,7 @@
102457 * finds that the saved generation number is smaller than the global generation
102458 * number, it wakes up the process.
102459 */
102460 -static atomic_t rds_cong_generation = ATOMIC_INIT(0);
102461 +static atomic_unchecked_t rds_cong_generation = ATOMIC_INIT(0);
102462
102463 /*
102464 * Congestion monitoring
102465 @@ -233,7 +233,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
102466 rdsdebug("waking map %p for %pI4\n",
102467 map, &map->m_addr);
102468 rds_stats_inc(s_cong_update_received);
102469 - atomic_inc(&rds_cong_generation);
102470 + atomic_inc_unchecked(&rds_cong_generation);
102471 if (waitqueue_active(&map->m_waitq))
102472 wake_up(&map->m_waitq);
102473 if (waitqueue_active(&rds_poll_waitq))
102474 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
102475
102476 int rds_cong_updated_since(unsigned long *recent)
102477 {
102478 - unsigned long gen = atomic_read(&rds_cong_generation);
102479 + unsigned long gen = atomic_read_unchecked(&rds_cong_generation);
102480
102481 if (likely(*recent == gen))
102482 return 0;
102483 diff --git a/net/rds/ib.h b/net/rds/ib.h
102484 index 7280ab8..e04f4ea 100644
102485 --- a/net/rds/ib.h
102486 +++ b/net/rds/ib.h
102487 @@ -128,7 +128,7 @@ struct rds_ib_connection {
102488 /* sending acks */
102489 unsigned long i_ack_flags;
102490 #ifdef KERNEL_HAS_ATOMIC64
102491 - atomic64_t i_ack_next; /* next ACK to send */
102492 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
102493 #else
102494 spinlock_t i_ack_lock; /* protect i_ack_next */
102495 u64 i_ack_next; /* next ACK to send */
102496 diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
102497 index 31b74f5..dc1fbfa 100644
102498 --- a/net/rds/ib_cm.c
102499 +++ b/net/rds/ib_cm.c
102500 @@ -717,7 +717,7 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
102501 /* Clear the ACK state */
102502 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
102503 #ifdef KERNEL_HAS_ATOMIC64
102504 - atomic64_set(&ic->i_ack_next, 0);
102505 + atomic64_set_unchecked(&ic->i_ack_next, 0);
102506 #else
102507 ic->i_ack_next = 0;
102508 #endif
102509 diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
102510 index b7ebe23..b6352f6 100644
102511 --- a/net/rds/ib_recv.c
102512 +++ b/net/rds/ib_recv.c
102513 @@ -596,7 +596,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
102514 static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
102515 int ack_required)
102516 {
102517 - atomic64_set(&ic->i_ack_next, seq);
102518 + atomic64_set_unchecked(&ic->i_ack_next, seq);
102519 if (ack_required) {
102520 smp_mb__before_clear_bit();
102521 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
102522 @@ -608,7 +608,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
102523 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
102524 smp_mb__after_clear_bit();
102525
102526 - return atomic64_read(&ic->i_ack_next);
102527 + return atomic64_read_unchecked(&ic->i_ack_next);
102528 }
102529 #endif
102530
102531 diff --git a/net/rds/iw.h b/net/rds/iw.h
102532 index 04ce3b1..48119a6 100644
102533 --- a/net/rds/iw.h
102534 +++ b/net/rds/iw.h
102535 @@ -134,7 +134,7 @@ struct rds_iw_connection {
102536 /* sending acks */
102537 unsigned long i_ack_flags;
102538 #ifdef KERNEL_HAS_ATOMIC64
102539 - atomic64_t i_ack_next; /* next ACK to send */
102540 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
102541 #else
102542 spinlock_t i_ack_lock; /* protect i_ack_next */
102543 u64 i_ack_next; /* next ACK to send */
102544 diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
102545 index a91e1db..cf3053f 100644
102546 --- a/net/rds/iw_cm.c
102547 +++ b/net/rds/iw_cm.c
102548 @@ -663,7 +663,7 @@ void rds_iw_conn_shutdown(struct rds_connection *conn)
102549 /* Clear the ACK state */
102550 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
102551 #ifdef KERNEL_HAS_ATOMIC64
102552 - atomic64_set(&ic->i_ack_next, 0);
102553 + atomic64_set_unchecked(&ic->i_ack_next, 0);
102554 #else
102555 ic->i_ack_next = 0;
102556 #endif
102557 diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
102558 index 4503335..db566b4 100644
102559 --- a/net/rds/iw_recv.c
102560 +++ b/net/rds/iw_recv.c
102561 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
102562 static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
102563 int ack_required)
102564 {
102565 - atomic64_set(&ic->i_ack_next, seq);
102566 + atomic64_set_unchecked(&ic->i_ack_next, seq);
102567 if (ack_required) {
102568 smp_mb__before_clear_bit();
102569 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
102570 @@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
102571 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
102572 smp_mb__after_clear_bit();
102573
102574 - return atomic64_read(&ic->i_ack_next);
102575 + return atomic64_read_unchecked(&ic->i_ack_next);
102576 }
102577 #endif
102578
102579 diff --git a/net/rds/rds.h b/net/rds/rds.h
102580 index 48f8ffc..0ef3eec 100644
102581 --- a/net/rds/rds.h
102582 +++ b/net/rds/rds.h
102583 @@ -449,7 +449,7 @@ struct rds_transport {
102584 void (*sync_mr)(void *trans_private, int direction);
102585 void (*free_mr)(void *trans_private, int invalidate);
102586 void (*flush_mrs)(void);
102587 -};
102588 +} __do_const;
102589
102590 struct rds_sock {
102591 struct sock rs_sk;
102592 diff --git a/net/rds/tcp.c b/net/rds/tcp.c
102593 index edac9ef..16bcb98 100644
102594 --- a/net/rds/tcp.c
102595 +++ b/net/rds/tcp.c
102596 @@ -59,7 +59,7 @@ void rds_tcp_nonagle(struct socket *sock)
102597 int val = 1;
102598
102599 set_fs(KERNEL_DS);
102600 - sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __user *)&val,
102601 + sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __force_user *)&val,
102602 sizeof(val));
102603 set_fs(oldfs);
102604 }
102605 diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
102606 index 81cf5a4..b5826ff 100644
102607 --- a/net/rds/tcp_send.c
102608 +++ b/net/rds/tcp_send.c
102609 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *sock, int val)
102610
102611 oldfs = get_fs();
102612 set_fs(KERNEL_DS);
102613 - sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __user *)&val,
102614 + sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __force_user *)&val,
102615 sizeof(val));
102616 set_fs(oldfs);
102617 }
102618 diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
102619 index 7b16704..9628ec6 100644
102620 --- a/net/rxrpc/af_rxrpc.c
102621 +++ b/net/rxrpc/af_rxrpc.c
102622 @@ -40,7 +40,7 @@ static const struct proto_ops rxrpc_rpc_ops;
102623 __be32 rxrpc_epoch;
102624
102625 /* current debugging ID */
102626 -atomic_t rxrpc_debug_id;
102627 +atomic_unchecked_t rxrpc_debug_id;
102628
102629 /* count of skbs currently in use */
102630 atomic_t rxrpc_n_skbs;
102631 diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
102632 index c6be17a..2a6200a 100644
102633 --- a/net/rxrpc/ar-ack.c
102634 +++ b/net/rxrpc/ar-ack.c
102635 @@ -223,7 +223,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
102636
102637 _enter("{%d,%d,%d,%d},",
102638 call->acks_hard, call->acks_unacked,
102639 - atomic_read(&call->sequence),
102640 + atomic_read_unchecked(&call->sequence),
102641 CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
102642
102643 stop = 0;
102644 @@ -247,7 +247,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
102645
102646 /* each Tx packet has a new serial number */
102647 sp->hdr.serial =
102648 - htonl(atomic_inc_return(&call->conn->serial));
102649 + htonl(atomic_inc_return_unchecked(&call->conn->serial));
102650
102651 hdr = (struct rxrpc_header *) txb->head;
102652 hdr->serial = sp->hdr.serial;
102653 @@ -451,7 +451,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
102654 */
102655 static void rxrpc_clear_tx_window(struct rxrpc_call *call)
102656 {
102657 - rxrpc_rotate_tx_window(call, atomic_read(&call->sequence));
102658 + rxrpc_rotate_tx_window(call, atomic_read_unchecked(&call->sequence));
102659 }
102660
102661 /*
102662 @@ -677,7 +677,7 @@ process_further:
102663
102664 latest = ntohl(sp->hdr.serial);
102665 hard = ntohl(ack.firstPacket);
102666 - tx = atomic_read(&call->sequence);
102667 + tx = atomic_read_unchecked(&call->sequence);
102668
102669 _proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
102670 latest,
102671 @@ -1209,7 +1209,7 @@ void rxrpc_process_call(struct work_struct *work)
102672 goto maybe_reschedule;
102673
102674 send_ACK_with_skew:
102675 - ack.maxSkew = htons(atomic_read(&call->conn->hi_serial) -
102676 + ack.maxSkew = htons(atomic_read_unchecked(&call->conn->hi_serial) -
102677 ntohl(ack.serial));
102678 send_ACK:
102679 mtu = call->conn->trans->peer->if_mtu;
102680 @@ -1221,7 +1221,7 @@ send_ACK:
102681 ackinfo.rxMTU = htonl(rxrpc_rx_mtu);
102682 ackinfo.jumbo_max = htonl(rxrpc_rx_jumbo_max);
102683
102684 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
102685 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
102686 _proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
102687 ntohl(hdr.serial),
102688 ntohs(ack.maxSkew),
102689 @@ -1239,7 +1239,7 @@ send_ACK:
102690 send_message:
102691 _debug("send message");
102692
102693 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
102694 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
102695 _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
102696 send_message_2:
102697
102698 diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
102699 index a9e05db..194e793 100644
102700 --- a/net/rxrpc/ar-call.c
102701 +++ b/net/rxrpc/ar-call.c
102702 @@ -232,7 +232,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
102703 spin_lock_init(&call->lock);
102704 rwlock_init(&call->state_lock);
102705 atomic_set(&call->usage, 1);
102706 - call->debug_id = atomic_inc_return(&rxrpc_debug_id);
102707 + call->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
102708 call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
102709
102710 memset(&call->sock_node, 0xed, sizeof(call->sock_node));
102711 diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
102712 index 6631f4f..bfdf056 100644
102713 --- a/net/rxrpc/ar-connection.c
102714 +++ b/net/rxrpc/ar-connection.c
102715 @@ -210,7 +210,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
102716 rwlock_init(&conn->lock);
102717 spin_lock_init(&conn->state_lock);
102718 atomic_set(&conn->usage, 1);
102719 - conn->debug_id = atomic_inc_return(&rxrpc_debug_id);
102720 + conn->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
102721 conn->avail_calls = RXRPC_MAXCALLS;
102722 conn->size_align = 4;
102723 conn->header_size = sizeof(struct rxrpc_header);
102724 diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
102725 index e7ed43a..6afa140 100644
102726 --- a/net/rxrpc/ar-connevent.c
102727 +++ b/net/rxrpc/ar-connevent.c
102728 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
102729
102730 len = iov[0].iov_len + iov[1].iov_len;
102731
102732 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
102733 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
102734 _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
102735
102736 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
102737 diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
102738 index 63b21e5..330232e 100644
102739 --- a/net/rxrpc/ar-input.c
102740 +++ b/net/rxrpc/ar-input.c
102741 @@ -338,9 +338,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
102742 /* track the latest serial number on this connection for ACK packet
102743 * information */
102744 serial = ntohl(sp->hdr.serial);
102745 - hi_serial = atomic_read(&call->conn->hi_serial);
102746 + hi_serial = atomic_read_unchecked(&call->conn->hi_serial);
102747 while (serial > hi_serial)
102748 - hi_serial = atomic_cmpxchg(&call->conn->hi_serial, hi_serial,
102749 + hi_serial = atomic_cmpxchg_unchecked(&call->conn->hi_serial, hi_serial,
102750 serial);
102751
102752 /* request ACK generation for any ACK or DATA packet that requests
102753 diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
102754 index ba9fd36..9bbfe01 100644
102755 --- a/net/rxrpc/ar-internal.h
102756 +++ b/net/rxrpc/ar-internal.h
102757 @@ -272,8 +272,8 @@ struct rxrpc_connection {
102758 int error; /* error code for local abort */
102759 int debug_id; /* debug ID for printks */
102760 unsigned int call_counter; /* call ID counter */
102761 - atomic_t serial; /* packet serial number counter */
102762 - atomic_t hi_serial; /* highest serial number received */
102763 + atomic_unchecked_t serial; /* packet serial number counter */
102764 + atomic_unchecked_t hi_serial; /* highest serial number received */
102765 u8 avail_calls; /* number of calls available */
102766 u8 size_align; /* data size alignment (for security) */
102767 u8 header_size; /* rxrpc + security header size */
102768 @@ -346,7 +346,7 @@ struct rxrpc_call {
102769 spinlock_t lock;
102770 rwlock_t state_lock; /* lock for state transition */
102771 atomic_t usage;
102772 - atomic_t sequence; /* Tx data packet sequence counter */
102773 + atomic_unchecked_t sequence; /* Tx data packet sequence counter */
102774 u32 abort_code; /* local/remote abort code */
102775 enum { /* current state of call */
102776 RXRPC_CALL_CLIENT_SEND_REQUEST, /* - client sending request phase */
102777 @@ -431,7 +431,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code)
102778 */
102779 extern atomic_t rxrpc_n_skbs;
102780 extern __be32 rxrpc_epoch;
102781 -extern atomic_t rxrpc_debug_id;
102782 +extern atomic_unchecked_t rxrpc_debug_id;
102783 extern struct workqueue_struct *rxrpc_workqueue;
102784
102785 /*
102786 diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c
102787 index 87f7135..74d3703 100644
102788 --- a/net/rxrpc/ar-local.c
102789 +++ b/net/rxrpc/ar-local.c
102790 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(struct sockaddr_rxrpc *srx)
102791 spin_lock_init(&local->lock);
102792 rwlock_init(&local->services_lock);
102793 atomic_set(&local->usage, 1);
102794 - local->debug_id = atomic_inc_return(&rxrpc_debug_id);
102795 + local->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
102796 memcpy(&local->srx, srx, sizeof(*srx));
102797 }
102798
102799 diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
102800 index 0b4b9a7..966ffbb 100644
102801 --- a/net/rxrpc/ar-output.c
102802 +++ b/net/rxrpc/ar-output.c
102803 @@ -682,14 +682,14 @@ static int rxrpc_send_data(struct kiocb *iocb,
102804 memset(skb_put(skb, pad), 0, pad);
102805 }
102806
102807 - seq = atomic_inc_return(&call->sequence);
102808 + seq = atomic_inc_return_unchecked(&call->sequence);
102809
102810 sp->hdr.epoch = conn->epoch;
102811 sp->hdr.cid = call->cid;
102812 sp->hdr.callNumber = call->call_id;
102813 sp->hdr.seq = htonl(seq);
102814 sp->hdr.serial =
102815 - htonl(atomic_inc_return(&conn->serial));
102816 + htonl(atomic_inc_return_unchecked(&conn->serial));
102817 sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
102818 sp->hdr.userStatus = 0;
102819 sp->hdr.securityIndex = conn->security_ix;
102820 diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
102821 index bebaa43..2644591 100644
102822 --- a/net/rxrpc/ar-peer.c
102823 +++ b/net/rxrpc/ar-peer.c
102824 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
102825 INIT_LIST_HEAD(&peer->error_targets);
102826 spin_lock_init(&peer->lock);
102827 atomic_set(&peer->usage, 1);
102828 - peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
102829 + peer->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
102830 memcpy(&peer->srx, srx, sizeof(*srx));
102831
102832 rxrpc_assess_MTU_size(peer);
102833 diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
102834 index 38047f7..9f48511 100644
102835 --- a/net/rxrpc/ar-proc.c
102836 +++ b/net/rxrpc/ar-proc.c
102837 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
102838 atomic_read(&conn->usage),
102839 rxrpc_conn_states[conn->state],
102840 key_serial(conn->key),
102841 - atomic_read(&conn->serial),
102842 - atomic_read(&conn->hi_serial));
102843 + atomic_read_unchecked(&conn->serial),
102844 + atomic_read_unchecked(&conn->hi_serial));
102845
102846 return 0;
102847 }
102848 diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
102849 index 1976dec..aa70be5 100644
102850 --- a/net/rxrpc/ar-transport.c
102851 +++ b/net/rxrpc/ar-transport.c
102852 @@ -51,7 +51,7 @@ static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
102853 spin_lock_init(&trans->client_lock);
102854 rwlock_init(&trans->conn_lock);
102855 atomic_set(&trans->usage, 1);
102856 - trans->debug_id = atomic_inc_return(&rxrpc_debug_id);
102857 + trans->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
102858
102859 if (peer->srx.transport.family == AF_INET) {
102860 switch (peer->srx.transport_type) {
102861 diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
102862 index f226709..0e735a8 100644
102863 --- a/net/rxrpc/rxkad.c
102864 +++ b/net/rxrpc/rxkad.c
102865 @@ -610,7 +610,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn)
102866
102867 len = iov[0].iov_len + iov[1].iov_len;
102868
102869 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
102870 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
102871 _proto("Tx CHALLENGE %%%u", ntohl(hdr.serial));
102872
102873 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
102874 @@ -660,7 +660,7 @@ static int rxkad_send_response(struct rxrpc_connection *conn,
102875
102876 len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;
102877
102878 - hdr->serial = htonl(atomic_inc_return(&conn->serial));
102879 + hdr->serial = htonl(atomic_inc_return_unchecked(&conn->serial));
102880 _proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
102881
102882 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
102883 diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
102884 index e1543b0..7ce8bd0 100644
102885 --- a/net/sched/sch_generic.c
102886 +++ b/net/sched/sch_generic.c
102887 @@ -310,7 +310,7 @@ void netif_carrier_on(struct net_device *dev)
102888 if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
102889 if (dev->reg_state == NETREG_UNINITIALIZED)
102890 return;
102891 - atomic_inc(&dev->carrier_changes);
102892 + atomic_inc_unchecked(&dev->carrier_changes);
102893 linkwatch_fire_event(dev);
102894 if (netif_running(dev))
102895 __netdev_watchdog_up(dev);
102896 @@ -329,7 +329,7 @@ void netif_carrier_off(struct net_device *dev)
102897 if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
102898 if (dev->reg_state == NETREG_UNINITIALIZED)
102899 return;
102900 - atomic_inc(&dev->carrier_changes);
102901 + atomic_inc_unchecked(&dev->carrier_changes);
102902 linkwatch_fire_event(dev);
102903 }
102904 }
102905 diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
102906 index 2b1738e..a9d0fc9 100644
102907 --- a/net/sctp/ipv6.c
102908 +++ b/net/sctp/ipv6.c
102909 @@ -966,7 +966,7 @@ static const struct inet6_protocol sctpv6_protocol = {
102910 .flags = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL,
102911 };
102912
102913 -static struct sctp_af sctp_af_inet6 = {
102914 +static struct sctp_af sctp_af_inet6 __read_only = {
102915 .sa_family = AF_INET6,
102916 .sctp_xmit = sctp_v6_xmit,
102917 .setsockopt = ipv6_setsockopt,
102918 @@ -998,7 +998,7 @@ static struct sctp_af sctp_af_inet6 = {
102919 #endif
102920 };
102921
102922 -static struct sctp_pf sctp_pf_inet6 = {
102923 +static struct sctp_pf sctp_pf_inet6 __read_only = {
102924 .event_msgname = sctp_inet6_event_msgname,
102925 .skb_msgname = sctp_inet6_skb_msgname,
102926 .af_supported = sctp_inet6_af_supported,
102927 @@ -1023,7 +1023,7 @@ void sctp_v6_pf_init(void)
102928
102929 void sctp_v6_pf_exit(void)
102930 {
102931 - list_del(&sctp_af_inet6.list);
102932 + pax_list_del(&sctp_af_inet6.list);
102933 }
102934
102935 /* Initialize IPv6 support and register with socket layer. */
102936 diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
102937 index 44cbb54..4c5dce6 100644
102938 --- a/net/sctp/protocol.c
102939 +++ b/net/sctp/protocol.c
102940 @@ -836,8 +836,10 @@ int sctp_register_af(struct sctp_af *af)
102941 return 0;
102942 }
102943
102944 + pax_open_kernel();
102945 INIT_LIST_HEAD(&af->list);
102946 - list_add_tail(&af->list, &sctp_address_families);
102947 + pax_close_kernel();
102948 + pax_list_add_tail(&af->list, &sctp_address_families);
102949 return 1;
102950 }
102951
102952 @@ -967,7 +969,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb,
102953
102954 static struct sctp_af sctp_af_inet;
102955
102956 -static struct sctp_pf sctp_pf_inet = {
102957 +static struct sctp_pf sctp_pf_inet __read_only = {
102958 .event_msgname = sctp_inet_event_msgname,
102959 .skb_msgname = sctp_inet_skb_msgname,
102960 .af_supported = sctp_inet_af_supported,
102961 @@ -1039,7 +1041,7 @@ static const struct net_protocol sctp_protocol = {
102962 };
102963
102964 /* IPv4 address related functions. */
102965 -static struct sctp_af sctp_af_inet = {
102966 +static struct sctp_af sctp_af_inet __read_only = {
102967 .sa_family = AF_INET,
102968 .sctp_xmit = sctp_v4_xmit,
102969 .setsockopt = ip_setsockopt,
102970 @@ -1124,7 +1126,7 @@ static void sctp_v4_pf_init(void)
102971
102972 static void sctp_v4_pf_exit(void)
102973 {
102974 - list_del(&sctp_af_inet.list);
102975 + pax_list_del(&sctp_af_inet.list);
102976 }
102977
102978 static int sctp_v4_protosw_init(void)
102979 diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
102980 index fef2acd..c705c4f 100644
102981 --- a/net/sctp/sm_sideeffect.c
102982 +++ b/net/sctp/sm_sideeffect.c
102983 @@ -439,7 +439,7 @@ static void sctp_generate_sack_event(unsigned long data)
102984 sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_SACK);
102985 }
102986
102987 -sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
102988 +sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
102989 NULL,
102990 sctp_generate_t1_cookie_event,
102991 sctp_generate_t1_init_event,
102992 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
102993 index fee06b9..eabc613 100644
102994 --- a/net/sctp/socket.c
102995 +++ b/net/sctp/socket.c
102996 @@ -2175,11 +2175,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
102997 {
102998 struct sctp_association *asoc;
102999 struct sctp_ulpevent *event;
103000 + struct sctp_event_subscribe subscribe;
103001
103002 if (optlen > sizeof(struct sctp_event_subscribe))
103003 return -EINVAL;
103004 - if (copy_from_user(&sctp_sk(sk)->subscribe, optval, optlen))
103005 + if (copy_from_user(&subscribe, optval, optlen))
103006 return -EFAULT;
103007 + sctp_sk(sk)->subscribe = subscribe;
103008
103009 /*
103010 * At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT,
103011 @@ -4259,13 +4261,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
103012 static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
103013 int __user *optlen)
103014 {
103015 + struct sctp_event_subscribe subscribe;
103016 +
103017 if (len <= 0)
103018 return -EINVAL;
103019 if (len > sizeof(struct sctp_event_subscribe))
103020 len = sizeof(struct sctp_event_subscribe);
103021 if (put_user(len, optlen))
103022 return -EFAULT;
103023 - if (copy_to_user(optval, &sctp_sk(sk)->subscribe, len))
103024 + subscribe = sctp_sk(sk)->subscribe;
103025 + if (copy_to_user(optval, &subscribe, len))
103026 return -EFAULT;
103027 return 0;
103028 }
103029 @@ -4283,6 +4288,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
103030 */
103031 static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optval, int __user *optlen)
103032 {
103033 + __u32 autoclose;
103034 +
103035 /* Applicable to UDP-style socket only */
103036 if (sctp_style(sk, TCP))
103037 return -EOPNOTSUPP;
103038 @@ -4291,7 +4298,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
103039 len = sizeof(int);
103040 if (put_user(len, optlen))
103041 return -EFAULT;
103042 - if (copy_to_user(optval, &sctp_sk(sk)->autoclose, sizeof(int)))
103043 + autoclose = sctp_sk(sk)->autoclose;
103044 + if (copy_to_user(optval, &autoclose, sizeof(int)))
103045 return -EFAULT;
103046 return 0;
103047 }
103048 @@ -4666,12 +4674,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
103049 */
103050 static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen)
103051 {
103052 + struct sctp_initmsg initmsg;
103053 +
103054 if (len < sizeof(struct sctp_initmsg))
103055 return -EINVAL;
103056 len = sizeof(struct sctp_initmsg);
103057 if (put_user(len, optlen))
103058 return -EFAULT;
103059 - if (copy_to_user(optval, &sctp_sk(sk)->initmsg, len))
103060 + initmsg = sctp_sk(sk)->initmsg;
103061 + if (copy_to_user(optval, &initmsg, len))
103062 return -EFAULT;
103063 return 0;
103064 }
103065 @@ -4712,6 +4723,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
103066 addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
103067 if (space_left < addrlen)
103068 return -ENOMEM;
103069 + if (addrlen > sizeof(temp) || addrlen < 0)
103070 + return -EFAULT;
103071 if (copy_to_user(to, &temp, addrlen))
103072 return -EFAULT;
103073 to += addrlen;
103074 diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
103075 index c82fdc1..4ca1f95 100644
103076 --- a/net/sctp/sysctl.c
103077 +++ b/net/sctp/sysctl.c
103078 @@ -308,7 +308,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, int write,
103079 {
103080 struct net *net = current->nsproxy->net_ns;
103081 char tmp[8];
103082 - struct ctl_table tbl;
103083 + ctl_table_no_const tbl;
103084 int ret;
103085 int changed = 0;
103086 char *none = "none";
103087 @@ -355,7 +355,7 @@ static int proc_sctp_do_rto_min(struct ctl_table *ctl, int write,
103088 {
103089 struct net *net = current->nsproxy->net_ns;
103090 int new_value;
103091 - struct ctl_table tbl;
103092 + ctl_table_no_const tbl;
103093 unsigned int min = *(unsigned int *) ctl->extra1;
103094 unsigned int max = *(unsigned int *) ctl->extra2;
103095 int ret;
103096 @@ -382,7 +382,7 @@ static int proc_sctp_do_rto_max(struct ctl_table *ctl, int write,
103097 {
103098 struct net *net = current->nsproxy->net_ns;
103099 int new_value;
103100 - struct ctl_table tbl;
103101 + ctl_table_no_const tbl;
103102 unsigned int min = *(unsigned int *) ctl->extra1;
103103 unsigned int max = *(unsigned int *) ctl->extra2;
103104 int ret;
103105 @@ -408,7 +408,7 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
103106 loff_t *ppos)
103107 {
103108 struct net *net = current->nsproxy->net_ns;
103109 - struct ctl_table tbl;
103110 + ctl_table_no_const tbl;
103111 int new_value, ret;
103112
103113 memset(&tbl, 0, sizeof(struct ctl_table));
103114 @@ -436,7 +436,7 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
103115
103116 int sctp_sysctl_net_register(struct net *net)
103117 {
103118 - struct ctl_table *table = sctp_net_table;
103119 + ctl_table_no_const *table = NULL;
103120
103121 if (!net_eq(net, &init_net)) {
103122 int i;
103123 @@ -449,7 +449,10 @@ int sctp_sysctl_net_register(struct net *net)
103124 table[i].data += (char *)(&net->sctp) - (char *)&init_net.sctp;
103125 }
103126
103127 - net->sctp.sysctl_header = register_net_sysctl(net, "net/sctp", table);
103128 + if (!net_eq(net, &init_net))
103129 + net->sctp.sysctl_header = register_net_sysctl(net, "net/sctp", table);
103130 + else
103131 + net->sctp.sysctl_header = register_net_sysctl(net, "net/sctp", sctp_net_table);
103132 return 0;
103133 }
103134
103135 diff --git a/net/socket.c b/net/socket.c
103136 index abf56b2..b8998bc 100644
103137 --- a/net/socket.c
103138 +++ b/net/socket.c
103139 @@ -89,6 +89,7 @@
103140 #include <linux/magic.h>
103141 #include <linux/slab.h>
103142 #include <linux/xattr.h>
103143 +#include <linux/in.h>
103144
103145 #include <asm/uaccess.h>
103146 #include <asm/unistd.h>
103147 @@ -112,6 +113,8 @@ unsigned int sysctl_net_busy_read __read_mostly;
103148 unsigned int sysctl_net_busy_poll __read_mostly;
103149 #endif
103150
103151 +#include <linux/grsock.h>
103152 +
103153 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
103154 static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
103155 unsigned long nr_segs, loff_t pos);
103156 @@ -163,7 +166,7 @@ static const struct file_operations socket_file_ops = {
103157 */
103158
103159 static DEFINE_SPINLOCK(net_family_lock);
103160 -static const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
103161 +const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
103162
103163 /*
103164 * Statistics counters of the socket lists
103165 @@ -329,7 +332,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
103166 &sockfs_dentry_operations, SOCKFS_MAGIC);
103167 }
103168
103169 -static struct vfsmount *sock_mnt __read_mostly;
103170 +struct vfsmount *sock_mnt __read_mostly;
103171
103172 static struct file_system_type sock_fs_type = {
103173 .name = "sockfs",
103174 @@ -1257,6 +1260,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
103175 return -EAFNOSUPPORT;
103176 if (type < 0 || type >= SOCK_MAX)
103177 return -EINVAL;
103178 + if (protocol < 0)
103179 + return -EINVAL;
103180
103181 /* Compatibility.
103182
103183 @@ -1277,6 +1282,20 @@ int __sock_create(struct net *net, int family, int type, int protocol,
103184 if (err)
103185 return err;
103186
103187 + if(!kern && !gr_search_socket(family, type, protocol)) {
103188 + if (rcu_access_pointer(net_families[family]) == NULL)
103189 + return -EAFNOSUPPORT;
103190 + else
103191 + return -EACCES;
103192 + }
103193 +
103194 + if (!kern && gr_handle_sock_all(family, type, protocol)) {
103195 + if (rcu_access_pointer(net_families[family]) == NULL)
103196 + return -EAFNOSUPPORT;
103197 + else
103198 + return -EACCES;
103199 + }
103200 +
103201 /*
103202 * Allocate the socket and allow the family to set things up. if
103203 * the protocol is 0, the family is instructed to select an appropriate
103204 @@ -1528,6 +1547,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
103205 if (sock) {
103206 err = move_addr_to_kernel(umyaddr, addrlen, &address);
103207 if (err >= 0) {
103208 + if (gr_handle_sock_server((struct sockaddr *)&address)) {
103209 + err = -EACCES;
103210 + goto error;
103211 + }
103212 + err = gr_search_bind(sock, (struct sockaddr_in *)&address);
103213 + if (err)
103214 + goto error;
103215 +
103216 err = security_socket_bind(sock,
103217 (struct sockaddr *)&address,
103218 addrlen);
103219 @@ -1536,6 +1563,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
103220 (struct sockaddr *)
103221 &address, addrlen);
103222 }
103223 +error:
103224 fput_light(sock->file, fput_needed);
103225 }
103226 return err;
103227 @@ -1559,10 +1587,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
103228 if ((unsigned int)backlog > somaxconn)
103229 backlog = somaxconn;
103230
103231 + if (gr_handle_sock_server_other(sock->sk)) {
103232 + err = -EPERM;
103233 + goto error;
103234 + }
103235 +
103236 + err = gr_search_listen(sock);
103237 + if (err)
103238 + goto error;
103239 +
103240 err = security_socket_listen(sock, backlog);
103241 if (!err)
103242 err = sock->ops->listen(sock, backlog);
103243
103244 +error:
103245 fput_light(sock->file, fput_needed);
103246 }
103247 return err;
103248 @@ -1606,6 +1644,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
103249 newsock->type = sock->type;
103250 newsock->ops = sock->ops;
103251
103252 + if (gr_handle_sock_server_other(sock->sk)) {
103253 + err = -EPERM;
103254 + sock_release(newsock);
103255 + goto out_put;
103256 + }
103257 +
103258 + err = gr_search_accept(sock);
103259 + if (err) {
103260 + sock_release(newsock);
103261 + goto out_put;
103262 + }
103263 +
103264 /*
103265 * We don't need try_module_get here, as the listening socket (sock)
103266 * has the protocol module (sock->ops->owner) held.
103267 @@ -1651,6 +1701,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
103268 fd_install(newfd, newfile);
103269 err = newfd;
103270
103271 + gr_attach_curr_ip(newsock->sk);
103272 +
103273 out_put:
103274 fput_light(sock->file, fput_needed);
103275 out:
103276 @@ -1683,6 +1735,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
103277 int, addrlen)
103278 {
103279 struct socket *sock;
103280 + struct sockaddr *sck;
103281 struct sockaddr_storage address;
103282 int err, fput_needed;
103283
103284 @@ -1693,6 +1746,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
103285 if (err < 0)
103286 goto out_put;
103287
103288 + sck = (struct sockaddr *)&address;
103289 +
103290 + if (gr_handle_sock_client(sck)) {
103291 + err = -EACCES;
103292 + goto out_put;
103293 + }
103294 +
103295 + err = gr_search_connect(sock, (struct sockaddr_in *)sck);
103296 + if (err)
103297 + goto out_put;
103298 +
103299 err =
103300 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
103301 if (err)
103302 @@ -1774,6 +1838,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
103303 * the protocol.
103304 */
103305
103306 +asmlinkage long sys_sendto(int, void __user *, size_t, unsigned, struct sockaddr __user *, int);
103307 +
103308 SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
103309 unsigned int, flags, struct sockaddr __user *, addr,
103310 int, addr_len)
103311 @@ -1840,7 +1906,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
103312 struct socket *sock;
103313 struct iovec iov;
103314 struct msghdr msg;
103315 - struct sockaddr_storage address;
103316 + struct sockaddr_storage address = { };
103317 int err, err2;
103318 int fput_needed;
103319
103320 @@ -2066,7 +2132,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
103321 * checking falls down on this.
103322 */
103323 if (copy_from_user(ctl_buf,
103324 - (void __user __force *)msg_sys->msg_control,
103325 + (void __force_user *)msg_sys->msg_control,
103326 ctl_len))
103327 goto out_freectl;
103328 msg_sys->msg_control = ctl_buf;
103329 @@ -2217,7 +2283,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
103330 int err, total_len, len;
103331
103332 /* kernel mode address */
103333 - struct sockaddr_storage addr;
103334 + struct sockaddr_storage addr = { };
103335
103336 /* user mode address pointers */
103337 struct sockaddr __user *uaddr;
103338 @@ -2246,7 +2312,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
103339 /* Save the user-mode address (verify_iovec will change the
103340 * kernel msghdr to use the kernel address space)
103341 */
103342 - uaddr = (__force void __user *)msg_sys->msg_name;
103343 + uaddr = (void __force_user *)msg_sys->msg_name;
103344 uaddr_len = COMPAT_NAMELEN(msg);
103345 if (MSG_CMSG_COMPAT & flags)
103346 err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
103347 @@ -2887,7 +2953,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
103348 ifr = compat_alloc_user_space(buf_size);
103349 rxnfc = (void __user *)ifr + ALIGN(sizeof(struct ifreq), 8);
103350
103351 - if (copy_in_user(&ifr->ifr_name, &ifr32->ifr_name, IFNAMSIZ))
103352 + if (copy_in_user(ifr->ifr_name, ifr32->ifr_name, IFNAMSIZ))
103353 return -EFAULT;
103354
103355 if (put_user(convert_in ? rxnfc : compat_ptr(data),
103356 @@ -2998,7 +3064,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
103357 old_fs = get_fs();
103358 set_fs(KERNEL_DS);
103359 err = dev_ioctl(net, cmd,
103360 - (struct ifreq __user __force *) &kifr);
103361 + (struct ifreq __force_user *) &kifr);
103362 set_fs(old_fs);
103363
103364 return err;
103365 @@ -3091,7 +3157,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
103366
103367 old_fs = get_fs();
103368 set_fs(KERNEL_DS);
103369 - err = dev_ioctl(net, cmd, (void __user __force *)&ifr);
103370 + err = dev_ioctl(net, cmd, (void __force_user *)&ifr);
103371 set_fs(old_fs);
103372
103373 if (cmd == SIOCGIFMAP && !err) {
103374 @@ -3175,7 +3241,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
103375 ret |= get_user(rtdev, &(ur4->rt_dev));
103376 if (rtdev) {
103377 ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
103378 - r4.rt_dev = (char __user __force *)devname;
103379 + r4.rt_dev = (char __force_user *)devname;
103380 devname[15] = 0;
103381 } else
103382 r4.rt_dev = NULL;
103383 @@ -3402,8 +3468,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
103384 int __user *uoptlen;
103385 int err;
103386
103387 - uoptval = (char __user __force *) optval;
103388 - uoptlen = (int __user __force *) optlen;
103389 + uoptval = (char __force_user *) optval;
103390 + uoptlen = (int __force_user *) optlen;
103391
103392 set_fs(KERNEL_DS);
103393 if (level == SOL_SOCKET)
103394 @@ -3423,7 +3489,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
103395 char __user *uoptval;
103396 int err;
103397
103398 - uoptval = (char __user __force *) optval;
103399 + uoptval = (char __force_user *) optval;
103400
103401 set_fs(KERNEL_DS);
103402 if (level == SOL_SOCKET)
103403 diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
103404 index 0f73f45..a96aa52 100644
103405 --- a/net/sunrpc/auth_gss/svcauth_gss.c
103406 +++ b/net/sunrpc/auth_gss/svcauth_gss.c
103407 @@ -1140,7 +1140,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
103408 uint64_t *handle)
103409 {
103410 struct rsc rsci, *rscp = NULL;
103411 - static atomic64_t ctxhctr;
103412 + static atomic64_unchecked_t ctxhctr = ATOMIC64_INIT(0);
103413 long long ctxh;
103414 struct gss_api_mech *gm = NULL;
103415 time_t expiry;
103416 @@ -1151,7 +1151,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
103417 status = -ENOMEM;
103418 /* the handle needs to be just a unique id,
103419 * use a static counter */
103420 - ctxh = atomic64_inc_return(&ctxhctr);
103421 + ctxh = atomic64_inc_return_unchecked(&ctxhctr);
103422
103423 /* make a copy for the caller */
103424 *handle = ctxh;
103425 diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
103426 index ae333c1..18521f0 100644
103427 --- a/net/sunrpc/cache.c
103428 +++ b/net/sunrpc/cache.c
103429 @@ -1609,7 +1609,7 @@ static int create_cache_proc_entries(struct cache_detail *cd, struct net *net)
103430 struct sunrpc_net *sn;
103431
103432 sn = net_generic(net, sunrpc_net_id);
103433 - cd->u.procfs.proc_ent = proc_mkdir(cd->name, sn->proc_net_rpc);
103434 + cd->u.procfs.proc_ent = proc_mkdir_restrict(cd->name, sn->proc_net_rpc);
103435 if (cd->u.procfs.proc_ent == NULL)
103436 goto out_nomem;
103437 cd->u.procfs.channel_ent = NULL;
103438 diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
103439 index 2e6ab10..3170800 100644
103440 --- a/net/sunrpc/clnt.c
103441 +++ b/net/sunrpc/clnt.c
103442 @@ -1425,7 +1425,9 @@ call_start(struct rpc_task *task)
103443 (RPC_IS_ASYNC(task) ? "async" : "sync"));
103444
103445 /* Increment call count */
103446 - task->tk_msg.rpc_proc->p_count++;
103447 + pax_open_kernel();
103448 + (*(unsigned int *)&task->tk_msg.rpc_proc->p_count)++;
103449 + pax_close_kernel();
103450 clnt->cl_stats->rpccnt++;
103451 task->tk_action = call_reserve;
103452 }
103453 diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
103454 index 25578af..a29298d 100644
103455 --- a/net/sunrpc/sched.c
103456 +++ b/net/sunrpc/sched.c
103457 @@ -261,9 +261,9 @@ static int rpc_wait_bit_killable(void *word)
103458 #if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)
103459 static void rpc_task_set_debuginfo(struct rpc_task *task)
103460 {
103461 - static atomic_t rpc_pid;
103462 + static atomic_unchecked_t rpc_pid;
103463
103464 - task->tk_pid = atomic_inc_return(&rpc_pid);
103465 + task->tk_pid = atomic_inc_return_unchecked(&rpc_pid);
103466 }
103467 #else
103468 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
103469 diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
103470 index 5453049..465669a 100644
103471 --- a/net/sunrpc/stats.c
103472 +++ b/net/sunrpc/stats.c
103473 @@ -267,7 +267,7 @@ int rpc_proc_init(struct net *net)
103474
103475 dprintk("RPC: registering /proc/net/rpc\n");
103476 sn = net_generic(net, sunrpc_net_id);
103477 - sn->proc_net_rpc = proc_mkdir("rpc", net->proc_net);
103478 + sn->proc_net_rpc = proc_mkdir_restrict("rpc", net->proc_net);
103479 if (sn->proc_net_rpc == NULL)
103480 return -ENOMEM;
103481
103482 diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
103483 index 5de6801..b4e330d 100644
103484 --- a/net/sunrpc/svc.c
103485 +++ b/net/sunrpc/svc.c
103486 @@ -1167,7 +1167,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
103487 svc_putnl(resv, RPC_SUCCESS);
103488
103489 /* Bump per-procedure stats counter */
103490 - procp->pc_count++;
103491 + pax_open_kernel();
103492 + (*(unsigned int *)&procp->pc_count)++;
103493 + pax_close_kernel();
103494
103495 /* Initialize storage for argp and resp */
103496 memset(rqstp->rq_argp, 0, procp->pc_argsize);
103497 diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
103498 index 621ca7b..59421dd 100644
103499 --- a/net/sunrpc/svcauth_unix.c
103500 +++ b/net/sunrpc/svcauth_unix.c
103501 @@ -414,7 +414,7 @@ struct unix_gid {
103502 struct group_info *gi;
103503 };
103504
103505 -static int unix_gid_hash(kuid_t uid)
103506 +static int __intentional_overflow(-1) unix_gid_hash(kuid_t uid)
103507 {
103508 return hash_long(from_kuid(&init_user_ns, uid), GID_HASHBITS);
103509 }
103510 @@ -470,7 +470,7 @@ static void unix_gid_request(struct cache_detail *cd,
103511 (*bpp)[-1] = '\n';
103512 }
103513
103514 -static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
103515 +static struct unix_gid * __intentional_overflow(-1) unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
103516
103517 static int unix_gid_parse(struct cache_detail *cd,
103518 char *mesg, int mlen)
103519 diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
103520 index c1b6270..05089c1 100644
103521 --- a/net/sunrpc/xprtrdma/svc_rdma.c
103522 +++ b/net/sunrpc/xprtrdma/svc_rdma.c
103523 @@ -62,15 +62,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE;
103524 static unsigned int min_max_inline = 4096;
103525 static unsigned int max_max_inline = 65536;
103526
103527 -atomic_t rdma_stat_recv;
103528 -atomic_t rdma_stat_read;
103529 -atomic_t rdma_stat_write;
103530 -atomic_t rdma_stat_sq_starve;
103531 -atomic_t rdma_stat_rq_starve;
103532 -atomic_t rdma_stat_rq_poll;
103533 -atomic_t rdma_stat_rq_prod;
103534 -atomic_t rdma_stat_sq_poll;
103535 -atomic_t rdma_stat_sq_prod;
103536 +atomic_unchecked_t rdma_stat_recv;
103537 +atomic_unchecked_t rdma_stat_read;
103538 +atomic_unchecked_t rdma_stat_write;
103539 +atomic_unchecked_t rdma_stat_sq_starve;
103540 +atomic_unchecked_t rdma_stat_rq_starve;
103541 +atomic_unchecked_t rdma_stat_rq_poll;
103542 +atomic_unchecked_t rdma_stat_rq_prod;
103543 +atomic_unchecked_t rdma_stat_sq_poll;
103544 +atomic_unchecked_t rdma_stat_sq_prod;
103545
103546 /* Temporary NFS request map and context caches */
103547 struct kmem_cache *svc_rdma_map_cachep;
103548 @@ -110,7 +110,7 @@ static int read_reset_stat(struct ctl_table *table, int write,
103549 len -= *ppos;
103550 if (len > *lenp)
103551 len = *lenp;
103552 - if (len && copy_to_user(buffer, str_buf, len))
103553 + if (len > sizeof str_buf || (len && copy_to_user(buffer, str_buf, len)))
103554 return -EFAULT;
103555 *lenp = len;
103556 *ppos += len;
103557 @@ -151,63 +151,63 @@ static struct ctl_table svcrdma_parm_table[] = {
103558 {
103559 .procname = "rdma_stat_read",
103560 .data = &rdma_stat_read,
103561 - .maxlen = sizeof(atomic_t),
103562 + .maxlen = sizeof(atomic_unchecked_t),
103563 .mode = 0644,
103564 .proc_handler = read_reset_stat,
103565 },
103566 {
103567 .procname = "rdma_stat_recv",
103568 .data = &rdma_stat_recv,
103569 - .maxlen = sizeof(atomic_t),
103570 + .maxlen = sizeof(atomic_unchecked_t),
103571 .mode = 0644,
103572 .proc_handler = read_reset_stat,
103573 },
103574 {
103575 .procname = "rdma_stat_write",
103576 .data = &rdma_stat_write,
103577 - .maxlen = sizeof(atomic_t),
103578 + .maxlen = sizeof(atomic_unchecked_t),
103579 .mode = 0644,
103580 .proc_handler = read_reset_stat,
103581 },
103582 {
103583 .procname = "rdma_stat_sq_starve",
103584 .data = &rdma_stat_sq_starve,
103585 - .maxlen = sizeof(atomic_t),
103586 + .maxlen = sizeof(atomic_unchecked_t),
103587 .mode = 0644,
103588 .proc_handler = read_reset_stat,
103589 },
103590 {
103591 .procname = "rdma_stat_rq_starve",
103592 .data = &rdma_stat_rq_starve,
103593 - .maxlen = sizeof(atomic_t),
103594 + .maxlen = sizeof(atomic_unchecked_t),
103595 .mode = 0644,
103596 .proc_handler = read_reset_stat,
103597 },
103598 {
103599 .procname = "rdma_stat_rq_poll",
103600 .data = &rdma_stat_rq_poll,
103601 - .maxlen = sizeof(atomic_t),
103602 + .maxlen = sizeof(atomic_unchecked_t),
103603 .mode = 0644,
103604 .proc_handler = read_reset_stat,
103605 },
103606 {
103607 .procname = "rdma_stat_rq_prod",
103608 .data = &rdma_stat_rq_prod,
103609 - .maxlen = sizeof(atomic_t),
103610 + .maxlen = sizeof(atomic_unchecked_t),
103611 .mode = 0644,
103612 .proc_handler = read_reset_stat,
103613 },
103614 {
103615 .procname = "rdma_stat_sq_poll",
103616 .data = &rdma_stat_sq_poll,
103617 - .maxlen = sizeof(atomic_t),
103618 + .maxlen = sizeof(atomic_unchecked_t),
103619 .mode = 0644,
103620 .proc_handler = read_reset_stat,
103621 },
103622 {
103623 .procname = "rdma_stat_sq_prod",
103624 .data = &rdma_stat_sq_prod,
103625 - .maxlen = sizeof(atomic_t),
103626 + .maxlen = sizeof(atomic_unchecked_t),
103627 .mode = 0644,
103628 .proc_handler = read_reset_stat,
103629 },
103630 diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
103631 index 8d904e4..b2fc727 100644
103632 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
103633 +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
103634 @@ -504,7 +504,7 @@ next_sge:
103635 svc_rdma_put_context(ctxt, 0);
103636 goto out;
103637 }
103638 - atomic_inc(&rdma_stat_read);
103639 + atomic_inc_unchecked(&rdma_stat_read);
103640
103641 if (read_wr.num_sge < chl_map->ch[ch_no].count) {
103642 chl_map->ch[ch_no].count -= read_wr.num_sge;
103643 @@ -607,7 +607,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
103644 dto_q);
103645 list_del_init(&ctxt->dto_q);
103646 } else {
103647 - atomic_inc(&rdma_stat_rq_starve);
103648 + atomic_inc_unchecked(&rdma_stat_rq_starve);
103649 clear_bit(XPT_DATA, &xprt->xpt_flags);
103650 ctxt = NULL;
103651 }
103652 @@ -627,7 +627,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
103653 dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
103654 ctxt, rdma_xprt, rqstp, ctxt->wc_status);
103655 BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
103656 - atomic_inc(&rdma_stat_recv);
103657 + atomic_inc_unchecked(&rdma_stat_recv);
103658
103659 /* Build up the XDR from the receive buffers. */
103660 rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
103661 diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
103662 index 7e024a5..17f13d3 100644
103663 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
103664 +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
103665 @@ -363,7 +363,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
103666 write_wr.wr.rdma.remote_addr = to;
103667
103668 /* Post It */
103669 - atomic_inc(&rdma_stat_write);
103670 + atomic_inc_unchecked(&rdma_stat_write);
103671 if (svc_rdma_send(xprt, &write_wr))
103672 goto err;
103673 return 0;
103674 diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
103675 index 25688fa..dc72003 100644
103676 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
103677 +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
103678 @@ -292,7 +292,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
103679 return;
103680
103681 ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
103682 - atomic_inc(&rdma_stat_rq_poll);
103683 + atomic_inc_unchecked(&rdma_stat_rq_poll);
103684
103685 while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
103686 ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
103687 @@ -314,7 +314,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
103688 }
103689
103690 if (ctxt)
103691 - atomic_inc(&rdma_stat_rq_prod);
103692 + atomic_inc_unchecked(&rdma_stat_rq_prod);
103693
103694 set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
103695 /*
103696 @@ -386,7 +386,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
103697 return;
103698
103699 ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
103700 - atomic_inc(&rdma_stat_sq_poll);
103701 + atomic_inc_unchecked(&rdma_stat_sq_poll);
103702 while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) {
103703 if (wc.status != IB_WC_SUCCESS)
103704 /* Close the transport */
103705 @@ -404,7 +404,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
103706 }
103707
103708 if (ctxt)
103709 - atomic_inc(&rdma_stat_sq_prod);
103710 + atomic_inc_unchecked(&rdma_stat_sq_prod);
103711 }
103712
103713 static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
103714 @@ -1261,7 +1261,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
103715 spin_lock_bh(&xprt->sc_lock);
103716 if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
103717 spin_unlock_bh(&xprt->sc_lock);
103718 - atomic_inc(&rdma_stat_sq_starve);
103719 + atomic_inc_unchecked(&rdma_stat_sq_starve);
103720
103721 /* See if we can opportunistically reap SQ WR to make room */
103722 sq_cq_reap(xprt);
103723 diff --git a/net/sysctl_net.c b/net/sysctl_net.c
103724 index e7000be..e3b0ba7 100644
103725 --- a/net/sysctl_net.c
103726 +++ b/net/sysctl_net.c
103727 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ctl_table_header *head,
103728 kgid_t root_gid = make_kgid(net->user_ns, 0);
103729
103730 /* Allow network administrator to have same access as root. */
103731 - if (ns_capable(net->user_ns, CAP_NET_ADMIN) ||
103732 + if (ns_capable_nolog(net->user_ns, CAP_NET_ADMIN) ||
103733 uid_eq(root_uid, current_euid())) {
103734 int mode = (table->mode >> 6) & 7;
103735 return (mode << 6) | (mode << 3) | mode;
103736 diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
103737 index 6424372..afd36e9 100644
103738 --- a/net/tipc/subscr.c
103739 +++ b/net/tipc/subscr.c
103740 @@ -97,7 +97,7 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
103741 struct tipc_subscriber *subscriber = sub->subscriber;
103742 struct kvec msg_sect;
103743
103744 - msg_sect.iov_base = (void *)&sub->evt;
103745 + msg_sect.iov_base = &sub->evt;
103746 msg_sect.iov_len = sizeof(struct tipc_event);
103747 sub->evt.event = htohl(event, sub->swap);
103748 sub->evt.found_lower = htohl(found_lower, sub->swap);
103749 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
103750 index bb7e8ba..9f444c6 100644
103751 --- a/net/unix/af_unix.c
103752 +++ b/net/unix/af_unix.c
103753 @@ -791,6 +791,12 @@ static struct sock *unix_find_other(struct net *net,
103754 err = -ECONNREFUSED;
103755 if (!S_ISSOCK(inode->i_mode))
103756 goto put_fail;
103757 +
103758 + if (!gr_acl_handle_unix(path.dentry, path.mnt)) {
103759 + err = -EACCES;
103760 + goto put_fail;
103761 + }
103762 +
103763 u = unix_find_socket_byinode(inode);
103764 if (!u)
103765 goto put_fail;
103766 @@ -811,6 +817,13 @@ static struct sock *unix_find_other(struct net *net,
103767 if (u) {
103768 struct dentry *dentry;
103769 dentry = unix_sk(u)->path.dentry;
103770 +
103771 + if (!gr_handle_chroot_unix(pid_vnr(u->sk_peer_pid))) {
103772 + err = -EPERM;
103773 + sock_put(u);
103774 + goto fail;
103775 + }
103776 +
103777 if (dentry)
103778 touch_atime(&unix_sk(u)->path);
103779 } else
103780 @@ -844,12 +857,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
103781 */
103782 err = security_path_mknod(&path, dentry, mode, 0);
103783 if (!err) {
103784 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
103785 + err = -EACCES;
103786 + goto out;
103787 + }
103788 err = vfs_mknod(path.dentry->d_inode, dentry, mode, 0);
103789 if (!err) {
103790 res->mnt = mntget(path.mnt);
103791 res->dentry = dget(dentry);
103792 + gr_handle_create(dentry, path.mnt);
103793 }
103794 }
103795 +out:
103796 done_path_create(&path, dentry);
103797 return err;
103798 }
103799 @@ -2344,9 +2363,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
103800 seq_puts(seq, "Num RefCount Protocol Flags Type St "
103801 "Inode Path\n");
103802 else {
103803 - struct sock *s = v;
103804 + struct sock *s = v, *peer;
103805 struct unix_sock *u = unix_sk(s);
103806 unix_state_lock(s);
103807 + peer = unix_peer(s);
103808 + unix_state_unlock(s);
103809 +
103810 + unix_state_double_lock(s, peer);
103811
103812 seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
103813 s,
103814 @@ -2373,8 +2396,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
103815 }
103816 for ( ; i < len; i++)
103817 seq_putc(seq, u->addr->name->sun_path[i]);
103818 - }
103819 - unix_state_unlock(s);
103820 + } else if (peer)
103821 + seq_printf(seq, " P%lu", sock_i_ino(peer));
103822 +
103823 + unix_state_double_unlock(s, peer);
103824 seq_putc(seq, '\n');
103825 }
103826
103827 diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
103828 index b3d5150..ff3a837 100644
103829 --- a/net/unix/sysctl_net_unix.c
103830 +++ b/net/unix/sysctl_net_unix.c
103831 @@ -28,7 +28,7 @@ static struct ctl_table unix_table[] = {
103832
103833 int __net_init unix_sysctl_register(struct net *net)
103834 {
103835 - struct ctl_table *table;
103836 + ctl_table_no_const *table;
103837
103838 table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
103839 if (table == NULL)
103840 diff --git a/net/vmw_vsock/vmci_transport_notify.c b/net/vmw_vsock/vmci_transport_notify.c
103841 index 9b7f207..2596621 100644
103842 --- a/net/vmw_vsock/vmci_transport_notify.c
103843 +++ b/net/vmw_vsock/vmci_transport_notify.c
103844 @@ -662,19 +662,19 @@ static void vmci_transport_notify_pkt_process_negotiate(struct sock *sk)
103845
103846 /* Socket control packet based operations. */
103847 struct vmci_transport_notify_ops vmci_transport_notify_pkt_ops = {
103848 - vmci_transport_notify_pkt_socket_init,
103849 - vmci_transport_notify_pkt_socket_destruct,
103850 - vmci_transport_notify_pkt_poll_in,
103851 - vmci_transport_notify_pkt_poll_out,
103852 - vmci_transport_notify_pkt_handle_pkt,
103853 - vmci_transport_notify_pkt_recv_init,
103854 - vmci_transport_notify_pkt_recv_pre_block,
103855 - vmci_transport_notify_pkt_recv_pre_dequeue,
103856 - vmci_transport_notify_pkt_recv_post_dequeue,
103857 - vmci_transport_notify_pkt_send_init,
103858 - vmci_transport_notify_pkt_send_pre_block,
103859 - vmci_transport_notify_pkt_send_pre_enqueue,
103860 - vmci_transport_notify_pkt_send_post_enqueue,
103861 - vmci_transport_notify_pkt_process_request,
103862 - vmci_transport_notify_pkt_process_negotiate,
103863 + .socket_init = vmci_transport_notify_pkt_socket_init,
103864 + .socket_destruct = vmci_transport_notify_pkt_socket_destruct,
103865 + .poll_in = vmci_transport_notify_pkt_poll_in,
103866 + .poll_out = vmci_transport_notify_pkt_poll_out,
103867 + .handle_notify_pkt = vmci_transport_notify_pkt_handle_pkt,
103868 + .recv_init = vmci_transport_notify_pkt_recv_init,
103869 + .recv_pre_block = vmci_transport_notify_pkt_recv_pre_block,
103870 + .recv_pre_dequeue = vmci_transport_notify_pkt_recv_pre_dequeue,
103871 + .recv_post_dequeue = vmci_transport_notify_pkt_recv_post_dequeue,
103872 + .send_init = vmci_transport_notify_pkt_send_init,
103873 + .send_pre_block = vmci_transport_notify_pkt_send_pre_block,
103874 + .send_pre_enqueue = vmci_transport_notify_pkt_send_pre_enqueue,
103875 + .send_post_enqueue = vmci_transport_notify_pkt_send_post_enqueue,
103876 + .process_request = vmci_transport_notify_pkt_process_request,
103877 + .process_negotiate = vmci_transport_notify_pkt_process_negotiate,
103878 };
103879 diff --git a/net/vmw_vsock/vmci_transport_notify_qstate.c b/net/vmw_vsock/vmci_transport_notify_qstate.c
103880 index dc9c792..3089de0 100644
103881 --- a/net/vmw_vsock/vmci_transport_notify_qstate.c
103882 +++ b/net/vmw_vsock/vmci_transport_notify_qstate.c
103883 @@ -420,19 +420,19 @@ vmci_transport_notify_pkt_send_pre_enqueue(
103884
103885 /* Socket always on control packet based operations. */
103886 struct vmci_transport_notify_ops vmci_transport_notify_pkt_q_state_ops = {
103887 - vmci_transport_notify_pkt_socket_init,
103888 - vmci_transport_notify_pkt_socket_destruct,
103889 - vmci_transport_notify_pkt_poll_in,
103890 - vmci_transport_notify_pkt_poll_out,
103891 - vmci_transport_notify_pkt_handle_pkt,
103892 - vmci_transport_notify_pkt_recv_init,
103893 - vmci_transport_notify_pkt_recv_pre_block,
103894 - vmci_transport_notify_pkt_recv_pre_dequeue,
103895 - vmci_transport_notify_pkt_recv_post_dequeue,
103896 - vmci_transport_notify_pkt_send_init,
103897 - vmci_transport_notify_pkt_send_pre_block,
103898 - vmci_transport_notify_pkt_send_pre_enqueue,
103899 - vmci_transport_notify_pkt_send_post_enqueue,
103900 - vmci_transport_notify_pkt_process_request,
103901 - vmci_transport_notify_pkt_process_negotiate,
103902 + .socket_init = vmci_transport_notify_pkt_socket_init,
103903 + .socket_destruct = vmci_transport_notify_pkt_socket_destruct,
103904 + .poll_in = vmci_transport_notify_pkt_poll_in,
103905 + .poll_out = vmci_transport_notify_pkt_poll_out,
103906 + .handle_notify_pkt = vmci_transport_notify_pkt_handle_pkt,
103907 + .recv_init = vmci_transport_notify_pkt_recv_init,
103908 + .recv_pre_block = vmci_transport_notify_pkt_recv_pre_block,
103909 + .recv_pre_dequeue = vmci_transport_notify_pkt_recv_pre_dequeue,
103910 + .recv_post_dequeue = vmci_transport_notify_pkt_recv_post_dequeue,
103911 + .send_init = vmci_transport_notify_pkt_send_init,
103912 + .send_pre_block = vmci_transport_notify_pkt_send_pre_block,
103913 + .send_pre_enqueue = vmci_transport_notify_pkt_send_pre_enqueue,
103914 + .send_post_enqueue = vmci_transport_notify_pkt_send_post_enqueue,
103915 + .process_request = vmci_transport_notify_pkt_process_request,
103916 + .process_negotiate = vmci_transport_notify_pkt_process_negotiate,
103917 };
103918 diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
103919 index c8717c1..08539f5 100644
103920 --- a/net/wireless/wext-core.c
103921 +++ b/net/wireless/wext-core.c
103922 @@ -748,8 +748,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
103923 */
103924
103925 /* Support for very large requests */
103926 - if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
103927 - (user_length > descr->max_tokens)) {
103928 + if (user_length > descr->max_tokens) {
103929 /* Allow userspace to GET more than max so
103930 * we can support any size GET requests.
103931 * There is still a limit : -ENOMEM.
103932 @@ -788,22 +787,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
103933 }
103934 }
103935
103936 - if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
103937 - /*
103938 - * If this is a GET, but not NOMAX, it means that the extra
103939 - * data is not bounded by userspace, but by max_tokens. Thus
103940 - * set the length to max_tokens. This matches the extra data
103941 - * allocation.
103942 - * The driver should fill it with the number of tokens it
103943 - * provided, and it may check iwp->length rather than having
103944 - * knowledge of max_tokens. If the driver doesn't change the
103945 - * iwp->length, this ioctl just copies back max_token tokens
103946 - * filled with zeroes. Hopefully the driver isn't claiming
103947 - * them to be valid data.
103948 - */
103949 - iwp->length = descr->max_tokens;
103950 - }
103951 -
103952 err = handler(dev, info, (union iwreq_data *) iwp, extra);
103953
103954 iwp->length += essid_compat;
103955 diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
103956 index 4323952..a06dfe1 100644
103957 --- a/net/x25/sysctl_net_x25.c
103958 +++ b/net/x25/sysctl_net_x25.c
103959 @@ -70,7 +70,7 @@ static struct ctl_table x25_table[] = {
103960 .mode = 0644,
103961 .proc_handler = proc_dointvec,
103962 },
103963 - { 0, },
103964 + { },
103965 };
103966
103967 void __init x25_register_sysctl(void)
103968 diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
103969 index 0917f04..f4e3d8c 100644
103970 --- a/net/x25/x25_proc.c
103971 +++ b/net/x25/x25_proc.c
103972 @@ -209,7 +209,7 @@ static const struct file_operations x25_seq_forward_fops = {
103973
103974 int __init x25_proc_init(void)
103975 {
103976 - if (!proc_mkdir("x25", init_net.proc_net))
103977 + if (!proc_mkdir_restrict("x25", init_net.proc_net))
103978 return -ENOMEM;
103979
103980 if (!proc_create("x25/route", S_IRUGO, init_net.proc_net,
103981 diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
103982 index c08fbd1..3d99e85 100644
103983 --- a/net/xfrm/xfrm_policy.c
103984 +++ b/net/xfrm/xfrm_policy.c
103985 @@ -325,7 +325,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
103986 {
103987 policy->walk.dead = 1;
103988
103989 - atomic_inc(&policy->genid);
103990 + atomic_inc_unchecked(&policy->genid);
103991
103992 if (del_timer(&policy->polq.hold_timer))
103993 xfrm_pol_put(policy);
103994 @@ -659,7 +659,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
103995 hlist_add_head(&policy->bydst, chain);
103996 xfrm_pol_hold(policy);
103997 net->xfrm.policy_count[dir]++;
103998 - atomic_inc(&net->xfrm.flow_cache_genid);
103999 + atomic_inc_unchecked(&net->xfrm.flow_cache_genid);
104000
104001 /* After previous checking, family can either be AF_INET or AF_INET6 */
104002 if (policy->family == AF_INET)
104003 @@ -1759,7 +1759,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
104004
104005 xdst->num_pols = num_pols;
104006 memcpy(xdst->pols, pols, sizeof(struct xfrm_policy *) * num_pols);
104007 - xdst->policy_genid = atomic_read(&pols[0]->genid);
104008 + xdst->policy_genid = atomic_read_unchecked(&pols[0]->genid);
104009
104010 return xdst;
104011 }
104012 @@ -2546,10 +2546,11 @@ void xfrm_garbage_collect(struct net *net)
104013 }
104014 EXPORT_SYMBOL(xfrm_garbage_collect);
104015
104016 -static void xfrm_garbage_collect_deferred(struct net *net)
104017 +void xfrm_garbage_collect_deferred(struct net *net)
104018 {
104019 flow_cache_flush_deferred(net);
104020 }
104021 +EXPORT_SYMBOL(xfrm_garbage_collect_deferred);
104022
104023 static void xfrm_init_pmtu(struct dst_entry *dst)
104024 {
104025 @@ -2599,7 +2600,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
104026 if (xdst->xfrm_genid != dst->xfrm->genid)
104027 return 0;
104028 if (xdst->num_pols > 0 &&
104029 - xdst->policy_genid != atomic_read(&xdst->pols[0]->genid))
104030 + xdst->policy_genid != atomic_read_unchecked(&xdst->pols[0]->genid))
104031 return 0;
104032
104033 mtu = dst_mtu(dst->child);
104034 @@ -2687,8 +2688,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
104035 dst_ops->link_failure = xfrm_link_failure;
104036 if (likely(dst_ops->neigh_lookup == NULL))
104037 dst_ops->neigh_lookup = xfrm_neigh_lookup;
104038 - if (likely(afinfo->garbage_collect == NULL))
104039 - afinfo->garbage_collect = xfrm_garbage_collect_deferred;
104040 rcu_assign_pointer(xfrm_policy_afinfo[afinfo->family], afinfo);
104041 }
104042 spin_unlock(&xfrm_policy_afinfo_lock);
104043 @@ -2742,7 +2741,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)
104044 dst_ops->check = NULL;
104045 dst_ops->negative_advice = NULL;
104046 dst_ops->link_failure = NULL;
104047 - afinfo->garbage_collect = NULL;
104048 }
104049 return err;
104050 }
104051 @@ -3137,7 +3135,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
104052 sizeof(pol->xfrm_vec[i].saddr));
104053 pol->xfrm_vec[i].encap_family = mp->new_family;
104054 /* flush bundles */
104055 - atomic_inc(&pol->genid);
104056 + atomic_inc_unchecked(&pol->genid);
104057 }
104058 }
104059
104060 diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
104061 index 8e9c781..3972135 100644
104062 --- a/net/xfrm/xfrm_state.c
104063 +++ b/net/xfrm/xfrm_state.c
104064 @@ -173,12 +173,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family)
104065
104066 if (unlikely(afinfo == NULL))
104067 return -EAFNOSUPPORT;
104068 - typemap = afinfo->type_map;
104069 + typemap = (const struct xfrm_type **)afinfo->type_map;
104070 spin_lock_bh(&xfrm_type_lock);
104071
104072 - if (likely(typemap[type->proto] == NULL))
104073 + if (likely(typemap[type->proto] == NULL)) {
104074 + pax_open_kernel();
104075 typemap[type->proto] = type;
104076 - else
104077 + pax_close_kernel();
104078 + } else
104079 err = -EEXIST;
104080 spin_unlock_bh(&xfrm_type_lock);
104081 xfrm_state_put_afinfo(afinfo);
104082 @@ -194,13 +196,16 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family)
104083
104084 if (unlikely(afinfo == NULL))
104085 return -EAFNOSUPPORT;
104086 - typemap = afinfo->type_map;
104087 + typemap = (const struct xfrm_type **)afinfo->type_map;
104088 spin_lock_bh(&xfrm_type_lock);
104089
104090 if (unlikely(typemap[type->proto] != type))
104091 err = -ENOENT;
104092 - else
104093 + else {
104094 + pax_open_kernel();
104095 typemap[type->proto] = NULL;
104096 + pax_close_kernel();
104097 + }
104098 spin_unlock_bh(&xfrm_type_lock);
104099 xfrm_state_put_afinfo(afinfo);
104100 return err;
104101 @@ -210,7 +215,6 @@ EXPORT_SYMBOL(xfrm_unregister_type);
104102 static const struct xfrm_type *xfrm_get_type(u8 proto, unsigned short family)
104103 {
104104 struct xfrm_state_afinfo *afinfo;
104105 - const struct xfrm_type **typemap;
104106 const struct xfrm_type *type;
104107 int modload_attempted = 0;
104108
104109 @@ -218,9 +222,8 @@ retry:
104110 afinfo = xfrm_state_get_afinfo(family);
104111 if (unlikely(afinfo == NULL))
104112 return NULL;
104113 - typemap = afinfo->type_map;
104114
104115 - type = typemap[proto];
104116 + type = afinfo->type_map[proto];
104117 if (unlikely(type && !try_module_get(type->owner)))
104118 type = NULL;
104119 if (!type && !modload_attempted) {
104120 @@ -254,7 +257,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
104121 return -EAFNOSUPPORT;
104122
104123 err = -EEXIST;
104124 - modemap = afinfo->mode_map;
104125 + modemap = (struct xfrm_mode **)afinfo->mode_map;
104126 spin_lock_bh(&xfrm_mode_lock);
104127 if (modemap[mode->encap])
104128 goto out;
104129 @@ -263,8 +266,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
104130 if (!try_module_get(afinfo->owner))
104131 goto out;
104132
104133 - mode->afinfo = afinfo;
104134 + pax_open_kernel();
104135 + *(const void **)&mode->afinfo = afinfo;
104136 modemap[mode->encap] = mode;
104137 + pax_close_kernel();
104138 err = 0;
104139
104140 out:
104141 @@ -288,10 +293,12 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family)
104142 return -EAFNOSUPPORT;
104143
104144 err = -ENOENT;
104145 - modemap = afinfo->mode_map;
104146 + modemap = (struct xfrm_mode **)afinfo->mode_map;
104147 spin_lock_bh(&xfrm_mode_lock);
104148 if (likely(modemap[mode->encap] == mode)) {
104149 + pax_open_kernel();
104150 modemap[mode->encap] = NULL;
104151 + pax_close_kernel();
104152 module_put(mode->afinfo->owner);
104153 err = 0;
104154 }
104155 @@ -1519,10 +1526,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq);
104156 u32 xfrm_get_acqseq(void)
104157 {
104158 u32 res;
104159 - static atomic_t acqseq;
104160 + static atomic_unchecked_t acqseq;
104161
104162 do {
104163 - res = atomic_inc_return(&acqseq);
104164 + res = atomic_inc_return_unchecked(&acqseq);
104165 } while (!res);
104166
104167 return res;
104168 diff --git a/net/xfrm/xfrm_sysctl.c b/net/xfrm/xfrm_sysctl.c
104169 index 05a6e3d..6716ec9 100644
104170 --- a/net/xfrm/xfrm_sysctl.c
104171 +++ b/net/xfrm/xfrm_sysctl.c
104172 @@ -42,7 +42,7 @@ static struct ctl_table xfrm_table[] = {
104173
104174 int __net_init xfrm_sysctl_init(struct net *net)
104175 {
104176 - struct ctl_table *table;
104177 + ctl_table_no_const *table;
104178
104179 __xfrm_sysctl_init(net);
104180
104181 diff --git a/scripts/Makefile b/scripts/Makefile
104182 index 1d07860..f16fc22 100644
104183 --- a/scripts/Makefile
104184 +++ b/scripts/Makefile
104185 @@ -40,3 +40,5 @@ subdir-$(CONFIG_DTC) += dtc
104186
104187 # Let clean descend into subdirs
104188 subdir- += basic kconfig package selinux
104189 +
104190 +clean-files := randstruct.seed
104191 diff --git a/scripts/Makefile.build b/scripts/Makefile.build
104192 index 003bc26..d5f02b0 100644
104193 --- a/scripts/Makefile.build
104194 +++ b/scripts/Makefile.build
104195 @@ -121,7 +121,7 @@ endif
104196 endif
104197
104198 # Do not include host rules unless needed
104199 -ifneq ($(hostprogs-y)$(hostprogs-m),)
104200 +ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),)
104201 include scripts/Makefile.host
104202 endif
104203
104204 diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
104205 index 686cb0d..9d653bf 100644
104206 --- a/scripts/Makefile.clean
104207 +++ b/scripts/Makefile.clean
104208 @@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn))
104209 __clean-files := $(extra-y) $(always) \
104210 $(targets) $(clean-files) \
104211 $(host-progs) \
104212 - $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
104213 + $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
104214 + $(hostlibs-y) $(hostlibs-m) $(hostlibs-)
104215
104216 __clean-files := $(filter-out $(no-clean-files), $(__clean-files))
104217
104218 diff --git a/scripts/Makefile.host b/scripts/Makefile.host
104219 index 1ac414f..38575f7 100644
104220 --- a/scripts/Makefile.host
104221 +++ b/scripts/Makefile.host
104222 @@ -31,6 +31,8 @@
104223 # Note: Shared libraries consisting of C++ files are not supported
104224
104225 __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
104226 +__hostlibs := $(sort $(hostlibs-y) $(hostlibs-m))
104227 +__hostcxxlibs := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))
104228
104229 # C code
104230 # Executables compiled from a single .c file
104231 @@ -54,11 +56,15 @@ host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
104232 # Shared libaries (only .c supported)
104233 # Shared libraries (.so) - all .so files referenced in "xxx-objs"
104234 host-cshlib := $(sort $(filter %.so, $(host-cobjs)))
104235 +host-cshlib += $(sort $(filter %.so, $(__hostlibs)))
104236 +host-cxxshlib := $(sort $(filter %.so, $(__hostcxxlibs)))
104237 # Remove .so files from "xxx-objs"
104238 host-cobjs := $(filter-out %.so,$(host-cobjs))
104239 +host-cxxobjs := $(filter-out %.so,$(host-cxxobjs))
104240
104241 -#Object (.o) files used by the shared libaries
104242 +# Object (.o) files used by the shared libaries
104243 host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
104244 +host-cxxshobjs := $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs))))
104245
104246 # output directory for programs/.o files
104247 # hostprogs-y := tools/build may have been specified. Retrieve directory
104248 @@ -82,7 +88,9 @@ host-cobjs := $(addprefix $(obj)/,$(host-cobjs))
104249 host-cxxmulti := $(addprefix $(obj)/,$(host-cxxmulti))
104250 host-cxxobjs := $(addprefix $(obj)/,$(host-cxxobjs))
104251 host-cshlib := $(addprefix $(obj)/,$(host-cshlib))
104252 +host-cxxshlib := $(addprefix $(obj)/,$(host-cxxshlib))
104253 host-cshobjs := $(addprefix $(obj)/,$(host-cshobjs))
104254 +host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs))
104255 host-objdirs := $(addprefix $(obj)/,$(host-objdirs))
104256
104257 obj-dirs += $(host-objdirs)
104258 @@ -156,6 +164,13 @@ quiet_cmd_host-cshobjs = HOSTCC -fPIC $@
104259 $(host-cshobjs): $(obj)/%.o: $(src)/%.c FORCE
104260 $(call if_changed_dep,host-cshobjs)
104261
104262 +# Compile .c file, create position independent .o file
104263 +# host-cxxshobjs -> .o
104264 +quiet_cmd_host-cxxshobjs = HOSTCXX -fPIC $@
104265 + cmd_host-cxxshobjs = $(HOSTCXX) $(hostcxx_flags) -fPIC -c -o $@ $<
104266 +$(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
104267 + $(call if_changed_dep,host-cxxshobjs)
104268 +
104269 # Link a shared library, based on position independent .o files
104270 # *.o -> .so shared library (host-cshlib)
104271 quiet_cmd_host-cshlib = HOSTLLD -shared $@
104272 @@ -165,6 +180,15 @@ quiet_cmd_host-cshlib = HOSTLLD -shared $@
104273 $(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
104274 $(call if_changed,host-cshlib)
104275
104276 +# Link a shared library, based on position independent .o files
104277 +# *.o -> .so shared library (host-cxxshlib)
104278 +quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
104279 + cmd_host-cxxshlib = $(HOSTCXX) $(HOSTLDFLAGS) -shared -o $@ \
104280 + $(addprefix $(obj)/,$($(@F:.so=-objs))) \
104281 + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
104282 +$(host-cxxshlib): $(obj)/%: $(host-cxxshobjs) FORCE
104283 + $(call if_changed,host-cxxshlib)
104284 +
104285 targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
104286 - $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
104287 + $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) $(host-cxxshlib) $(host-cxxshobjs)
104288
104289 diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
104290 index 078fe1d..fbdb363 100644
104291 --- a/scripts/basic/fixdep.c
104292 +++ b/scripts/basic/fixdep.c
104293 @@ -161,7 +161,7 @@ static unsigned int strhash(const char *str, unsigned int sz)
104294 /*
104295 * Lookup a value in the configuration string.
104296 */
104297 -static int is_defined_config(const char *name, int len, unsigned int hash)
104298 +static int is_defined_config(const char *name, unsigned int len, unsigned int hash)
104299 {
104300 struct item *aux;
104301
104302 @@ -211,10 +211,10 @@ static void clear_config(void)
104303 /*
104304 * Record the use of a CONFIG_* word.
104305 */
104306 -static void use_config(const char *m, int slen)
104307 +static void use_config(const char *m, unsigned int slen)
104308 {
104309 unsigned int hash = strhash(m, slen);
104310 - int c, i;
104311 + unsigned int c, i;
104312
104313 if (is_defined_config(m, slen, hash))
104314 return;
104315 @@ -235,9 +235,9 @@ static void use_config(const char *m, int slen)
104316
104317 static void parse_config_file(const char *map, size_t len)
104318 {
104319 - const int *end = (const int *) (map + len);
104320 + const unsigned int *end = (const unsigned int *) (map + len);
104321 /* start at +1, so that p can never be < map */
104322 - const int *m = (const int *) map + 1;
104323 + const unsigned int *m = (const unsigned int *) map + 1;
104324 const char *p, *q;
104325
104326 for (; m < end; m++) {
104327 @@ -435,7 +435,7 @@ static void print_deps(void)
104328 static void traps(void)
104329 {
104330 static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
104331 - int *p = (int *)test;
104332 + unsigned int *p = (unsigned int *)test;
104333
104334 if (*p != INT_CONF) {
104335 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianness? %#x\n",
104336 diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh
104337 new file mode 100644
104338 index 0000000..3fd3699
104339 --- /dev/null
104340 +++ b/scripts/gcc-plugin.sh
104341 @@ -0,0 +1,43 @@
104342 +#!/bin/bash
104343 +srctree=$(dirname "$0")
104344 +gccplugins_dir=$($3 -print-file-name=plugin)
104345 +plugincc=$($1 -E - -o /dev/null -I${srctree}/../tools/gcc -I${gccplugins_dir}/include 2>&1 <<EOF
104346 +#include "gcc-common.h"
104347 +#if BUILDING_GCC_VERSION >= 4008 || defined(ENABLE_BUILD_WITH_CXX)
104348 +#warning $2 CXX
104349 +#else
104350 +#warning $1 CC
104351 +#endif
104352 +EOF
104353 +)
104354 +
104355 +if [ $? -ne 0 ]
104356 +then
104357 + exit 1
104358 +fi
104359 +
104360 +if [[ "$plugincc" =~ "$1 CC" ]]
104361 +then
104362 + echo "$1"
104363 + exit 0
104364 +fi
104365 +
104366 +if [[ "$plugincc" =~ "$2 CXX" ]]
104367 +then
104368 +plugincc=$($1 -c -x c++ -std=gnu++98 - -o /dev/null -I${srctree}/../tools/gcc -I${gccplugins_dir}/include 2>&1 <<EOF
104369 +#include "gcc-common.h"
104370 +class test {
104371 +public:
104372 + int test;
104373 +} test = {
104374 + .test = 1
104375 +};
104376 +EOF
104377 +)
104378 +if [ $? -eq 0 ]
104379 +then
104380 + echo "$2"
104381 + exit 0
104382 +fi
104383 +fi
104384 +exit 1
104385 diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
104386 index 5de5660..d3deb89 100644
104387 --- a/scripts/headers_install.sh
104388 +++ b/scripts/headers_install.sh
104389 @@ -32,6 +32,7 @@ do
104390 FILE="$(basename "$i")"
104391 sed -r \
104392 -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
104393 + -e 's/__intentional_overflow\([- \t,0-9]*\)//g' \
104394 -e 's/__attribute_const__([ \t]|$)/\1/g' \
104395 -e 's@^#include <linux/compiler.h>@@' \
104396 -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
104397 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
104398 index 86a4fe7..99e91f9 100644
104399 --- a/scripts/link-vmlinux.sh
104400 +++ b/scripts/link-vmlinux.sh
104401 @@ -166,7 +166,7 @@ else
104402 fi;
104403
104404 # final build of init/
104405 -${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
104406 +${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init GCC_PLUGINS_CFLAGS="${GCC_PLUGINS_CFLAGS}" GCC_PLUGINS_AFLAGS="${GCC_PLUGINS_AFLAGS}"
104407
104408 kallsymso=""
104409 kallsyms_vmlinux=""
104410 diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
104411 index 1924990..3de7363 100644
104412 --- a/scripts/mod/file2alias.c
104413 +++ b/scripts/mod/file2alias.c
104414 @@ -142,7 +142,7 @@ static void device_id_check(const char *modname, const char *device_id,
104415 unsigned long size, unsigned long id_size,
104416 void *symval)
104417 {
104418 - int i;
104419 + unsigned int i;
104420
104421 if (size % id_size || size < id_size) {
104422 fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo "
104423 @@ -171,7 +171,7 @@ static void device_id_check(const char *modname, const char *device_id,
104424 /* USB is special because the bcdDevice can be matched against a numeric range */
104425 /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipNinN" */
104426 static void do_usb_entry(void *symval,
104427 - unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
104428 + unsigned int bcdDevice_initial, unsigned int bcdDevice_initial_digits,
104429 unsigned char range_lo, unsigned char range_hi,
104430 unsigned char max, struct module *mod)
104431 {
104432 @@ -281,7 +281,7 @@ static void do_usb_entry_multi(void *symval, struct module *mod)
104433 {
104434 unsigned int devlo, devhi;
104435 unsigned char chi, clo, max;
104436 - int ndigits;
104437 + unsigned int ndigits;
104438
104439 DEF_FIELD(symval, usb_device_id, match_flags);
104440 DEF_FIELD(symval, usb_device_id, idVendor);
104441 @@ -534,7 +534,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
104442 for (i = 0; i < count; i++) {
104443 DEF_FIELD_ADDR(symval + i*id_size, pnp_device_id, id);
104444 char acpi_id[sizeof(*id)];
104445 - int j;
104446 + unsigned int j;
104447
104448 buf_printf(&mod->dev_table_buf,
104449 "MODULE_ALIAS(\"pnp:d%s*\");\n", *id);
104450 @@ -563,7 +563,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
104451
104452 for (j = 0; j < PNP_MAX_DEVICES; j++) {
104453 const char *id = (char *)(*devs)[j].id;
104454 - int i2, j2;
104455 + unsigned int i2, j2;
104456 int dup = 0;
104457
104458 if (!id[0])
104459 @@ -589,7 +589,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
104460 /* add an individual alias for every device entry */
104461 if (!dup) {
104462 char acpi_id[PNP_ID_LEN];
104463 - int k;
104464 + unsigned int k;
104465
104466 buf_printf(&mod->dev_table_buf,
104467 "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
104468 @@ -941,7 +941,7 @@ static void dmi_ascii_filter(char *d, const char *s)
104469 static int do_dmi_entry(const char *filename, void *symval,
104470 char *alias)
104471 {
104472 - int i, j;
104473 + unsigned int i, j;
104474 DEF_FIELD_ADDR(symval, dmi_system_id, matches);
104475 sprintf(alias, "dmi*");
104476
104477 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
104478 index 0663556..d9494f0 100644
104479 --- a/scripts/mod/modpost.c
104480 +++ b/scripts/mod/modpost.c
104481 @@ -949,6 +949,7 @@ enum mismatch {
104482 ANY_INIT_TO_ANY_EXIT,
104483 ANY_EXIT_TO_ANY_INIT,
104484 EXPORT_TO_INIT_EXIT,
104485 + DATA_TO_TEXT
104486 };
104487
104488 struct sectioncheck {
104489 @@ -1035,6 +1036,12 @@ const struct sectioncheck sectioncheck[] = {
104490 .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
104491 .mismatch = EXPORT_TO_INIT_EXIT,
104492 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
104493 +},
104494 +/* Do not reference code from writable data */
104495 +{
104496 + .fromsec = { DATA_SECTIONS, NULL },
104497 + .tosec = { TEXT_SECTIONS, NULL },
104498 + .mismatch = DATA_TO_TEXT
104499 }
104500 };
104501
104502 @@ -1155,10 +1162,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
104503 continue;
104504 if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
104505 continue;
104506 - if (sym->st_value == addr)
104507 - return sym;
104508 /* Find a symbol nearby - addr are maybe negative */
104509 d = sym->st_value - addr;
104510 + if (d == 0)
104511 + return sym;
104512 if (d < 0)
104513 d = addr - sym->st_value;
104514 if (d < distance) {
104515 @@ -1436,6 +1443,14 @@ static void report_sec_mismatch(const char *modname,
104516 tosym, prl_to, prl_to, tosym);
104517 free(prl_to);
104518 break;
104519 + case DATA_TO_TEXT:
104520 +#if 0
104521 + fprintf(stderr,
104522 + "The %s %s:%s references\n"
104523 + "the %s %s:%s%s\n",
104524 + from, fromsec, fromsym, to, tosec, tosym, to_p);
104525 +#endif
104526 + break;
104527 }
104528 fprintf(stderr, "\n");
104529 }
104530 @@ -1687,7 +1702,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
104531 static void check_sec_ref(struct module *mod, const char *modname,
104532 struct elf_info *elf)
104533 {
104534 - int i;
104535 + unsigned int i;
104536 Elf_Shdr *sechdrs = elf->sechdrs;
104537
104538 /* Walk through all sections */
104539 @@ -1819,7 +1834,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
104540 va_end(ap);
104541 }
104542
104543 -void buf_write(struct buffer *buf, const char *s, int len)
104544 +void buf_write(struct buffer *buf, const char *s, unsigned int len)
104545 {
104546 if (buf->size - buf->pos < len) {
104547 buf->size += len + SZ;
104548 @@ -2038,7 +2053,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
104549 if (fstat(fileno(file), &st) < 0)
104550 goto close_write;
104551
104552 - if (st.st_size != b->pos)
104553 + if (st.st_size != (off_t)b->pos)
104554 goto close_write;
104555
104556 tmp = NOFAIL(malloc(b->pos));
104557 diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
104558 index 168b43d..77914bf 100644
104559 --- a/scripts/mod/modpost.h
104560 +++ b/scripts/mod/modpost.h
104561 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *expr);
104562
104563 struct buffer {
104564 char *p;
104565 - int pos;
104566 - int size;
104567 + unsigned int pos;
104568 + unsigned int size;
104569 };
104570
104571 void __attribute__((format(printf, 2, 3)))
104572 buf_printf(struct buffer *buf, const char *fmt, ...);
104573
104574 void
104575 -buf_write(struct buffer *buf, const char *s, int len);
104576 +buf_write(struct buffer *buf, const char *s, unsigned int len);
104577
104578 struct module {
104579 struct module *next;
104580 diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
104581 index deb2994..af4f63e 100644
104582 --- a/scripts/mod/sumversion.c
104583 +++ b/scripts/mod/sumversion.c
104584 @@ -470,7 +470,7 @@ static void write_version(const char *filename, const char *sum,
104585 goto out;
104586 }
104587
104588 - if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) {
104589 + if (write(fd, sum, strlen(sum)+1) != (ssize_t)strlen(sum)+1) {
104590 warn("writing sum in %s failed: %s\n",
104591 filename, strerror(errno));
104592 goto out;
104593 diff --git a/scripts/module-common.lds b/scripts/module-common.lds
104594 index 0865b3e..7235dd4 100644
104595 --- a/scripts/module-common.lds
104596 +++ b/scripts/module-common.lds
104597 @@ -6,6 +6,10 @@
104598 SECTIONS {
104599 /DISCARD/ : { *(.discard) }
104600
104601 + .rodata : {
104602 + *(.rodata) *(.rodata.*)
104603 + *(.data..read_only)
104604 + }
104605 __ksymtab : { *(SORT(___ksymtab+*)) }
104606 __ksymtab_gpl : { *(SORT(___ksymtab_gpl+*)) }
104607 __ksymtab_unused : { *(SORT(___ksymtab_unused+*)) }
104608 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
104609 index 152d4d2..791684c 100644
104610 --- a/scripts/package/builddeb
104611 +++ b/scripts/package/builddeb
104612 @@ -291,6 +291,7 @@ fi
104613 (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
104614 (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
104615 (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
104616 +(cd $objtree; find tools/gcc -name \*.so >> "$objtree/debian/hdrobjfiles")
104617 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
104618 mkdir -p "$destdir"
104619 (cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
104620 diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
104621 index 68bb4ef..2f419e1 100644
104622 --- a/scripts/pnmtologo.c
104623 +++ b/scripts/pnmtologo.c
104624 @@ -244,14 +244,14 @@ static void write_header(void)
104625 fprintf(out, " * Linux logo %s\n", logoname);
104626 fputs(" */\n\n", out);
104627 fputs("#include <linux/linux_logo.h>\n\n", out);
104628 - fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
104629 + fprintf(out, "static unsigned char %s_data[] = {\n",
104630 logoname);
104631 }
104632
104633 static void write_footer(void)
104634 {
104635 fputs("\n};\n\n", out);
104636 - fprintf(out, "const struct linux_logo %s __initconst = {\n", logoname);
104637 + fprintf(out, "const struct linux_logo %s = {\n", logoname);
104638 fprintf(out, "\t.type\t\t= %s,\n", logo_types[logo_type]);
104639 fprintf(out, "\t.width\t\t= %d,\n", logo_width);
104640 fprintf(out, "\t.height\t\t= %d,\n", logo_height);
104641 @@ -381,7 +381,7 @@ static void write_logo_clut224(void)
104642 fputs("\n};\n\n", out);
104643
104644 /* write logo clut */
104645 - fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
104646 + fprintf(out, "static unsigned char %s_clut[] = {\n",
104647 logoname);
104648 write_hex_cnt = 0;
104649 for (i = 0; i < logo_clutsize; i++) {
104650 diff --git a/scripts/sortextable.h b/scripts/sortextable.h
104651 index 8fac3fd..32ff38d 100644
104652 --- a/scripts/sortextable.h
104653 +++ b/scripts/sortextable.h
104654 @@ -108,9 +108,9 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
104655 const char *secstrtab;
104656 const char *strtab;
104657 char *extab_image;
104658 - int extab_index = 0;
104659 - int i;
104660 - int idx;
104661 + unsigned int extab_index = 0;
104662 + unsigned int i;
104663 + unsigned int idx;
104664 unsigned int num_sections;
104665 unsigned int secindex_strings;
104666
104667 diff --git a/security/Kconfig b/security/Kconfig
104668 index beb86b5..40b1edb 100644
104669 --- a/security/Kconfig
104670 +++ b/security/Kconfig
104671 @@ -4,6 +4,957 @@
104672
104673 menu "Security options"
104674
104675 +menu "Grsecurity"
104676 +
104677 + config ARCH_TRACK_EXEC_LIMIT
104678 + bool
104679 +
104680 + config PAX_KERNEXEC_PLUGIN
104681 + bool
104682 +
104683 + config PAX_PER_CPU_PGD
104684 + bool
104685 +
104686 + config TASK_SIZE_MAX_SHIFT
104687 + int
104688 + depends on X86_64
104689 + default 47 if !PAX_PER_CPU_PGD
104690 + default 42 if PAX_PER_CPU_PGD
104691 +
104692 + config PAX_ENABLE_PAE
104693 + bool
104694 + default y if (X86_32 && (MPENTIUM4 || MK8 || MPSC || MCORE2 || MATOM))
104695 +
104696 + config PAX_USERCOPY_SLABS
104697 + bool
104698 +
104699 +config GRKERNSEC
104700 + bool "Grsecurity"
104701 + select CRYPTO
104702 + select CRYPTO_SHA256
104703 + select PROC_FS
104704 + select STOP_MACHINE
104705 + select TTY
104706 + select DEBUG_KERNEL
104707 + select DEBUG_LIST
104708 + help
104709 + If you say Y here, you will be able to configure many features
104710 + that will enhance the security of your system. It is highly
104711 + recommended that you say Y here and read through the help
104712 + for each option so that you fully understand the features and
104713 + can evaluate their usefulness for your machine.
104714 +
104715 +choice
104716 + prompt "Configuration Method"
104717 + depends on GRKERNSEC
104718 + default GRKERNSEC_CONFIG_CUSTOM
104719 + help
104720 +
104721 +config GRKERNSEC_CONFIG_AUTO
104722 + bool "Automatic"
104723 + help
104724 + If you choose this configuration method, you'll be able to answer a small
104725 + number of simple questions about how you plan to use this kernel.
104726 + The settings of grsecurity and PaX will be automatically configured for
104727 + the highest commonly-used settings within the provided constraints.
104728 +
104729 + If you require additional configuration, custom changes can still be made
104730 + from the "custom configuration" menu.
104731 +
104732 +config GRKERNSEC_CONFIG_CUSTOM
104733 + bool "Custom"
104734 + help
104735 + If you choose this configuration method, you'll be able to configure all
104736 + grsecurity and PaX settings manually. Via this method, no options are
104737 + automatically enabled.
104738 +
104739 +endchoice
104740 +
104741 +choice
104742 + prompt "Usage Type"
104743 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
104744 + default GRKERNSEC_CONFIG_SERVER
104745 + help
104746 +
104747 +config GRKERNSEC_CONFIG_SERVER
104748 + bool "Server"
104749 + help
104750 + Choose this option if you plan to use this kernel on a server.
104751 +
104752 +config GRKERNSEC_CONFIG_DESKTOP
104753 + bool "Desktop"
104754 + help
104755 + Choose this option if you plan to use this kernel on a desktop.
104756 +
104757 +endchoice
104758 +
104759 +choice
104760 + prompt "Virtualization Type"
104761 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO)
104762 + default GRKERNSEC_CONFIG_VIRT_NONE
104763 + help
104764 +
104765 +config GRKERNSEC_CONFIG_VIRT_NONE
104766 + bool "None"
104767 + help
104768 + Choose this option if this kernel will be run on bare metal.
104769 +
104770 +config GRKERNSEC_CONFIG_VIRT_GUEST
104771 + bool "Guest"
104772 + help
104773 + Choose this option if this kernel will be run as a VM guest.
104774 +
104775 +config GRKERNSEC_CONFIG_VIRT_HOST
104776 + bool "Host"
104777 + help
104778 + Choose this option if this kernel will be run as a VM host.
104779 +
104780 +endchoice
104781 +
104782 +choice
104783 + prompt "Virtualization Hardware"
104784 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
104785 + help
104786 +
104787 +config GRKERNSEC_CONFIG_VIRT_EPT
104788 + bool "EPT/RVI Processor Support"
104789 + depends on X86
104790 + help
104791 + Choose this option if your CPU supports the EPT or RVI features of 2nd-gen
104792 + hardware virtualization. This allows for additional kernel hardening protections
104793 + to operate without additional performance impact.
104794 +
104795 + To see if your Intel processor supports EPT, see:
104796 + http://ark.intel.com/Products/VirtualizationTechnology
104797 + (Most Core i3/5/7 support EPT)
104798 +
104799 + To see if your AMD processor supports RVI, see:
104800 + http://support.amd.com/us/kbarticles/Pages/GPU120AMDRVICPUsHyperVWin8.aspx
104801 +
104802 +config GRKERNSEC_CONFIG_VIRT_SOFT
104803 + bool "First-gen/No Hardware Virtualization"
104804 + help
104805 + Choose this option if you use an Atom/Pentium/Core 2 processor that either doesn't
104806 + support hardware virtualization or doesn't support the EPT/RVI extensions.
104807 +
104808 +endchoice
104809 +
104810 +choice
104811 + prompt "Virtualization Software"
104812 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
104813 + help
104814 +
104815 +config GRKERNSEC_CONFIG_VIRT_XEN
104816 + bool "Xen"
104817 + help
104818 + Choose this option if this kernel is running as a Xen guest or host.
104819 +
104820 +config GRKERNSEC_CONFIG_VIRT_VMWARE
104821 + bool "VMWare"
104822 + help
104823 + Choose this option if this kernel is running as a VMWare guest or host.
104824 +
104825 +config GRKERNSEC_CONFIG_VIRT_KVM
104826 + bool "KVM"
104827 + help
104828 + Choose this option if this kernel is running as a KVM guest or host.
104829 +
104830 +config GRKERNSEC_CONFIG_VIRT_VIRTUALBOX
104831 + bool "VirtualBox"
104832 + help
104833 + Choose this option if this kernel is running as a VirtualBox guest or host.
104834 +
104835 +endchoice
104836 +
104837 +choice
104838 + prompt "Required Priorities"
104839 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
104840 + default GRKERNSEC_CONFIG_PRIORITY_PERF
104841 + help
104842 +
104843 +config GRKERNSEC_CONFIG_PRIORITY_PERF
104844 + bool "Performance"
104845 + help
104846 + Choose this option if performance is of highest priority for this deployment
104847 + of grsecurity. Features like UDEREF on a 64bit kernel, kernel stack clearing,
104848 + clearing of structures intended for userland, and freed memory sanitizing will
104849 + be disabled.
104850 +
104851 +config GRKERNSEC_CONFIG_PRIORITY_SECURITY
104852 + bool "Security"
104853 + help
104854 + Choose this option if security is of highest priority for this deployment of
104855 + grsecurity. UDEREF, kernel stack clearing, clearing of structures intended
104856 + for userland, and freed memory sanitizing will be enabled for this kernel.
104857 + In a worst-case scenario, these features can introduce a 20% performance hit
104858 + (UDEREF on x64 contributing half of this hit).
104859 +
104860 +endchoice
104861 +
104862 +menu "Default Special Groups"
104863 +depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
104864 +
104865 +config GRKERNSEC_PROC_GID
104866 + int "GID exempted from /proc restrictions"
104867 + default 1001
104868 + help
104869 + Setting this GID determines which group will be exempted from
104870 + grsecurity's /proc restrictions, allowing users of the specified
104871 + group to view network statistics and the existence of other users'
104872 + processes on the system. This GID may also be chosen at boot time
104873 + via "grsec_proc_gid=" on the kernel commandline.
104874 +
104875 +config GRKERNSEC_TPE_UNTRUSTED_GID
104876 + int "GID for TPE-untrusted users"
104877 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
104878 + default 1005
104879 + help
104880 + Setting this GID determines which group untrusted users should
104881 + be added to. These users will be placed under grsecurity's Trusted Path
104882 + Execution mechanism, preventing them from executing their own binaries.
104883 + The users will only be able to execute binaries in directories owned and
104884 + writable only by the root user. If the sysctl option is enabled, a sysctl
104885 + option with name "tpe_gid" is created.
104886 +
104887 +config GRKERNSEC_TPE_TRUSTED_GID
104888 + int "GID for TPE-trusted users"
104889 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
104890 + default 1005
104891 + help
104892 + Setting this GID determines what group TPE restrictions will be
104893 + *disabled* for. If the sysctl option is enabled, a sysctl option
104894 + with name "tpe_gid" is created.
104895 +
104896 +config GRKERNSEC_SYMLINKOWN_GID
104897 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
104898 + depends on GRKERNSEC_CONFIG_SERVER
104899 + default 1006
104900 + help
104901 + Setting this GID determines what group kernel-enforced
104902 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
104903 + is enabled, a sysctl option with name "symlinkown_gid" is created.
104904 +
104905 +
104906 +endmenu
104907 +
104908 +menu "Customize Configuration"
104909 +depends on GRKERNSEC
104910 +
104911 +menu "PaX"
104912 +
104913 +config PAX
104914 + bool "Enable various PaX features"
104915 + default y if GRKERNSEC_CONFIG_AUTO
104916 + depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS || PARISC || PPC || SPARC || X86)
104917 + help
104918 + This allows you to enable various PaX features. PaX adds
104919 + intrusion prevention mechanisms to the kernel that reduce
104920 + the risks posed by exploitable memory corruption bugs.
104921 +
104922 +menu "PaX Control"
104923 + depends on PAX
104924 +
104925 +config PAX_SOFTMODE
104926 + bool 'Support soft mode'
104927 + help
104928 + Enabling this option will allow you to run PaX in soft mode, that
104929 + is, PaX features will not be enforced by default, only on executables
104930 + marked explicitly. You must also enable PT_PAX_FLAGS or XATTR_PAX_FLAGS
104931 + support as they are the only way to mark executables for soft mode use.
104932 +
104933 + Soft mode can be activated by using the "pax_softmode=1" kernel command
104934 + line option on boot. Furthermore you can control various PaX features
104935 + at runtime via the entries in /proc/sys/kernel/pax.
104936 +
104937 +config PAX_EI_PAX
104938 + bool 'Use legacy ELF header marking'
104939 + default y if GRKERNSEC_CONFIG_AUTO
104940 + help
104941 + Enabling this option will allow you to control PaX features on
104942 + a per executable basis via the 'chpax' utility available at
104943 + http://pax.grsecurity.net/. The control flags will be read from
104944 + an otherwise reserved part of the ELF header. This marking has
104945 + numerous drawbacks (no support for soft-mode, toolchain does not
104946 + know about the non-standard use of the ELF header) therefore it
104947 + has been deprecated in favour of PT_PAX_FLAGS and XATTR_PAX_FLAGS
104948 + support.
104949 +
104950 + Note that if you enable PT_PAX_FLAGS or XATTR_PAX_FLAGS marking
104951 + support as well, they will override the legacy EI_PAX marks.
104952 +
104953 + If you enable none of the marking options then all applications
104954 + will run with PaX enabled on them by default.
104955 +
104956 +config PAX_PT_PAX_FLAGS
104957 + bool 'Use ELF program header marking'
104958 + default y if GRKERNSEC_CONFIG_AUTO
104959 + help
104960 + Enabling this option will allow you to control PaX features on
104961 + a per executable basis via the 'paxctl' utility available at
104962 + http://pax.grsecurity.net/. The control flags will be read from
104963 + a PaX specific ELF program header (PT_PAX_FLAGS). This marking
104964 + has the benefits of supporting both soft mode and being fully
104965 + integrated into the toolchain (the binutils patch is available
104966 + from http://pax.grsecurity.net).
104967 +
104968 + Note that if you enable the legacy EI_PAX marking support as well,
104969 + the EI_PAX marks will be overridden by the PT_PAX_FLAGS marks.
104970 +
104971 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
104972 + must make sure that the marks are the same if a binary has both marks.
104973 +
104974 + If you enable none of the marking options then all applications
104975 + will run with PaX enabled on them by default.
104976 +
104977 +config PAX_XATTR_PAX_FLAGS
104978 + bool 'Use filesystem extended attributes marking'
104979 + default y if GRKERNSEC_CONFIG_AUTO
104980 + select CIFS_XATTR if CIFS
104981 + select F2FS_FS_XATTR if F2FS_FS
104982 + select EXT2_FS_XATTR if EXT2_FS
104983 + select EXT3_FS_XATTR if EXT3_FS
104984 + select JFFS2_FS_XATTR if JFFS2_FS
104985 + select REISERFS_FS_XATTR if REISERFS_FS
104986 + select SQUASHFS_XATTR if SQUASHFS
104987 + select TMPFS_XATTR if TMPFS
104988 + help
104989 + Enabling this option will allow you to control PaX features on
104990 + a per executable basis via the 'setfattr' utility. The control
104991 + flags will be read from the user.pax.flags extended attribute of
104992 + the file. This marking has the benefit of supporting binary-only
104993 + applications that self-check themselves (e.g., skype) and would
104994 + not tolerate chpax/paxctl changes. The main drawback is that
104995 + extended attributes are not supported by some filesystems (e.g.,
104996 + isofs, udf, vfat) so copying files through such filesystems will
104997 + lose the extended attributes and these PaX markings.
104998 +
104999 + Note that if you enable the legacy EI_PAX marking support as well,
105000 + the EI_PAX marks will be overridden by the XATTR_PAX_FLAGS marks.
105001 +
105002 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
105003 + must make sure that the marks are the same if a binary has both marks.
105004 +
105005 + If you enable none of the marking options then all applications
105006 + will run with PaX enabled on them by default.
105007 +
105008 +choice
105009 + prompt 'MAC system integration'
105010 + default PAX_HAVE_ACL_FLAGS
105011 + help
105012 + Mandatory Access Control systems have the option of controlling
105013 + PaX flags on a per executable basis, choose the method supported
105014 + by your particular system.
105015 +
105016 + - "none": if your MAC system does not interact with PaX,
105017 + - "direct": if your MAC system defines pax_set_initial_flags() itself,
105018 + - "hook": if your MAC system uses the pax_set_initial_flags_func callback.
105019 +
105020 + NOTE: this option is for developers/integrators only.
105021 +
105022 + config PAX_NO_ACL_FLAGS
105023 + bool 'none'
105024 +
105025 + config PAX_HAVE_ACL_FLAGS
105026 + bool 'direct'
105027 +
105028 + config PAX_HOOK_ACL_FLAGS
105029 + bool 'hook'
105030 +endchoice
105031 +
105032 +endmenu
105033 +
105034 +menu "Non-executable pages"
105035 + depends on PAX
105036 +
105037 +config PAX_NOEXEC
105038 + bool "Enforce non-executable pages"
105039 + default y if GRKERNSEC_CONFIG_AUTO
105040 + depends on ALPHA || (ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || IA64 || MIPS || PARISC || PPC || S390 || SPARC || X86
105041 + help
105042 + By design some architectures do not allow for protecting memory
105043 + pages against execution or even if they do, Linux does not make
105044 + use of this feature. In practice this means that if a page is
105045 + readable (such as the stack or heap) it is also executable.
105046 +
105047 + There is a well known exploit technique that makes use of this
105048 + fact and a common programming mistake where an attacker can
105049 + introduce code of his choice somewhere in the attacked program's
105050 + memory (typically the stack or the heap) and then execute it.
105051 +
105052 + If the attacked program was running with different (typically
105053 + higher) privileges than that of the attacker, then he can elevate
105054 + his own privilege level (e.g. get a root shell, write to files for
105055 + which he does not have write access to, etc).
105056 +
105057 + Enabling this option will let you choose from various features
105058 + that prevent the injection and execution of 'foreign' code in
105059 + a program.
105060 +
105061 + This will also break programs that rely on the old behaviour and
105062 + expect that dynamically allocated memory via the malloc() family
105063 + of functions is executable (which it is not). Notable examples
105064 + are the XFree86 4.x server, the java runtime and wine.
105065 +
105066 +config PAX_PAGEEXEC
105067 + bool "Paging based non-executable pages"
105068 + default y if GRKERNSEC_CONFIG_AUTO
105069 + depends on PAX_NOEXEC && (!X86_32 || M586 || M586TSC || M586MMX || M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MATOM || MPENTIUM4 || MPSC || MK7 || MK8 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MVIAC3_2 || MVIAC7)
105070 + select ARCH_TRACK_EXEC_LIMIT if X86_32
105071 + help
105072 + This implementation is based on the paging feature of the CPU.
105073 + On i386 without hardware non-executable bit support there is a
105074 + variable but usually low performance impact, however on Intel's
105075 + P4 core based CPUs it is very high so you should not enable this
105076 + for kernels meant to be used on such CPUs.
105077 +
105078 + On alpha, avr32, ia64, parisc, sparc, sparc64, x86_64 and i386
105079 + with hardware non-executable bit support there is no performance
105080 + impact, on ppc the impact is negligible.
105081 +
105082 + Note that several architectures require various emulations due to
105083 + badly designed userland ABIs, this will cause a performance impact
105084 + but will disappear as soon as userland is fixed. For example, ppc
105085 + userland MUST have been built with secure-plt by a recent toolchain.
105086 +
105087 +config PAX_SEGMEXEC
105088 + bool "Segmentation based non-executable pages"
105089 + default y if GRKERNSEC_CONFIG_AUTO
105090 + depends on PAX_NOEXEC && X86_32
105091 + help
105092 + This implementation is based on the segmentation feature of the
105093 + CPU and has a very small performance impact, however applications
105094 + will be limited to a 1.5 GB address space instead of the normal
105095 + 3 GB.
105096 +
105097 +config PAX_EMUTRAMP
105098 + bool "Emulate trampolines"
105099 + default y if PARISC || GRKERNSEC_CONFIG_AUTO
105100 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC) && (PARISC || X86)
105101 + help
105102 + There are some programs and libraries that for one reason or
105103 + another attempt to execute special small code snippets from
105104 + non-executable memory pages. Most notable examples are the
105105 + signal handler return code generated by the kernel itself and
105106 + the GCC trampolines.
105107 +
105108 + If you enabled CONFIG_PAX_PAGEEXEC or CONFIG_PAX_SEGMEXEC then
105109 + such programs will no longer work under your kernel.
105110 +
105111 + As a remedy you can say Y here and use the 'chpax' or 'paxctl'
105112 + utilities to enable trampoline emulation for the affected programs
105113 + yet still have the protection provided by the non-executable pages.
105114 +
105115 + On parisc you MUST enable this option and EMUSIGRT as well, otherwise
105116 + your system will not even boot.
105117 +
105118 + Alternatively you can say N here and use the 'chpax' or 'paxctl'
105119 + utilities to disable CONFIG_PAX_PAGEEXEC and CONFIG_PAX_SEGMEXEC
105120 + for the affected files.
105121 +
105122 + NOTE: enabling this feature *may* open up a loophole in the
105123 + protection provided by non-executable pages that an attacker
105124 + could abuse. Therefore the best solution is to not have any
105125 + files on your system that would require this option. This can
105126 + be achieved by not using libc5 (which relies on the kernel
105127 + signal handler return code) and not using or rewriting programs
105128 + that make use of the nested function implementation of GCC.
105129 + Skilled users can just fix GCC itself so that it implements
105130 + nested function calls in a way that does not interfere with PaX.
105131 +
105132 +config PAX_EMUSIGRT
105133 + bool "Automatically emulate sigreturn trampolines"
105134 + depends on PAX_EMUTRAMP && PARISC
105135 + default y
105136 + help
105137 + Enabling this option will have the kernel automatically detect
105138 + and emulate signal return trampolines executing on the stack
105139 + that would otherwise lead to task termination.
105140 +
105141 + This solution is intended as a temporary one for users with
105142 + legacy versions of libc (libc5, glibc 2.0, uClibc before 0.9.17,
105143 + Modula-3 runtime, etc) or executables linked to such, basically
105144 + everything that does not specify its own SA_RESTORER function in
105145 + normal executable memory like glibc 2.1+ does.
105146 +
105147 + On parisc you MUST enable this option, otherwise your system will
105148 + not even boot.
105149 +
105150 + NOTE: this feature cannot be disabled on a per executable basis
105151 + and since it *does* open up a loophole in the protection provided
105152 + by non-executable pages, the best solution is to not have any
105153 + files on your system that would require this option.
105154 +
105155 +config PAX_MPROTECT
105156 + bool "Restrict mprotect()"
105157 + default y if GRKERNSEC_CONFIG_AUTO
105158 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC)
105159 + help
105160 + Enabling this option will prevent programs from
105161 + - changing the executable status of memory pages that were
105162 + not originally created as executable,
105163 + - making read-only executable pages writable again,
105164 + - creating executable pages from anonymous memory,
105165 + - making read-only-after-relocations (RELRO) data pages writable again.
105166 +
105167 + You should say Y here to complete the protection provided by
105168 + the enforcement of non-executable pages.
105169 +
105170 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
105171 + this feature on a per file basis.
105172 +
105173 +config PAX_MPROTECT_COMPAT
105174 + bool "Use legacy/compat protection demoting (read help)"
105175 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
105176 + depends on PAX_MPROTECT
105177 + help
105178 + The current implementation of PAX_MPROTECT denies RWX allocations/mprotects
105179 + by sending the proper error code to the application. For some broken
105180 + userland, this can cause problems with Python or other applications. The
105181 + current implementation however allows for applications like clamav to
105182 + detect if JIT compilation/execution is allowed and to fall back gracefully
105183 + to an interpreter-based mode if it does not. While we encourage everyone
105184 + to use the current implementation as-is and push upstream to fix broken
105185 + userland (note that the RWX logging option can assist with this), in some
105186 + environments this may not be possible. Having to disable MPROTECT
105187 + completely on certain binaries reduces the security benefit of PaX,
105188 + so this option is provided for those environments to revert to the old
105189 + behavior.
105190 +
105191 +config PAX_ELFRELOCS
105192 + bool "Allow ELF text relocations (read help)"
105193 + depends on PAX_MPROTECT
105194 + default n
105195 + help
105196 + Non-executable pages and mprotect() restrictions are effective
105197 + in preventing the introduction of new executable code into an
105198 + attacked task's address space. There remain only two venues
105199 + for this kind of attack: if the attacker can execute already
105200 + existing code in the attacked task then he can either have it
105201 + create and mmap() a file containing his code or have it mmap()
105202 + an already existing ELF library that does not have position
105203 + independent code in it and use mprotect() on it to make it
105204 + writable and copy his code there. While protecting against
105205 + the former approach is beyond PaX, the latter can be prevented
105206 + by having only PIC ELF libraries on one's system (which do not
105207 + need to relocate their code). If you are sure this is your case,
105208 + as is the case with all modern Linux distributions, then leave
105209 + this option disabled. You should say 'n' here.
105210 +
105211 +config PAX_ETEXECRELOCS
105212 + bool "Allow ELF ET_EXEC text relocations"
105213 + depends on PAX_MPROTECT && (ALPHA || IA64 || PARISC)
105214 + select PAX_ELFRELOCS
105215 + default y
105216 + help
105217 + On some architectures there are incorrectly created applications
105218 + that require text relocations and would not work without enabling
105219 + this option. If you are an alpha, ia64 or parisc user, you should
105220 + enable this option and disable it once you have made sure that
105221 + none of your applications need it.
105222 +
105223 +config PAX_EMUPLT
105224 + bool "Automatically emulate ELF PLT"
105225 + depends on PAX_MPROTECT && (ALPHA || PARISC || SPARC)
105226 + default y
105227 + help
105228 + Enabling this option will have the kernel automatically detect
105229 + and emulate the Procedure Linkage Table entries in ELF files.
105230 + On some architectures such entries are in writable memory, and
105231 + become non-executable leading to task termination. Therefore
105232 + it is mandatory that you enable this option on alpha, parisc,
105233 + sparc and sparc64, otherwise your system would not even boot.
105234 +
105235 + NOTE: this feature *does* open up a loophole in the protection
105236 + provided by the non-executable pages, therefore the proper
105237 + solution is to modify the toolchain to produce a PLT that does
105238 + not need to be writable.
105239 +
105240 +config PAX_DLRESOLVE
105241 + bool 'Emulate old glibc resolver stub'
105242 + depends on PAX_EMUPLT && SPARC
105243 + default n
105244 + help
105245 + This option is needed if userland has an old glibc (before 2.4)
105246 + that puts a 'save' instruction into the runtime generated resolver
105247 + stub that needs special emulation.
105248 +
105249 +config PAX_KERNEXEC
105250 + bool "Enforce non-executable kernel pages"
105251 + default y if GRKERNSEC_CONFIG_AUTO && (!X86 || GRKERNSEC_CONFIG_VIRT_NONE || (GRKERNSEC_CONFIG_VIRT_EPT && GRKERNSEC_CONFIG_VIRT_GUEST) || (GRKERNSEC_CONFIG_VIRT_EPT && GRKERNSEC_CONFIG_VIRT_KVM))
105252 + depends on (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !(ARM_LPAE && MODULES))) && !XEN
105253 + select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
105254 + select PAX_KERNEXEC_PLUGIN if X86_64
105255 + help
105256 + This is the kernel land equivalent of PAGEEXEC and MPROTECT,
105257 + that is, enabling this option will make it harder to inject
105258 + and execute 'foreign' code in kernel memory itself.
105259 +
105260 +choice
105261 + prompt "Return Address Instrumentation Method"
105262 + default PAX_KERNEXEC_PLUGIN_METHOD_BTS
105263 + depends on PAX_KERNEXEC_PLUGIN
105264 + help
105265 + Select the method used to instrument function pointer dereferences.
105266 + Note that binary modules cannot be instrumented by this approach.
105267 +
105268 + Note that the implementation requires a gcc with plugin support,
105269 + i.e., gcc 4.5 or newer. You may need to install the supporting
105270 + headers explicitly in addition to the normal gcc package.
105271 +
105272 + config PAX_KERNEXEC_PLUGIN_METHOD_BTS
105273 + bool "bts"
105274 + help
105275 + This method is compatible with binary only modules but has
105276 + a higher runtime overhead.
105277 +
105278 + config PAX_KERNEXEC_PLUGIN_METHOD_OR
105279 + bool "or"
105280 + depends on !PARAVIRT
105281 + help
105282 + This method is incompatible with binary only modules but has
105283 + a lower runtime overhead.
105284 +endchoice
105285 +
105286 +config PAX_KERNEXEC_PLUGIN_METHOD
105287 + string
105288 + default "bts" if PAX_KERNEXEC_PLUGIN_METHOD_BTS
105289 + default "or" if PAX_KERNEXEC_PLUGIN_METHOD_OR
105290 + default ""
105291 +
105292 +config PAX_KERNEXEC_MODULE_TEXT
105293 + int "Minimum amount of memory reserved for module code"
105294 + default "4" if (!GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_SERVER)
105295 + default "12" if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
105296 + depends on PAX_KERNEXEC && X86_32
105297 + help
105298 + Due to implementation details the kernel must reserve a fixed
105299 + amount of memory for runtime allocated code (such as modules)
105300 + at compile time that cannot be changed at runtime. Here you
105301 + can specify the minimum amount in MB that will be reserved.
105302 + Due to the same implementation details this size will always
105303 + be rounded up to the next 2/4 MB boundary (depends on PAE) so
105304 + the actually available memory for runtime allocated code will
105305 + usually be more than this minimum.
105306 +
105307 + The default 4 MB should be enough for most users but if you have
105308 + an excessive number of modules (e.g., most distribution configs
105309 + compile many drivers as modules) or use huge modules such as
105310 + nvidia's kernel driver, you will need to adjust this amount.
105311 + A good rule of thumb is to look at your currently loaded kernel
105312 + modules and add up their sizes.
105313 +
105314 +endmenu
105315 +
105316 +menu "Address Space Layout Randomization"
105317 + depends on PAX
105318 +
105319 +config PAX_ASLR
105320 + bool "Address Space Layout Randomization"
105321 + default y if GRKERNSEC_CONFIG_AUTO
105322 + help
105323 + Many if not most exploit techniques rely on the knowledge of
105324 + certain addresses in the attacked program. The following options
105325 + will allow the kernel to apply a certain amount of randomization
105326 + to specific parts of the program thereby forcing an attacker to
105327 + guess them in most cases. Any failed guess will most likely crash
105328 + the attacked program which allows the kernel to detect such attempts
105329 + and react on them. PaX itself provides no reaction mechanisms,
105330 + instead it is strongly encouraged that you make use of grsecurity's
105331 + (http://www.grsecurity.net/) built-in crash detection features or
105332 + develop one yourself.
105333 +
105334 + By saying Y here you can choose to randomize the following areas:
105335 + - top of the task's kernel stack
105336 + - top of the task's userland stack
105337 + - base address for mmap() requests that do not specify one
105338 + (this includes all libraries)
105339 + - base address of the main executable
105340 +
105341 + It is strongly recommended to say Y here as address space layout
105342 + randomization has negligible impact on performance yet it provides
105343 + a very effective protection.
105344 +
105345 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
105346 + this feature on a per file basis.
105347 +
105348 +config PAX_RANDKSTACK
105349 + bool "Randomize kernel stack base"
105350 + default y if GRKERNSEC_CONFIG_AUTO && !(GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_VIRTUALBOX)
105351 + depends on X86_TSC && X86
105352 + help
105353 + By saying Y here the kernel will randomize every task's kernel
105354 + stack on every system call. This will not only force an attacker
105355 + to guess it but also prevent him from making use of possible
105356 + leaked information about it.
105357 +
105358 + Since the kernel stack is a rather scarce resource, randomization
105359 + may cause unexpected stack overflows, therefore you should very
105360 + carefully test your system. Note that once enabled in the kernel
105361 + configuration, this feature cannot be disabled on a per file basis.
105362 +
105363 +config PAX_RANDUSTACK
105364 + bool
105365 +
105366 +config PAX_RANDMMAP
105367 + bool "Randomize user stack and mmap() bases"
105368 + default y if GRKERNSEC_CONFIG_AUTO
105369 + depends on PAX_ASLR
105370 + select PAX_RANDUSTACK
105371 + help
105372 + By saying Y here the kernel will randomize every task's userland
105373 + stack and use a randomized base address for mmap() requests that
105374 + do not specify one themselves.
105375 +
105376 + The stack randomization is done in two steps where the second
105377 + one may apply a big amount of shift to the top of the stack and
105378 + cause problems for programs that want to use lots of memory (more
105379 + than 2.5 GB if SEGMEXEC is not active, or 1.25 GB when it is).
105380 +
105381 + As a result of mmap randomization all dynamically loaded libraries
105382 + will appear at random addresses and therefore be harder to exploit
105383 + by a technique where an attacker attempts to execute library code
105384 + for his purposes (e.g. spawn a shell from an exploited program that
105385 + is running at an elevated privilege level).
105386 +
105387 + Furthermore, if a program is relinked as a dynamic ELF file, its
105388 + base address will be randomized as well, completing the full
105389 + randomization of the address space layout. Attacking such programs
105390 + becomes a guess game. You can find an example of doing this at
105391 + http://pax.grsecurity.net/et_dyn.tar.gz and practical samples at
105392 + http://www.grsecurity.net/grsec-gcc-specs.tar.gz .
105393 +
105394 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control this
105395 + feature on a per file basis.
105396 +
105397 +endmenu
105398 +
105399 +menu "Miscellaneous hardening features"
105400 +
105401 +config PAX_MEMORY_SANITIZE
105402 + bool "Sanitize all freed memory"
105403 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
105404 + help
105405 + By saying Y here the kernel will erase memory pages and slab objects
105406 + as soon as they are freed. This in turn reduces the lifetime of data
105407 + stored in them, making it less likely that sensitive information such
105408 + as passwords, cryptographic secrets, etc stay in memory for too long.
105409 +
105410 + This is especially useful for programs whose runtime is short, long
105411 + lived processes and the kernel itself benefit from this as long as
105412 + they ensure timely freeing of memory that may hold sensitive
105413 + information.
105414 +
105415 + A nice side effect of the sanitization of slab objects is the
105416 + reduction of possible info leaks caused by padding bytes within the
105417 + leaky structures. Use-after-free bugs for structures containing
105418 + pointers can also be detected as dereferencing the sanitized pointer
105419 + will generate an access violation.
105420 +
105421 + The tradeoff is performance impact, on a single CPU system kernel
105422 + compilation sees a 3% slowdown, other systems and workloads may vary
105423 + and you are advised to test this feature on your expected workload
105424 + before deploying it.
105425 +
105426 + To reduce the performance penalty by sanitizing pages only, albeit
105427 + limiting the effectiveness of this feature at the same time, slab
105428 + sanitization can be disabled with the kernel commandline parameter
105429 + "pax_sanitize_slab=0".
105430 +
105431 + Note that this feature does not protect data stored in live pages,
105432 + e.g., process memory swapped to disk may stay there for a long time.
105433 +
105434 +config PAX_MEMORY_STACKLEAK
105435 + bool "Sanitize kernel stack"
105436 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
105437 + depends on X86
105438 + help
105439 + By saying Y here the kernel will erase the kernel stack before it
105440 + returns from a system call. This in turn reduces the information
105441 + that a kernel stack leak bug can reveal.
105442 +
105443 + Note that such a bug can still leak information that was put on
105444 + the stack by the current system call (the one eventually triggering
105445 + the bug) but traces of earlier system calls on the kernel stack
105446 + cannot leak anymore.
105447 +
105448 + The tradeoff is performance impact: on a single CPU system kernel
105449 + compilation sees a 1% slowdown, other systems and workloads may vary
105450 + and you are advised to test this feature on your expected workload
105451 + before deploying it.
105452 +
105453 + Note that the full feature requires a gcc with plugin support,
105454 + i.e., gcc 4.5 or newer. You may need to install the supporting
105455 + headers explicitly in addition to the normal gcc package. Using
105456 + older gcc versions means that functions with large enough stack
105457 + frames may leave uninitialized memory behind that may be exposed
105458 + to a later syscall leaking the stack.
105459 +
105460 +config PAX_MEMORY_STRUCTLEAK
105461 + bool "Forcibly initialize local variables copied to userland"
105462 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
105463 + help
105464 + By saying Y here the kernel will zero initialize some local
105465 + variables that are going to be copied to userland. This in
105466 + turn prevents unintended information leakage from the kernel
105467 + stack should later code forget to explicitly set all parts of
105468 + the copied variable.
105469 +
105470 + The tradeoff is less performance impact than PAX_MEMORY_STACKLEAK
105471 + at a much smaller coverage.
105472 +
105473 + Note that the implementation requires a gcc with plugin support,
105474 + i.e., gcc 4.5 or newer. You may need to install the supporting
105475 + headers explicitly in addition to the normal gcc package.
105476 +
105477 +config PAX_MEMORY_UDEREF
105478 + bool "Prevent invalid userland pointer dereference"
105479 + default y if GRKERNSEC_CONFIG_AUTO && !(X86_64 && GRKERNSEC_CONFIG_PRIORITY_PERF) && (!X86 || GRKERNSEC_CONFIG_VIRT_NONE || GRKERNSEC_CONFIG_VIRT_EPT)
105480 + depends on (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !ARM_LPAE)) && !UML_X86 && !XEN
105481 + select PAX_PER_CPU_PGD if X86_64
105482 + help
105483 + By saying Y here the kernel will be prevented from dereferencing
105484 + userland pointers in contexts where the kernel expects only kernel
105485 + pointers. This is both a useful runtime debugging feature and a
105486 + security measure that prevents exploiting a class of kernel bugs.
105487 +
105488 + The tradeoff is that some virtualization solutions may experience
105489 + a huge slowdown and therefore you should not enable this feature
105490 + for kernels meant to run in such environments. Whether a given VM
105491 + solution is affected or not is best determined by simply trying it
105492 + out, the performance impact will be obvious right on boot as this
105493 + mechanism engages from very early on. A good rule of thumb is that
105494 + VMs running on CPUs without hardware virtualization support (i.e.,
105495 + the majority of IA-32 CPUs) will likely experience the slowdown.
105496 +
105497 + On X86_64 the kernel will make use of PCID support when available
105498 + (Intel's Westmere, Sandy Bridge, etc) for better security (default)
105499 + or performance impact. Pass pax_weakuderef on the kernel command
105500 + line to choose the latter.
105501 +
105502 +config PAX_REFCOUNT
105503 + bool "Prevent various kernel object reference counter overflows"
105504 + default y if GRKERNSEC_CONFIG_AUTO
105505 + depends on GRKERNSEC && ((ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || MIPS || SPARC64 || X86)
105506 + help
105507 + By saying Y here the kernel will detect and prevent overflowing
105508 + various (but not all) kinds of object reference counters. Such
105509 + overflows can normally occur due to bugs only and are often, if
105510 + not always, exploitable.
105511 +
105512 + The tradeoff is that data structures protected by an overflowed
105513 + refcount will never be freed and therefore will leak memory. Note
105514 + that this leak also happens even without this protection but in
105515 + that case the overflow can eventually trigger the freeing of the
105516 + data structure while it is still being used elsewhere, resulting
105517 + in the exploitable situation that this feature prevents.
105518 +
105519 + Since this has a negligible performance impact, you should enable
105520 + this feature.
105521 +
105522 +config PAX_CONSTIFY_PLUGIN
105523 + bool "Automatically constify eligible structures"
105524 + default y
105525 + depends on !UML && PAX_KERNEXEC
105526 + help
105527 + By saying Y here the compiler will automatically constify a class
105528 + of types that contain only function pointers. This reduces the
105529 + kernel's attack surface and also produces a better memory layout.
105530 +
105531 + Note that the implementation requires a gcc with plugin support,
105532 + i.e., gcc 4.5 or newer. You may need to install the supporting
105533 + headers explicitly in addition to the normal gcc package.
105534 +
105535 + Note that if some code really has to modify constified variables
105536 + then the source code will have to be patched to allow it. Examples
105537 + can be found in PaX itself (the no_const attribute) and for some
105538 + out-of-tree modules at http://www.grsecurity.net/~paxguy1/ .
105539 +
105540 +config PAX_USERCOPY
105541 + bool "Harden heap object copies between kernel and userland"
105542 + default y if GRKERNSEC_CONFIG_AUTO
105543 + depends on ARM || IA64 || PPC || SPARC || X86
105544 + depends on GRKERNSEC && (SLAB || SLUB || SLOB)
105545 + select PAX_USERCOPY_SLABS
105546 + help
105547 + By saying Y here the kernel will enforce the size of heap objects
105548 + when they are copied in either direction between the kernel and
105549 + userland, even if only a part of the heap object is copied.
105550 +
105551 + Specifically, this checking prevents information leaking from the
105552 + kernel heap during kernel to userland copies (if the kernel heap
105553 + object is otherwise fully initialized) and prevents kernel heap
105554 + overflows during userland to kernel copies.
105555 +
105556 + Note that the current implementation provides the strictest bounds
105557 + checks for the SLUB allocator.
105558 +
105559 + Enabling this option also enables per-slab cache protection against
105560 + data in a given cache being copied into/out of via userland
105561 + accessors. Though the whitelist of regions will be reduced over
105562 + time, it notably protects important data structures like task structs.
105563 +
105564 + If frame pointers are enabled on x86, this option will also restrict
105565 + copies into and out of the kernel stack to local variables within a
105566 + single frame.
105567 +
105568 + Since this has a negligible performance impact, you should enable
105569 + this feature.
105570 +
105571 +config PAX_USERCOPY_DEBUG
105572 + bool
105573 + depends on X86 && PAX_USERCOPY
105574 + default n
105575 +
105576 +config PAX_SIZE_OVERFLOW
105577 + bool "Prevent various integer overflows in function size parameters"
105578 + default y if GRKERNSEC_CONFIG_AUTO
105579 + depends on X86
105580 + help
105581 + By saying Y here the kernel recomputes expressions of function
105582 + arguments marked by a size_overflow attribute with double integer
105583 + precision (DImode/TImode for 32/64 bit integer types).
105584 +
105585 + The recomputed argument is checked against TYPE_MAX and an event
105586 + is logged on overflow and the triggering process is killed.
105587 +
105588 + Homepage: http://www.grsecurity.net/~ephox/overflow_plugin/
105589 +
105590 + Note that the implementation requires a gcc with plugin support,
105591 + i.e., gcc 4.5 or newer. You may need to install the supporting
105592 + headers explicitly in addition to the normal gcc package.
105593 +
105594 +config PAX_LATENT_ENTROPY
105595 + bool "Generate some entropy during boot and runtime"
105596 + default y if GRKERNSEC_CONFIG_AUTO
105597 + help
105598 + By saying Y here the kernel will instrument some kernel code to
105599 + extract some entropy from both original and artificially created
105600 + program state. This will help especially embedded systems where
105601 + there is little 'natural' source of entropy normally. The cost
105602 + is some slowdown of the boot process and fork and irq processing.
105603 +
105604 + When pax_extra_latent_entropy is passed on the kernel command line,
105605 + entropy will be extracted from up to the first 4GB of RAM while the
105606 + runtime memory allocator is being initialized. This costs even more
105607 + slowdown of the boot process.
105608 +
105609 + Note that the implementation requires a gcc with plugin support,
105610 + i.e., gcc 4.5 or newer. You may need to install the supporting
105611 + headers explicitly in addition to the normal gcc package.
105612 +
105613 + Note that entropy extracted this way is not cryptographically
105614 + secure!
105615 +
105616 +endmenu
105617 +
105618 +endmenu
105619 +
105620 +source grsecurity/Kconfig
105621 +
105622 +endmenu
105623 +
105624 +endmenu
105625 +
105626 source security/keys/Kconfig
105627
105628 config SECURITY_DMESG_RESTRICT
105629 @@ -103,7 +1054,7 @@ config INTEL_TXT
105630 config LSM_MMAP_MIN_ADDR
105631 int "Low address space for LSM to protect from user allocation"
105632 depends on SECURITY && SECURITY_SELINUX
105633 - default 32768 if ARM || (ARM64 && COMPAT)
105634 + default 32768 if ALPHA || ARM || (ARM64 && COMPAT) || PARISC || SPARC32
105635 default 65536
105636 help
105637 This is the portion of low virtual memory which should be protected
105638 diff --git a/security/apparmor/file.c b/security/apparmor/file.c
105639 index fdaa50c..2761dcb 100644
105640 --- a/security/apparmor/file.c
105641 +++ b/security/apparmor/file.c
105642 @@ -348,8 +348,8 @@ static inline bool xindex_is_subset(u32 link, u32 target)
105643 int aa_path_link(struct aa_profile *profile, struct dentry *old_dentry,
105644 struct path *new_dir, struct dentry *new_dentry)
105645 {
105646 - struct path link = { new_dir->mnt, new_dentry };
105647 - struct path target = { new_dir->mnt, old_dentry };
105648 + struct path link = { .mnt = new_dir->mnt, .dentry = new_dentry };
105649 + struct path target = { .mnt = new_dir->mnt, .dentry = old_dentry };
105650 struct path_cond cond = {
105651 old_dentry->d_inode->i_uid,
105652 old_dentry->d_inode->i_mode
105653 diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
105654 index 9981000..eb21356 100644
105655 --- a/security/apparmor/lsm.c
105656 +++ b/security/apparmor/lsm.c
105657 @@ -186,7 +186,7 @@ static int common_perm_dir_dentry(int op, struct path *dir,
105658 struct dentry *dentry, u32 mask,
105659 struct path_cond *cond)
105660 {
105661 - struct path path = { dir->mnt, dentry };
105662 + struct path path = { .mnt = dir->mnt, .dentry = dentry };
105663
105664 return common_perm(op, &path, mask, cond);
105665 }
105666 @@ -203,7 +203,7 @@ static int common_perm_dir_dentry(int op, struct path *dir,
105667 static int common_perm_mnt_dentry(int op, struct vfsmount *mnt,
105668 struct dentry *dentry, u32 mask)
105669 {
105670 - struct path path = { mnt, dentry };
105671 + struct path path = { .mnt = mnt, .dentry = dentry };
105672 struct path_cond cond = { dentry->d_inode->i_uid,
105673 dentry->d_inode->i_mode
105674 };
105675 @@ -325,8 +325,8 @@ static int apparmor_path_rename(struct path *old_dir, struct dentry *old_dentry,
105676
105677 profile = aa_current_profile();
105678 if (!unconfined(profile)) {
105679 - struct path old_path = { old_dir->mnt, old_dentry };
105680 - struct path new_path = { new_dir->mnt, new_dentry };
105681 + struct path old_path = { .mnt = old_dir->mnt, .dentry = old_dentry };
105682 + struct path new_path = { .mnt = new_dir->mnt, .dentry = new_dentry };
105683 struct path_cond cond = { old_dentry->d_inode->i_uid,
105684 old_dentry->d_inode->i_mode
105685 };
105686 @@ -615,7 +615,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,
105687 return error;
105688 }
105689
105690 -static struct security_operations apparmor_ops = {
105691 +static struct security_operations apparmor_ops __read_only = {
105692 .name = "apparmor",
105693
105694 .ptrace_access_check = apparmor_ptrace_access_check,
105695 diff --git a/security/commoncap.c b/security/commoncap.c
105696 index b9d613e..f68305c 100644
105697 --- a/security/commoncap.c
105698 +++ b/security/commoncap.c
105699 @@ -424,6 +424,32 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
105700 return 0;
105701 }
105702
105703 +/* returns:
105704 + 1 for suid privilege
105705 + 2 for sgid privilege
105706 + 3 for fscap privilege
105707 +*/
105708 +int is_privileged_binary(const struct dentry *dentry)
105709 +{
105710 + struct cpu_vfs_cap_data capdata;
105711 + struct inode *inode = dentry->d_inode;
105712 +
105713 + if (!inode || S_ISDIR(inode->i_mode))
105714 + return 0;
105715 +
105716 + if (inode->i_mode & S_ISUID)
105717 + return 1;
105718 + if ((inode->i_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))
105719 + return 2;
105720 +
105721 + if (!get_vfs_caps_from_disk(dentry, &capdata)) {
105722 + if (!cap_isclear(capdata.inheritable) || !cap_isclear(capdata.permitted))
105723 + return 3;
105724 + }
105725 +
105726 + return 0;
105727 +}
105728 +
105729 /*
105730 * Attempt to get the on-exec apply capability sets for an executable file from
105731 * its xattrs and, if present, apply them to the proposed credentials being
105732 @@ -592,6 +618,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
105733 const struct cred *cred = current_cred();
105734 kuid_t root_uid = make_kuid(cred->user_ns, 0);
105735
105736 + if (gr_acl_enable_at_secure())
105737 + return 1;
105738 +
105739 if (!uid_eq(cred->uid, root_uid)) {
105740 if (bprm->cap_effective)
105741 return 1;
105742 diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
105743 index f79fa8b..6161868 100644
105744 --- a/security/integrity/ima/ima.h
105745 +++ b/security/integrity/ima/ima.h
105746 @@ -118,8 +118,8 @@ int ima_init_template(void);
105747 extern spinlock_t ima_queue_lock;
105748
105749 struct ima_h_table {
105750 - atomic_long_t len; /* number of stored measurements in the list */
105751 - atomic_long_t violations;
105752 + atomic_long_unchecked_t len; /* number of stored measurements in the list */
105753 + atomic_long_unchecked_t violations;
105754 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
105755 };
105756 extern struct ima_h_table ima_htable;
105757 diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
105758 index d9cd5ce..c5c29ac 100644
105759 --- a/security/integrity/ima/ima_api.c
105760 +++ b/security/integrity/ima/ima_api.c
105761 @@ -137,7 +137,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename,
105762 int result;
105763
105764 /* can overflow, only indicator */
105765 - atomic_long_inc(&ima_htable.violations);
105766 + atomic_long_inc_unchecked(&ima_htable.violations);
105767
105768 result = ima_alloc_init_template(NULL, file, filename,
105769 NULL, 0, &entry);
105770 diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
105771 index da92fcc..8a5d390 100644
105772 --- a/security/integrity/ima/ima_fs.c
105773 +++ b/security/integrity/ima/ima_fs.c
105774 @@ -28,12 +28,12 @@
105775 static int valid_policy = 1;
105776 #define TMPBUFLEN 12
105777 static ssize_t ima_show_htable_value(char __user *buf, size_t count,
105778 - loff_t *ppos, atomic_long_t *val)
105779 + loff_t *ppos, atomic_long_unchecked_t *val)
105780 {
105781 char tmpbuf[TMPBUFLEN];
105782 ssize_t len;
105783
105784 - len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
105785 + len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
105786 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
105787 }
105788
105789 diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
105790 index 552705d..9920f4fb 100644
105791 --- a/security/integrity/ima/ima_queue.c
105792 +++ b/security/integrity/ima/ima_queue.c
105793 @@ -83,7 +83,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
105794 INIT_LIST_HEAD(&qe->later);
105795 list_add_tail_rcu(&qe->later, &ima_measurements);
105796
105797 - atomic_long_inc(&ima_htable.len);
105798 + atomic_long_inc_unchecked(&ima_htable.len);
105799 key = ima_hash_key(entry->digest);
105800 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
105801 return 0;
105802 diff --git a/security/keys/compat.c b/security/keys/compat.c
105803 index 3478965..ec7bb9e 100644
105804 --- a/security/keys/compat.c
105805 +++ b/security/keys/compat.c
105806 @@ -44,7 +44,7 @@ static long compat_keyctl_instantiate_key_iov(
105807 if (ret == 0)
105808 goto no_payload_free;
105809
105810 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
105811 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
105812 err:
105813 if (iov != iovstack)
105814 kfree(iov);
105815 diff --git a/security/keys/internal.h b/security/keys/internal.h
105816 index 80b2aac..bb7ee65 100644
105817 --- a/security/keys/internal.h
105818 +++ b/security/keys/internal.h
105819 @@ -253,7 +253,7 @@ extern long keyctl_instantiate_key_iov(key_serial_t,
105820 extern long keyctl_invalidate_key(key_serial_t);
105821
105822 extern long keyctl_instantiate_key_common(key_serial_t,
105823 - const struct iovec *,
105824 + const struct iovec __user *,
105825 unsigned, size_t, key_serial_t);
105826 #ifdef CONFIG_PERSISTENT_KEYRINGS
105827 extern long keyctl_get_persistent(uid_t, key_serial_t);
105828 diff --git a/security/keys/key.c b/security/keys/key.c
105829 index 6e21c11..9ed67ca 100644
105830 --- a/security/keys/key.c
105831 +++ b/security/keys/key.c
105832 @@ -285,7 +285,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
105833
105834 atomic_set(&key->usage, 1);
105835 init_rwsem(&key->sem);
105836 - lockdep_set_class(&key->sem, &type->lock_class);
105837 + lockdep_set_class(&key->sem, (struct lock_class_key *)&type->lock_class);
105838 key->index_key.type = type;
105839 key->user = user;
105840 key->quotalen = quotalen;
105841 @@ -1036,7 +1036,9 @@ int register_key_type(struct key_type *ktype)
105842 struct key_type *p;
105843 int ret;
105844
105845 - memset(&ktype->lock_class, 0, sizeof(ktype->lock_class));
105846 + pax_open_kernel();
105847 + memset((void *)&ktype->lock_class, 0, sizeof(ktype->lock_class));
105848 + pax_close_kernel();
105849
105850 ret = -EEXIST;
105851 down_write(&key_types_sem);
105852 @@ -1048,7 +1050,7 @@ int register_key_type(struct key_type *ktype)
105853 }
105854
105855 /* store the type */
105856 - list_add(&ktype->link, &key_types_list);
105857 + pax_list_add((struct list_head *)&ktype->link, &key_types_list);
105858
105859 pr_notice("Key type %s registered\n", ktype->name);
105860 ret = 0;
105861 @@ -1070,7 +1072,7 @@ EXPORT_SYMBOL(register_key_type);
105862 void unregister_key_type(struct key_type *ktype)
105863 {
105864 down_write(&key_types_sem);
105865 - list_del_init(&ktype->link);
105866 + pax_list_del_init((struct list_head *)&ktype->link);
105867 downgrade_write(&key_types_sem);
105868 key_gc_keytype(ktype);
105869 pr_notice("Key type %s unregistered\n", ktype->name);
105870 @@ -1088,10 +1090,10 @@ void __init key_init(void)
105871 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
105872
105873 /* add the special key types */
105874 - list_add_tail(&key_type_keyring.link, &key_types_list);
105875 - list_add_tail(&key_type_dead.link, &key_types_list);
105876 - list_add_tail(&key_type_user.link, &key_types_list);
105877 - list_add_tail(&key_type_logon.link, &key_types_list);
105878 + pax_list_add_tail((struct list_head *)&key_type_keyring.link, &key_types_list);
105879 + pax_list_add_tail((struct list_head *)&key_type_dead.link, &key_types_list);
105880 + pax_list_add_tail((struct list_head *)&key_type_user.link, &key_types_list);
105881 + pax_list_add_tail((struct list_head *)&key_type_logon.link, &key_types_list);
105882
105883 /* record the root user tracking */
105884 rb_link_node(&root_key_user.node,
105885 diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
105886 index cee72ce..e46074a 100644
105887 --- a/security/keys/keyctl.c
105888 +++ b/security/keys/keyctl.c
105889 @@ -987,7 +987,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
105890 /*
105891 * Copy the iovec data from userspace
105892 */
105893 -static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
105894 +static long copy_from_user_iovec(void *buffer, const struct iovec __user *iov,
105895 unsigned ioc)
105896 {
105897 for (; ioc > 0; ioc--) {
105898 @@ -1009,7 +1009,7 @@ static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
105899 * If successful, 0 will be returned.
105900 */
105901 long keyctl_instantiate_key_common(key_serial_t id,
105902 - const struct iovec *payload_iov,
105903 + const struct iovec __user *payload_iov,
105904 unsigned ioc,
105905 size_t plen,
105906 key_serial_t ringid)
105907 @@ -1104,7 +1104,7 @@ long keyctl_instantiate_key(key_serial_t id,
105908 [0].iov_len = plen
105909 };
105910
105911 - return keyctl_instantiate_key_common(id, iov, 1, plen, ringid);
105912 + return keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, 1, plen, ringid);
105913 }
105914
105915 return keyctl_instantiate_key_common(id, NULL, 0, 0, ringid);
105916 @@ -1137,7 +1137,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
105917 if (ret == 0)
105918 goto no_payload_free;
105919
105920 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
105921 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
105922 err:
105923 if (iov != iovstack)
105924 kfree(iov);
105925 diff --git a/security/min_addr.c b/security/min_addr.c
105926 index f728728..6457a0c 100644
105927 --- a/security/min_addr.c
105928 +++ b/security/min_addr.c
105929 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
105930 */
105931 static void update_mmap_min_addr(void)
105932 {
105933 +#ifndef SPARC
105934 #ifdef CONFIG_LSM_MMAP_MIN_ADDR
105935 if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR)
105936 mmap_min_addr = dac_mmap_min_addr;
105937 @@ -22,6 +23,7 @@ static void update_mmap_min_addr(void)
105938 #else
105939 mmap_min_addr = dac_mmap_min_addr;
105940 #endif
105941 +#endif
105942 }
105943
105944 /*
105945 diff --git a/security/security.c b/security/security.c
105946 index 8b774f3..a396233 100644
105947 --- a/security/security.c
105948 +++ b/security/security.c
105949 @@ -33,8 +33,8 @@
105950 static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
105951 CONFIG_DEFAULT_SECURITY;
105952
105953 -static struct security_operations *security_ops;
105954 -static struct security_operations default_security_ops = {
105955 +struct security_operations *security_ops __read_only;
105956 +struct security_operations default_security_ops __read_only = {
105957 .name = "default",
105958 };
105959
105960 @@ -73,11 +73,6 @@ int __init security_init(void)
105961 return 0;
105962 }
105963
105964 -void reset_security_ops(void)
105965 -{
105966 - security_ops = &default_security_ops;
105967 -}
105968 -
105969 /* Save user chosen LSM */
105970 static int __init choose_lsm(char *str)
105971 {
105972 diff --git a/security/selinux/avc.c b/security/selinux/avc.c
105973 index fc3e662..7844c60 100644
105974 --- a/security/selinux/avc.c
105975 +++ b/security/selinux/avc.c
105976 @@ -59,7 +59,7 @@ struct avc_node {
105977 struct avc_cache {
105978 struct hlist_head slots[AVC_CACHE_SLOTS]; /* head for avc_node->list */
105979 spinlock_t slots_lock[AVC_CACHE_SLOTS]; /* lock for writes */
105980 - atomic_t lru_hint; /* LRU hint for reclaim scan */
105981 + atomic_unchecked_t lru_hint; /* LRU hint for reclaim scan */
105982 atomic_t active_nodes;
105983 u32 latest_notif; /* latest revocation notification */
105984 };
105985 @@ -167,7 +167,7 @@ void __init avc_init(void)
105986 spin_lock_init(&avc_cache.slots_lock[i]);
105987 }
105988 atomic_set(&avc_cache.active_nodes, 0);
105989 - atomic_set(&avc_cache.lru_hint, 0);
105990 + atomic_set_unchecked(&avc_cache.lru_hint, 0);
105991
105992 avc_node_cachep = kmem_cache_create("avc_node", sizeof(struct avc_node),
105993 0, SLAB_PANIC, NULL);
105994 @@ -242,7 +242,7 @@ static inline int avc_reclaim_node(void)
105995 spinlock_t *lock;
105996
105997 for (try = 0, ecx = 0; try < AVC_CACHE_SLOTS; try++) {
105998 - hvalue = atomic_inc_return(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1);
105999 + hvalue = atomic_inc_return_unchecked(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1);
106000 head = &avc_cache.slots[hvalue];
106001 lock = &avc_cache.slots_lock[hvalue];
106002
106003 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
106004 index 2c7341d..1da068e 100644
106005 --- a/security/selinux/hooks.c
106006 +++ b/security/selinux/hooks.c
106007 @@ -95,8 +95,6 @@
106008 #include "audit.h"
106009 #include "avc_ss.h"
106010
106011 -extern struct security_operations *security_ops;
106012 -
106013 /* SECMARK reference count */
106014 static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
106015
106016 @@ -5758,7 +5756,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
106017
106018 #endif
106019
106020 -static struct security_operations selinux_ops = {
106021 +static struct security_operations selinux_ops __read_only = {
106022 .name = "selinux",
106023
106024 .ptrace_access_check = selinux_ptrace_access_check,
106025 @@ -6111,6 +6109,9 @@ static void selinux_nf_ip_exit(void)
106026 #ifdef CONFIG_SECURITY_SELINUX_DISABLE
106027 static int selinux_disabled;
106028
106029 +extern struct security_operations *security_ops;
106030 +extern struct security_operations default_security_ops;
106031 +
106032 int selinux_disable(void)
106033 {
106034 if (ss_initialized) {
106035 @@ -6128,7 +6129,9 @@ int selinux_disable(void)
106036 selinux_disabled = 1;
106037 selinux_enabled = 0;
106038
106039 - reset_security_ops();
106040 + pax_open_kernel();
106041 + security_ops = &default_security_ops;
106042 + pax_close_kernel();
106043
106044 /* Try to destroy the avc node cache */
106045 avc_disable();
106046 diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
106047 index 1450f85..a91e0bc 100644
106048 --- a/security/selinux/include/xfrm.h
106049 +++ b/security/selinux/include/xfrm.h
106050 @@ -48,7 +48,7 @@ static inline void selinux_xfrm_notify_policyload(void)
106051
106052 rtnl_lock();
106053 for_each_net(net) {
106054 - atomic_inc(&net->xfrm.flow_cache_genid);
106055 + atomic_inc_unchecked(&net->xfrm.flow_cache_genid);
106056 rt_genid_bump_all(net);
106057 }
106058 rtnl_unlock();
106059 diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
106060 index 14f52be..7352368 100644
106061 --- a/security/smack/smack_lsm.c
106062 +++ b/security/smack/smack_lsm.c
106063 @@ -3726,7 +3726,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
106064 return 0;
106065 }
106066
106067 -struct security_operations smack_ops = {
106068 +struct security_operations smack_ops __read_only = {
106069 .name = "smack",
106070
106071 .ptrace_access_check = smack_ptrace_access_check,
106072 diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
106073 index 4003907..13a2b55 100644
106074 --- a/security/tomoyo/file.c
106075 +++ b/security/tomoyo/file.c
106076 @@ -692,7 +692,7 @@ int tomoyo_path_number_perm(const u8 type, struct path *path,
106077 {
106078 struct tomoyo_request_info r;
106079 struct tomoyo_obj_info obj = {
106080 - .path1 = *path,
106081 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
106082 };
106083 int error = -ENOMEM;
106084 struct tomoyo_path_info buf;
106085 @@ -740,7 +740,7 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain,
106086 struct tomoyo_path_info buf;
106087 struct tomoyo_request_info r;
106088 struct tomoyo_obj_info obj = {
106089 - .path1 = *path,
106090 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
106091 };
106092 int idx;
106093
106094 @@ -786,7 +786,7 @@ int tomoyo_path_perm(const u8 operation, struct path *path, const char *target)
106095 {
106096 struct tomoyo_request_info r;
106097 struct tomoyo_obj_info obj = {
106098 - .path1 = *path,
106099 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
106100 };
106101 int error;
106102 struct tomoyo_path_info buf;
106103 @@ -843,7 +843,7 @@ int tomoyo_mkdev_perm(const u8 operation, struct path *path,
106104 {
106105 struct tomoyo_request_info r;
106106 struct tomoyo_obj_info obj = {
106107 - .path1 = *path,
106108 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
106109 };
106110 int error = -ENOMEM;
106111 struct tomoyo_path_info buf;
106112 @@ -890,8 +890,8 @@ int tomoyo_path2_perm(const u8 operation, struct path *path1,
106113 struct tomoyo_path_info buf2;
106114 struct tomoyo_request_info r;
106115 struct tomoyo_obj_info obj = {
106116 - .path1 = *path1,
106117 - .path2 = *path2,
106118 + .path1 = { .mnt = path1->mnt, .dentry = path1->dentry },
106119 + .path2 = { .mnt = path2->mnt, .dentry = path2->dentry }
106120 };
106121 int idx;
106122
106123 diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c
106124 index 390c646..f2f8db3 100644
106125 --- a/security/tomoyo/mount.c
106126 +++ b/security/tomoyo/mount.c
106127 @@ -118,6 +118,10 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r,
106128 type == tomoyo_mounts[TOMOYO_MOUNT_MOVE]) {
106129 need_dev = -1; /* dev_name is a directory */
106130 } else {
106131 + if (!capable(CAP_SYS_ADMIN)) {
106132 + error = -EPERM;
106133 + goto out;
106134 + }
106135 fstype = get_fs_type(type);
106136 if (!fstype) {
106137 error = -ENODEV;
106138 diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
106139 index f0b756e..8aa497b 100644
106140 --- a/security/tomoyo/tomoyo.c
106141 +++ b/security/tomoyo/tomoyo.c
106142 @@ -146,7 +146,7 @@ static int tomoyo_bprm_check_security(struct linux_binprm *bprm)
106143 */
106144 static int tomoyo_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
106145 {
106146 - struct path path = { mnt, dentry };
106147 + struct path path = { .mnt = mnt, .dentry = dentry };
106148 return tomoyo_path_perm(TOMOYO_TYPE_GETATTR, &path, NULL);
106149 }
106150
106151 @@ -172,7 +172,7 @@ static int tomoyo_path_truncate(struct path *path)
106152 */
106153 static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry)
106154 {
106155 - struct path path = { parent->mnt, dentry };
106156 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
106157 return tomoyo_path_perm(TOMOYO_TYPE_UNLINK, &path, NULL);
106158 }
106159
106160 @@ -188,7 +188,7 @@ static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry)
106161 static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,
106162 umode_t mode)
106163 {
106164 - struct path path = { parent->mnt, dentry };
106165 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
106166 return tomoyo_path_number_perm(TOMOYO_TYPE_MKDIR, &path,
106167 mode & S_IALLUGO);
106168 }
106169 @@ -203,7 +203,7 @@ static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,
106170 */
106171 static int tomoyo_path_rmdir(struct path *parent, struct dentry *dentry)
106172 {
106173 - struct path path = { parent->mnt, dentry };
106174 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
106175 return tomoyo_path_perm(TOMOYO_TYPE_RMDIR, &path, NULL);
106176 }
106177
106178 @@ -219,7 +219,7 @@ static int tomoyo_path_rmdir(struct path *parent, struct dentry *dentry)
106179 static int tomoyo_path_symlink(struct path *parent, struct dentry *dentry,
106180 const char *old_name)
106181 {
106182 - struct path path = { parent->mnt, dentry };
106183 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
106184 return tomoyo_path_perm(TOMOYO_TYPE_SYMLINK, &path, old_name);
106185 }
106186
106187 @@ -236,7 +236,7 @@ static int tomoyo_path_symlink(struct path *parent, struct dentry *dentry,
106188 static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry,
106189 umode_t mode, unsigned int dev)
106190 {
106191 - struct path path = { parent->mnt, dentry };
106192 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
106193 int type = TOMOYO_TYPE_CREATE;
106194 const unsigned int perm = mode & S_IALLUGO;
106195
106196 @@ -275,8 +275,8 @@ static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry,
106197 static int tomoyo_path_link(struct dentry *old_dentry, struct path *new_dir,
106198 struct dentry *new_dentry)
106199 {
106200 - struct path path1 = { new_dir->mnt, old_dentry };
106201 - struct path path2 = { new_dir->mnt, new_dentry };
106202 + struct path path1 = { .mnt = new_dir->mnt, .dentry = old_dentry };
106203 + struct path path2 = { .mnt = new_dir->mnt, .dentry = new_dentry };
106204 return tomoyo_path2_perm(TOMOYO_TYPE_LINK, &path1, &path2);
106205 }
106206
106207 @@ -295,8 +295,8 @@ static int tomoyo_path_rename(struct path *old_parent,
106208 struct path *new_parent,
106209 struct dentry *new_dentry)
106210 {
106211 - struct path path1 = { old_parent->mnt, old_dentry };
106212 - struct path path2 = { new_parent->mnt, new_dentry };
106213 + struct path path1 = { .mnt = old_parent->mnt, .dentry = old_dentry };
106214 + struct path path2 = { .mnt = new_parent->mnt, .dentry = new_dentry };
106215 return tomoyo_path2_perm(TOMOYO_TYPE_RENAME, &path1, &path2);
106216 }
106217
106218 @@ -424,7 +424,7 @@ static int tomoyo_sb_mount(const char *dev_name, struct path *path,
106219 */
106220 static int tomoyo_sb_umount(struct vfsmount *mnt, int flags)
106221 {
106222 - struct path path = { mnt, mnt->mnt_root };
106223 + struct path path = { .mnt = mnt, .dentry = mnt->mnt_root };
106224 return tomoyo_path_perm(TOMOYO_TYPE_UMOUNT, &path, NULL);
106225 }
106226
106227 @@ -503,7 +503,7 @@ static int tomoyo_socket_sendmsg(struct socket *sock, struct msghdr *msg,
106228 * tomoyo_security_ops is a "struct security_operations" which is used for
106229 * registering TOMOYO.
106230 */
106231 -static struct security_operations tomoyo_security_ops = {
106232 +static struct security_operations tomoyo_security_ops __read_only = {
106233 .name = "tomoyo",
106234 .cred_alloc_blank = tomoyo_cred_alloc_blank,
106235 .cred_prepare = tomoyo_cred_prepare,
106236 diff --git a/security/yama/Kconfig b/security/yama/Kconfig
106237 index 20ef514..4182bed 100644
106238 --- a/security/yama/Kconfig
106239 +++ b/security/yama/Kconfig
106240 @@ -1,6 +1,6 @@
106241 config SECURITY_YAMA
106242 bool "Yama support"
106243 - depends on SECURITY
106244 + depends on SECURITY && !GRKERNSEC
106245 select SECURITYFS
106246 select SECURITY_PATH
106247 default n
106248 diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
106249 index 13c88fbc..f8c115e 100644
106250 --- a/security/yama/yama_lsm.c
106251 +++ b/security/yama/yama_lsm.c
106252 @@ -365,7 +365,7 @@ int yama_ptrace_traceme(struct task_struct *parent)
106253 }
106254
106255 #ifndef CONFIG_SECURITY_YAMA_STACKED
106256 -static struct security_operations yama_ops = {
106257 +static struct security_operations yama_ops __read_only = {
106258 .name = "yama",
106259
106260 .ptrace_access_check = yama_ptrace_access_check,
106261 @@ -376,28 +376,24 @@ static struct security_operations yama_ops = {
106262 #endif
106263
106264 #ifdef CONFIG_SYSCTL
106265 +static int zero __read_only;
106266 +static int max_scope __read_only = YAMA_SCOPE_NO_ATTACH;
106267 +
106268 static int yama_dointvec_minmax(struct ctl_table *table, int write,
106269 void __user *buffer, size_t *lenp, loff_t *ppos)
106270 {
106271 - int rc;
106272 + ctl_table_no_const yama_table;
106273
106274 if (write && !capable(CAP_SYS_PTRACE))
106275 return -EPERM;
106276
106277 - rc = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
106278 - if (rc)
106279 - return rc;
106280 -
106281 + yama_table = *table;
106282 /* Lock the max value if it ever gets set. */
106283 - if (write && *(int *)table->data == *(int *)table->extra2)
106284 - table->extra1 = table->extra2;
106285 -
106286 - return rc;
106287 + if (ptrace_scope == max_scope)
106288 + yama_table.extra1 = &max_scope;
106289 + return proc_dointvec_minmax(&yama_table, write, buffer, lenp, ppos);
106290 }
106291
106292 -static int zero;
106293 -static int max_scope = YAMA_SCOPE_NO_ATTACH;
106294 -
106295 struct ctl_path yama_sysctl_path[] = {
106296 { .procname = "kernel", },
106297 { .procname = "yama", },
106298 diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
106299 index f01bffb..bdda392 100644
106300 --- a/sound/aoa/codecs/onyx.c
106301 +++ b/sound/aoa/codecs/onyx.c
106302 @@ -54,7 +54,7 @@ struct onyx {
106303 spdif_locked:1,
106304 analog_locked:1,
106305 original_mute:2;
106306 - int open_count;
106307 + local_t open_count;
106308 struct codec_info *codec_info;
106309
106310 /* mutex serializes concurrent access to the device
106311 @@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_item *cii,
106312 struct onyx *onyx = cii->codec_data;
106313
106314 mutex_lock(&onyx->mutex);
106315 - onyx->open_count++;
106316 + local_inc(&onyx->open_count);
106317 mutex_unlock(&onyx->mutex);
106318
106319 return 0;
106320 @@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_item *cii,
106321 struct onyx *onyx = cii->codec_data;
106322
106323 mutex_lock(&onyx->mutex);
106324 - onyx->open_count--;
106325 - if (!onyx->open_count)
106326 + if (local_dec_and_test(&onyx->open_count))
106327 onyx->spdif_locked = onyx->analog_locked = 0;
106328 mutex_unlock(&onyx->mutex);
106329
106330 diff --git a/sound/aoa/codecs/onyx.h b/sound/aoa/codecs/onyx.h
106331 index ffd2025..df062c9 100644
106332 --- a/sound/aoa/codecs/onyx.h
106333 +++ b/sound/aoa/codecs/onyx.h
106334 @@ -11,6 +11,7 @@
106335 #include <linux/i2c.h>
106336 #include <asm/pmac_low_i2c.h>
106337 #include <asm/prom.h>
106338 +#include <asm/local.h>
106339
106340 /* PCM3052 register definitions */
106341
106342 diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
106343 index ada69d7..5f65386 100644
106344 --- a/sound/core/oss/pcm_oss.c
106345 +++ b/sound/core/oss/pcm_oss.c
106346 @@ -1190,10 +1190,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
106347 if (in_kernel) {
106348 mm_segment_t fs;
106349 fs = snd_enter_user();
106350 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
106351 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
106352 snd_leave_user(fs);
106353 } else {
106354 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
106355 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
106356 }
106357 if (ret != -EPIPE && ret != -ESTRPIPE)
106358 break;
106359 @@ -1233,10 +1233,10 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p
106360 if (in_kernel) {
106361 mm_segment_t fs;
106362 fs = snd_enter_user();
106363 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
106364 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
106365 snd_leave_user(fs);
106366 } else {
106367 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
106368 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
106369 }
106370 if (ret == -EPIPE) {
106371 if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
106372 @@ -1332,7 +1332,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha
106373 struct snd_pcm_plugin_channel *channels;
106374 size_t oss_frame_bytes = (runtime->oss.plugin_first->src_width * runtime->oss.plugin_first->src_format.channels) / 8;
106375 if (!in_kernel) {
106376 - if (copy_from_user(runtime->oss.buffer, (const char __force __user *)buf, bytes))
106377 + if (copy_from_user(runtime->oss.buffer, (const char __force_user *)buf, bytes))
106378 return -EFAULT;
106379 buf = runtime->oss.buffer;
106380 }
106381 @@ -1402,7 +1402,7 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha
106382 }
106383 } else {
106384 tmp = snd_pcm_oss_write2(substream,
106385 - (const char __force *)buf,
106386 + (const char __force_kernel *)buf,
106387 runtime->oss.period_bytes, 0);
106388 if (tmp <= 0)
106389 goto err;
106390 @@ -1428,7 +1428,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf,
106391 struct snd_pcm_runtime *runtime = substream->runtime;
106392 snd_pcm_sframes_t frames, frames1;
106393 #ifdef CONFIG_SND_PCM_OSS_PLUGINS
106394 - char __user *final_dst = (char __force __user *)buf;
106395 + char __user *final_dst = (char __force_user *)buf;
106396 if (runtime->oss.plugin_first) {
106397 struct snd_pcm_plugin_channel *channels;
106398 size_t oss_frame_bytes = (runtime->oss.plugin_last->dst_width * runtime->oss.plugin_last->dst_format.channels) / 8;
106399 @@ -1490,7 +1490,7 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
106400 xfer += tmp;
106401 runtime->oss.buffer_used -= tmp;
106402 } else {
106403 - tmp = snd_pcm_oss_read2(substream, (char __force *)buf,
106404 + tmp = snd_pcm_oss_read2(substream, (char __force_kernel *)buf,
106405 runtime->oss.period_bytes, 0);
106406 if (tmp <= 0)
106407 goto err;
106408 @@ -1659,7 +1659,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
106409 size1);
106410 size1 /= runtime->channels; /* frames */
106411 fs = snd_enter_user();
106412 - snd_pcm_lib_write(substream, (void __force __user *)runtime->oss.buffer, size1);
106413 + snd_pcm_lib_write(substream, (void __force_user *)runtime->oss.buffer, size1);
106414 snd_leave_user(fs);
106415 }
106416 } else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
106417 diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
106418 index af49721..e85058e 100644
106419 --- a/sound/core/pcm_compat.c
106420 +++ b/sound/core/pcm_compat.c
106421 @@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,
106422 int err;
106423
106424 fs = snd_enter_user();
106425 - err = snd_pcm_delay(substream, &delay);
106426 + err = snd_pcm_delay(substream, (snd_pcm_sframes_t __force_user *)&delay);
106427 snd_leave_user(fs);
106428 if (err < 0)
106429 return err;
106430 diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
106431 index b653ab0..a4738e3 100644
106432 --- a/sound/core/pcm_native.c
106433 +++ b/sound/core/pcm_native.c
106434 @@ -2812,11 +2812,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
106435 switch (substream->stream) {
106436 case SNDRV_PCM_STREAM_PLAYBACK:
106437 result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
106438 - (void __user *)arg);
106439 + (void __force_user *)arg);
106440 break;
106441 case SNDRV_PCM_STREAM_CAPTURE:
106442 result = snd_pcm_capture_ioctl1(NULL, substream, cmd,
106443 - (void __user *)arg);
106444 + (void __force_user *)arg);
106445 break;
106446 default:
106447 result = -EINVAL;
106448 diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
106449 index 16d4267..fe8b49b 100644
106450 --- a/sound/core/seq/oss/seq_oss.c
106451 +++ b/sound/core/seq/oss/seq_oss.c
106452 @@ -69,8 +69,8 @@ static int __init alsa_seq_oss_init(void)
106453 {
106454 int rc;
106455 static struct snd_seq_dev_ops ops = {
106456 - snd_seq_oss_synth_register,
106457 - snd_seq_oss_synth_unregister,
106458 + .init_device = snd_seq_oss_synth_register,
106459 + .free_device = snd_seq_oss_synth_unregister,
106460 };
106461
106462 snd_seq_autoload_lock();
106463 diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
106464 index 91a786a..4c07ed4 100644
106465 --- a/sound/core/seq/seq_device.c
106466 +++ b/sound/core/seq/seq_device.c
106467 @@ -64,7 +64,7 @@ struct ops_list {
106468 int argsize; /* argument size */
106469
106470 /* operators */
106471 - struct snd_seq_dev_ops ops;
106472 + struct snd_seq_dev_ops *ops;
106473
106474 /* registered devices */
106475 struct list_head dev_list; /* list of devices */
106476 @@ -333,7 +333,7 @@ int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry,
106477
106478 mutex_lock(&ops->reg_mutex);
106479 /* copy driver operators */
106480 - ops->ops = *entry;
106481 + ops->ops = entry;
106482 ops->driver |= DRIVER_LOADED;
106483 ops->argsize = argsize;
106484
106485 @@ -463,7 +463,7 @@ static int init_device(struct snd_seq_device *dev, struct ops_list *ops)
106486 dev->name, ops->id, ops->argsize, dev->argsize);
106487 return -EINVAL;
106488 }
106489 - if (ops->ops.init_device(dev) >= 0) {
106490 + if (ops->ops->init_device(dev) >= 0) {
106491 dev->status = SNDRV_SEQ_DEVICE_REGISTERED;
106492 ops->num_init_devices++;
106493 } else {
106494 @@ -490,7 +490,7 @@ static int free_device(struct snd_seq_device *dev, struct ops_list *ops)
106495 dev->name, ops->id, ops->argsize, dev->argsize);
106496 return -EINVAL;
106497 }
106498 - if ((result = ops->ops.free_device(dev)) >= 0 || result == -ENXIO) {
106499 + if ((result = ops->ops->free_device(dev)) >= 0 || result == -ENXIO) {
106500 dev->status = SNDRV_SEQ_DEVICE_FREE;
106501 dev->driver_data = NULL;
106502 ops->num_init_devices--;
106503 diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
106504 index 3e05c55..0f02efc 100644
106505 --- a/sound/core/seq/seq_midi.c
106506 +++ b/sound/core/seq/seq_midi.c
106507 @@ -462,8 +462,8 @@ snd_seq_midisynth_unregister_port(struct snd_seq_device *dev)
106508 static int __init alsa_seq_midi_init(void)
106509 {
106510 static struct snd_seq_dev_ops ops = {
106511 - snd_seq_midisynth_register_port,
106512 - snd_seq_midisynth_unregister_port,
106513 + .init_device = snd_seq_midisynth_register_port,
106514 + .free_device = snd_seq_midisynth_unregister_port,
106515 };
106516 memset(&synths, 0, sizeof(synths));
106517 snd_seq_autoload_lock();
106518 diff --git a/sound/core/sound.c b/sound/core/sound.c
106519 index 38ad1a0..5010a40 100644
106520 --- a/sound/core/sound.c
106521 +++ b/sound/core/sound.c
106522 @@ -86,7 +86,7 @@ static void snd_request_other(int minor)
106523 case SNDRV_MINOR_TIMER: str = "snd-timer"; break;
106524 default: return;
106525 }
106526 - request_module(str);
106527 + request_module("%s", str);
106528 }
106529
106530 #endif /* modular kernel */
106531 diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
106532 index f5fd448..6ae276da 100644
106533 --- a/sound/drivers/mts64.c
106534 +++ b/sound/drivers/mts64.c
106535 @@ -29,6 +29,7 @@
106536 #include <sound/initval.h>
106537 #include <sound/rawmidi.h>
106538 #include <sound/control.h>
106539 +#include <asm/local.h>
106540
106541 #define CARD_NAME "Miditerminal 4140"
106542 #define DRIVER_NAME "MTS64"
106543 @@ -67,7 +68,7 @@ struct mts64 {
106544 struct pardevice *pardev;
106545 int pardev_claimed;
106546
106547 - int open_count;
106548 + local_t open_count;
106549 int current_midi_output_port;
106550 int current_midi_input_port;
106551 u8 mode[MTS64_NUM_INPUT_PORTS];
106552 @@ -697,7 +698,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
106553 {
106554 struct mts64 *mts = substream->rmidi->private_data;
106555
106556 - if (mts->open_count == 0) {
106557 + if (local_read(&mts->open_count) == 0) {
106558 /* We don't need a spinlock here, because this is just called
106559 if the device has not been opened before.
106560 So there aren't any IRQs from the device */
106561 @@ -705,7 +706,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
106562
106563 msleep(50);
106564 }
106565 - ++(mts->open_count);
106566 + local_inc(&mts->open_count);
106567
106568 return 0;
106569 }
106570 @@ -715,8 +716,7 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
106571 struct mts64 *mts = substream->rmidi->private_data;
106572 unsigned long flags;
106573
106574 - --(mts->open_count);
106575 - if (mts->open_count == 0) {
106576 + if (local_dec_return(&mts->open_count) == 0) {
106577 /* We need the spinlock_irqsave here because we can still
106578 have IRQs at this point */
106579 spin_lock_irqsave(&mts->lock, flags);
106580 @@ -725,8 +725,8 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
106581
106582 msleep(500);
106583
106584 - } else if (mts->open_count < 0)
106585 - mts->open_count = 0;
106586 + } else if (local_read(&mts->open_count) < 0)
106587 + local_set(&mts->open_count, 0);
106588
106589 return 0;
106590 }
106591 diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c
106592 index 6839953..7a0f4b9 100644
106593 --- a/sound/drivers/opl3/opl3_seq.c
106594 +++ b/sound/drivers/opl3/opl3_seq.c
106595 @@ -281,8 +281,8 @@ static int __init alsa_opl3_seq_init(void)
106596 {
106597 static struct snd_seq_dev_ops ops =
106598 {
106599 - snd_opl3_seq_new_device,
106600 - snd_opl3_seq_delete_device
106601 + .init_device = snd_opl3_seq_new_device,
106602 + .free_device = snd_opl3_seq_delete_device
106603 };
106604
106605 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL3, &ops,
106606 diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
106607 index b953fb4..1999c01 100644
106608 --- a/sound/drivers/opl4/opl4_lib.c
106609 +++ b/sound/drivers/opl4/opl4_lib.c
106610 @@ -29,7 +29,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
106611 MODULE_DESCRIPTION("OPL4 driver");
106612 MODULE_LICENSE("GPL");
106613
106614 -static void inline snd_opl4_wait(struct snd_opl4 *opl4)
106615 +static inline void snd_opl4_wait(struct snd_opl4 *opl4)
106616 {
106617 int timeout = 10;
106618 while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
106619 diff --git a/sound/drivers/opl4/opl4_seq.c b/sound/drivers/opl4/opl4_seq.c
106620 index 9919769..d7de36c 100644
106621 --- a/sound/drivers/opl4/opl4_seq.c
106622 +++ b/sound/drivers/opl4/opl4_seq.c
106623 @@ -198,8 +198,8 @@ static int snd_opl4_seq_delete_device(struct snd_seq_device *dev)
106624 static int __init alsa_opl4_synth_init(void)
106625 {
106626 static struct snd_seq_dev_ops ops = {
106627 - snd_opl4_seq_new_device,
106628 - snd_opl4_seq_delete_device
106629 + .init_device = snd_opl4_seq_new_device,
106630 + .free_device = snd_opl4_seq_delete_device
106631 };
106632
106633 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL4, &ops,
106634 diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
106635 index 78ccfa4..7a0857b 100644
106636 --- a/sound/drivers/portman2x4.c
106637 +++ b/sound/drivers/portman2x4.c
106638 @@ -48,6 +48,7 @@
106639 #include <sound/initval.h>
106640 #include <sound/rawmidi.h>
106641 #include <sound/control.h>
106642 +#include <asm/local.h>
106643
106644 #define CARD_NAME "Portman 2x4"
106645 #define DRIVER_NAME "portman"
106646 @@ -85,7 +86,7 @@ struct portman {
106647 struct pardevice *pardev;
106648 int pardev_claimed;
106649
106650 - int open_count;
106651 + local_t open_count;
106652 int mode[PORTMAN_NUM_INPUT_PORTS];
106653 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
106654 };
106655 diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
106656 index 9048777..2d8b1fc 100644
106657 --- a/sound/firewire/amdtp.c
106658 +++ b/sound/firewire/amdtp.c
106659 @@ -488,7 +488,7 @@ static void queue_out_packet(struct amdtp_out_stream *s, unsigned int cycle)
106660 ptr = s->pcm_buffer_pointer + data_blocks;
106661 if (ptr >= pcm->runtime->buffer_size)
106662 ptr -= pcm->runtime->buffer_size;
106663 - ACCESS_ONCE(s->pcm_buffer_pointer) = ptr;
106664 + ACCESS_ONCE_RW(s->pcm_buffer_pointer) = ptr;
106665
106666 s->pcm_period_pointer += data_blocks;
106667 if (s->pcm_period_pointer >= pcm->runtime->period_size) {
106668 @@ -655,7 +655,7 @@ EXPORT_SYMBOL(amdtp_out_stream_pcm_pointer);
106669 */
106670 void amdtp_out_stream_update(struct amdtp_out_stream *s)
106671 {
106672 - ACCESS_ONCE(s->source_node_id_field) =
106673 + ACCESS_ONCE_RW(s->source_node_id_field) =
106674 (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
106675 }
106676 EXPORT_SYMBOL(amdtp_out_stream_update);
106677 diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h
106678 index 2746ecd..c35dedd 100644
106679 --- a/sound/firewire/amdtp.h
106680 +++ b/sound/firewire/amdtp.h
106681 @@ -135,7 +135,7 @@ static inline bool amdtp_out_streaming_error(struct amdtp_out_stream *s)
106682 static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
106683 struct snd_pcm_substream *pcm)
106684 {
106685 - ACCESS_ONCE(s->pcm) = pcm;
106686 + ACCESS_ONCE_RW(s->pcm) = pcm;
106687 }
106688
106689 static inline bool cip_sfc_is_base_44100(enum cip_sfc sfc)
106690 diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
106691 index 7ac9443..0ec6274 100644
106692 --- a/sound/firewire/isight.c
106693 +++ b/sound/firewire/isight.c
106694 @@ -96,7 +96,7 @@ static void isight_update_pointers(struct isight *isight, unsigned int count)
106695 ptr += count;
106696 if (ptr >= runtime->buffer_size)
106697 ptr -= runtime->buffer_size;
106698 - ACCESS_ONCE(isight->buffer_pointer) = ptr;
106699 + ACCESS_ONCE_RW(isight->buffer_pointer) = ptr;
106700
106701 isight->period_counter += count;
106702 if (isight->period_counter >= runtime->period_size) {
106703 @@ -299,7 +299,7 @@ static int isight_hw_params(struct snd_pcm_substream *substream,
106704 if (err < 0)
106705 return err;
106706
106707 - ACCESS_ONCE(isight->pcm_active) = true;
106708 + ACCESS_ONCE_RW(isight->pcm_active) = true;
106709
106710 return 0;
106711 }
106712 @@ -337,7 +337,7 @@ static int isight_hw_free(struct snd_pcm_substream *substream)
106713 {
106714 struct isight *isight = substream->private_data;
106715
106716 - ACCESS_ONCE(isight->pcm_active) = false;
106717 + ACCESS_ONCE_RW(isight->pcm_active) = false;
106718
106719 mutex_lock(&isight->mutex);
106720 isight_stop_streaming(isight);
106721 @@ -430,10 +430,10 @@ static int isight_trigger(struct snd_pcm_substream *substream, int cmd)
106722
106723 switch (cmd) {
106724 case SNDRV_PCM_TRIGGER_START:
106725 - ACCESS_ONCE(isight->pcm_running) = true;
106726 + ACCESS_ONCE_RW(isight->pcm_running) = true;
106727 break;
106728 case SNDRV_PCM_TRIGGER_STOP:
106729 - ACCESS_ONCE(isight->pcm_running) = false;
106730 + ACCESS_ONCE_RW(isight->pcm_running) = false;
106731 break;
106732 default:
106733 return -EINVAL;
106734 diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c
106735 index 2dba848..c682aef 100644
106736 --- a/sound/firewire/scs1x.c
106737 +++ b/sound/firewire/scs1x.c
106738 @@ -74,7 +74,7 @@ static void scs_output_trigger(struct snd_rawmidi_substream *stream, int up)
106739 {
106740 struct scs *scs = stream->rmidi->private_data;
106741
106742 - ACCESS_ONCE(scs->output) = up ? stream : NULL;
106743 + ACCESS_ONCE_RW(scs->output) = up ? stream : NULL;
106744 if (up) {
106745 scs->output_idle = false;
106746 tasklet_schedule(&scs->tasklet);
106747 @@ -257,7 +257,7 @@ static void scs_input_trigger(struct snd_rawmidi_substream *stream, int up)
106748 {
106749 struct scs *scs = stream->rmidi->private_data;
106750
106751 - ACCESS_ONCE(scs->input) = up ? stream : NULL;
106752 + ACCESS_ONCE_RW(scs->input) = up ? stream : NULL;
106753 }
106754
106755 static void scs_input_escaped_byte(struct snd_rawmidi_substream *stream,
106756 @@ -473,8 +473,8 @@ static void scs_remove(struct fw_unit *unit)
106757
106758 snd_card_disconnect(scs->card);
106759
106760 - ACCESS_ONCE(scs->output) = NULL;
106761 - ACCESS_ONCE(scs->input) = NULL;
106762 + ACCESS_ONCE_RW(scs->output) = NULL;
106763 + ACCESS_ONCE_RW(scs->input) = NULL;
106764
106765 wait_event(scs->idle_wait, scs->output_idle);
106766
106767 diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c
106768 index 4e3fcfb..ab45a9d 100644
106769 --- a/sound/isa/sb/emu8000_synth.c
106770 +++ b/sound/isa/sb/emu8000_synth.c
106771 @@ -120,8 +120,8 @@ static int __init alsa_emu8000_init(void)
106772 {
106773
106774 static struct snd_seq_dev_ops ops = {
106775 - snd_emu8000_new_device,
106776 - snd_emu8000_delete_device,
106777 + .init_device = snd_emu8000_new_device,
106778 + .free_device = snd_emu8000_delete_device,
106779 };
106780 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU8000, &ops,
106781 sizeof(struct snd_emu8000*));
106782 diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
106783 index 048439a..3be9f6f 100644
106784 --- a/sound/oss/sb_audio.c
106785 +++ b/sound/oss/sb_audio.c
106786 @@ -904,7 +904,7 @@ sb16_copy_from_user(int dev,
106787 buf16 = (signed short *)(localbuf + localoffs);
106788 while (c)
106789 {
106790 - locallen = (c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
106791 + locallen = ((unsigned)c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
106792 if (copy_from_user(lbuf8,
106793 userbuf+useroffs + p,
106794 locallen))
106795 diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
106796 index f851fd0..92576fb 100644
106797 --- a/sound/oss/swarm_cs4297a.c
106798 +++ b/sound/oss/swarm_cs4297a.c
106799 @@ -2623,7 +2623,6 @@ static int __init cs4297a_init(void)
106800 {
106801 struct cs4297a_state *s;
106802 u32 pwr, id;
106803 - mm_segment_t fs;
106804 int rval;
106805 #ifndef CONFIG_BCM_CS4297A_CSWARM
106806 u64 cfg;
106807 @@ -2713,22 +2712,23 @@ static int __init cs4297a_init(void)
106808 if (!rval) {
106809 char *sb1250_duart_present;
106810
106811 +#if 0
106812 + mm_segment_t fs;
106813 fs = get_fs();
106814 set_fs(KERNEL_DS);
106815 -#if 0
106816 val = SOUND_MASK_LINE;
106817 mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &val);
106818 for (i = 0; i < ARRAY_SIZE(initvol); i++) {
106819 val = initvol[i].vol;
106820 mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);
106821 }
106822 + set_fs(fs);
106823 // cs4297a_write_ac97(s, 0x18, 0x0808);
106824 #else
106825 // cs4297a_write_ac97(s, 0x5e, 0x180);
106826 cs4297a_write_ac97(s, 0x02, 0x0808);
106827 cs4297a_write_ac97(s, 0x18, 0x0808);
106828 #endif
106829 - set_fs(fs);
106830
106831 list_add(&s->list, &cs4297a_devs);
106832
106833 diff --git a/sound/pci/emu10k1/emu10k1_synth.c b/sound/pci/emu10k1/emu10k1_synth.c
106834 index 4c41c90..37f3631 100644
106835 --- a/sound/pci/emu10k1/emu10k1_synth.c
106836 +++ b/sound/pci/emu10k1/emu10k1_synth.c
106837 @@ -108,8 +108,8 @@ static int __init alsa_emu10k1_synth_init(void)
106838 {
106839
106840 static struct snd_seq_dev_ops ops = {
106841 - snd_emu10k1_synth_new_device,
106842 - snd_emu10k1_synth_delete_device,
106843 + .init_device = snd_emu10k1_synth_new_device,
106844 + .free_device = snd_emu10k1_synth_delete_device,
106845 };
106846 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops,
106847 sizeof(struct snd_emu10k1_synth_arg));
106848 diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
106849 index 4c20277..91abdce 100644
106850 --- a/sound/pci/hda/hda_codec.c
106851 +++ b/sound/pci/hda/hda_codec.c
106852 @@ -966,14 +966,10 @@ find_codec_preset(struct hda_codec *codec)
106853 mutex_unlock(&preset_mutex);
106854
106855 if (mod_requested < HDA_MODREQ_MAX_COUNT) {
106856 - char name[32];
106857 if (!mod_requested)
106858 - snprintf(name, sizeof(name), "snd-hda-codec-id:%08x",
106859 - codec->vendor_id);
106860 + request_module("snd-hda-codec-id:%08x", codec->vendor_id);
106861 else
106862 - snprintf(name, sizeof(name), "snd-hda-codec-id:%04x*",
106863 - (codec->vendor_id >> 16) & 0xffff);
106864 - request_module(name);
106865 + request_module("snd-hda-codec-id:%04x*", (codec->vendor_id >> 16) & 0xffff);
106866 mod_requested++;
106867 goto again;
106868 }
106869 @@ -2777,7 +2773,7 @@ static int get_kctl_0dB_offset(struct snd_kcontrol *kctl, int *step_to_check)
106870 /* FIXME: set_fs() hack for obtaining user-space TLV data */
106871 mm_segment_t fs = get_fs();
106872 set_fs(get_ds());
106873 - if (!kctl->tlv.c(kctl, 0, sizeof(_tlv), _tlv))
106874 + if (!kctl->tlv.c(kctl, 0, sizeof(_tlv), (unsigned int __force_user *)_tlv))
106875 tlv = _tlv;
106876 set_fs(fs);
106877 } else if (kctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_READ)
106878 diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h
106879 index 4631a23..001ae57 100644
106880 --- a/sound/pci/ymfpci/ymfpci.h
106881 +++ b/sound/pci/ymfpci/ymfpci.h
106882 @@ -358,7 +358,7 @@ struct snd_ymfpci {
106883 spinlock_t reg_lock;
106884 spinlock_t voice_lock;
106885 wait_queue_head_t interrupt_sleep;
106886 - atomic_t interrupt_sleep_count;
106887 + atomic_unchecked_t interrupt_sleep_count;
106888 struct snd_info_entry *proc_entry;
106889 const struct firmware *dsp_microcode;
106890 const struct firmware *controller_microcode;
106891 diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
106892 index 81c916a..516f0bf 100644
106893 --- a/sound/pci/ymfpci/ymfpci_main.c
106894 +++ b/sound/pci/ymfpci/ymfpci_main.c
106895 @@ -204,8 +204,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
106896 if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
106897 break;
106898 }
106899 - if (atomic_read(&chip->interrupt_sleep_count)) {
106900 - atomic_set(&chip->interrupt_sleep_count, 0);
106901 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
106902 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
106903 wake_up(&chip->interrupt_sleep);
106904 }
106905 __end:
106906 @@ -789,7 +789,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
106907 continue;
106908 init_waitqueue_entry(&wait, current);
106909 add_wait_queue(&chip->interrupt_sleep, &wait);
106910 - atomic_inc(&chip->interrupt_sleep_count);
106911 + atomic_inc_unchecked(&chip->interrupt_sleep_count);
106912 schedule_timeout_uninterruptible(msecs_to_jiffies(50));
106913 remove_wait_queue(&chip->interrupt_sleep, &wait);
106914 }
106915 @@ -827,8 +827,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
106916 snd_ymfpci_writel(chip, YDSXGR_MODE, mode);
106917 spin_unlock(&chip->reg_lock);
106918
106919 - if (atomic_read(&chip->interrupt_sleep_count)) {
106920 - atomic_set(&chip->interrupt_sleep_count, 0);
106921 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
106922 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
106923 wake_up(&chip->interrupt_sleep);
106924 }
106925 }
106926 @@ -2423,7 +2423,7 @@ int snd_ymfpci_create(struct snd_card *card,
106927 spin_lock_init(&chip->reg_lock);
106928 spin_lock_init(&chip->voice_lock);
106929 init_waitqueue_head(&chip->interrupt_sleep);
106930 - atomic_set(&chip->interrupt_sleep_count, 0);
106931 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
106932 chip->card = card;
106933 chip->pci = pci;
106934 chip->irq = -1;
106935 diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
106936 index 5428a1f..474f651 100644
106937 --- a/sound/soc/fsl/fsl_ssi.c
106938 +++ b/sound/soc/fsl/fsl_ssi.c
106939 @@ -1255,7 +1255,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
106940 {
106941 struct fsl_ssi_private *ssi_private;
106942 int ret = 0;
106943 - struct device_attribute *dev_attr = NULL;
106944 struct device_node *np = pdev->dev.of_node;
106945 const struct of_device_id *of_id;
106946 enum fsl_ssi_type hw_type;
106947 @@ -1481,7 +1480,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
106948 &ssi_private->cpu_dai_drv, 1);
106949 if (ret) {
106950 dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
106951 - goto error_dev;
106952 + goto error_clk;
106953 }
106954
106955 ret = fsl_ssi_debugfs_create(ssi_private, &pdev->dev);
106956 @@ -1562,9 +1561,6 @@ error_pcm:
106957 error_dbgfs:
106958 snd_soc_unregister_component(&pdev->dev);
106959
106960 -error_dev:
106961 - device_remove_file(&pdev->dev, dev_attr);
106962 -
106963 error_clk:
106964 if (ssi_private->ssi_on_imx) {
106965 if (!IS_ERR(ssi_private->baudclk))
106966 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
106967 index 051c006..70598e8 100644
106968 --- a/sound/soc/soc-core.c
106969 +++ b/sound/soc/soc-core.c
106970 @@ -2255,8 +2255,10 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
106971 if (ret)
106972 return ret;
106973
106974 - ops->warm_reset = snd_soc_ac97_warm_reset;
106975 - ops->reset = snd_soc_ac97_reset;
106976 + pax_open_kernel();
106977 + *(void **)&ops->warm_reset = snd_soc_ac97_warm_reset;
106978 + *(void **)&ops->reset = snd_soc_ac97_reset;
106979 + pax_close_kernel();
106980
106981 snd_ac97_rst_cfg = cfg;
106982 return 0;
106983 diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
106984 index 7778b8e..3d619fc 100644
106985 --- a/sound/synth/emux/emux_seq.c
106986 +++ b/sound/synth/emux/emux_seq.c
106987 @@ -33,13 +33,13 @@ static int snd_emux_unuse(void *private_data, struct snd_seq_port_subscribe *inf
106988 * MIDI emulation operators
106989 */
106990 static struct snd_midi_op emux_ops = {
106991 - snd_emux_note_on,
106992 - snd_emux_note_off,
106993 - snd_emux_key_press,
106994 - snd_emux_terminate_note,
106995 - snd_emux_control,
106996 - snd_emux_nrpn,
106997 - snd_emux_sysex,
106998 + .note_on = snd_emux_note_on,
106999 + .note_off = snd_emux_note_off,
107000 + .key_press = snd_emux_key_press,
107001 + .note_terminate = snd_emux_terminate_note,
107002 + .control = snd_emux_control,
107003 + .nrpn = snd_emux_nrpn,
107004 + .sysex = snd_emux_sysex,
107005 };
107006
107007
107008 diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
107009 new file mode 100644
107010 index 0000000..7b8921f
107011 --- /dev/null
107012 +++ b/tools/gcc/Makefile
107013 @@ -0,0 +1,52 @@
107014 +#CC := gcc
107015 +#PLUGIN_SOURCE_FILES := pax_plugin.c
107016 +#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES))
107017 +GCCPLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
107018 +#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W -std=gnu99
107019 +
107020 +ifeq ($(PLUGINCC),$(HOSTCC))
107021 +HOSTLIBS := hostlibs
107022 +HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include -I$(src) -std=gnu99 -ggdb
107023 +export HOST_EXTRACFLAGS
107024 +else
107025 +HOSTLIBS := hostcxxlibs
107026 +HOST_EXTRACXXFLAGS += -I$(GCCPLUGINS_DIR)/include -I$(src) -std=gnu++98 -fno-rtti -ggdb -Wno-unused-parameter -Wno-narrowing -Wno-unused-variable
107027 +export HOST_EXTRACXXFLAGS
107028 +endif
107029 +
107030 +export GCCPLUGINS_DIR HOSTLIBS
107031 +
107032 +$(HOSTLIBS)-$(CONFIG_PAX_CONSTIFY_PLUGIN) := constify_plugin.so
107033 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
107034 +$(HOSTLIBS)-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
107035 +$(HOSTLIBS)-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
107036 +$(HOSTLIBS)-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
107037 +$(HOSTLIBS)-y += colorize_plugin.so
107038 +$(HOSTLIBS)-$(CONFIG_PAX_LATENT_ENTROPY) += latent_entropy_plugin.so
107039 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STRUCTLEAK) += structleak_plugin.so
107040 +$(HOSTLIBS)-$(CONFIG_GRKERNSEC_RANDSTRUCT) += randomize_layout_plugin.so
107041 +
107042 +subdir-$(CONFIG_PAX_SIZE_OVERFLOW) := size_overflow_plugin
107043 +subdir- += size_overflow_plugin
107044 +
107045 +always := $($(HOSTLIBS)-y)
107046 +
107047 +constify_plugin-objs := constify_plugin.o
107048 +stackleak_plugin-objs := stackleak_plugin.o
107049 +kallocstat_plugin-objs := kallocstat_plugin.o
107050 +kernexec_plugin-objs := kernexec_plugin.o
107051 +checker_plugin-objs := checker_plugin.o
107052 +colorize_plugin-objs := colorize_plugin.o
107053 +latent_entropy_plugin-objs := latent_entropy_plugin.o
107054 +structleak_plugin-objs := structleak_plugin.o
107055 +randomize_layout_plugin-objs := randomize_layout_plugin.o
107056 +
107057 +$(obj)/randomize_layout_plugin.o: $(objtree)/$(obj)/randomize_layout_seed.h
107058 +
107059 +quiet_cmd_create_randomize_layout_seed = GENSEED $@
107060 + cmd_create_randomize_layout_seed = \
107061 + $(CONFIG_SHELL) $(srctree)/$(src)/gen-random-seed.sh $@ $(objtree)/include/generated/randomize_layout_hash.h
107062 +$(objtree)/$(obj)/randomize_layout_seed.h: FORCE
107063 + $(call if_changed,create_randomize_layout_seed)
107064 +
107065 +targets += randomize_layout_seed.h randomize_layout_hash.h
107066 diff --git a/tools/gcc/checker_plugin.c b/tools/gcc/checker_plugin.c
107067 new file mode 100644
107068 index 0000000..5452feea
107069 --- /dev/null
107070 +++ b/tools/gcc/checker_plugin.c
107071 @@ -0,0 +1,150 @@
107072 +/*
107073 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
107074 + * Licensed under the GPL v2
107075 + *
107076 + * Note: the choice of the license means that the compilation process is
107077 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
107078 + * but for the kernel it doesn't matter since it doesn't link against
107079 + * any of the gcc libraries
107080 + *
107081 + * gcc plugin to implement various sparse (source code checker) features
107082 + *
107083 + * TODO:
107084 + * - define separate __iomem, __percpu and __rcu address spaces (lots of code to patch)
107085 + *
107086 + * BUGS:
107087 + * - none known
107088 + */
107089 +
107090 +#include "gcc-common.h"
107091 +
107092 +extern void c_register_addr_space (const char *str, addr_space_t as);
107093 +extern enum machine_mode default_addr_space_pointer_mode (addr_space_t);
107094 +extern enum machine_mode default_addr_space_address_mode (addr_space_t);
107095 +extern bool default_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as);
107096 +extern bool default_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as);
107097 +extern rtx default_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as);
107098 +
107099 +int plugin_is_GPL_compatible;
107100 +
107101 +static struct plugin_info checker_plugin_info = {
107102 + .version = "201304082245",
107103 + .help = NULL,
107104 +};
107105 +
107106 +#define ADDR_SPACE_KERNEL 0
107107 +#define ADDR_SPACE_FORCE_KERNEL 1
107108 +#define ADDR_SPACE_USER 2
107109 +#define ADDR_SPACE_FORCE_USER 3
107110 +#define ADDR_SPACE_IOMEM 0
107111 +#define ADDR_SPACE_FORCE_IOMEM 0
107112 +#define ADDR_SPACE_PERCPU 0
107113 +#define ADDR_SPACE_FORCE_PERCPU 0
107114 +#define ADDR_SPACE_RCU 0
107115 +#define ADDR_SPACE_FORCE_RCU 0
107116 +
107117 +static enum machine_mode checker_addr_space_pointer_mode(addr_space_t addrspace)
107118 +{
107119 + return default_addr_space_pointer_mode(ADDR_SPACE_GENERIC);
107120 +}
107121 +
107122 +static enum machine_mode checker_addr_space_address_mode(addr_space_t addrspace)
107123 +{
107124 + return default_addr_space_address_mode(ADDR_SPACE_GENERIC);
107125 +}
107126 +
107127 +static bool checker_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as)
107128 +{
107129 + return default_addr_space_valid_pointer_mode(mode, as);
107130 +}
107131 +
107132 +static bool checker_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as)
107133 +{
107134 + return default_addr_space_legitimate_address_p(mode, mem, strict, ADDR_SPACE_GENERIC);
107135 +}
107136 +
107137 +static rtx checker_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as)
107138 +{
107139 + return default_addr_space_legitimize_address(x, oldx, mode, as);
107140 +}
107141 +
107142 +static bool checker_addr_space_subset_p(addr_space_t subset, addr_space_t superset)
107143 +{
107144 + if (subset == ADDR_SPACE_FORCE_KERNEL && superset == ADDR_SPACE_KERNEL)
107145 + return true;
107146 +
107147 + if (subset == ADDR_SPACE_FORCE_USER && superset == ADDR_SPACE_USER)
107148 + return true;
107149 +
107150 + if (subset == ADDR_SPACE_FORCE_IOMEM && superset == ADDR_SPACE_IOMEM)
107151 + return true;
107152 +
107153 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_USER)
107154 + return true;
107155 +
107156 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_IOMEM)
107157 + return true;
107158 +
107159 + if (subset == ADDR_SPACE_USER && superset == ADDR_SPACE_FORCE_KERNEL)
107160 + return true;
107161 +
107162 + if (subset == ADDR_SPACE_IOMEM && superset == ADDR_SPACE_FORCE_KERNEL)
107163 + return true;
107164 +
107165 + return subset == superset;
107166 +}
107167 +
107168 +static rtx checker_addr_space_convert(rtx op, tree from_type, tree to_type)
107169 +{
107170 +// addr_space_t from_as = TYPE_ADDR_SPACE(TREE_TYPE(from_type));
107171 +// addr_space_t to_as = TYPE_ADDR_SPACE(TREE_TYPE(to_type));
107172 +
107173 + return op;
107174 +}
107175 +
107176 +static void register_checker_address_spaces(void *event_data, void *data)
107177 +{
107178 + c_register_addr_space("__kernel", ADDR_SPACE_KERNEL);
107179 + c_register_addr_space("__force_kernel", ADDR_SPACE_FORCE_KERNEL);
107180 + c_register_addr_space("__user", ADDR_SPACE_USER);
107181 + c_register_addr_space("__force_user", ADDR_SPACE_FORCE_USER);
107182 +// c_register_addr_space("__iomem", ADDR_SPACE_IOMEM);
107183 +// c_register_addr_space("__force_iomem", ADDR_SPACE_FORCE_IOMEM);
107184 +// c_register_addr_space("__percpu", ADDR_SPACE_PERCPU);
107185 +// c_register_addr_space("__force_percpu", ADDR_SPACE_FORCE_PERCPU);
107186 +// c_register_addr_space("__rcu", ADDR_SPACE_RCU);
107187 +// c_register_addr_space("__force_rcu", ADDR_SPACE_FORCE_RCU);
107188 +
107189 + targetm.addr_space.pointer_mode = checker_addr_space_pointer_mode;
107190 + targetm.addr_space.address_mode = checker_addr_space_address_mode;
107191 + targetm.addr_space.valid_pointer_mode = checker_addr_space_valid_pointer_mode;
107192 + targetm.addr_space.legitimate_address_p = checker_addr_space_legitimate_address_p;
107193 +// targetm.addr_space.legitimize_address = checker_addr_space_legitimize_address;
107194 + targetm.addr_space.subset_p = checker_addr_space_subset_p;
107195 + targetm.addr_space.convert = checker_addr_space_convert;
107196 +}
107197 +
107198 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
107199 +{
107200 + const char * const plugin_name = plugin_info->base_name;
107201 + const int argc = plugin_info->argc;
107202 + const struct plugin_argument * const argv = plugin_info->argv;
107203 + int i;
107204 +
107205 + if (!plugin_default_version_check(version, &gcc_version)) {
107206 + error(G_("incompatible gcc/plugin versions"));
107207 + return 1;
107208 + }
107209 +
107210 + register_callback(plugin_name, PLUGIN_INFO, NULL, &checker_plugin_info);
107211 +
107212 + for (i = 0; i < argc; ++i)
107213 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
107214 +
107215 + if (TARGET_64BIT == 0)
107216 + return 0;
107217 +
107218 + register_callback(plugin_name, PLUGIN_PRAGMAS, register_checker_address_spaces, NULL);
107219 +
107220 + return 0;
107221 +}
107222 diff --git a/tools/gcc/colorize_plugin.c b/tools/gcc/colorize_plugin.c
107223 new file mode 100644
107224 index 0000000..54461af
107225 --- /dev/null
107226 +++ b/tools/gcc/colorize_plugin.c
107227 @@ -0,0 +1,210 @@
107228 +/*
107229 + * Copyright 2012-2014 by PaX Team <pageexec@freemail.hu>
107230 + * Licensed under the GPL v2
107231 + *
107232 + * Note: the choice of the license means that the compilation process is
107233 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
107234 + * but for the kernel it doesn't matter since it doesn't link against
107235 + * any of the gcc libraries
107236 + *
107237 + * gcc plugin to colorize diagnostic output
107238 + *
107239 + */
107240 +
107241 +#include "gcc-common.h"
107242 +
107243 +int plugin_is_GPL_compatible;
107244 +
107245 +static struct plugin_info colorize_plugin_info = {
107246 + .version = "201404202350",
107247 + .help = "color=[never|always|auto]\tdetermine when to colorize\n",
107248 +};
107249 +
107250 +#define GREEN "\033[32m\033[K"
107251 +#define LIGHTGREEN "\033[1;32m\033[K"
107252 +#define YELLOW "\033[33m\033[K"
107253 +#define LIGHTYELLOW "\033[1;33m\033[K"
107254 +#define RED "\033[31m\033[K"
107255 +#define LIGHTRED "\033[1;31m\033[K"
107256 +#define BLUE "\033[34m\033[K"
107257 +#define LIGHTBLUE "\033[1;34m\033[K"
107258 +#define BRIGHT "\033[1;m\033[K"
107259 +#define NORMAL "\033[m\033[K"
107260 +
107261 +static diagnostic_starter_fn old_starter;
107262 +static diagnostic_finalizer_fn old_finalizer;
107263 +
107264 +static void start_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
107265 +{
107266 + const char *color;
107267 + char *newprefix;
107268 +
107269 + switch (diagnostic->kind) {
107270 + case DK_NOTE:
107271 + color = LIGHTBLUE;
107272 + break;
107273 +
107274 + case DK_PEDWARN:
107275 + case DK_WARNING:
107276 + color = LIGHTYELLOW;
107277 + break;
107278 +
107279 + case DK_ERROR:
107280 + case DK_FATAL:
107281 + case DK_ICE:
107282 + case DK_PERMERROR:
107283 + case DK_SORRY:
107284 + color = LIGHTRED;
107285 + break;
107286 +
107287 + default:
107288 + color = NORMAL;
107289 + }
107290 +
107291 + old_starter(context, diagnostic);
107292 + if (-1 == asprintf(&newprefix, "%s%s" NORMAL, color, context->printer->prefix))
107293 + return;
107294 + pp_destroy_prefix(context->printer);
107295 + pp_set_prefix(context->printer, newprefix);
107296 +}
107297 +
107298 +static void finalize_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
107299 +{
107300 + old_finalizer(context, diagnostic);
107301 +}
107302 +
107303 +static void colorize_arm(void)
107304 +{
107305 + old_starter = diagnostic_starter(global_dc);
107306 + old_finalizer = diagnostic_finalizer(global_dc);
107307 +
107308 + diagnostic_starter(global_dc) = start_colorize;
107309 + diagnostic_finalizer(global_dc) = finalize_colorize;
107310 +}
107311 +
107312 +static unsigned int execute_colorize_rearm(void)
107313 +{
107314 + if (diagnostic_starter(global_dc) == start_colorize)
107315 + return 0;
107316 +
107317 + colorize_arm();
107318 + return 0;
107319 +}
107320 +
107321 +#if BUILDING_GCC_VERSION >= 4009
107322 +static const struct pass_data colorize_rearm_pass_data = {
107323 +#else
107324 +struct simple_ipa_opt_pass colorize_rearm_pass = {
107325 + .pass = {
107326 +#endif
107327 + .type = SIMPLE_IPA_PASS,
107328 + .name = "colorize_rearm",
107329 +#if BUILDING_GCC_VERSION >= 4008
107330 + .optinfo_flags = OPTGROUP_NONE,
107331 +#endif
107332 +#if BUILDING_GCC_VERSION >= 4009
107333 + .has_gate = false,
107334 + .has_execute = true,
107335 +#else
107336 + .gate = NULL,
107337 + .execute = execute_colorize_rearm,
107338 + .sub = NULL,
107339 + .next = NULL,
107340 + .static_pass_number = 0,
107341 +#endif
107342 + .tv_id = TV_NONE,
107343 + .properties_required = 0,
107344 + .properties_provided = 0,
107345 + .properties_destroyed = 0,
107346 + .todo_flags_start = 0,
107347 + .todo_flags_finish = 0
107348 +#if BUILDING_GCC_VERSION < 4009
107349 + }
107350 +#endif
107351 +};
107352 +
107353 +#if BUILDING_GCC_VERSION >= 4009
107354 +namespace {
107355 +class colorize_rearm_pass : public simple_ipa_opt_pass {
107356 +public:
107357 + colorize_rearm_pass() : simple_ipa_opt_pass(colorize_rearm_pass_data, g) {}
107358 + unsigned int execute() { return execute_colorize_rearm(); }
107359 +};
107360 +}
107361 +
107362 +static opt_pass *make_colorize_rearm_pass(void)
107363 +{
107364 + return new colorize_rearm_pass();
107365 +}
107366 +#else
107367 +static struct opt_pass *make_colorize_rearm_pass(void)
107368 +{
107369 + return &colorize_rearm_pass.pass;
107370 +}
107371 +#endif
107372 +
107373 +static void colorize_start_unit(void *gcc_data, void *user_data)
107374 +{
107375 + colorize_arm();
107376 +}
107377 +
107378 +static bool should_colorize(void)
107379 +{
107380 +#if BUILDING_GCC_VERSION >= 4009
107381 + return false;
107382 +#else
107383 + char const *t = getenv("TERM");
107384 +
107385 + return t && strcmp(t, "dumb") && isatty(STDERR_FILENO);
107386 +#endif
107387 +}
107388 +
107389 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
107390 +{
107391 + const char * const plugin_name = plugin_info->base_name;
107392 + const int argc = plugin_info->argc;
107393 + const struct plugin_argument * const argv = plugin_info->argv;
107394 + int i;
107395 + struct register_pass_info colorize_rearm_pass_info;
107396 + bool colorize;
107397 +
107398 + colorize_rearm_pass_info.pass = make_colorize_rearm_pass();
107399 + colorize_rearm_pass_info.reference_pass_name = "*free_lang_data";
107400 + colorize_rearm_pass_info.ref_pass_instance_number = 1;
107401 + colorize_rearm_pass_info.pos_op = PASS_POS_INSERT_AFTER;
107402 +
107403 + if (!plugin_default_version_check(version, &gcc_version)) {
107404 + error(G_("incompatible gcc/plugin versions"));
107405 + return 1;
107406 + }
107407 +
107408 + register_callback(plugin_name, PLUGIN_INFO, NULL, &colorize_plugin_info);
107409 +
107410 + colorize = getenv("GCC_COLORS") ? should_colorize() : false;
107411 +
107412 + for (i = 0; i < argc; ++i) {
107413 + if (!strcmp(argv[i].key, "color")) {
107414 + if (!argv[i].value) {
107415 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
107416 + continue;
107417 + }
107418 + if (!strcmp(argv[i].value, "always"))
107419 + colorize = true;
107420 + else if (!strcmp(argv[i].value, "never"))
107421 + colorize = false;
107422 + else if (!strcmp(argv[i].value, "auto"))
107423 + colorize = should_colorize();
107424 + else
107425 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
107426 + continue;
107427 + }
107428 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
107429 + }
107430 +
107431 + if (colorize) {
107432 + // TODO: parse GCC_COLORS as used by gcc 4.9+
107433 + register_callback(plugin_name, PLUGIN_START_UNIT, &colorize_start_unit, NULL);
107434 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &colorize_rearm_pass_info);
107435 + }
107436 + return 0;
107437 +}
107438 diff --git a/tools/gcc/constify_plugin.c b/tools/gcc/constify_plugin.c
107439 new file mode 100644
107440 index 0000000..82bc5a8
107441 --- /dev/null
107442 +++ b/tools/gcc/constify_plugin.c
107443 @@ -0,0 +1,557 @@
107444 +/*
107445 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
107446 + * Copyright 2011-2014 by PaX Team <pageexec@freemail.hu>
107447 + * Licensed under the GPL v2, or (at your option) v3
107448 + *
107449 + * This gcc plugin constifies all structures which contain only function pointers or are explicitly marked for constification.
107450 + *
107451 + * Homepage:
107452 + * http://www.grsecurity.net/~ephox/const_plugin/
107453 + *
107454 + * Usage:
107455 + * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
107456 + * $ gcc -fplugin=constify_plugin.so test.c -O2
107457 + */
107458 +
107459 +#include "gcc-common.h"
107460 +
107461 +// unused C type flag in all versions 4.5-4.9
107462 +#define TYPE_CONSTIFY_VISITED(TYPE) TYPE_LANG_FLAG_4(TYPE)
107463 +
107464 +int plugin_is_GPL_compatible;
107465 +
107466 +static struct plugin_info const_plugin_info = {
107467 + .version = "201401270210",
107468 + .help = "no-constify\tturn off constification\n",
107469 +};
107470 +
107471 +typedef struct {
107472 + bool has_fptr_field;
107473 + bool has_writable_field;
107474 + bool has_do_const_field;
107475 + bool has_no_const_field;
107476 +} constify_info;
107477 +
107478 +static const_tree get_field_type(const_tree field)
107479 +{
107480 + return strip_array_types(TREE_TYPE(field));
107481 +}
107482 +
107483 +static bool is_fptr(const_tree field)
107484 +{
107485 + const_tree ptr = get_field_type(field);
107486 +
107487 + if (TREE_CODE(ptr) != POINTER_TYPE)
107488 + return false;
107489 +
107490 + return TREE_CODE(TREE_TYPE(ptr)) == FUNCTION_TYPE;
107491 +}
107492 +
107493 +/*
107494 + * determine whether the given structure type meets the requirements for automatic constification,
107495 + * including the constification attributes on nested structure types
107496 + */
107497 +static void constifiable(const_tree node, constify_info *cinfo)
107498 +{
107499 + const_tree field;
107500 +
107501 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
107502 +
107503 + // e.g., pointer to structure fields while still constructing the structure type
107504 + if (TYPE_FIELDS(node) == NULL_TREE)
107505 + return;
107506 +
107507 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
107508 + const_tree type = get_field_type(field);
107509 + enum tree_code code = TREE_CODE(type);
107510 +
107511 + if (node == type)
107512 + continue;
107513 +
107514 + if (is_fptr(field))
107515 + cinfo->has_fptr_field = true;
107516 + else if (!TREE_READONLY(field))
107517 + cinfo->has_writable_field = true;
107518 +
107519 + if (code == RECORD_TYPE || code == UNION_TYPE) {
107520 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
107521 + cinfo->has_do_const_field = true;
107522 + else if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type)))
107523 + cinfo->has_no_const_field = true;
107524 + else
107525 + constifiable(type, cinfo);
107526 + }
107527 + }
107528 +}
107529 +
107530 +static bool constified(const_tree node)
107531 +{
107532 + constify_info cinfo = {
107533 + .has_fptr_field = false,
107534 + .has_writable_field = false,
107535 + .has_do_const_field = false,
107536 + .has_no_const_field = false
107537 + };
107538 +
107539 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
107540 +
107541 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(node))) {
107542 +// gcc_assert(!TYPE_READONLY(node));
107543 + return false;
107544 + }
107545 +
107546 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(node))) {
107547 + gcc_assert(TYPE_READONLY(node));
107548 + return true;
107549 + }
107550 +
107551 + constifiable(node, &cinfo);
107552 + if ((!cinfo.has_fptr_field || cinfo.has_writable_field) && !cinfo.has_do_const_field)
107553 + return false;
107554 +
107555 + return TYPE_READONLY(node);
107556 +}
107557 +
107558 +static void deconstify_tree(tree node);
107559 +
107560 +static void deconstify_type(tree type)
107561 +{
107562 + tree field;
107563 +
107564 + gcc_assert(TREE_CODE(type) == RECORD_TYPE || TREE_CODE(type) == UNION_TYPE);
107565 +
107566 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
107567 + const_tree fieldtype = get_field_type(field);
107568 +
107569 + // special case handling of simple ptr-to-same-array-type members
107570 + if (TREE_CODE(TREE_TYPE(field)) == POINTER_TYPE) {
107571 + tree ptrtype = TREE_TYPE(TREE_TYPE(field));
107572 +
107573 + if (TREE_TYPE(TREE_TYPE(field)) == type)
107574 + continue;
107575 + if (TREE_CODE(ptrtype) != RECORD_TYPE && TREE_CODE(ptrtype) != UNION_TYPE)
107576 + continue;
107577 + if (!constified(ptrtype))
107578 + continue;
107579 + if (TYPE_MAIN_VARIANT(ptrtype) == TYPE_MAIN_VARIANT(type)) {
107580 + TREE_TYPE(field) = copy_node(TREE_TYPE(field));
107581 + TREE_TYPE(TREE_TYPE(field)) = build_qualified_type(type, TYPE_QUALS(ptrtype) & ~TYPE_QUAL_CONST);
107582 + }
107583 + continue;
107584 + }
107585 + if (TREE_CODE(fieldtype) != RECORD_TYPE && TREE_CODE(fieldtype) != UNION_TYPE)
107586 + continue;
107587 + if (!constified(fieldtype))
107588 + continue;
107589 +
107590 + deconstify_tree(field);
107591 + TREE_READONLY(field) = 0;
107592 + }
107593 + TYPE_READONLY(type) = 0;
107594 + C_TYPE_FIELDS_READONLY(type) = 0;
107595 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
107596 + TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
107597 + TYPE_ATTRIBUTES(type) = remove_attribute("do_const", TYPE_ATTRIBUTES(type));
107598 + }
107599 +}
107600 +
107601 +static void deconstify_tree(tree node)
107602 +{
107603 + tree old_type, new_type, field;
107604 +
107605 + old_type = TREE_TYPE(node);
107606 + while (TREE_CODE(old_type) == ARRAY_TYPE && TREE_CODE(TREE_TYPE(old_type)) != ARRAY_TYPE) {
107607 + node = TREE_TYPE(node) = copy_node(old_type);
107608 + old_type = TREE_TYPE(old_type);
107609 + }
107610 +
107611 + gcc_assert(TREE_CODE(old_type) == RECORD_TYPE || TREE_CODE(old_type) == UNION_TYPE);
107612 + gcc_assert(TYPE_READONLY(old_type) && (TYPE_QUALS(old_type) & TYPE_QUAL_CONST));
107613 +
107614 + new_type = build_qualified_type(old_type, TYPE_QUALS(old_type) & ~TYPE_QUAL_CONST);
107615 + TYPE_FIELDS(new_type) = copy_list(TYPE_FIELDS(new_type));
107616 + for (field = TYPE_FIELDS(new_type); field; field = TREE_CHAIN(field))
107617 + DECL_FIELD_CONTEXT(field) = new_type;
107618 +
107619 + deconstify_type(new_type);
107620 +
107621 + TREE_TYPE(node) = new_type;
107622 +}
107623 +
107624 +static tree handle_no_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
107625 +{
107626 + tree type;
107627 + constify_info cinfo = {
107628 + .has_fptr_field = false,
107629 + .has_writable_field = false,
107630 + .has_do_const_field = false,
107631 + .has_no_const_field = false
107632 + };
107633 +
107634 + *no_add_attrs = true;
107635 + if (TREE_CODE(*node) == FUNCTION_DECL) {
107636 + error("%qE attribute does not apply to functions (%qF)", name, *node);
107637 + return NULL_TREE;
107638 + }
107639 +
107640 + if (TREE_CODE(*node) == PARM_DECL) {
107641 + error("%qE attribute does not apply to function parameters (%qD)", name, *node);
107642 + return NULL_TREE;
107643 + }
107644 +
107645 + if (TREE_CODE(*node) == VAR_DECL) {
107646 + error("%qE attribute does not apply to variables (%qD)", name, *node);
107647 + return NULL_TREE;
107648 + }
107649 +
107650 + if (TYPE_P(*node)) {
107651 + type = *node;
107652 + } else {
107653 + gcc_assert(TREE_CODE(*node) == TYPE_DECL);
107654 + type = TREE_TYPE(*node);
107655 + }
107656 +
107657 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE) {
107658 + error("%qE attribute used on %qT applies to struct and union types only", name, type);
107659 + return NULL_TREE;
107660 + }
107661 +
107662 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
107663 + error("%qE attribute is already applied to the type %qT", name, type);
107664 + return NULL_TREE;
107665 + }
107666 +
107667 + if (TYPE_P(*node)) {
107668 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
107669 + error("%qE attribute used on type %qT is incompatible with 'do_const'", name, type);
107670 + else
107671 + *no_add_attrs = false;
107672 + return NULL_TREE;
107673 + }
107674 +
107675 + constifiable(type, &cinfo);
107676 + if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
107677 + deconstify_tree(*node);
107678 + TYPE_CONSTIFY_VISITED(TREE_TYPE(*node)) = 1;
107679 + return NULL_TREE;
107680 + }
107681 +
107682 + error("%qE attribute used on type %qT that is not constified", name, type);
107683 + return NULL_TREE;
107684 +}
107685 +
107686 +static void constify_type(tree type)
107687 +{
107688 + TYPE_READONLY(type) = 1;
107689 + C_TYPE_FIELDS_READONLY(type) = 1;
107690 + TYPE_CONSTIFY_VISITED(type) = 1;
107691 +// TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
107692 +// TYPE_ATTRIBUTES(type) = tree_cons(get_identifier("do_const"), NULL_TREE, TYPE_ATTRIBUTES(type));
107693 +}
107694 +
107695 +static tree handle_do_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
107696 +{
107697 + *no_add_attrs = true;
107698 + if (!TYPE_P(*node)) {
107699 + error("%qE attribute applies to types only (%qD)", name, *node);
107700 + return NULL_TREE;
107701 + }
107702 +
107703 + if (TREE_CODE(*node) != RECORD_TYPE && TREE_CODE(*node) != UNION_TYPE) {
107704 + error("%qE attribute used on %qT applies to struct and union types only", name, *node);
107705 + return NULL_TREE;
107706 + }
107707 +
107708 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(*node))) {
107709 + error("%qE attribute used on %qT is already applied to the type", name, *node);
107710 + return NULL_TREE;
107711 + }
107712 +
107713 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(*node))) {
107714 + error("%qE attribute used on %qT is incompatible with 'no_const'", name, *node);
107715 + return NULL_TREE;
107716 + }
107717 +
107718 + *no_add_attrs = false;
107719 + return NULL_TREE;
107720 +}
107721 +
107722 +static struct attribute_spec no_const_attr = {
107723 + .name = "no_const",
107724 + .min_length = 0,
107725 + .max_length = 0,
107726 + .decl_required = false,
107727 + .type_required = false,
107728 + .function_type_required = false,
107729 + .handler = handle_no_const_attribute,
107730 +#if BUILDING_GCC_VERSION >= 4007
107731 + .affects_type_identity = true
107732 +#endif
107733 +};
107734 +
107735 +static struct attribute_spec do_const_attr = {
107736 + .name = "do_const",
107737 + .min_length = 0,
107738 + .max_length = 0,
107739 + .decl_required = false,
107740 + .type_required = false,
107741 + .function_type_required = false,
107742 + .handler = handle_do_const_attribute,
107743 +#if BUILDING_GCC_VERSION >= 4007
107744 + .affects_type_identity = true
107745 +#endif
107746 +};
107747 +
107748 +static void register_attributes(void *event_data, void *data)
107749 +{
107750 + register_attribute(&no_const_attr);
107751 + register_attribute(&do_const_attr);
107752 +}
107753 +
107754 +static void finish_type(void *event_data, void *data)
107755 +{
107756 + tree type = (tree)event_data;
107757 + constify_info cinfo = {
107758 + .has_fptr_field = false,
107759 + .has_writable_field = false,
107760 + .has_do_const_field = false,
107761 + .has_no_const_field = false
107762 + };
107763 +
107764 + if (type == NULL_TREE || type == error_mark_node)
107765 + return;
107766 +
107767 + if (TYPE_FIELDS(type) == NULL_TREE || TYPE_CONSTIFY_VISITED(type))
107768 + return;
107769 +
107770 + constifiable(type, &cinfo);
107771 +
107772 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type))) {
107773 + if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || cinfo.has_do_const_field) {
107774 + deconstify_type(type);
107775 + TYPE_CONSTIFY_VISITED(type) = 1;
107776 + } else
107777 + error("'no_const' attribute used on type %qT that is not constified", type);
107778 + return;
107779 + }
107780 +
107781 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
107782 + if (!cinfo.has_writable_field) {
107783 + error("'do_const' attribute used on type %qT that is%sconstified", type, cinfo.has_fptr_field ? " " : " not ");
107784 + return;
107785 + }
107786 + constify_type(type);
107787 + return;
107788 + }
107789 +
107790 + if (cinfo.has_fptr_field && !cinfo.has_writable_field) {
107791 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
107792 + error("'do_const' attribute used on type %qT that is constified", type);
107793 + return;
107794 + }
107795 + constify_type(type);
107796 + return;
107797 + }
107798 +
107799 + deconstify_type(type);
107800 + TYPE_CONSTIFY_VISITED(type) = 1;
107801 +}
107802 +
107803 +static void check_global_variables(void *event_data, void *data)
107804 +{
107805 +#if BUILDING_GCC_VERSION >= 4009
107806 + varpool_node *node;
107807 +#else
107808 + struct varpool_node *node;
107809 +#endif
107810 +
107811 + FOR_EACH_VARIABLE(node) {
107812 + tree var = NODE_DECL(node);
107813 + tree type = TREE_TYPE(var);
107814 +
107815 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
107816 + continue;
107817 +
107818 + if (!TYPE_READONLY(type) || !C_TYPE_FIELDS_READONLY(type))
107819 + continue;
107820 +
107821 + if (!TYPE_CONSTIFY_VISITED(type))
107822 + continue;
107823 +
107824 + if (DECL_EXTERNAL(var))
107825 + continue;
107826 +
107827 + if (DECL_INITIAL(var))
107828 + continue;
107829 +
107830 + // this works around a gcc bug/feature where uninitialized globals
107831 + // are moved into the .bss section regardless of any constification
107832 + DECL_INITIAL(var) = build_constructor(type, NULL);
107833 +// inform(DECL_SOURCE_LOCATION(var), "constified variable %qE moved into .rodata", var);
107834 + }
107835 +}
107836 +
107837 +static unsigned int check_local_variables(void)
107838 +{
107839 + unsigned int ret = 0;
107840 + tree var;
107841 +
107842 + unsigned int i;
107843 +
107844 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
107845 + tree type = TREE_TYPE(var);
107846 +
107847 + gcc_assert(DECL_P(var));
107848 + if (is_global_var(var))
107849 + continue;
107850 +
107851 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
107852 + continue;
107853 +
107854 + if (!TYPE_READONLY(type) || !C_TYPE_FIELDS_READONLY(type))
107855 + continue;
107856 +
107857 + if (!TYPE_CONSTIFY_VISITED(type))
107858 + continue;
107859 +
107860 + error_at(DECL_SOURCE_LOCATION(var), "constified variable %qE cannot be local", var);
107861 + ret = 1;
107862 + }
107863 + return ret;
107864 +}
107865 +
107866 +#if BUILDING_GCC_VERSION >= 4009
107867 +static const struct pass_data check_local_variables_pass_data = {
107868 +#else
107869 +static struct gimple_opt_pass check_local_variables_pass = {
107870 + .pass = {
107871 +#endif
107872 + .type = GIMPLE_PASS,
107873 + .name = "check_local_variables",
107874 +#if BUILDING_GCC_VERSION >= 4008
107875 + .optinfo_flags = OPTGROUP_NONE,
107876 +#endif
107877 +#if BUILDING_GCC_VERSION >= 4009
107878 + .has_gate = false,
107879 + .has_execute = true,
107880 +#else
107881 + .gate = NULL,
107882 + .execute = check_local_variables,
107883 + .sub = NULL,
107884 + .next = NULL,
107885 + .static_pass_number = 0,
107886 +#endif
107887 + .tv_id = TV_NONE,
107888 + .properties_required = 0,
107889 + .properties_provided = 0,
107890 + .properties_destroyed = 0,
107891 + .todo_flags_start = 0,
107892 + .todo_flags_finish = 0
107893 +#if BUILDING_GCC_VERSION < 4009
107894 + }
107895 +#endif
107896 +};
107897 +
107898 +#if BUILDING_GCC_VERSION >= 4009
107899 +namespace {
107900 +class check_local_variables_pass : public gimple_opt_pass {
107901 +public:
107902 + check_local_variables_pass() : gimple_opt_pass(check_local_variables_pass_data, g) {}
107903 + unsigned int execute() { return check_local_variables(); }
107904 +};
107905 +}
107906 +
107907 +static opt_pass *make_check_local_variables_pass(void)
107908 +{
107909 + return new check_local_variables_pass();
107910 +}
107911 +#else
107912 +static struct opt_pass *make_check_local_variables_pass(void)
107913 +{
107914 + return &check_local_variables_pass.pass;
107915 +}
107916 +#endif
107917 +
107918 +static struct {
107919 + const char *name;
107920 + const char *asm_op;
107921 +} sections[] = {
107922 + {".init.rodata", "\t.section\t.init.rodata,\"a\""},
107923 + {".ref.rodata", "\t.section\t.ref.rodata,\"a\""},
107924 + {".devinit.rodata", "\t.section\t.devinit.rodata,\"a\""},
107925 + {".devexit.rodata", "\t.section\t.devexit.rodata,\"a\""},
107926 + {".cpuinit.rodata", "\t.section\t.cpuinit.rodata,\"a\""},
107927 + {".cpuexit.rodata", "\t.section\t.cpuexit.rodata,\"a\""},
107928 + {".meminit.rodata", "\t.section\t.meminit.rodata,\"a\""},
107929 + {".memexit.rodata", "\t.section\t.memexit.rodata,\"a\""},
107930 + {".data..read_only", "\t.section\t.data..read_only,\"a\""},
107931 +};
107932 +
107933 +static unsigned int (*old_section_type_flags)(tree decl, const char *name, int reloc);
107934 +
107935 +static unsigned int constify_section_type_flags(tree decl, const char *name, int reloc)
107936 +{
107937 + size_t i;
107938 +
107939 + for (i = 0; i < ARRAY_SIZE(sections); i++)
107940 + if (!strcmp(sections[i].name, name))
107941 + return 0;
107942 + return old_section_type_flags(decl, name, reloc);
107943 +}
107944 +
107945 +static void constify_start_unit(void *gcc_data, void *user_data)
107946 +{
107947 +// size_t i;
107948 +
107949 +// for (i = 0; i < ARRAY_SIZE(sections); i++)
107950 +// sections[i].section = get_unnamed_section(0, output_section_asm_op, sections[i].asm_op);
107951 +// sections[i].section = get_section(sections[i].name, 0, NULL);
107952 +
107953 + old_section_type_flags = targetm.section_type_flags;
107954 + targetm.section_type_flags = constify_section_type_flags;
107955 +}
107956 +
107957 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
107958 +{
107959 + const char * const plugin_name = plugin_info->base_name;
107960 + const int argc = plugin_info->argc;
107961 + const struct plugin_argument * const argv = plugin_info->argv;
107962 + int i;
107963 + bool constify = true;
107964 +
107965 + struct register_pass_info check_local_variables_pass_info;
107966 +
107967 + check_local_variables_pass_info.pass = make_check_local_variables_pass();
107968 + check_local_variables_pass_info.reference_pass_name = "ssa";
107969 + check_local_variables_pass_info.ref_pass_instance_number = 1;
107970 + check_local_variables_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
107971 +
107972 + if (!plugin_default_version_check(version, &gcc_version)) {
107973 + error(G_("incompatible gcc/plugin versions"));
107974 + return 1;
107975 + }
107976 +
107977 + for (i = 0; i < argc; ++i) {
107978 + if (!(strcmp(argv[i].key, "no-constify"))) {
107979 + constify = false;
107980 + continue;
107981 + }
107982 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
107983 + }
107984 +
107985 + if (strcmp(lang_hooks.name, "GNU C")) {
107986 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
107987 + constify = false;
107988 + }
107989 +
107990 + register_callback(plugin_name, PLUGIN_INFO, NULL, &const_plugin_info);
107991 + if (constify) {
107992 + register_callback(plugin_name, PLUGIN_ALL_IPA_PASSES_START, check_global_variables, NULL);
107993 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
107994 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &check_local_variables_pass_info);
107995 + register_callback(plugin_name, PLUGIN_START_UNIT, constify_start_unit, NULL);
107996 + }
107997 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
107998 +
107999 + return 0;
108000 +}
108001 diff --git a/tools/gcc/gcc-common.h b/tools/gcc/gcc-common.h
108002 new file mode 100644
108003 index 0000000..e90c205
108004 --- /dev/null
108005 +++ b/tools/gcc/gcc-common.h
108006 @@ -0,0 +1,295 @@
108007 +#ifndef GCC_COMMON_H_INCLUDED
108008 +#define GCC_COMMON_H_INCLUDED
108009 +
108010 +#include "plugin.h"
108011 +#include "bversion.h"
108012 +#include "plugin-version.h"
108013 +#include "config.h"
108014 +#include "system.h"
108015 +#include "coretypes.h"
108016 +#include "tm.h"
108017 +#include "line-map.h"
108018 +#include "input.h"
108019 +#include "tree.h"
108020 +
108021 +#include "tree-inline.h"
108022 +#include "version.h"
108023 +#include "rtl.h"
108024 +#include "tm_p.h"
108025 +#include "flags.h"
108026 +//#include "insn-attr.h"
108027 +//#include "insn-config.h"
108028 +//#include "insn-flags.h"
108029 +#include "hard-reg-set.h"
108030 +//#include "recog.h"
108031 +#include "output.h"
108032 +#include "except.h"
108033 +#include "function.h"
108034 +#include "toplev.h"
108035 +//#include "expr.h"
108036 +#include "basic-block.h"
108037 +#include "intl.h"
108038 +#include "ggc.h"
108039 +//#include "regs.h"
108040 +#include "timevar.h"
108041 +
108042 +#include "params.h"
108043 +#include "pointer-set.h"
108044 +#include "emit-rtl.h"
108045 +//#include "reload.h"
108046 +//#include "ira.h"
108047 +//#include "dwarf2asm.h"
108048 +#include "debug.h"
108049 +#include "target.h"
108050 +#include "langhooks.h"
108051 +#include "cfgloop.h"
108052 +//#include "hosthooks.h"
108053 +#include "cgraph.h"
108054 +#include "opts.h"
108055 +//#include "coverage.h"
108056 +//#include "value-prof.h"
108057 +
108058 +#if BUILDING_GCC_VERSION >= 4007
108059 +#include "tree-pretty-print.h"
108060 +#include "gimple-pretty-print.h"
108061 +#include "c-tree.h"
108062 +//#include "alloc-pool.h"
108063 +#endif
108064 +
108065 +#if BUILDING_GCC_VERSION <= 4008
108066 +#include "tree-flow.h"
108067 +#else
108068 +#include "tree-cfgcleanup.h"
108069 +#endif
108070 +
108071 +#include "diagnostic.h"
108072 +//#include "tree-diagnostic.h"
108073 +#include "tree-dump.h"
108074 +#include "tree-pass.h"
108075 +//#include "df.h"
108076 +#include "predict.h"
108077 +#include "ipa-utils.h"
108078 +
108079 +#if BUILDING_GCC_VERSION >= 4009
108080 +#include "varasm.h"
108081 +#include "stor-layout.h"
108082 +#include "internal-fn.h"
108083 +#include "gimple-expr.h"
108084 +//#include "diagnostic-color.h"
108085 +#include "context.h"
108086 +#include "tree-ssa-alias.h"
108087 +#include "stringpool.h"
108088 +#include "tree-ssanames.h"
108089 +#include "print-tree.h"
108090 +#include "tree-eh.h"
108091 +#include "stmt.h"
108092 +#endif
108093 +
108094 +#include "gimple.h"
108095 +
108096 +#if BUILDING_GCC_VERSION >= 4009
108097 +#include "tree-ssa-operands.h"
108098 +#include "tree-phinodes.h"
108099 +#include "tree-cfg.h"
108100 +#include "gimple-iterator.h"
108101 +#include "gimple-ssa.h"
108102 +#include "ssa-iterators.h"
108103 +#endif
108104 +
108105 +//#include "lto/lto.h"
108106 +//#include "data-streamer.h"
108107 +//#include "lto-compress.h"
108108 +
108109 +//#include "expr.h" where are you...
108110 +extern rtx emit_move_insn(rtx x, rtx y);
108111 +
108112 +// missing from basic_block.h...
108113 +extern void debug_dominance_info(enum cdi_direction dir);
108114 +extern void debug_dominance_tree(enum cdi_direction dir, basic_block root);
108115 +
108116 +#define __unused __attribute__((__unused__))
108117 +
108118 +#define DECL_NAME_POINTER(node) IDENTIFIER_POINTER(DECL_NAME(node))
108119 +#define DECL_NAME_LENGTH(node) IDENTIFIER_LENGTH(DECL_NAME(node))
108120 +#define TYPE_NAME_POINTER(node) IDENTIFIER_POINTER(TYPE_NAME(node))
108121 +#define TYPE_NAME_LENGTH(node) IDENTIFIER_LENGTH(TYPE_NAME(node))
108122 +
108123 +#if BUILDING_GCC_VERSION == 4005
108124 +#define FOR_EACH_LOCAL_DECL(FUN, I, D) for (tree vars = (FUN)->local_decls; vars && (D = TREE_VALUE(vars)); vars = TREE_CHAIN(vars), I)
108125 +#define DECL_CHAIN(NODE) (TREE_CHAIN(DECL_MINIMAL_CHECK(NODE)))
108126 +#define FOR_EACH_VEC_ELT(T, V, I, P) for (I = 0; VEC_iterate(T, (V), (I), (P)); ++(I))
108127 +#define TODO_rebuild_cgraph_edges 0
108128 +
108129 +static inline bool gimple_call_builtin_p(gimple stmt, enum built_in_function code)
108130 +{
108131 + tree fndecl;
108132 +
108133 + if (!is_gimple_call(stmt))
108134 + return false;
108135 + fndecl = gimple_call_fndecl(stmt);
108136 + if (!fndecl || DECL_BUILT_IN_CLASS(fndecl) != BUILT_IN_NORMAL)
108137 + return false;
108138 +// print_node(stderr, "pax", fndecl, 4);
108139 + return DECL_FUNCTION_CODE(fndecl) == code;
108140 +}
108141 +
108142 +static inline bool is_simple_builtin(tree decl)
108143 +{
108144 + if (decl && DECL_BUILT_IN_CLASS(decl) != BUILT_IN_NORMAL)
108145 + return false;
108146 +
108147 + switch (DECL_FUNCTION_CODE(decl)) {
108148 + /* Builtins that expand to constants. */
108149 + case BUILT_IN_CONSTANT_P:
108150 + case BUILT_IN_EXPECT:
108151 + case BUILT_IN_OBJECT_SIZE:
108152 + case BUILT_IN_UNREACHABLE:
108153 + /* Simple register moves or loads from stack. */
108154 + case BUILT_IN_RETURN_ADDRESS:
108155 + case BUILT_IN_EXTRACT_RETURN_ADDR:
108156 + case BUILT_IN_FROB_RETURN_ADDR:
108157 + case BUILT_IN_RETURN:
108158 + case BUILT_IN_AGGREGATE_INCOMING_ADDRESS:
108159 + case BUILT_IN_FRAME_ADDRESS:
108160 + case BUILT_IN_VA_END:
108161 + case BUILT_IN_STACK_SAVE:
108162 + case BUILT_IN_STACK_RESTORE:
108163 + /* Exception state returns or moves registers around. */
108164 + case BUILT_IN_EH_FILTER:
108165 + case BUILT_IN_EH_POINTER:
108166 + case BUILT_IN_EH_COPY_VALUES:
108167 + return true;
108168 +
108169 + default:
108170 + return false;
108171 + }
108172 +}
108173 +#endif
108174 +
108175 +#if BUILDING_GCC_VERSION <= 4006
108176 +#define ANY_RETURN_P(rtx) (GET_CODE(rtx) == RETURN)
108177 +#define C_DECL_REGISTER(EXP) DECL_LANG_FLAG_4(EXP)
108178 +
108179 +// should come from c-tree.h if only it were installed for gcc 4.5...
108180 +#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
108181 +
108182 +#define get_random_seed(noinit) ({ \
108183 + unsigned HOST_WIDE_INT seed; \
108184 + sscanf(get_random_seed(noinit), "%" HOST_WIDE_INT_PRINT "x", &seed); \
108185 + seed * seed; })
108186 +
108187 +static inline bool gimple_clobber_p(gimple s)
108188 +{
108189 + return false;
108190 +}
108191 +
108192 +static inline tree builtin_decl_implicit(enum built_in_function fncode)
108193 +{
108194 + return implicit_built_in_decls[fncode];
108195 +}
108196 +
108197 +static inline struct cgraph_node *cgraph_get_create_node(tree decl)
108198 +{
108199 + struct cgraph_node *node = cgraph_get_node(decl);
108200 +
108201 + return node ? node : cgraph_node(decl);
108202 +}
108203 +
108204 +static inline bool cgraph_function_with_gimple_body_p(struct cgraph_node *node)
108205 +{
108206 + return node->analyzed && !node->thunk.thunk_p && !node->alias;
108207 +}
108208 +
108209 +static inline struct cgraph_node *cgraph_first_function_with_gimple_body(void)
108210 +{
108211 + struct cgraph_node *node;
108212 +
108213 + for (node = cgraph_nodes; node; node = node->next)
108214 + if (cgraph_function_with_gimple_body_p(node))
108215 + return node;
108216 + return NULL;
108217 +}
108218 +
108219 +static inline struct cgraph_node *cgraph_next_function_with_gimple_body(struct cgraph_node *node)
108220 +{
108221 + for (node = node->next; node; node = node->next)
108222 + if (cgraph_function_with_gimple_body_p(node))
108223 + return node;
108224 + return NULL;
108225 +}
108226 +
108227 +#define FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) \
108228 + for ((node) = cgraph_first_function_with_gimple_body(); (node); \
108229 + (node) = cgraph_next_function_with_gimple_body(node))
108230 +#endif
108231 +
108232 +#if BUILDING_GCC_VERSION == 4006
108233 +extern void debug_gimple_stmt(gimple);
108234 +extern void debug_gimple_seq(gimple_seq);
108235 +extern void print_gimple_seq(FILE *, gimple_seq, int, int);
108236 +extern void print_gimple_stmt(FILE *, gimple, int, int);
108237 +extern void print_gimple_expr(FILE *, gimple, int, int);
108238 +extern void dump_gimple_stmt(pretty_printer *, gimple, int, int);
108239 +#endif
108240 +
108241 +#if BUILDING_GCC_VERSION <= 4007
108242 +#define FOR_EACH_VARIABLE(node) for (node = varpool_nodes; node; node = node->next)
108243 +#define PROP_loops 0
108244 +
108245 +static inline int bb_loop_depth(const_basic_block bb)
108246 +{
108247 + return bb->loop_father ? loop_depth(bb->loop_father) : 0;
108248 +}
108249 +
108250 +static inline bool gimple_store_p(gimple gs)
108251 +{
108252 + tree lhs = gimple_get_lhs(gs);
108253 + return lhs && !is_gimple_reg(lhs);
108254 +}
108255 +#endif
108256 +
108257 +#if BUILDING_GCC_VERSION >= 4007
108258 +#define cgraph_create_edge(caller, callee, call_stmt, count, freq, nest) \
108259 + cgraph_create_edge((caller), (callee), (call_stmt), (count), (freq))
108260 +#define cgraph_create_edge_including_clones(caller, callee, old_call_stmt, call_stmt, count, freq, nest, reason) \
108261 + cgraph_create_edge_including_clones((caller), (callee), (old_call_stmt), (call_stmt), (count), (freq), (reason))
108262 +#endif
108263 +
108264 +#if BUILDING_GCC_VERSION <= 4008
108265 +#define ENTRY_BLOCK_PTR_FOR_FN(FN) ENTRY_BLOCK_PTR_FOR_FUNCTION(FN)
108266 +#define EXIT_BLOCK_PTR_FOR_FN(FN) EXIT_BLOCK_PTR_FOR_FUNCTION(FN)
108267 +#define basic_block_info_for_fn(FN) ((FN)->cfg->x_basic_block_info)
108268 +#define n_basic_blocks_for_fn(FN) ((FN)->cfg->x_n_basic_blocks)
108269 +#define n_edges_for_fn(FN) ((FN)->cfg->x_n_edges)
108270 +#define last_basic_block_for_fn(FN) ((FN)->cfg->x_last_basic_block)
108271 +#define label_to_block_map_for_fn(FN) ((FN)->cfg->x_label_to_block_map)
108272 +#define profile_status_for_fn(FN) ((FN)->cfg->x_profile_status)
108273 +
108274 +static inline const char *get_tree_code_name(enum tree_code code)
108275 +{
108276 + gcc_assert(code < MAX_TREE_CODES);
108277 + return tree_code_name[code];
108278 +}
108279 +
108280 +#define ipa_remove_stmt_references(cnode, stmt)
108281 +#endif
108282 +
108283 +#if BUILDING_GCC_VERSION == 4008
108284 +#define NODE_DECL(node) node->symbol.decl
108285 +#else
108286 +#define NODE_DECL(node) node->decl
108287 +#endif
108288 +
108289 +#if BUILDING_GCC_VERSION >= 4008
108290 +#define add_referenced_var(var)
108291 +#define mark_sym_for_renaming(var)
108292 +#define varpool_mark_needed_node(node)
108293 +#define TODO_dump_func 0
108294 +#define TODO_dump_cgraph 0
108295 +#endif
108296 +
108297 +#if BUILDING_GCC_VERSION >= 4009
108298 +#define TODO_ggc_collect 0
108299 +#endif
108300 +
108301 +#endif
108302 diff --git a/tools/gcc/gen-random-seed.sh b/tools/gcc/gen-random-seed.sh
108303 new file mode 100644
108304 index 0000000..7514850
108305 --- /dev/null
108306 +++ b/tools/gcc/gen-random-seed.sh
108307 @@ -0,0 +1,8 @@
108308 +#!/bin/sh
108309 +
108310 +if [ ! -f "$1" ]; then
108311 + SEED=`od -A n -t x8 -N 32 /dev/urandom | tr -d ' \n'`
108312 + echo "const char *randstruct_seed = \"$SEED\";" > "$1"
108313 + HASH=`echo -n "$SEED" | sha256sum | cut -d" " -f1 | tr -d ' \n'`
108314 + echo "#define RANDSTRUCT_HASHED_SEED \"$HASH\"" > "$2"
108315 +fi
108316 diff --git a/tools/gcc/kallocstat_plugin.c b/tools/gcc/kallocstat_plugin.c
108317 new file mode 100644
108318 index 0000000..d81c094
108319 --- /dev/null
108320 +++ b/tools/gcc/kallocstat_plugin.c
108321 @@ -0,0 +1,183 @@
108322 +/*
108323 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
108324 + * Licensed under the GPL v2
108325 + *
108326 + * Note: the choice of the license means that the compilation process is
108327 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
108328 + * but for the kernel it doesn't matter since it doesn't link against
108329 + * any of the gcc libraries
108330 + *
108331 + * gcc plugin to find the distribution of k*alloc sizes
108332 + *
108333 + * TODO:
108334 + *
108335 + * BUGS:
108336 + * - none known
108337 + */
108338 +
108339 +#include "gcc-common.h"
108340 +
108341 +int plugin_is_GPL_compatible;
108342 +
108343 +static struct plugin_info kallocstat_plugin_info = {
108344 + .version = "201401260140",
108345 + .help = NULL
108346 +};
108347 +
108348 +static const char * const kalloc_functions[] = {
108349 + "__kmalloc",
108350 + "kmalloc",
108351 + "kmalloc_large",
108352 + "kmalloc_node",
108353 + "kmalloc_order",
108354 + "kmalloc_order_trace",
108355 + "kmalloc_slab",
108356 + "kzalloc",
108357 + "kzalloc_node",
108358 +};
108359 +
108360 +static bool is_kalloc(const char *fnname)
108361 +{
108362 + size_t i;
108363 +
108364 + for (i = 0; i < ARRAY_SIZE(kalloc_functions); i++)
108365 + if (!strcmp(fnname, kalloc_functions[i]))
108366 + return true;
108367 + return false;
108368 +}
108369 +
108370 +static unsigned int execute_kallocstat(void)
108371 +{
108372 + basic_block bb;
108373 +
108374 + // 1. loop through BBs and GIMPLE statements
108375 + FOR_EACH_BB_FN(bb, cfun) {
108376 + gimple_stmt_iterator gsi;
108377 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
108378 + // gimple match:
108379 + tree fndecl, size;
108380 + gimple stmt;
108381 + const char *fnname;
108382 +
108383 + // is it a call
108384 + stmt = gsi_stmt(gsi);
108385 + if (!is_gimple_call(stmt))
108386 + continue;
108387 + fndecl = gimple_call_fndecl(stmt);
108388 + if (fndecl == NULL_TREE)
108389 + continue;
108390 + if (TREE_CODE(fndecl) != FUNCTION_DECL)
108391 + continue;
108392 +
108393 + // is it a call to k*alloc
108394 + fnname = DECL_NAME_POINTER(fndecl);
108395 + if (!is_kalloc(fnname))
108396 + continue;
108397 +
108398 + // is the size arg const or the result of a simple const assignment
108399 + size = gimple_call_arg(stmt, 0);
108400 + while (true) {
108401 + expanded_location xloc;
108402 + size_t size_val;
108403 +
108404 + if (TREE_CONSTANT(size)) {
108405 + xloc = expand_location(gimple_location(stmt));
108406 + if (!xloc.file)
108407 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
108408 + size_val = TREE_INT_CST_LOW(size);
108409 + fprintf(stderr, "kallocsize: %8zu %8zx %s %s:%u\n", size_val, size_val, fnname, xloc.file, xloc.line);
108410 + break;
108411 + }
108412 +
108413 + if (TREE_CODE(size) != SSA_NAME)
108414 + break;
108415 + stmt = SSA_NAME_DEF_STMT(size);
108416 +//debug_gimple_stmt(stmt);
108417 +//debug_tree(size);
108418 + if (!stmt || !is_gimple_assign(stmt))
108419 + break;
108420 + if (gimple_num_ops(stmt) != 2)
108421 + break;
108422 + size = gimple_assign_rhs1(stmt);
108423 + }
108424 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
108425 +//debug_tree(gimple_call_fn(call_stmt));
108426 +//print_node(stderr, "pax", fndecl, 4);
108427 + }
108428 + }
108429 +
108430 + return 0;
108431 +}
108432 +
108433 +#if BUILDING_GCC_VERSION >= 4009
108434 +static const struct pass_data kallocstat_pass_data = {
108435 +#else
108436 +static struct gimple_opt_pass kallocstat_pass = {
108437 + .pass = {
108438 +#endif
108439 + .type = GIMPLE_PASS,
108440 + .name = "kallocstat",
108441 +#if BUILDING_GCC_VERSION >= 4008
108442 + .optinfo_flags = OPTGROUP_NONE,
108443 +#endif
108444 +#if BUILDING_GCC_VERSION >= 4009
108445 + .has_gate = false,
108446 + .has_execute = true,
108447 +#else
108448 + .gate = NULL,
108449 + .execute = execute_kallocstat,
108450 + .sub = NULL,
108451 + .next = NULL,
108452 + .static_pass_number = 0,
108453 +#endif
108454 + .tv_id = TV_NONE,
108455 + .properties_required = 0,
108456 + .properties_provided = 0,
108457 + .properties_destroyed = 0,
108458 + .todo_flags_start = 0,
108459 + .todo_flags_finish = 0
108460 +#if BUILDING_GCC_VERSION < 4009
108461 + }
108462 +#endif
108463 +};
108464 +
108465 +#if BUILDING_GCC_VERSION >= 4009
108466 +namespace {
108467 +class kallocstat_pass : public gimple_opt_pass {
108468 +public:
108469 + kallocstat_pass() : gimple_opt_pass(kallocstat_pass_data, g) {}
108470 + unsigned int execute() { return execute_kallocstat(); }
108471 +};
108472 +}
108473 +
108474 +static opt_pass *make_kallocstat_pass(void)
108475 +{
108476 + return new kallocstat_pass();
108477 +}
108478 +#else
108479 +static struct opt_pass *make_kallocstat_pass(void)
108480 +{
108481 + return &kallocstat_pass.pass;
108482 +}
108483 +#endif
108484 +
108485 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
108486 +{
108487 + const char * const plugin_name = plugin_info->base_name;
108488 + struct register_pass_info kallocstat_pass_info;
108489 +
108490 + kallocstat_pass_info.pass = make_kallocstat_pass();
108491 + kallocstat_pass_info.reference_pass_name = "ssa";
108492 + kallocstat_pass_info.ref_pass_instance_number = 1;
108493 + kallocstat_pass_info.pos_op = PASS_POS_INSERT_AFTER;
108494 +
108495 + if (!plugin_default_version_check(version, &gcc_version)) {
108496 + error(G_("incompatible gcc/plugin versions"));
108497 + return 1;
108498 + }
108499 +
108500 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kallocstat_plugin_info);
108501 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kallocstat_pass_info);
108502 +
108503 + return 0;
108504 +}
108505 diff --git a/tools/gcc/kernexec_plugin.c b/tools/gcc/kernexec_plugin.c
108506 new file mode 100644
108507 index 0000000..89f256d
108508 --- /dev/null
108509 +++ b/tools/gcc/kernexec_plugin.c
108510 @@ -0,0 +1,522 @@
108511 +/*
108512 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
108513 + * Licensed under the GPL v2
108514 + *
108515 + * Note: the choice of the license means that the compilation process is
108516 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
108517 + * but for the kernel it doesn't matter since it doesn't link against
108518 + * any of the gcc libraries
108519 + *
108520 + * gcc plugin to make KERNEXEC/amd64 almost as good as it is on i386
108521 + *
108522 + * TODO:
108523 + *
108524 + * BUGS:
108525 + * - none known
108526 + */
108527 +
108528 +#include "gcc-common.h"
108529 +
108530 +int plugin_is_GPL_compatible;
108531 +
108532 +static struct plugin_info kernexec_plugin_info = {
108533 + .version = "201401260140",
108534 + .help = "method=[bts|or]\tinstrumentation method\n"
108535 +};
108536 +
108537 +static void (*kernexec_instrument_fptr)(gimple_stmt_iterator *);
108538 +static void (*kernexec_instrument_retaddr)(rtx);
108539 +
108540 +/*
108541 + * add special KERNEXEC instrumentation: reload %r12 after it has been clobbered
108542 + */
108543 +static void kernexec_reload_fptr_mask(gimple_stmt_iterator *gsi)
108544 +{
108545 + gimple asm_movabs_stmt;
108546 +
108547 + // build asm volatile("movabs $0x8000000000000000, %%r12\n\t" : : : );
108548 + asm_movabs_stmt = gimple_build_asm_vec("movabs $0x8000000000000000, %%r12\n\t", NULL, NULL, NULL, NULL);
108549 + gimple_asm_set_volatile(asm_movabs_stmt, true);
108550 + gsi_insert_after(gsi, asm_movabs_stmt, GSI_CONTINUE_LINKING);
108551 + update_stmt(asm_movabs_stmt);
108552 +}
108553 +
108554 +/*
108555 + * find all asm() stmts that clobber r12 and add a reload of r12
108556 + */
108557 +static unsigned int execute_kernexec_reload(void)
108558 +{
108559 + basic_block bb;
108560 +
108561 + // 1. loop through BBs and GIMPLE statements
108562 + FOR_EACH_BB_FN(bb, cfun) {
108563 + gimple_stmt_iterator gsi;
108564 +
108565 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
108566 + // gimple match: __asm__ ("" : : : "r12");
108567 + gimple asm_stmt;
108568 + size_t nclobbers;
108569 +
108570 + // is it an asm ...
108571 + asm_stmt = gsi_stmt(gsi);
108572 + if (gimple_code(asm_stmt) != GIMPLE_ASM)
108573 + continue;
108574 +
108575 + // ... clobbering r12
108576 + nclobbers = gimple_asm_nclobbers(asm_stmt);
108577 + while (nclobbers--) {
108578 + tree op = gimple_asm_clobber_op(asm_stmt, nclobbers);
108579 + if (strcmp(TREE_STRING_POINTER(TREE_VALUE(op)), "r12"))
108580 + continue;
108581 + kernexec_reload_fptr_mask(&gsi);
108582 +//print_gimple_stmt(stderr, asm_stmt, 0, TDF_LINENO);
108583 + break;
108584 + }
108585 + }
108586 + }
108587 +
108588 + return 0;
108589 +}
108590 +
108591 +/*
108592 + * add special KERNEXEC instrumentation: force MSB of fptr to 1, which will produce
108593 + * a non-canonical address from a userland ptr and will just trigger a GPF on dereference
108594 + */
108595 +static void kernexec_instrument_fptr_bts(gimple_stmt_iterator *gsi)
108596 +{
108597 + gimple assign_intptr, assign_new_fptr, call_stmt;
108598 + tree intptr, orptr, old_fptr, new_fptr, kernexec_mask;
108599 +
108600 + call_stmt = gsi_stmt(*gsi);
108601 + old_fptr = gimple_call_fn(call_stmt);
108602 +
108603 + // create temporary unsigned long variable used for bitops and cast fptr to it
108604 + intptr = create_tmp_var(long_unsigned_type_node, "kernexec_bts");
108605 + add_referenced_var(intptr);
108606 + intptr = make_ssa_name(intptr, NULL);
108607 + assign_intptr = gimple_build_assign(intptr, fold_convert(long_unsigned_type_node, old_fptr));
108608 + SSA_NAME_DEF_STMT(intptr) = assign_intptr;
108609 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
108610 + update_stmt(assign_intptr);
108611 +
108612 + // apply logical or to temporary unsigned long and bitmask
108613 + kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0x8000000000000000LL);
108614 +// kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0xffffffff80000000LL);
108615 + orptr = fold_build2(BIT_IOR_EXPR, long_long_unsigned_type_node, intptr, kernexec_mask);
108616 + intptr = make_ssa_name(SSA_NAME_VAR(intptr), NULL);
108617 + assign_intptr = gimple_build_assign(intptr, orptr);
108618 + SSA_NAME_DEF_STMT(intptr) = assign_intptr;
108619 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
108620 + update_stmt(assign_intptr);
108621 +
108622 + // cast temporary unsigned long back to a temporary fptr variable
108623 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_fptr");
108624 + add_referenced_var(new_fptr);
108625 + new_fptr = make_ssa_name(new_fptr, NULL);
108626 + assign_new_fptr = gimple_build_assign(new_fptr, fold_convert(TREE_TYPE(old_fptr), intptr));
108627 + SSA_NAME_DEF_STMT(new_fptr) = assign_new_fptr;
108628 + gsi_insert_before(gsi, assign_new_fptr, GSI_SAME_STMT);
108629 + update_stmt(assign_new_fptr);
108630 +
108631 + // replace call stmt fn with the new fptr
108632 + gimple_call_set_fn(call_stmt, new_fptr);
108633 + update_stmt(call_stmt);
108634 +}
108635 +
108636 +static void kernexec_instrument_fptr_or(gimple_stmt_iterator *gsi)
108637 +{
108638 + gimple asm_or_stmt, call_stmt;
108639 + tree old_fptr, new_fptr, input, output;
108640 +#if BUILDING_GCC_VERSION <= 4007
108641 + VEC(tree, gc) *inputs = NULL;
108642 + VEC(tree, gc) *outputs = NULL;
108643 +#else
108644 + vec<tree, va_gc> *inputs = NULL;
108645 + vec<tree, va_gc> *outputs = NULL;
108646 +#endif
108647 +
108648 + call_stmt = gsi_stmt(*gsi);
108649 + old_fptr = gimple_call_fn(call_stmt);
108650 +
108651 + // create temporary fptr variable
108652 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_or");
108653 + add_referenced_var(new_fptr);
108654 + new_fptr = make_ssa_name(new_fptr, NULL);
108655 +
108656 + // build asm volatile("orq %%r12, %0\n\t" : "=r"(new_fptr) : "0"(old_fptr));
108657 + input = build_tree_list(NULL_TREE, build_string(1, "0"));
108658 + input = chainon(NULL_TREE, build_tree_list(input, old_fptr));
108659 + output = build_tree_list(NULL_TREE, build_string(2, "=r"));
108660 + output = chainon(NULL_TREE, build_tree_list(output, new_fptr));
108661 +#if BUILDING_GCC_VERSION <= 4007
108662 + VEC_safe_push(tree, gc, inputs, input);
108663 + VEC_safe_push(tree, gc, outputs, output);
108664 +#else
108665 + vec_safe_push(inputs, input);
108666 + vec_safe_push(outputs, output);
108667 +#endif
108668 + asm_or_stmt = gimple_build_asm_vec("orq %%r12, %0\n\t", inputs, outputs, NULL, NULL);
108669 + SSA_NAME_DEF_STMT(new_fptr) = asm_or_stmt;
108670 + gimple_asm_set_volatile(asm_or_stmt, true);
108671 + gsi_insert_before(gsi, asm_or_stmt, GSI_SAME_STMT);
108672 + update_stmt(asm_or_stmt);
108673 +
108674 + // replace call stmt fn with the new fptr
108675 + gimple_call_set_fn(call_stmt, new_fptr);
108676 + update_stmt(call_stmt);
108677 +}
108678 +
108679 +/*
108680 + * find all C level function pointer dereferences and forcibly set the highest bit of the pointer
108681 + */
108682 +static unsigned int execute_kernexec_fptr(void)
108683 +{
108684 + basic_block bb;
108685 +
108686 + // 1. loop through BBs and GIMPLE statements
108687 + FOR_EACH_BB_FN(bb, cfun) {
108688 + gimple_stmt_iterator gsi;
108689 +
108690 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
108691 + // gimple match: h_1 = get_fptr (); D.2709_3 = h_1 (x_2(D));
108692 + tree fn;
108693 + gimple call_stmt;
108694 +
108695 + // is it a call ...
108696 + call_stmt = gsi_stmt(gsi);
108697 + if (!is_gimple_call(call_stmt))
108698 + continue;
108699 + fn = gimple_call_fn(call_stmt);
108700 + if (TREE_CODE(fn) == ADDR_EXPR)
108701 + continue;
108702 + if (TREE_CODE(fn) != SSA_NAME)
108703 + gcc_unreachable();
108704 +
108705 + // ... through a function pointer
108706 + if (SSA_NAME_VAR(fn) != NULL_TREE) {
108707 + fn = SSA_NAME_VAR(fn);
108708 + if (TREE_CODE(fn) != VAR_DECL && TREE_CODE(fn) != PARM_DECL) {
108709 + debug_tree(fn);
108710 + gcc_unreachable();
108711 + }
108712 + }
108713 + fn = TREE_TYPE(fn);
108714 + if (TREE_CODE(fn) != POINTER_TYPE)
108715 + continue;
108716 + fn = TREE_TYPE(fn);
108717 + if (TREE_CODE(fn) != FUNCTION_TYPE)
108718 + continue;
108719 +
108720 + kernexec_instrument_fptr(&gsi);
108721 +
108722 +//debug_tree(gimple_call_fn(call_stmt));
108723 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
108724 + }
108725 + }
108726 +
108727 + return 0;
108728 +}
108729 +
108730 +// add special KERNEXEC instrumentation: btsq $63,(%rsp) just before retn
108731 +static void kernexec_instrument_retaddr_bts(rtx insn)
108732 +{
108733 + rtx btsq;
108734 + rtvec argvec, constraintvec, labelvec;
108735 + int line;
108736 +
108737 + // create asm volatile("btsq $63,(%%rsp)":::)
108738 + argvec = rtvec_alloc(0);
108739 + constraintvec = rtvec_alloc(0);
108740 + labelvec = rtvec_alloc(0);
108741 + line = expand_location(RTL_LOCATION(insn)).line;
108742 + btsq = gen_rtx_ASM_OPERANDS(VOIDmode, "btsq $63,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
108743 + MEM_VOLATILE_P(btsq) = 1;
108744 +// RTX_FRAME_RELATED_P(btsq) = 1; // not for ASM_OPERANDS
108745 + emit_insn_before(btsq, insn);
108746 +}
108747 +
108748 +// add special KERNEXEC instrumentation: orq %r12,(%rsp) just before retn
108749 +static void kernexec_instrument_retaddr_or(rtx insn)
108750 +{
108751 + rtx orq;
108752 + rtvec argvec, constraintvec, labelvec;
108753 + int line;
108754 +
108755 + // create asm volatile("orq %%r12,(%%rsp)":::)
108756 + argvec = rtvec_alloc(0);
108757 + constraintvec = rtvec_alloc(0);
108758 + labelvec = rtvec_alloc(0);
108759 + line = expand_location(RTL_LOCATION(insn)).line;
108760 + orq = gen_rtx_ASM_OPERANDS(VOIDmode, "orq %%r12,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
108761 + MEM_VOLATILE_P(orq) = 1;
108762 +// RTX_FRAME_RELATED_P(orq) = 1; // not for ASM_OPERANDS
108763 + emit_insn_before(orq, insn);
108764 +}
108765 +
108766 +/*
108767 + * find all asm level function returns and forcibly set the highest bit of the return address
108768 + */
108769 +static unsigned int execute_kernexec_retaddr(void)
108770 +{
108771 + rtx insn;
108772 +
108773 +// if (stack_realign_drap)
108774 +// inform(DECL_SOURCE_LOCATION(current_function_decl), "drap detected in %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
108775 +
108776 + // 1. find function returns
108777 + for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
108778 + // rtl match: (jump_insn 41 40 42 2 (return) fptr.c:42 634 {return_internal} (nil))
108779 + // (jump_insn 12 9 11 2 (parallel [ (return) (unspec [ (0) ] UNSPEC_REP) ]) fptr.c:46 635 {return_internal_long} (nil))
108780 + // (jump_insn 97 96 98 6 (simple_return) fptr.c:50 -1 (nil) -> simple_return)
108781 + rtx body;
108782 +
108783 + // is it a retn
108784 + if (!JUMP_P(insn))
108785 + continue;
108786 + body = PATTERN(insn);
108787 + if (GET_CODE(body) == PARALLEL)
108788 + body = XVECEXP(body, 0, 0);
108789 + if (!ANY_RETURN_P(body))
108790 + continue;
108791 + kernexec_instrument_retaddr(insn);
108792 + }
108793 +
108794 +// print_simple_rtl(stderr, get_insns());
108795 +// print_rtl(stderr, get_insns());
108796 +
108797 + return 0;
108798 +}
108799 +
108800 +static bool kernexec_cmodel_check(void)
108801 +{
108802 + tree section;
108803 +
108804 + if (ix86_cmodel != CM_KERNEL)
108805 + return false;
108806 +
108807 + section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
108808 + if (!section || !TREE_VALUE(section))
108809 + return true;
108810 +
108811 + section = TREE_VALUE(TREE_VALUE(section));
108812 + if (strncmp(TREE_STRING_POINTER(section), ".vsyscall_", 10))
108813 + return true;
108814 +
108815 + return false;
108816 +}
108817 +
108818 +#if BUILDING_GCC_VERSION >= 4009
108819 +static const struct pass_data kernexec_reload_pass_data = {
108820 +#else
108821 +static struct gimple_opt_pass kernexec_reload_pass = {
108822 + .pass = {
108823 +#endif
108824 + .type = GIMPLE_PASS,
108825 + .name = "kernexec_reload",
108826 +#if BUILDING_GCC_VERSION >= 4008
108827 + .optinfo_flags = OPTGROUP_NONE,
108828 +#endif
108829 +#if BUILDING_GCC_VERSION >= 4009
108830 + .has_gate = true,
108831 + .has_execute = true,
108832 +#else
108833 + .gate = kernexec_cmodel_check,
108834 + .execute = execute_kernexec_reload,
108835 + .sub = NULL,
108836 + .next = NULL,
108837 + .static_pass_number = 0,
108838 +#endif
108839 + .tv_id = TV_NONE,
108840 + .properties_required = 0,
108841 + .properties_provided = 0,
108842 + .properties_destroyed = 0,
108843 + .todo_flags_start = 0,
108844 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
108845 +#if BUILDING_GCC_VERSION < 4009
108846 + }
108847 +#endif
108848 +};
108849 +
108850 +#if BUILDING_GCC_VERSION >= 4009
108851 +static const struct pass_data kernexec_fptr_pass_data = {
108852 +#else
108853 +static struct gimple_opt_pass kernexec_fptr_pass = {
108854 + .pass = {
108855 +#endif
108856 + .type = GIMPLE_PASS,
108857 + .name = "kernexec_fptr",
108858 +#if BUILDING_GCC_VERSION >= 4008
108859 + .optinfo_flags = OPTGROUP_NONE,
108860 +#endif
108861 +#if BUILDING_GCC_VERSION >= 4009
108862 + .has_gate = true,
108863 + .has_execute = true,
108864 +#else
108865 + .gate = kernexec_cmodel_check,
108866 + .execute = execute_kernexec_fptr,
108867 + .sub = NULL,
108868 + .next = NULL,
108869 + .static_pass_number = 0,
108870 +#endif
108871 + .tv_id = TV_NONE,
108872 + .properties_required = 0,
108873 + .properties_provided = 0,
108874 + .properties_destroyed = 0,
108875 + .todo_flags_start = 0,
108876 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
108877 +#if BUILDING_GCC_VERSION < 4009
108878 + }
108879 +#endif
108880 +};
108881 +
108882 +#if BUILDING_GCC_VERSION >= 4009
108883 +static const struct pass_data kernexec_retaddr_pass_data = {
108884 +#else
108885 +static struct rtl_opt_pass kernexec_retaddr_pass = {
108886 + .pass = {
108887 +#endif
108888 + .type = RTL_PASS,
108889 + .name = "kernexec_retaddr",
108890 +#if BUILDING_GCC_VERSION >= 4008
108891 + .optinfo_flags = OPTGROUP_NONE,
108892 +#endif
108893 +#if BUILDING_GCC_VERSION >= 4009
108894 + .has_gate = true,
108895 + .has_execute = true,
108896 +#else
108897 + .gate = kernexec_cmodel_check,
108898 + .execute = execute_kernexec_retaddr,
108899 + .sub = NULL,
108900 + .next = NULL,
108901 + .static_pass_number = 0,
108902 +#endif
108903 + .tv_id = TV_NONE,
108904 + .properties_required = 0,
108905 + .properties_provided = 0,
108906 + .properties_destroyed = 0,
108907 + .todo_flags_start = 0,
108908 + .todo_flags_finish = TODO_dump_func | TODO_ggc_collect
108909 +#if BUILDING_GCC_VERSION < 4009
108910 + }
108911 +#endif
108912 +};
108913 +
108914 +#if BUILDING_GCC_VERSION >= 4009
108915 +namespace {
108916 +class kernexec_reload_pass : public gimple_opt_pass {
108917 +public:
108918 + kernexec_reload_pass() : gimple_opt_pass(kernexec_reload_pass_data, g) {}
108919 + bool gate() { return kernexec_cmodel_check(); }
108920 + unsigned int execute() { return execute_kernexec_reload(); }
108921 +};
108922 +
108923 +class kernexec_fptr_pass : public gimple_opt_pass {
108924 +public:
108925 + kernexec_fptr_pass() : gimple_opt_pass(kernexec_fptr_pass_data, g) {}
108926 + bool gate() { return kernexec_cmodel_check(); }
108927 + unsigned int execute() { return execute_kernexec_fptr(); }
108928 +};
108929 +
108930 +class kernexec_retaddr_pass : public rtl_opt_pass {
108931 +public:
108932 + kernexec_retaddr_pass() : rtl_opt_pass(kernexec_retaddr_pass_data, g) {}
108933 + bool gate() { return kernexec_cmodel_check(); }
108934 + unsigned int execute() { return execute_kernexec_retaddr(); }
108935 +};
108936 +}
108937 +
108938 +static opt_pass *make_kernexec_reload_pass(void)
108939 +{
108940 + return new kernexec_reload_pass();
108941 +}
108942 +
108943 +static opt_pass *make_kernexec_fptr_pass(void)
108944 +{
108945 + return new kernexec_fptr_pass();
108946 +}
108947 +
108948 +static opt_pass *make_kernexec_retaddr_pass(void)
108949 +{
108950 + return new kernexec_retaddr_pass();
108951 +}
108952 +#else
108953 +static struct opt_pass *make_kernexec_reload_pass(void)
108954 +{
108955 + return &kernexec_reload_pass.pass;
108956 +}
108957 +
108958 +static struct opt_pass *make_kernexec_fptr_pass(void)
108959 +{
108960 + return &kernexec_fptr_pass.pass;
108961 +}
108962 +
108963 +static struct opt_pass *make_kernexec_retaddr_pass(void)
108964 +{
108965 + return &kernexec_retaddr_pass.pass;
108966 +}
108967 +#endif
108968 +
108969 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
108970 +{
108971 + const char * const plugin_name = plugin_info->base_name;
108972 + const int argc = plugin_info->argc;
108973 + const struct plugin_argument * const argv = plugin_info->argv;
108974 + int i;
108975 + struct register_pass_info kernexec_reload_pass_info;
108976 + struct register_pass_info kernexec_fptr_pass_info;
108977 + struct register_pass_info kernexec_retaddr_pass_info;
108978 +
108979 + kernexec_reload_pass_info.pass = make_kernexec_reload_pass();
108980 + kernexec_reload_pass_info.reference_pass_name = "ssa";
108981 + kernexec_reload_pass_info.ref_pass_instance_number = 1;
108982 + kernexec_reload_pass_info.pos_op = PASS_POS_INSERT_AFTER;
108983 +
108984 + kernexec_fptr_pass_info.pass = make_kernexec_fptr_pass();
108985 + kernexec_fptr_pass_info.reference_pass_name = "ssa";
108986 + kernexec_fptr_pass_info.ref_pass_instance_number = 1;
108987 + kernexec_fptr_pass_info.pos_op = PASS_POS_INSERT_AFTER;
108988 +
108989 + kernexec_retaddr_pass_info.pass = make_kernexec_retaddr_pass();
108990 + kernexec_retaddr_pass_info.reference_pass_name = "pro_and_epilogue";
108991 + kernexec_retaddr_pass_info.ref_pass_instance_number = 1;
108992 + kernexec_retaddr_pass_info.pos_op = PASS_POS_INSERT_AFTER;
108993 +
108994 + if (!plugin_default_version_check(version, &gcc_version)) {
108995 + error(G_("incompatible gcc/plugin versions"));
108996 + return 1;
108997 + }
108998 +
108999 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kernexec_plugin_info);
109000 +
109001 + if (TARGET_64BIT == 0)
109002 + return 0;
109003 +
109004 + for (i = 0; i < argc; ++i) {
109005 + if (!strcmp(argv[i].key, "method")) {
109006 + if (!argv[i].value) {
109007 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
109008 + continue;
109009 + }
109010 + if (!strcmp(argv[i].value, "bts")) {
109011 + kernexec_instrument_fptr = kernexec_instrument_fptr_bts;
109012 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_bts;
109013 + } else if (!strcmp(argv[i].value, "or")) {
109014 + kernexec_instrument_fptr = kernexec_instrument_fptr_or;
109015 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_or;
109016 + fix_register("r12", 1, 1);
109017 + } else
109018 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
109019 + continue;
109020 + }
109021 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
109022 + }
109023 + if (!kernexec_instrument_fptr || !kernexec_instrument_retaddr)
109024 + error(G_("no instrumentation method was selected via '-fplugin-arg-%s-method'"), plugin_name);
109025 +
109026 + if (kernexec_instrument_fptr == kernexec_instrument_fptr_or)
109027 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_reload_pass_info);
109028 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_fptr_pass_info);
109029 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_retaddr_pass_info);
109030 +
109031 + return 0;
109032 +}
109033 diff --git a/tools/gcc/latent_entropy_plugin.c b/tools/gcc/latent_entropy_plugin.c
109034 new file mode 100644
109035 index 0000000..39d7cc7
109036 --- /dev/null
109037 +++ b/tools/gcc/latent_entropy_plugin.c
109038 @@ -0,0 +1,462 @@
109039 +/*
109040 + * Copyright 2012-2014 by the PaX Team <pageexec@freemail.hu>
109041 + * Licensed under the GPL v2
109042 + *
109043 + * Note: the choice of the license means that the compilation process is
109044 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
109045 + * but for the kernel it doesn't matter since it doesn't link against
109046 + * any of the gcc libraries
109047 + *
109048 + * gcc plugin to help generate a little bit of entropy from program state,
109049 + * used throughout the uptime of the kernel
109050 + *
109051 + * TODO:
109052 + * - add ipa pass to identify not explicitly marked candidate functions
109053 + * - mix in more program state (function arguments/return values, loop variables, etc)
109054 + * - more instrumentation control via attribute parameters
109055 + *
109056 + * BUGS:
109057 + * - LTO needs -flto-partition=none for now
109058 + */
109059 +
109060 +#include "gcc-common.h"
109061 +
109062 +int plugin_is_GPL_compatible;
109063 +
109064 +static tree latent_entropy_decl;
109065 +
109066 +static struct plugin_info latent_entropy_plugin_info = {
109067 + .version = "201403280150",
109068 + .help = NULL
109069 +};
109070 +
109071 +static unsigned HOST_WIDE_INT seed;
109072 +static unsigned HOST_WIDE_INT get_random_const(void)
109073 +{
109074 + unsigned int i;
109075 + unsigned HOST_WIDE_INT ret = 0;
109076 +
109077 + for (i = 0; i < 8 * sizeof ret; i++) {
109078 + ret = (ret << 1) | (seed & 1);
109079 + seed >>= 1;
109080 + if (ret & 1)
109081 + seed ^= 0xD800000000000000ULL;
109082 + }
109083 +
109084 + return ret;
109085 +}
109086 +
109087 +static tree handle_latent_entropy_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
109088 +{
109089 + tree type;
109090 + unsigned long long mask;
109091 +#if BUILDING_GCC_VERSION <= 4007
109092 + VEC(constructor_elt, gc) *vals;
109093 +#else
109094 + vec<constructor_elt, va_gc> *vals;
109095 +#endif
109096 +
109097 + switch (TREE_CODE(*node)) {
109098 + default:
109099 + *no_add_attrs = true;
109100 + error("%qE attribute only applies to functions and variables", name);
109101 + break;
109102 +
109103 + case VAR_DECL:
109104 + if (DECL_INITIAL(*node)) {
109105 + *no_add_attrs = true;
109106 + error("variable %qD with %qE attribute must not be initialized", *node, name);
109107 + break;
109108 + }
109109 +
109110 + if (!TREE_STATIC(*node)) {
109111 + *no_add_attrs = true;
109112 + error("variable %qD with %qE attribute must not be local", *node, name);
109113 + break;
109114 + }
109115 +
109116 + type = TREE_TYPE(*node);
109117 + switch (TREE_CODE(type)) {
109118 + default:
109119 + *no_add_attrs = true;
109120 + error("variable %qD with %qE attribute must be an integer or a fixed length integer array type or a fixed sized structure with integer fields", *node, name);
109121 + break;
109122 +
109123 + case RECORD_TYPE: {
109124 + tree field;
109125 + unsigned int nelt = 0;
109126 +
109127 + for (field = TYPE_FIELDS(type); field; nelt++, field = TREE_CHAIN(field)) {
109128 + tree fieldtype;
109129 +
109130 + fieldtype = TREE_TYPE(field);
109131 + if (TREE_CODE(fieldtype) != INTEGER_TYPE) {
109132 + *no_add_attrs = true;
109133 + error("structure variable %qD with %qE attribute has a non-integer field %qE", *node, name, field);
109134 + break;
109135 + }
109136 + }
109137 +
109138 + if (field)
109139 + break;
109140 +
109141 +#if BUILDING_GCC_VERSION <= 4007
109142 + vals = VEC_alloc(constructor_elt, gc, nelt);
109143 +#else
109144 + vec_alloc(vals, nelt);
109145 +#endif
109146 +
109147 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
109148 + tree fieldtype;
109149 +
109150 + fieldtype = TREE_TYPE(field);
109151 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(fieldtype)) - 1);
109152 + mask = 2 * (mask - 1) + 1;
109153 +
109154 + if (TYPE_UNSIGNED(fieldtype))
109155 + CONSTRUCTOR_APPEND_ELT(vals, field, build_int_cstu(fieldtype, mask & get_random_const()));
109156 + else
109157 + CONSTRUCTOR_APPEND_ELT(vals, field, build_int_cst(fieldtype, mask & get_random_const()));
109158 + }
109159 +
109160 + DECL_INITIAL(*node) = build_constructor(type, vals);
109161 +//debug_tree(DECL_INITIAL(*node));
109162 + break;
109163 + }
109164 +
109165 + case INTEGER_TYPE:
109166 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(type)) - 1);
109167 + mask = 2 * (mask - 1) + 1;
109168 +
109169 + if (TYPE_UNSIGNED(type))
109170 + DECL_INITIAL(*node) = build_int_cstu(type, mask & get_random_const());
109171 + else
109172 + DECL_INITIAL(*node) = build_int_cst(type, mask & get_random_const());
109173 + break;
109174 +
109175 + case ARRAY_TYPE: {
109176 + tree elt_type, array_size, elt_size;
109177 + unsigned int i, nelt;
109178 +
109179 + elt_type = TREE_TYPE(type);
109180 + elt_size = TYPE_SIZE_UNIT(TREE_TYPE(type));
109181 + array_size = TYPE_SIZE_UNIT(type);
109182 +
109183 + if (TREE_CODE(elt_type) != INTEGER_TYPE || !array_size || TREE_CODE(array_size) != INTEGER_CST) {
109184 + *no_add_attrs = true;
109185 + error("array variable %qD with %qE attribute must be a fixed length integer array type", *node, name);
109186 + break;
109187 + }
109188 +
109189 + nelt = TREE_INT_CST_LOW(array_size) / TREE_INT_CST_LOW(elt_size);
109190 +#if BUILDING_GCC_VERSION <= 4007
109191 + vals = VEC_alloc(constructor_elt, gc, nelt);
109192 +#else
109193 + vec_alloc(vals, nelt);
109194 +#endif
109195 +
109196 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(elt_type)) - 1);
109197 + mask = 2 * (mask - 1) + 1;
109198 +
109199 + for (i = 0; i < nelt; i++)
109200 + if (TYPE_UNSIGNED(elt_type))
109201 + CONSTRUCTOR_APPEND_ELT(vals, size_int(i), build_int_cstu(elt_type, mask & get_random_const()));
109202 + else
109203 + CONSTRUCTOR_APPEND_ELT(vals, size_int(i), build_int_cst(elt_type, mask & get_random_const()));
109204 +
109205 + DECL_INITIAL(*node) = build_constructor(type, vals);
109206 +//debug_tree(DECL_INITIAL(*node));
109207 + break;
109208 + }
109209 + }
109210 + break;
109211 +
109212 + case FUNCTION_DECL:
109213 + break;
109214 + }
109215 +
109216 + return NULL_TREE;
109217 +}
109218 +
109219 +static struct attribute_spec latent_entropy_attr = {
109220 + .name = "latent_entropy",
109221 + .min_length = 0,
109222 + .max_length = 0,
109223 + .decl_required = true,
109224 + .type_required = false,
109225 + .function_type_required = false,
109226 + .handler = handle_latent_entropy_attribute,
109227 +#if BUILDING_GCC_VERSION >= 4007
109228 + .affects_type_identity = false
109229 +#endif
109230 +};
109231 +
109232 +static void register_attributes(void *event_data, void *data)
109233 +{
109234 + register_attribute(&latent_entropy_attr);
109235 +}
109236 +
109237 +static bool gate_latent_entropy(void)
109238 +{
109239 + // don't bother with noreturn functions for now
109240 + if (TREE_THIS_VOLATILE(current_function_decl))
109241 + return false;
109242 +
109243 + return lookup_attribute("latent_entropy", DECL_ATTRIBUTES(current_function_decl)) != NULL_TREE;
109244 +}
109245 +
109246 +static enum tree_code get_op(tree *rhs)
109247 +{
109248 + static enum tree_code op;
109249 + unsigned HOST_WIDE_INT random_const;
109250 +
109251 + random_const = get_random_const();
109252 +
109253 + switch (op) {
109254 + case BIT_XOR_EXPR:
109255 + op = PLUS_EXPR;
109256 + break;
109257 +
109258 + case PLUS_EXPR:
109259 + if (rhs) {
109260 + op = LROTATE_EXPR;
109261 + random_const &= HOST_BITS_PER_WIDE_INT - 1;
109262 + break;
109263 + }
109264 +
109265 + case LROTATE_EXPR:
109266 + default:
109267 + op = BIT_XOR_EXPR;
109268 + break;
109269 + }
109270 + if (rhs)
109271 + *rhs = build_int_cstu(unsigned_intDI_type_node, random_const);
109272 + return op;
109273 +}
109274 +
109275 +static void perturb_local_entropy(basic_block bb, tree local_entropy)
109276 +{
109277 + gimple_stmt_iterator gsi;
109278 + gimple assign;
109279 + tree addxorrol, rhs;
109280 + enum tree_code op;
109281 +
109282 + op = get_op(&rhs);
109283 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, op, unsigned_intDI_type_node, local_entropy, rhs);
109284 + assign = gimple_build_assign(local_entropy, addxorrol);
109285 + gsi = gsi_after_labels(bb);
109286 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
109287 + update_stmt(assign);
109288 +//debug_bb(bb);
109289 +}
109290 +
109291 +static void perturb_latent_entropy(basic_block bb, tree rhs)
109292 +{
109293 + gimple_stmt_iterator gsi;
109294 + gimple assign;
109295 + tree addxorrol, temp;
109296 +
109297 + // 1. create temporary copy of latent_entropy
109298 + temp = create_tmp_var(unsigned_intDI_type_node, "temp_latent_entropy");
109299 + add_referenced_var(temp);
109300 +
109301 + // 2. read...
109302 + temp = make_ssa_name(temp, NULL);
109303 + assign = gimple_build_assign(temp, latent_entropy_decl);
109304 + SSA_NAME_DEF_STMT(temp) = assign;
109305 + add_referenced_var(latent_entropy_decl);
109306 + gsi = gsi_after_labels(bb);
109307 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
109308 + update_stmt(assign);
109309 +
109310 + // 3. ...modify...
109311 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, get_op(NULL), unsigned_intDI_type_node, temp, rhs);
109312 + temp = make_ssa_name(SSA_NAME_VAR(temp), NULL);
109313 + assign = gimple_build_assign(temp, addxorrol);
109314 + SSA_NAME_DEF_STMT(temp) = assign;
109315 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
109316 + update_stmt(assign);
109317 +
109318 + // 4. ...write latent_entropy
109319 + assign = gimple_build_assign(latent_entropy_decl, temp);
109320 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
109321 + update_stmt(assign);
109322 +}
109323 +
109324 +static unsigned int execute_latent_entropy(void)
109325 +{
109326 + basic_block bb;
109327 + gimple assign;
109328 + gimple_stmt_iterator gsi;
109329 + tree local_entropy;
109330 +
109331 + if (!latent_entropy_decl) {
109332 +#if BUILDING_GCC_VERSION >= 4009
109333 + varpool_node *node;
109334 +#else
109335 + struct varpool_node *node;
109336 +#endif
109337 +
109338 + FOR_EACH_VARIABLE(node) {
109339 + tree var = NODE_DECL(node);
109340 +
109341 + if (strcmp(IDENTIFIER_POINTER(DECL_NAME(var)), "latent_entropy"))
109342 + continue;
109343 + latent_entropy_decl = var;
109344 +// debug_tree(var);
109345 + break;
109346 + }
109347 + if (!latent_entropy_decl) {
109348 +// debug_tree(current_function_decl);
109349 + return 0;
109350 + }
109351 + }
109352 +
109353 +//fprintf(stderr, "latent_entropy: %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
109354 +
109355 + // 1. create local entropy variable
109356 + local_entropy = create_tmp_var(unsigned_intDI_type_node, "local_entropy");
109357 + add_referenced_var(local_entropy);
109358 + mark_sym_for_renaming(local_entropy);
109359 +
109360 + // 2. initialize local entropy variable
109361 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
109362 + if (dom_info_available_p(CDI_DOMINATORS))
109363 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
109364 + gsi = gsi_start_bb(bb);
109365 +
109366 + assign = gimple_build_assign(local_entropy, build_int_cstu(unsigned_intDI_type_node, get_random_const()));
109367 +// gimple_set_location(assign, loc);
109368 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
109369 + update_stmt(assign);
109370 +//debug_bb(bb);
109371 + gcc_assert(single_succ_p(bb));
109372 + bb = single_succ(bb);
109373 +
109374 + // 3. instrument each BB with an operation on the local entropy variable
109375 + while (bb != EXIT_BLOCK_PTR_FOR_FN(cfun)) {
109376 + perturb_local_entropy(bb, local_entropy);
109377 +//debug_bb(bb);
109378 + bb = bb->next_bb;
109379 + };
109380 +
109381 + // 4. mix local entropy into the global entropy variable
109382 + gcc_assert(single_pred_p(EXIT_BLOCK_PTR_FOR_FN(cfun)));
109383 + perturb_latent_entropy(single_pred(EXIT_BLOCK_PTR_FOR_FN(cfun)), local_entropy);
109384 +//debug_bb(single_pred(EXIT_BLOCK_PTR_FOR_FN(cfun)));
109385 + return 0;
109386 +}
109387 +
109388 +static void latent_entropy_start_unit(void *gcc_data, void *user_data)
109389 +{
109390 + tree latent_entropy_type;
109391 +
109392 + seed = get_random_seed(false);
109393 +
109394 + if (in_lto_p)
109395 + return;
109396 +
109397 + // extern volatile u64 latent_entropy
109398 + gcc_assert(TYPE_PRECISION(long_long_unsigned_type_node) == 64);
109399 + latent_entropy_type = build_qualified_type(long_long_unsigned_type_node, TYPE_QUALS(long_long_unsigned_type_node) | TYPE_QUAL_VOLATILE);
109400 + latent_entropy_decl = build_decl(UNKNOWN_LOCATION, VAR_DECL, get_identifier("latent_entropy"), latent_entropy_type);
109401 +
109402 + TREE_STATIC(latent_entropy_decl) = 1;
109403 + TREE_PUBLIC(latent_entropy_decl) = 1;
109404 + TREE_USED(latent_entropy_decl) = 1;
109405 + TREE_THIS_VOLATILE(latent_entropy_decl) = 1;
109406 + DECL_EXTERNAL(latent_entropy_decl) = 1;
109407 + DECL_ARTIFICIAL(latent_entropy_decl) = 1;
109408 + lang_hooks.decls.pushdecl(latent_entropy_decl);
109409 +// DECL_ASSEMBLER_NAME(latent_entropy_decl);
109410 +// varpool_finalize_decl(latent_entropy_decl);
109411 +// varpool_mark_needed_node(latent_entropy_decl);
109412 +}
109413 +
109414 +#if BUILDING_GCC_VERSION >= 4009
109415 +static const struct pass_data latent_entropy_pass_data = {
109416 +#else
109417 +static struct gimple_opt_pass latent_entropy_pass = {
109418 + .pass = {
109419 +#endif
109420 + .type = GIMPLE_PASS,
109421 + .name = "latent_entropy",
109422 +#if BUILDING_GCC_VERSION >= 4008
109423 + .optinfo_flags = OPTGROUP_NONE,
109424 +#endif
109425 +#if BUILDING_GCC_VERSION >= 4009
109426 + .has_gate = true,
109427 + .has_execute = true,
109428 +#else
109429 + .gate = gate_latent_entropy,
109430 + .execute = execute_latent_entropy,
109431 + .sub = NULL,
109432 + .next = NULL,
109433 + .static_pass_number = 0,
109434 +#endif
109435 + .tv_id = TV_NONE,
109436 + .properties_required = PROP_gimple_leh | PROP_cfg,
109437 + .properties_provided = 0,
109438 + .properties_destroyed = 0,
109439 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
109440 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
109441 +#if BUILDING_GCC_VERSION < 4009
109442 + }
109443 +#endif
109444 +};
109445 +
109446 +#if BUILDING_GCC_VERSION >= 4009
109447 +namespace {
109448 +class latent_entropy_pass : public gimple_opt_pass {
109449 +public:
109450 + latent_entropy_pass() : gimple_opt_pass(latent_entropy_pass_data, g) {}
109451 + bool gate() { return gate_latent_entropy(); }
109452 + unsigned int execute() { return execute_latent_entropy(); }
109453 +};
109454 +}
109455 +
109456 +static opt_pass *make_latent_entropy_pass(void)
109457 +{
109458 + return new latent_entropy_pass();
109459 +}
109460 +#else
109461 +static struct opt_pass *make_latent_entropy_pass(void)
109462 +{
109463 + return &latent_entropy_pass.pass;
109464 +}
109465 +#endif
109466 +
109467 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
109468 +{
109469 + const char * const plugin_name = plugin_info->base_name;
109470 + struct register_pass_info latent_entropy_pass_info;
109471 +
109472 + latent_entropy_pass_info.pass = make_latent_entropy_pass();
109473 + latent_entropy_pass_info.reference_pass_name = "optimized";
109474 + latent_entropy_pass_info.ref_pass_instance_number = 1;
109475 + latent_entropy_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
109476 + static const struct ggc_root_tab gt_ggc_r_gt_latent_entropy[] = {
109477 + {
109478 + .base = &latent_entropy_decl,
109479 + .nelt = 1,
109480 + .stride = sizeof(latent_entropy_decl),
109481 + .cb = &gt_ggc_mx_tree_node,
109482 + .pchw = &gt_pch_nx_tree_node
109483 + },
109484 + LAST_GGC_ROOT_TAB
109485 + };
109486 +
109487 + if (!plugin_default_version_check(version, &gcc_version)) {
109488 + error(G_("incompatible gcc/plugin versions"));
109489 + return 1;
109490 + }
109491 +
109492 + register_callback(plugin_name, PLUGIN_INFO, NULL, &latent_entropy_plugin_info);
109493 + register_callback(plugin_name, PLUGIN_START_UNIT, &latent_entropy_start_unit, NULL);
109494 + if (!in_lto_p)
109495 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_latent_entropy);
109496 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &latent_entropy_pass_info);
109497 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
109498 +
109499 + return 0;
109500 +}
109501 diff --git a/tools/gcc/randomize_layout_plugin.c b/tools/gcc/randomize_layout_plugin.c
109502 new file mode 100644
109503 index 0000000..8dafb22
109504 --- /dev/null
109505 +++ b/tools/gcc/randomize_layout_plugin.c
109506 @@ -0,0 +1,910 @@
109507 +/*
109508 + * Copyright 2014 by Open Source Security, Inc., Brad Spengler <spender@grsecurity.net>
109509 + * and PaX Team <pageexec@freemail.hu>
109510 + * Licensed under the GPL v2
109511 + *
109512 + * Usage:
109513 + * $ # for 4.5/4.6/C based 4.7
109514 + * $ gcc -I`gcc -print-file-name=plugin`/include -I`gcc -print-file-name=plugin`/include/c-family -fPIC -shared -O2 -o randomize_layout_plugin.so randomize_layout_plugin.c
109515 + * $ # for C++ based 4.7/4.8+
109516 + * $ g++ -I`g++ -print-file-name=plugin`/include -I`g++ -print-file-name=plugin`/include/c-family -fPIC -shared -O2 -o randomize_layout_plugin.so randomize_layout_plugin.c
109517 + * $ gcc -fplugin=./randomize_layout_plugin.so test.c -O2
109518 + */
109519 +
109520 +#include "gcc-common.h"
109521 +#include "randomize_layout_seed.h"
109522 +
109523 +#if BUILDING_GCC_MAJOR < 4 || BUILDING_GCC_MINOR < 6 || (BUILDING_GCC_MINOR == 6 && BUILDING_GCC_PATCHLEVEL < 4)
109524 +#error "The RANDSTRUCT plugin requires GCC 4.6.4 or newer."
109525 +#endif
109526 +
109527 +#define ORIG_TYPE_NAME(node) \
109528 + (TYPE_NAME(TYPE_MAIN_VARIANT(node)) != NULL_TREE ? ((const unsigned char *)IDENTIFIER_POINTER(TYPE_NAME(TYPE_MAIN_VARIANT(node)))) : (const unsigned char *)"anonymous")
109529 +
109530 +int plugin_is_GPL_compatible;
109531 +
109532 +static int performance_mode;
109533 +
109534 +static struct plugin_info randomize_layout_plugin_info = {
109535 + .version = "201402201816",
109536 + .help = "disable\t\t\tdo not activate plugin\n"
109537 + "performance-mode\tenable cacheline-aware layout randomization\n"
109538 +};
109539 +
109540 +/* from old Linux dcache.h */
109541 +static inline unsigned long
109542 +partial_name_hash(unsigned long c, unsigned long prevhash)
109543 +{
109544 + return (prevhash + (c << 4) + (c >> 4)) * 11;
109545 +}
109546 +static inline unsigned int
109547 +name_hash(const unsigned char *name)
109548 +{
109549 + unsigned long hash = 0;
109550 + unsigned int len = strlen((const char *)name);
109551 + while (len--)
109552 + hash = partial_name_hash(*name++, hash);
109553 + return (unsigned int)hash;
109554 +}
109555 +
109556 +static tree handle_randomize_layout_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
109557 +{
109558 + tree type;
109559 +
109560 + *no_add_attrs = true;
109561 + if (TREE_CODE(*node) == FUNCTION_DECL) {
109562 + error("%qE attribute does not apply to functions (%qF)", name, *node);
109563 + return NULL_TREE;
109564 + }
109565 +
109566 + if (TREE_CODE(*node) == PARM_DECL) {
109567 + error("%qE attribute does not apply to function parameters (%qD)", name, *node);
109568 + return NULL_TREE;
109569 + }
109570 +
109571 + if (TREE_CODE(*node) == VAR_DECL) {
109572 + error("%qE attribute does not apply to variables (%qD)", name, *node);
109573 + return NULL_TREE;
109574 + }
109575 +
109576 + if (TYPE_P(*node)) {
109577 + type = *node;
109578 + } else {
109579 + gcc_assert(TREE_CODE(*node) == TYPE_DECL);
109580 + type = TREE_TYPE(*node);
109581 + }
109582 +
109583 + if (TREE_CODE(type) != RECORD_TYPE) {
109584 + error("%qE attribute used on %qT applies to struct types only", name, type);
109585 + return NULL_TREE;
109586 + }
109587 +
109588 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
109589 + error("%qE attribute is already applied to the type %qT", name, type);
109590 + return NULL_TREE;
109591 + }
109592 +
109593 + *no_add_attrs = false;
109594 +
109595 + return NULL_TREE;
109596 +}
109597 +
109598 +/* set on complete types that we don't need to inspect further at all */
109599 +static tree handle_randomize_considered_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
109600 +{
109601 + *no_add_attrs = false;
109602 + return NULL_TREE;
109603 +}
109604 +
109605 +/*
109606 + * set on types that we've performed a shuffle on, to prevent re-shuffling
109607 + * this does not preclude us from inspecting its fields for potential shuffles
109608 + */
109609 +static tree handle_randomize_performed_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
109610 +{
109611 + *no_add_attrs = false;
109612 + return NULL_TREE;
109613 +}
109614 +
109615 +/*
109616 + * 64bit variant of Bob Jenkins' public domain PRNG
109617 + * 256 bits of internal state
109618 + */
109619 +
109620 +typedef unsigned long long u64;
109621 +
109622 +typedef struct ranctx { u64 a; u64 b; u64 c; u64 d; } ranctx;
109623 +
109624 +#define rot(x,k) (((x)<<(k))|((x)>>(64-(k))))
109625 +static u64 ranval(ranctx *x) {
109626 + u64 e = x->a - rot(x->b, 7);
109627 + x->a = x->b ^ rot(x->c, 13);
109628 + x->b = x->c + rot(x->d, 37);
109629 + x->c = x->d + e;
109630 + x->d = e + x->a;
109631 + return x->d;
109632 +}
109633 +
109634 +static void raninit(ranctx *x, u64 *seed) {
109635 + int i;
109636 +
109637 + x->a = seed[0];
109638 + x->b = seed[1];
109639 + x->c = seed[2];
109640 + x->d = seed[3];
109641 +
109642 + for (i=0; i < 30; ++i)
109643 + (void)ranval(x);
109644 +}
109645 +
109646 +static u64 shuffle_seed[4];
109647 +
109648 +struct partition_group {
109649 + tree tree_start;
109650 + unsigned long start;
109651 + unsigned long length;
109652 +};
109653 +
109654 +static void partition_struct(tree *fields, unsigned long length, struct partition_group *size_groups, unsigned long *num_groups)
109655 +{
109656 + unsigned long i;
109657 + unsigned long accum_size = 0;
109658 + unsigned long accum_length = 0;
109659 + unsigned long group_idx = 0;
109660 +
109661 + gcc_assert(length < INT_MAX);
109662 +
109663 + memset(size_groups, 0, sizeof(struct partition_group) * length);
109664 +
109665 + for (i = 0; i < length; i++) {
109666 + if (size_groups[group_idx].tree_start == NULL_TREE) {
109667 + size_groups[group_idx].tree_start = fields[i];
109668 + size_groups[group_idx].start = i;
109669 + accum_length = 0;
109670 + accum_size = 0;
109671 + }
109672 + accum_size += (unsigned long)int_size_in_bytes(TREE_TYPE(fields[i]));
109673 + accum_length++;
109674 + if (accum_size >= 64) {
109675 + size_groups[group_idx].length = accum_length;
109676 + accum_length = 0;
109677 + group_idx++;
109678 + }
109679 + }
109680 +
109681 + if (size_groups[group_idx].tree_start != NULL_TREE &&
109682 + !size_groups[group_idx].length) {
109683 + size_groups[group_idx].length = accum_length;
109684 + group_idx++;
109685 + }
109686 +
109687 + *num_groups = group_idx;
109688 +}
109689 +
109690 +static void performance_shuffle(tree *newtree, unsigned long length, ranctx *prng_state)
109691 +{
109692 + unsigned long i, x;
109693 + struct partition_group size_group[length];
109694 + unsigned long num_groups = 0;
109695 + unsigned long randnum;
109696 +
109697 + partition_struct(newtree, length, (struct partition_group *)&size_group, &num_groups);
109698 + for (i = num_groups - 1; i > 0; i--) {
109699 + struct partition_group tmp;
109700 + randnum = ranval(prng_state) % (i + 1);
109701 + tmp = size_group[i];
109702 + size_group[i] = size_group[randnum];
109703 + size_group[randnum] = tmp;
109704 + }
109705 +
109706 + for (x = 0; x < num_groups; x++) {
109707 + for (i = size_group[x].start + size_group[x].length - 1; i > size_group[x].start; i--) {
109708 + tree tmp;
109709 + if (DECL_BIT_FIELD_TYPE(newtree[i]))
109710 + continue;
109711 + randnum = ranval(prng_state) % (i + 1);
109712 + // we could handle this case differently if desired
109713 + if (DECL_BIT_FIELD_TYPE(newtree[randnum]))
109714 + continue;
109715 + tmp = newtree[i];
109716 + newtree[i] = newtree[randnum];
109717 + newtree[randnum] = tmp;
109718 + }
109719 + }
109720 +}
109721 +
109722 +static void full_shuffle(tree *newtree, unsigned long length, ranctx *prng_state)
109723 +{
109724 + unsigned long i, randnum;
109725 +
109726 + for (i = length - 1; i > 0; i--) {
109727 + tree tmp;
109728 + randnum = ranval(prng_state) % (i + 1);
109729 + tmp = newtree[i];
109730 + newtree[i] = newtree[randnum];
109731 + newtree[randnum] = tmp;
109732 + }
109733 +}
109734 +
109735 +/* modern in-place Fisher-Yates shuffle */
109736 +static void shuffle(const_tree type, tree *newtree, unsigned long length)
109737 +{
109738 + unsigned long i;
109739 + u64 seed[4];
109740 + ranctx prng_state;
109741 + const unsigned char *structname;
109742 +
109743 + if (length == 0)
109744 + return;
109745 +
109746 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
109747 +
109748 + structname = ORIG_TYPE_NAME(type);
109749 +
109750 +#ifdef __DEBUG_PLUGIN
109751 + fprintf(stderr, "Shuffling struct %s %p\n", (const char *)structname, type);
109752 +#ifdef __DEBUG_VERBOSE
109753 + debug_tree((tree)type);
109754 +#endif
109755 +#endif
109756 +
109757 + for (i = 0; i < 4; i++) {
109758 + seed[i] = shuffle_seed[i];
109759 + seed[i] ^= name_hash(structname);
109760 + }
109761 +
109762 + raninit(&prng_state, (u64 *)&seed);
109763 +
109764 + if (performance_mode)
109765 + performance_shuffle(newtree, length, &prng_state);
109766 + else
109767 + full_shuffle(newtree, length, &prng_state);
109768 +}
109769 +
109770 +static bool is_flexible_array(const_tree field)
109771 +{
109772 + const_tree fieldtype;
109773 + const_tree typesize;
109774 + const_tree elemtype;
109775 + const_tree elemsize;
109776 +
109777 + fieldtype = TREE_TYPE(field);
109778 + typesize = TYPE_SIZE(fieldtype);
109779 +
109780 + if (TREE_CODE(fieldtype) != ARRAY_TYPE)
109781 + return false;
109782 +
109783 + elemtype = TREE_TYPE(fieldtype);
109784 + elemsize = TYPE_SIZE(elemtype);
109785 +
109786 + /* size of type is represented in bits */
109787 +
109788 + if (typesize == NULL_TREE && TYPE_DOMAIN(fieldtype) != NULL_TREE &&
109789 + TYPE_MAX_VALUE(TYPE_DOMAIN(fieldtype)) == NULL_TREE)
109790 + return true;
109791 +
109792 + if (typesize != NULL_TREE &&
109793 + (TREE_CONSTANT(typesize) && (!TREE_INT_CST_LOW(typesize) ||
109794 + TREE_INT_CST_LOW(typesize) == TREE_INT_CST_LOW(elemsize))))
109795 + return true;
109796 +
109797 + return false;
109798 +}
109799 +
109800 +static int relayout_struct(tree type)
109801 +{
109802 + unsigned long num_fields = (unsigned long)list_length(TYPE_FIELDS(type));
109803 + unsigned long shuffle_length = num_fields;
109804 + tree field;
109805 + tree newtree[num_fields];
109806 + unsigned long i;
109807 + tree list;
109808 + tree variant;
109809 + expanded_location xloc;
109810 +
109811 + if (TYPE_FIELDS(type) == NULL_TREE)
109812 + return 0;
109813 +
109814 + if (num_fields < 2)
109815 + return 0;
109816 +
109817 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
109818 +
109819 + gcc_assert(num_fields < INT_MAX);
109820 +
109821 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(type)) ||
109822 + lookup_attribute("no_randomize_layout", TYPE_ATTRIBUTES(TYPE_MAIN_VARIANT(type))))
109823 + return 0;
109824 +
109825 + /* throw out any structs in uapi */
109826 + xloc = expand_location(DECL_SOURCE_LOCATION(TYPE_FIELDS(type)));
109827 +
109828 + if (strstr(xloc.file, "/uapi/"))
109829 + error(G_("attempted to randomize userland API struct %s"), ORIG_TYPE_NAME(type));
109830 +
109831 + for (field = TYPE_FIELDS(type), i = 0; field; field = TREE_CHAIN(field), i++) {
109832 + gcc_assert(TREE_CODE(field) == FIELD_DECL);
109833 + newtree[i] = field;
109834 + }
109835 +
109836 + /*
109837 + * enforce that we don't randomize the layout of the last
109838 + * element of a struct if it's a 0 or 1-length array
109839 + * or a proper flexible array
109840 + */
109841 + if (is_flexible_array(newtree[num_fields - 1]))
109842 + shuffle_length--;
109843 +
109844 + shuffle(type, (tree *)newtree, shuffle_length);
109845 +
109846 + /*
109847 + * set up a bogus anonymous struct field designed to error out on unnamed struct initializers
109848 + * as gcc provides no other way to detect such code
109849 + */
109850 + list = make_node(FIELD_DECL);
109851 + TREE_CHAIN(list) = newtree[0];
109852 + TREE_TYPE(list) = void_type_node;
109853 + DECL_SIZE(list) = bitsize_zero_node;
109854 + DECL_NONADDRESSABLE_P(list) = 1;
109855 + DECL_FIELD_BIT_OFFSET(list) = bitsize_zero_node;
109856 + DECL_SIZE_UNIT(list) = size_zero_node;
109857 + DECL_FIELD_OFFSET(list) = size_zero_node;
109858 + // to satisfy the constify plugin
109859 + TREE_READONLY(list) = 1;
109860 +
109861 + for (i = 0; i < num_fields - 1; i++)
109862 + TREE_CHAIN(newtree[i]) = newtree[i+1];
109863 + TREE_CHAIN(newtree[num_fields - 1]) = NULL_TREE;
109864 +
109865 + for (variant = TYPE_MAIN_VARIANT(type); variant; variant = TYPE_NEXT_VARIANT(variant)) {
109866 + TYPE_FIELDS(variant) = list;
109867 + TYPE_ATTRIBUTES(variant) = copy_list(TYPE_ATTRIBUTES(variant));
109868 + TYPE_ATTRIBUTES(variant) = tree_cons(get_identifier("randomize_performed"), NULL_TREE, TYPE_ATTRIBUTES(variant));
109869 + // force a re-layout
109870 + TYPE_SIZE(variant) = NULL_TREE;
109871 + layout_type(variant);
109872 + }
109873 +
109874 + return 1;
109875 +}
109876 +
109877 +/* from constify plugin */
109878 +static const_tree get_field_type(const_tree field)
109879 +{
109880 + return strip_array_types(TREE_TYPE(field));
109881 +}
109882 +
109883 +/* from constify plugin */
109884 +static bool is_fptr(const_tree fieldtype)
109885 +{
109886 + if (TREE_CODE(fieldtype) != POINTER_TYPE)
109887 + return false;
109888 +
109889 + return TREE_CODE(TREE_TYPE(fieldtype)) == FUNCTION_TYPE;
109890 +}
109891 +
109892 +/* derived from constify plugin */
109893 +static int is_pure_ops_struct(const_tree node)
109894 +{
109895 + const_tree field;
109896 +
109897 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
109898 +
109899 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
109900 + const_tree fieldtype = get_field_type(field);
109901 + enum tree_code code = TREE_CODE(fieldtype);
109902 +
109903 + if (node == fieldtype)
109904 + continue;
109905 +
109906 + if (!is_fptr(fieldtype))
109907 + return 0;
109908 +
109909 + if (code != RECORD_TYPE && code != UNION_TYPE)
109910 + continue;
109911 +
109912 + if (!is_pure_ops_struct(fieldtype))
109913 + return 0;
109914 + }
109915 +
109916 + return 1;
109917 +}
109918 +
109919 +static void randomize_type(tree type)
109920 +{
109921 + tree variant;
109922 +
109923 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
109924 +
109925 + if (lookup_attribute("randomize_considered", TYPE_ATTRIBUTES(type)))
109926 + return;
109927 +
109928 + if (lookup_attribute("randomize_layout", TYPE_ATTRIBUTES(TYPE_MAIN_VARIANT(type))) || is_pure_ops_struct(type))
109929 + relayout_struct(type);
109930 +
109931 + for (variant = TYPE_MAIN_VARIANT(type); variant; variant = TYPE_NEXT_VARIANT(variant)) {
109932 + TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
109933 + TYPE_ATTRIBUTES(type) = tree_cons(get_identifier("randomize_considered"), NULL_TREE, TYPE_ATTRIBUTES(type));
109934 + }
109935 +#ifdef __DEBUG_PLUGIN
109936 + fprintf(stderr, "Marking randomize_considered on struct %s\n", ORIG_TYPE_NAME(type));
109937 +#ifdef __DEBUG_VERBOSE
109938 + debug_tree(type);
109939 +#endif
109940 +#endif
109941 +}
109942 +
109943 +static void randomize_layout_finish_decl(void *event_data, void *data)
109944 +{
109945 + tree decl = (tree)event_data;
109946 + tree type;
109947 +
109948 + if (decl == NULL_TREE || decl == error_mark_node)
109949 + return;
109950 +
109951 + type = TREE_TYPE(decl);
109952 +
109953 + if (TREE_CODE(decl) != VAR_DECL)
109954 + return;
109955 +
109956 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
109957 + return;
109958 +
109959 + if (!lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(type)))
109960 + return;
109961 +
109962 + relayout_decl(decl);
109963 +}
109964 +
109965 +static void finish_type(void *event_data, void *data)
109966 +{
109967 + tree type = (tree)event_data;
109968 +
109969 + if (type == NULL_TREE || type == error_mark_node)
109970 + return;
109971 +
109972 + if (TREE_CODE(type) != RECORD_TYPE)
109973 + return;
109974 +
109975 + if (TYPE_FIELDS(type) == NULL_TREE)
109976 + return;
109977 +
109978 + if (lookup_attribute("randomize_considered", TYPE_ATTRIBUTES(type)))
109979 + return;
109980 +
109981 +#ifdef __DEBUG_PLUGIN
109982 + fprintf(stderr, "Calling randomize_type on %s\n", ORIG_TYPE_NAME(type));
109983 +#endif
109984 +#ifdef __DEBUG_VERBOSE
109985 + debug_tree(type);
109986 +#endif
109987 + randomize_type(type);
109988 +
109989 + return;
109990 +}
109991 +
109992 +static struct attribute_spec randomize_layout_attr = {
109993 + .name = "randomize_layout",
109994 + // related to args
109995 + .min_length = 0,
109996 + .max_length = 0,
109997 + .decl_required = false,
109998 + // need type declaration
109999 + .type_required = true,
110000 + .function_type_required = false,
110001 + .handler = handle_randomize_layout_attr,
110002 +#if BUILDING_GCC_VERSION >= 4007
110003 + .affects_type_identity = true
110004 +#endif
110005 +};
110006 +
110007 +static struct attribute_spec no_randomize_layout_attr = {
110008 + .name = "no_randomize_layout",
110009 + // related to args
110010 + .min_length = 0,
110011 + .max_length = 0,
110012 + .decl_required = false,
110013 + // need type declaration
110014 + .type_required = true,
110015 + .function_type_required = false,
110016 + .handler = handle_randomize_layout_attr,
110017 +#if BUILDING_GCC_VERSION >= 4007
110018 + .affects_type_identity = true
110019 +#endif
110020 +};
110021 +
110022 +static struct attribute_spec randomize_considered_attr = {
110023 + .name = "randomize_considered",
110024 + // related to args
110025 + .min_length = 0,
110026 + .max_length = 0,
110027 + .decl_required = false,
110028 + // need type declaration
110029 + .type_required = true,
110030 + .function_type_required = false,
110031 + .handler = handle_randomize_considered_attr,
110032 +#if BUILDING_GCC_VERSION >= 4007
110033 + .affects_type_identity = false
110034 +#endif
110035 +};
110036 +
110037 +static struct attribute_spec randomize_performed_attr = {
110038 + .name = "randomize_performed",
110039 + // related to args
110040 + .min_length = 0,
110041 + .max_length = 0,
110042 + .decl_required = false,
110043 + // need type declaration
110044 + .type_required = true,
110045 + .function_type_required = false,
110046 + .handler = handle_randomize_performed_attr,
110047 +#if BUILDING_GCC_VERSION >= 4007
110048 + .affects_type_identity = false
110049 +#endif
110050 +};
110051 +
110052 +static void register_attributes(void *event_data, void *data)
110053 +{
110054 + register_attribute(&randomize_layout_attr);
110055 + register_attribute(&no_randomize_layout_attr);
110056 + register_attribute(&randomize_considered_attr);
110057 + register_attribute(&randomize_performed_attr);
110058 +}
110059 +
110060 +static void check_bad_casts_in_constructor(tree var, tree init)
110061 +{
110062 + unsigned HOST_WIDE_INT idx;
110063 + tree field, val;
110064 + tree field_type, val_type;
110065 +
110066 + FOR_EACH_CONSTRUCTOR_ELT(CONSTRUCTOR_ELTS(init), idx, field, val) {
110067 + if (TREE_CODE(val) == CONSTRUCTOR) {
110068 + check_bad_casts_in_constructor(var, val);
110069 + continue;
110070 + }
110071 +
110072 + /* pipacs' plugin creates franken-arrays that differ from those produced by
110073 + normal code which all have valid 'field' trees. work around this */
110074 + if (field == NULL_TREE)
110075 + continue;
110076 + field_type = TREE_TYPE(field);
110077 + val_type = TREE_TYPE(val);
110078 +
110079 + if (TREE_CODE(field_type) != POINTER_TYPE || TREE_CODE(val_type) != POINTER_TYPE)
110080 + continue;
110081 +
110082 + if (field_type == val_type)
110083 + continue;
110084 +
110085 + field_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(field_type))));
110086 + val_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(val_type))));
110087 +
110088 + if (field_type == void_type_node)
110089 + continue;
110090 + if (field_type == val_type)
110091 + continue;
110092 + if (TREE_CODE(val_type) != RECORD_TYPE)
110093 + continue;
110094 +
110095 + if (!lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(val_type)))
110096 + continue;
110097 + inform(DECL_SOURCE_LOCATION(var), "found mismatched struct pointer types: %qT and %qT\n", TYPE_MAIN_VARIANT(field_type), TYPE_MAIN_VARIANT(val_type));
110098 + }
110099 +}
110100 +
110101 +/* derived from the constify plugin */
110102 +static void check_global_variables(void *event_data, void *data)
110103 +{
110104 + struct varpool_node *node;
110105 + tree init;
110106 +
110107 + FOR_EACH_VARIABLE(node) {
110108 + tree var = NODE_DECL(node);
110109 + init = DECL_INITIAL(var);
110110 + if (init == NULL_TREE)
110111 + continue;
110112 +
110113 + if (TREE_CODE(init) != CONSTRUCTOR)
110114 + continue;
110115 +
110116 + check_bad_casts_in_constructor(var, init);
110117 + }
110118 +}
110119 +
110120 +static bool dominated_by_is_err(const_tree rhs, basic_block bb)
110121 +{
110122 + basic_block dom;
110123 + gimple dom_stmt;
110124 + gimple call_stmt;
110125 + const_tree dom_lhs;
110126 + const_tree poss_is_err_cond;
110127 + const_tree poss_is_err_func;
110128 + const_tree is_err_arg;
110129 +
110130 + dom = get_immediate_dominator(CDI_DOMINATORS, bb);
110131 + if (!dom)
110132 + return false;
110133 +
110134 + dom_stmt = last_stmt(dom);
110135 + if (!dom_stmt)
110136 + return false;
110137 +
110138 + if (gimple_code(dom_stmt) != GIMPLE_COND)
110139 + return false;
110140 +
110141 + if (gimple_cond_code(dom_stmt) != NE_EXPR)
110142 + return false;
110143 +
110144 + if (!integer_zerop(gimple_cond_rhs(dom_stmt)))
110145 + return false;
110146 +
110147 + poss_is_err_cond = gimple_cond_lhs(dom_stmt);
110148 +
110149 + if (TREE_CODE(poss_is_err_cond) != SSA_NAME)
110150 + return false;
110151 +
110152 + call_stmt = SSA_NAME_DEF_STMT(poss_is_err_cond);
110153 +
110154 + if (gimple_code(call_stmt) != GIMPLE_CALL)
110155 + return false;
110156 +
110157 + dom_lhs = gimple_get_lhs(call_stmt);
110158 + poss_is_err_func = gimple_call_fndecl(call_stmt);
110159 + if (!poss_is_err_func)
110160 + return false;
110161 + if (dom_lhs != poss_is_err_cond)
110162 + return false;
110163 + if (strcmp(DECL_NAME_POINTER(poss_is_err_func), "IS_ERR"))
110164 + return false;
110165 +
110166 + is_err_arg = gimple_call_arg(call_stmt, 0);
110167 + if (!is_err_arg)
110168 + return false;
110169 +
110170 + if (is_err_arg != rhs)
110171 + return false;
110172 +
110173 + return true;
110174 +}
110175 +
110176 +static void handle_local_var_initializers(void)
110177 +{
110178 + tree var;
110179 + unsigned int i;
110180 +
110181 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
110182 + tree init = DECL_INITIAL(var);
110183 + if (!init)
110184 + continue;
110185 + if (TREE_CODE(init) != CONSTRUCTOR)
110186 + continue;
110187 + check_bad_casts_in_constructor(var, init);
110188 + }
110189 +}
110190 +
110191 +/*
110192 + * iterate over all statements to find "bad" casts:
110193 + * those where the address of the start of a structure is cast
110194 + * to a pointer of a structure of a different type, or a
110195 + * structure pointer type is cast to a different structure pointer type
110196 + */
110197 +static unsigned int find_bad_casts(void)
110198 +{
110199 + basic_block bb;
110200 +
110201 + handle_local_var_initializers();
110202 +
110203 + FOR_ALL_BB_FN(bb, cfun) {
110204 + gimple_stmt_iterator gsi;
110205 +
110206 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
110207 + gimple stmt;
110208 + const_tree lhs;
110209 + const_tree lhs_type;
110210 + const_tree rhs1;
110211 + const_tree rhs_type;
110212 + const_tree ptr_lhs_type;
110213 + const_tree ptr_rhs_type;
110214 + const_tree op0;
110215 + const_tree op0_type;
110216 + enum tree_code rhs_code;
110217 +
110218 + stmt = gsi_stmt(gsi);
110219 +
110220 +#ifdef __DEBUG_PLUGIN
110221 +#ifdef __DEBUG_VERBOSE
110222 + debug_gimple_stmt(stmt);
110223 + debug_tree(gimple_get_lhs(stmt));
110224 +#endif
110225 +#endif
110226 +
110227 + if (gimple_code(stmt) != GIMPLE_ASSIGN)
110228 + continue;
110229 +
110230 +#ifdef __DEBUG_PLUGIN
110231 +#ifdef __DEBUG_VERBOSE
110232 + debug_tree(gimple_assign_rhs1(stmt));
110233 +#endif
110234 +#endif
110235 +
110236 + rhs_code = gimple_assign_rhs_code(stmt);
110237 +
110238 + if (rhs_code != ADDR_EXPR && rhs_code != SSA_NAME)
110239 + continue;
110240 +
110241 + lhs = gimple_get_lhs(stmt);
110242 + lhs_type = TREE_TYPE(lhs);
110243 + rhs1 = gimple_assign_rhs1(stmt);
110244 + rhs_type = TREE_TYPE(rhs1);
110245 +
110246 + if (TREE_CODE(rhs_type) != POINTER_TYPE ||
110247 + TREE_CODE(lhs_type) != POINTER_TYPE)
110248 + continue;
110249 +
110250 + ptr_lhs_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(lhs_type))));
110251 + ptr_rhs_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(rhs_type))));
110252 +
110253 + if (ptr_rhs_type == void_type_node)
110254 + continue;
110255 +
110256 + if (ptr_lhs_type == void_type_node)
110257 + continue;
110258 +
110259 + if (dominated_by_is_err(rhs1, bb))
110260 + continue;
110261 +
110262 + if (TREE_CODE(ptr_rhs_type) != RECORD_TYPE) {
110263 +#ifndef __DEBUG_PLUGIN
110264 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(ptr_lhs_type)))
110265 +#endif
110266 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, ptr_rhs_type);
110267 + continue;
110268 + }
110269 +
110270 + if (rhs_code == SSA_NAME && ptr_lhs_type == ptr_rhs_type)
110271 + continue;
110272 +
110273 + if (rhs_code == ADDR_EXPR) {
110274 + op0 = TREE_OPERAND(rhs1, 0);
110275 +
110276 + if (op0 == NULL_TREE)
110277 + continue;
110278 +
110279 + if (TREE_CODE(op0) != VAR_DECL)
110280 + continue;
110281 +
110282 + op0_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(op0))));
110283 + if (op0_type == ptr_lhs_type)
110284 + continue;
110285 +
110286 +#ifndef __DEBUG_PLUGIN
110287 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(op0_type)))
110288 +#endif
110289 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, op0_type);
110290 + } else {
110291 + const_tree ssa_name_var = SSA_NAME_VAR(rhs1);
110292 + /* skip bogus type casts introduced by container_of */
110293 + if (ssa_name_var != NULL_TREE && DECL_NAME(ssa_name_var) &&
110294 + !strcmp((const char *)DECL_NAME_POINTER(ssa_name_var), "__mptr"))
110295 + continue;
110296 +#ifndef __DEBUG_PLUGIN
110297 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(ptr_rhs_type)))
110298 +#endif
110299 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, ptr_rhs_type);
110300 + }
110301 +
110302 + }
110303 + }
110304 + return 0;
110305 +}
110306 +
110307 +#if BUILDING_GCC_VERSION >= 4009
110308 +static const struct pass_data randomize_layout_bad_cast_data = {
110309 +#else
110310 +static struct gimple_opt_pass randomize_layout_bad_cast = {
110311 + .pass = {
110312 +#endif
110313 + .type = GIMPLE_PASS,
110314 + .name = "randomize_layout_bad_cast",
110315 +#if BUILDING_GCC_VERSION >= 4008
110316 + .optinfo_flags = OPTGROUP_NONE,
110317 +#endif
110318 +#if BUILDING_GCC_VERSION >= 4009
110319 + .has_gate = false,
110320 + .has_execute = true,
110321 +#else
110322 + .gate = NULL,
110323 + .execute = find_bad_casts,
110324 + .sub = NULL,
110325 + .next = NULL,
110326 + .static_pass_number = 0,
110327 +#endif
110328 + .tv_id = TV_NONE,
110329 + .properties_required = PROP_cfg,
110330 + .properties_provided = 0,
110331 + .properties_destroyed = 0,
110332 + .todo_flags_start = 0,
110333 + .todo_flags_finish = TODO_dump_func
110334 +#if BUILDING_GCC_VERSION < 4009
110335 + }
110336 +#endif
110337 +};
110338 +
110339 +#if BUILDING_GCC_VERSION >= 4009
110340 +namespace {
110341 +class randomize_layout_bad_cast : public gimple_opt_pass {
110342 +public:
110343 + randomize_layout_bad_cast() : gimple_opt_pass(randomize_layout_bad_cast_data, g) {}
110344 + unsigned int execute() { return find_bad_casts(); }
110345 +};
110346 +}
110347 +#endif
110348 +
110349 +static struct opt_pass *make_randomize_layout_bad_cast(void)
110350 +{
110351 +#if BUILDING_GCC_VERSION >= 4009
110352 + return new randomize_layout_bad_cast();
110353 +#else
110354 + return &randomize_layout_bad_cast.pass;
110355 +#endif
110356 +}
110357 +
110358 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
110359 +{
110360 + int i;
110361 + const char * const plugin_name = plugin_info->base_name;
110362 + const int argc = plugin_info->argc;
110363 + const struct plugin_argument * const argv = plugin_info->argv;
110364 + bool enable = true;
110365 + int obtained_seed = 0;
110366 + struct register_pass_info randomize_layout_bad_cast_info;
110367 +
110368 + randomize_layout_bad_cast_info.pass = make_randomize_layout_bad_cast();
110369 + randomize_layout_bad_cast_info.reference_pass_name = "ssa";
110370 + randomize_layout_bad_cast_info.ref_pass_instance_number = 1;
110371 + randomize_layout_bad_cast_info.pos_op = PASS_POS_INSERT_AFTER;
110372 +
110373 + if (!plugin_default_version_check(version, &gcc_version)) {
110374 + error(G_("incompatible gcc/plugin versions"));
110375 + return 1;
110376 + }
110377 +
110378 + if (strcmp(lang_hooks.name, "GNU C")) {
110379 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
110380 + enable = false;
110381 + }
110382 +
110383 + for (i = 0; i < argc; ++i) {
110384 + if (!strcmp(argv[i].key, "disable")) {
110385 + enable = false;
110386 + continue;
110387 + }
110388 + if (!strcmp(argv[i].key, "performance-mode")) {
110389 + performance_mode = 1;
110390 + continue;
110391 + }
110392 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
110393 + }
110394 +
110395 + if (strlen(randstruct_seed) != 64) {
110396 + error(G_("invalid seed value supplied for %s plugin"), plugin_name);
110397 + return 1;
110398 + }
110399 + obtained_seed = sscanf(randstruct_seed, "%016llx%016llx%016llx%016llx",
110400 + &shuffle_seed[0], &shuffle_seed[1], &shuffle_seed[2], &shuffle_seed[3]);
110401 + if (obtained_seed != 4) {
110402 + error(G_("Invalid seed supplied for %s plugin"), plugin_name);
110403 + return 1;
110404 + }
110405 +
110406 + register_callback(plugin_name, PLUGIN_INFO, NULL, &randomize_layout_plugin_info);
110407 + if (enable) {
110408 + register_callback(plugin_name, PLUGIN_ALL_IPA_PASSES_START, check_global_variables, NULL);
110409 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &randomize_layout_bad_cast_info);
110410 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
110411 + register_callback(plugin_name, PLUGIN_FINISH_DECL, randomize_layout_finish_decl, NULL);
110412 + }
110413 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
110414 +
110415 + return 0;
110416 +}
110417 diff --git a/tools/gcc/size_overflow_plugin/.gitignore b/tools/gcc/size_overflow_plugin/.gitignore
110418 new file mode 100644
110419 index 0000000..1f0214f
110420 --- /dev/null
110421 +++ b/tools/gcc/size_overflow_plugin/.gitignore
110422 @@ -0,0 +1,3 @@
110423 +randomize_layout_seed.h
110424 +size_overflow_hash.h
110425 +size_overflow_hash_aux.h
110426 diff --git a/tools/gcc/size_overflow_plugin/Makefile b/tools/gcc/size_overflow_plugin/Makefile
110427 new file mode 100644
110428 index 0000000..1ae2ed5
110429 --- /dev/null
110430 +++ b/tools/gcc/size_overflow_plugin/Makefile
110431 @@ -0,0 +1,20 @@
110432 +$(HOSTLIBS)-$(CONFIG_PAX_SIZE_OVERFLOW) += size_overflow_plugin.so
110433 +always := $($(HOSTLIBS)-y)
110434 +
110435 +size_overflow_plugin-objs := $(patsubst $(srctree)/$(src)/%.c,%.o,$(wildcard $(srctree)/$(src)/*.c))
110436 +
110437 +$(patsubst $(srctree)/$(src)/%.c,$(obj)/%.o,$(wildcard $(srctree)/$(src)/*.c)): $(objtree)/$(obj)/size_overflow_hash.h $(objtree)/$(obj)/size_overflow_hash_aux.h
110438 +
110439 +quiet_cmd_build_size_overflow_hash = GENHASH $@
110440 + cmd_build_size_overflow_hash = \
110441 + $(CONFIG_SHELL) $(srctree)/$(src)/generate_size_overflow_hash.sh -s size_overflow_hash -d $< -o $@
110442 +$(objtree)/$(obj)/size_overflow_hash.h: $(src)/size_overflow_hash.data FORCE
110443 + $(call if_changed,build_size_overflow_hash)
110444 +
110445 +quiet_cmd_build_size_overflow_hash_aux = GENHASH $@
110446 + cmd_build_size_overflow_hash_aux = \
110447 + $(CONFIG_SHELL) $(srctree)/$(src)/generate_size_overflow_hash.sh -s size_overflow_hash_aux -d $< -o $@
110448 +$(objtree)/$(obj)/size_overflow_hash_aux.h: $(src)/size_overflow_hash_aux.data FORCE
110449 + $(call if_changed,build_size_overflow_hash_aux)
110450 +
110451 +targets += size_overflow_hash.h size_overflow_hash_aux.h
110452 diff --git a/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh b/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh
110453 new file mode 100644
110454 index 0000000..12b1e3b
110455 --- /dev/null
110456 +++ b/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh
110457 @@ -0,0 +1,102 @@
110458 +#!/bin/bash
110459 +
110460 +# This script generates the hash table (size_overflow_hash.h) for the size_overflow gcc plugin (size_overflow_plugin.c).
110461 +
110462 +header1="size_overflow_hash.h"
110463 +database="size_overflow_hash.data"
110464 +n=65536
110465 +hashtable_name="size_overflow_hash"
110466 +
110467 +usage() {
110468 +cat <<EOF
110469 +usage: $0 options
110470 +OPTIONS:
110471 + -h|--help help
110472 + -o header file
110473 + -d database file
110474 + -n hash array size
110475 + -s name of the hash table
110476 +EOF
110477 + return 0
110478 +}
110479 +
110480 +while true
110481 +do
110482 + case "$1" in
110483 + -h|--help) usage && exit 0;;
110484 + -n) n=$2; shift 2;;
110485 + -o) header1="$2"; shift 2;;
110486 + -d) database="$2"; shift 2;;
110487 + -s) hashtable_name="$2"; shift 2;;
110488 + --) shift 1; break ;;
110489 + *) break ;;
110490 + esac
110491 +done
110492 +
110493 +create_defines() {
110494 + for i in `seq 0 31`
110495 + do
110496 + echo -e "#define PARAM"$i" (1U << "$i")" >> "$header1"
110497 + done
110498 + echo >> "$header1"
110499 +}
110500 +
110501 +create_structs() {
110502 + rm -f "$header1"
110503 +
110504 + create_defines
110505 +
110506 + cat "$database" | while read data
110507 + do
110508 + data_array=($data)
110509 + struct_hash_name="${data_array[0]}"
110510 + funcn="${data_array[1]}"
110511 + params="${data_array[2]}"
110512 + next="${data_array[4]}"
110513 +
110514 + echo "const struct size_overflow_hash $struct_hash_name = {" >> "$header1"
110515 +
110516 + echo -e "\t.next\t= $next,\n\t.name\t= \"$funcn\"," >> "$header1"
110517 + echo -en "\t.param\t= " >> "$header1"
110518 + line=
110519 + for param_num in ${params//-/ };
110520 + do
110521 + line="${line}PARAM"$param_num"|"
110522 + done
110523 +
110524 + echo -e "${line%?},\n};\n" >> "$header1"
110525 + done
110526 +}
110527 +
110528 +create_headers() {
110529 + echo "const struct size_overflow_hash * const $hashtable_name[$n] = {" >> "$header1"
110530 +}
110531 +
110532 +create_array_elements() {
110533 + index=0
110534 + grep -v "nohasharray" $database | sort -n -k 4 | while read data
110535 + do
110536 + data_array=($data)
110537 + i="${data_array[3]}"
110538 + hash="${data_array[0]}"
110539 + while [[ $index -lt $i ]]
110540 + do
110541 + echo -e "\t["$index"]\t= NULL," >> "$header1"
110542 + index=$(($index + 1))
110543 + done
110544 + index=$(($index + 1))
110545 + echo -e "\t["$i"]\t= &"$hash"," >> "$header1"
110546 + done
110547 + echo '};' >> $header1
110548 +}
110549 +
110550 +size_overflow_plugin_dir=`dirname $header1`
110551 +if [ "$size_overflow_plugin_dir" != '.' ]; then
110552 + mkdir -p "$size_overflow_plugin_dir" 2> /dev/null
110553 +fi
110554 +
110555 +create_structs
110556 +create_headers
110557 +create_array_elements
110558 +
110559 +exit 0
110560 diff --git a/tools/gcc/size_overflow_plugin/insert_size_overflow_asm.c b/tools/gcc/size_overflow_plugin/insert_size_overflow_asm.c
110561 new file mode 100644
110562 index 0000000..3e8148c
110563 --- /dev/null
110564 +++ b/tools/gcc/size_overflow_plugin/insert_size_overflow_asm.c
110565 @@ -0,0 +1,790 @@
110566 +/*
110567 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
110568 + * Licensed under the GPL v2, or (at your option) v3
110569 + *
110570 + * Homepage:
110571 + * http://www.grsecurity.net/~ephox/overflow_plugin/
110572 + *
110573 + * Documentation:
110574 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
110575 + *
110576 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
110577 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
110578 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
110579 + *
110580 + * Usage:
110581 + * $ make
110582 + * $ make run
110583 + */
110584 +
110585 +#include "gcc-common.h"
110586 +#include "size_overflow.h"
110587 +
110588 +static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs);
110589 +static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs);
110590 +
110591 +// data for the size_overflow asm stmt
110592 +struct asm_data {
110593 + gimple def_stmt;
110594 + tree input;
110595 + tree output;
110596 +};
110597 +
110598 +#if BUILDING_GCC_VERSION <= 4007
110599 +static VEC(tree, gc) *create_asm_io_list(tree string, tree io)
110600 +#else
110601 +static vec<tree, va_gc> *create_asm_io_list(tree string, tree io)
110602 +#endif
110603 +{
110604 + tree list;
110605 +#if BUILDING_GCC_VERSION <= 4007
110606 + VEC(tree, gc) *vec_list = NULL;
110607 +#else
110608 + vec<tree, va_gc> *vec_list = NULL;
110609 +#endif
110610 +
110611 + list = build_tree_list(NULL_TREE, string);
110612 + list = chainon(NULL_TREE, build_tree_list(list, io));
110613 +#if BUILDING_GCC_VERSION <= 4007
110614 + VEC_safe_push(tree, gc, vec_list, list);
110615 +#else
110616 + vec_safe_push(vec_list, list);
110617 +#endif
110618 + return vec_list;
110619 +}
110620 +
110621 +static void create_asm_stmt(const char *str, tree str_input, tree str_output, struct asm_data *asm_data)
110622 +{
110623 + gimple asm_stmt;
110624 + gimple_stmt_iterator gsi;
110625 +#if BUILDING_GCC_VERSION <= 4007
110626 + VEC(tree, gc) *input, *output = NULL;
110627 +#else
110628 + vec<tree, va_gc> *input, *output = NULL;
110629 +#endif
110630 +
110631 + input = create_asm_io_list(str_input, asm_data->input);
110632 +
110633 + if (asm_data->output)
110634 + output = create_asm_io_list(str_output, asm_data->output);
110635 +
110636 + asm_stmt = gimple_build_asm_vec(str, input, output, NULL, NULL);
110637 + gsi = gsi_for_stmt(asm_data->def_stmt);
110638 + gsi_insert_after(&gsi, asm_stmt, GSI_NEW_STMT);
110639 +
110640 + if (asm_data->output)
110641 + SSA_NAME_DEF_STMT(asm_data->output) = asm_stmt;
110642 +}
110643 +
110644 +static void replace_call_lhs(const struct asm_data *asm_data)
110645 +{
110646 + gimple_set_lhs(asm_data->def_stmt, asm_data->input);
110647 + update_stmt(asm_data->def_stmt);
110648 + SSA_NAME_DEF_STMT(asm_data->input) = asm_data->def_stmt;
110649 +}
110650 +
110651 +static enum mark search_intentional_phi(struct pointer_set_t *visited, const_tree result)
110652 +{
110653 + enum mark cur_fndecl_attr;
110654 + gimple phi = get_def_stmt(result);
110655 + unsigned int i, n = gimple_phi_num_args(phi);
110656 +
110657 + pointer_set_insert(visited, phi);
110658 + for (i = 0; i < n; i++) {
110659 + tree arg = gimple_phi_arg_def(phi, i);
110660 +
110661 + cur_fndecl_attr = search_intentional(visited, arg);
110662 + if (cur_fndecl_attr != MARK_NO)
110663 + return cur_fndecl_attr;
110664 + }
110665 + return MARK_NO;
110666 +}
110667 +
110668 +static enum mark search_intentional_binary(struct pointer_set_t *visited, const_tree lhs)
110669 +{
110670 + enum mark cur_fndecl_attr;
110671 + const_tree rhs1, rhs2;
110672 + gimple def_stmt = get_def_stmt(lhs);
110673 +
110674 + rhs1 = gimple_assign_rhs1(def_stmt);
110675 + rhs2 = gimple_assign_rhs2(def_stmt);
110676 +
110677 + cur_fndecl_attr = search_intentional(visited, rhs1);
110678 + if (cur_fndecl_attr != MARK_NO)
110679 + return cur_fndecl_attr;
110680 + return search_intentional(visited, rhs2);
110681 +}
110682 +
110683 +// Look up the intentional_overflow attribute on the caller and the callee functions.
110684 +static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs)
110685 +{
110686 + const_gimple def_stmt;
110687 +
110688 + if (TREE_CODE(lhs) != SSA_NAME)
110689 + return get_intentional_attr_type(lhs);
110690 +
110691 + def_stmt = get_def_stmt(lhs);
110692 + if (!def_stmt)
110693 + return MARK_NO;
110694 +
110695 + if (pointer_set_contains(visited, def_stmt))
110696 + return MARK_NO;
110697 +
110698 + switch (gimple_code(def_stmt)) {
110699 + case GIMPLE_NOP:
110700 + return search_intentional(visited, SSA_NAME_VAR(lhs));
110701 + case GIMPLE_ASM:
110702 + if (is_size_overflow_intentional_asm_turn_off(def_stmt))
110703 + return MARK_TURN_OFF;
110704 + return MARK_NO;
110705 + case GIMPLE_CALL:
110706 + return MARK_NO;
110707 + case GIMPLE_PHI:
110708 + return search_intentional_phi(visited, lhs);
110709 + case GIMPLE_ASSIGN:
110710 + switch (gimple_num_ops(def_stmt)) {
110711 + case 2:
110712 + return search_intentional(visited, gimple_assign_rhs1(def_stmt));
110713 + case 3:
110714 + return search_intentional_binary(visited, lhs);
110715 + }
110716 + case GIMPLE_RETURN:
110717 + return MARK_NO;
110718 + default:
110719 + debug_gimple_stmt((gimple)def_stmt);
110720 + error("%s: unknown gimple code", __func__);
110721 + gcc_unreachable();
110722 + }
110723 +}
110724 +
110725 +// Check the intentional_overflow attribute and create the asm comment string for the size_overflow asm stmt.
110726 +static enum mark check_intentional_attribute_gimple(const_tree arg, const_gimple stmt, unsigned int argnum)
110727 +{
110728 + const_tree fndecl;
110729 + struct pointer_set_t *visited;
110730 + enum mark cur_fndecl_attr, decl_attr = MARK_NO;
110731 +
110732 + fndecl = get_interesting_orig_fndecl(stmt, argnum);
110733 + if (is_end_intentional_intentional_attr(fndecl, argnum))
110734 + decl_attr = MARK_NOT_INTENTIONAL;
110735 + else if (is_yes_intentional_attr(fndecl, argnum))
110736 + decl_attr = MARK_YES;
110737 + else if (is_turn_off_intentional_attr(fndecl) || is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
110738 + return MARK_TURN_OFF;
110739 + }
110740 +
110741 + visited = pointer_set_create();
110742 + cur_fndecl_attr = search_intentional(visited, arg);
110743 + pointer_set_destroy(visited);
110744 +
110745 + switch (cur_fndecl_attr) {
110746 + case MARK_NO:
110747 + case MARK_TURN_OFF:
110748 + return cur_fndecl_attr;
110749 + default:
110750 + print_missing_intentional(decl_attr, cur_fndecl_attr, fndecl, argnum);
110751 + return MARK_YES;
110752 + }
110753 +}
110754 +
110755 +static void check_missing_size_overflow_attribute(tree var)
110756 +{
110757 + tree orig_fndecl;
110758 + unsigned int num;
110759 +
110760 + if (is_a_return_check(var))
110761 + orig_fndecl = DECL_ORIGIN(var);
110762 + else
110763 + orig_fndecl = DECL_ORIGIN(current_function_decl);
110764 +
110765 + num = get_function_num(var, orig_fndecl);
110766 + if (num == CANNOT_FIND_ARG)
110767 + return;
110768 +
110769 + is_missing_function(orig_fndecl, num);
110770 +}
110771 +
110772 +static void search_size_overflow_attribute_phi(struct pointer_set_t *visited, const_tree result)
110773 +{
110774 + gimple phi = get_def_stmt(result);
110775 + unsigned int i, n = gimple_phi_num_args(phi);
110776 +
110777 + pointer_set_insert(visited, phi);
110778 + for (i = 0; i < n; i++) {
110779 + tree arg = gimple_phi_arg_def(phi, i);
110780 +
110781 + search_size_overflow_attribute(visited, arg);
110782 + }
110783 +}
110784 +
110785 +static void search_size_overflow_attribute_binary(struct pointer_set_t *visited, const_tree lhs)
110786 +{
110787 + const_gimple def_stmt = get_def_stmt(lhs);
110788 + tree rhs1, rhs2;
110789 +
110790 + rhs1 = gimple_assign_rhs1(def_stmt);
110791 + rhs2 = gimple_assign_rhs2(def_stmt);
110792 +
110793 + search_size_overflow_attribute(visited, rhs1);
110794 + search_size_overflow_attribute(visited, rhs2);
110795 +}
110796 +
110797 +static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs)
110798 +{
110799 + const_gimple def_stmt;
110800 +
110801 + if (TREE_CODE(lhs) == PARM_DECL) {
110802 + check_missing_size_overflow_attribute(lhs);
110803 + return;
110804 + }
110805 +
110806 + def_stmt = get_def_stmt(lhs);
110807 + if (!def_stmt)
110808 + return;
110809 +
110810 + if (pointer_set_insert(visited, def_stmt))
110811 + return;
110812 +
110813 + switch (gimple_code(def_stmt)) {
110814 + case GIMPLE_NOP:
110815 + return search_size_overflow_attribute(visited, SSA_NAME_VAR(lhs));
110816 + case GIMPLE_ASM:
110817 + return;
110818 + case GIMPLE_CALL: {
110819 + tree fndecl = gimple_call_fndecl(def_stmt);
110820 +
110821 + if (fndecl == NULL_TREE)
110822 + return;
110823 + check_missing_size_overflow_attribute(fndecl);
110824 + return;
110825 + }
110826 + case GIMPLE_PHI:
110827 + return search_size_overflow_attribute_phi(visited, lhs);
110828 + case GIMPLE_ASSIGN:
110829 + switch (gimple_num_ops(def_stmt)) {
110830 + case 2:
110831 + return search_size_overflow_attribute(visited, gimple_assign_rhs1(def_stmt));
110832 + case 3:
110833 + return search_size_overflow_attribute_binary(visited, lhs);
110834 + }
110835 + default:
110836 + debug_gimple_stmt((gimple)def_stmt);
110837 + error("%s: unknown gimple code", __func__);
110838 + gcc_unreachable();
110839 + }
110840 +}
110841 +
110842 +// Search missing entries in the hash table (invoked from the gimple pass)
110843 +static void search_missing_size_overflow_attribute_gimple(const_gimple stmt, unsigned int num)
110844 +{
110845 + tree fndecl = NULL_TREE;
110846 + tree lhs;
110847 + struct pointer_set_t *visited;
110848 +
110849 + if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl)))
110850 + return;
110851 +
110852 + if (num == 0) {
110853 + gcc_assert(gimple_code(stmt) == GIMPLE_RETURN);
110854 + lhs = gimple_return_retval(stmt);
110855 + } else {
110856 + gcc_assert(is_gimple_call(stmt));
110857 + lhs = gimple_call_arg(stmt, num - 1);
110858 + fndecl = gimple_call_fndecl(stmt);
110859 + }
110860 +
110861 + if (fndecl != NULL_TREE && is_turn_off_intentional_attr(DECL_ORIGIN(fndecl)))
110862 + return;
110863 +
110864 + visited = pointer_set_create();
110865 + search_size_overflow_attribute(visited, lhs);
110866 + pointer_set_destroy(visited);
110867 +}
110868 +
110869 +static void create_output_from_phi(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
110870 +{
110871 + gimple_stmt_iterator gsi;
110872 + gimple assign;
110873 +
110874 + assign = gimple_build_assign(asm_data->input, asm_data->output);
110875 + gsi = gsi_for_stmt(stmt);
110876 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
110877 + asm_data->def_stmt = assign;
110878 +
110879 + asm_data->output = create_new_var(TREE_TYPE(asm_data->output));
110880 + asm_data->output = make_ssa_name(asm_data->output, stmt);
110881 + if (gimple_code(stmt) == GIMPLE_RETURN)
110882 + gimple_return_set_retval(stmt, asm_data->output);
110883 + else
110884 + gimple_call_set_arg(stmt, argnum - 1, asm_data->output);
110885 + update_stmt(stmt);
110886 +}
110887 +
110888 +static char *create_asm_comment(unsigned int argnum, const_gimple stmt , const char *mark_str)
110889 +{
110890 + const char *fn_name;
110891 + char *asm_comment;
110892 + unsigned int len;
110893 +
110894 + if (argnum == 0)
110895 + fn_name = DECL_NAME_POINTER(current_function_decl);
110896 + else
110897 + fn_name = DECL_NAME_POINTER(gimple_call_fndecl(stmt));
110898 +
110899 + len = asprintf(&asm_comment, "%s %s %u", mark_str, fn_name, argnum);
110900 + gcc_assert(len > 0);
110901 +
110902 + return asm_comment;
110903 +}
110904 +
110905 +static const char *convert_mark_to_str(enum mark mark)
110906 +{
110907 + switch (mark) {
110908 + case MARK_NO:
110909 + return OK_ASM_STR;
110910 + case MARK_YES:
110911 + case MARK_NOT_INTENTIONAL:
110912 + return YES_ASM_STR;
110913 + case MARK_TURN_OFF:
110914 + return TURN_OFF_ASM_STR;
110915 + }
110916 +
110917 + gcc_unreachable();
110918 +}
110919 +
110920 +/* Create the input of the size_overflow asm stmt.
110921 + * When the arg of the callee function is a parm_decl it creates this kind of size_overflow asm stmt:
110922 + * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D));
110923 + * The input field in asm_data will be empty if there is no need for further size_overflow asm stmt insertion.
110924 + * otherwise create the input (for a phi stmt the output too) of the asm stmt.
110925 + */
110926 +static void create_asm_input(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
110927 +{
110928 + if (!asm_data->def_stmt) {
110929 + asm_data->input = NULL_TREE;
110930 + return;
110931 + }
110932 +
110933 + asm_data->input = create_new_var(TREE_TYPE(asm_data->output));
110934 + asm_data->input = make_ssa_name(asm_data->input, asm_data->def_stmt);
110935 +
110936 + switch (gimple_code(asm_data->def_stmt)) {
110937 + case GIMPLE_ASSIGN:
110938 + case GIMPLE_CALL:
110939 + replace_call_lhs(asm_data);
110940 + break;
110941 + case GIMPLE_PHI:
110942 + create_output_from_phi(stmt, argnum, asm_data);
110943 + break;
110944 + case GIMPLE_NOP: {
110945 + enum mark mark;
110946 + const char *mark_str;
110947 + char *asm_comment;
110948 +
110949 + mark = check_intentional_attribute_gimple(asm_data->output, stmt, argnum);
110950 +
110951 + asm_data->input = asm_data->output;
110952 + asm_data->output = NULL;
110953 + asm_data->def_stmt = stmt;
110954 +
110955 + mark_str = convert_mark_to_str(mark);
110956 + asm_comment = create_asm_comment(argnum, stmt, mark_str);
110957 +
110958 + create_asm_stmt(asm_comment, build_string(3, "rm"), NULL, asm_data);
110959 + free(asm_comment);
110960 + asm_data->input = NULL_TREE;
110961 + break;
110962 + }
110963 + case GIMPLE_ASM:
110964 + if (is_size_overflow_asm(asm_data->def_stmt)) {
110965 + asm_data->input = NULL_TREE;
110966 + break;
110967 + }
110968 + default:
110969 + debug_gimple_stmt(asm_data->def_stmt);
110970 + gcc_unreachable();
110971 + }
110972 +}
110973 +
110974 +/* This is the gimple part of searching for a missing size_overflow attribute. If the intentional_overflow attribute type
110975 + * is of the right kind create the appropriate size_overflow asm stmts:
110976 + * __asm__("# size_overflow" : =rm" D.3344_8 : "0" cicus.4_16);
110977 + * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D));
110978 + */
110979 +static void create_size_overflow_asm(gimple stmt, tree output_node, unsigned int argnum)
110980 +{
110981 + struct asm_data asm_data;
110982 + const char *mark_str;
110983 + char *asm_comment;
110984 + enum mark mark;
110985 +
110986 + if (is_gimple_constant(output_node))
110987 + return;
110988 +
110989 + asm_data.output = output_node;
110990 + mark = check_intentional_attribute_gimple(asm_data.output, stmt, argnum);
110991 + if (mark != MARK_TURN_OFF)
110992 + search_missing_size_overflow_attribute_gimple(stmt, argnum);
110993 +
110994 + asm_data.def_stmt = get_def_stmt(asm_data.output);
110995 + if (is_size_overflow_intentional_asm_turn_off(asm_data.def_stmt))
110996 + return;
110997 +
110998 + create_asm_input(stmt, argnum, &asm_data);
110999 + if (asm_data.input == NULL_TREE)
111000 + return;
111001 +
111002 + mark_str = convert_mark_to_str(mark);
111003 + asm_comment = create_asm_comment(argnum, stmt, mark_str);
111004 + create_asm_stmt(asm_comment, build_string(2, "0"), build_string(4, "=rm"), &asm_data);
111005 + free(asm_comment);
111006 +}
111007 +
111008 +// Insert an asm stmt with "MARK_TURN_OFF", "MARK_YES" or "MARK_NOT_INTENTIONAL".
111009 +static bool create_mark_asm(gimple stmt, enum mark mark)
111010 +{
111011 + struct asm_data asm_data;
111012 + const char *asm_str;
111013 +
111014 + switch (mark) {
111015 + case MARK_TURN_OFF:
111016 + asm_str = TURN_OFF_ASM_STR;
111017 + break;
111018 + case MARK_NOT_INTENTIONAL:
111019 + case MARK_YES:
111020 + asm_str = YES_ASM_STR;
111021 + break;
111022 + default:
111023 + gcc_unreachable();
111024 + }
111025 +
111026 + asm_data.def_stmt = stmt;
111027 + asm_data.output = gimple_call_lhs(stmt);
111028 +
111029 + if (asm_data.output == NULL_TREE) {
111030 + asm_data.input = gimple_call_arg(stmt, 0);
111031 + if (is_gimple_constant(asm_data.input))
111032 + return false;
111033 + asm_data.output = NULL;
111034 + create_asm_stmt(asm_str, build_string(3, "rm"), NULL, &asm_data);
111035 + return true;
111036 + }
111037 +
111038 + create_asm_input(stmt, 0, &asm_data);
111039 + gcc_assert(asm_data.input != NULL_TREE);
111040 +
111041 + create_asm_stmt(asm_str, build_string(2, "0"), build_string(4, "=rm"), &asm_data);
111042 + return true;
111043 +}
111044 +
111045 +static bool is_from_cast(const_tree node)
111046 +{
111047 + gimple def_stmt = get_def_stmt(node);
111048 +
111049 + if (!def_stmt)
111050 + return false;
111051 +
111052 + if (gimple_assign_cast_p(def_stmt))
111053 + return true;
111054 +
111055 + return false;
111056 +}
111057 +
111058 +// Skip duplication when there is a minus expr and the type of rhs1 or rhs2 is a pointer_type.
111059 +static bool skip_ptr_minus(gimple stmt)
111060 +{
111061 + const_tree rhs1, rhs2, ptr1_rhs, ptr2_rhs;
111062 +
111063 + if (gimple_assign_rhs_code(stmt) != MINUS_EXPR)
111064 + return false;
111065 +
111066 + rhs1 = gimple_assign_rhs1(stmt);
111067 + if (!is_from_cast(rhs1))
111068 + return false;
111069 +
111070 + rhs2 = gimple_assign_rhs2(stmt);
111071 + if (!is_from_cast(rhs2))
111072 + return false;
111073 +
111074 + ptr1_rhs = gimple_assign_rhs1(get_def_stmt(rhs1));
111075 + ptr2_rhs = gimple_assign_rhs1(get_def_stmt(rhs2));
111076 +
111077 + if (TREE_CODE(TREE_TYPE(ptr1_rhs)) != POINTER_TYPE && TREE_CODE(TREE_TYPE(ptr2_rhs)) != POINTER_TYPE)
111078 + return false;
111079 +
111080 + create_mark_asm(stmt, MARK_YES);
111081 + return true;
111082 +}
111083 +
111084 +static void walk_use_def_ptr(struct pointer_set_t *visited, const_tree lhs)
111085 +{
111086 + gimple def_stmt;
111087 +
111088 + def_stmt = get_def_stmt(lhs);
111089 + if (!def_stmt)
111090 + return;
111091 +
111092 + if (pointer_set_insert(visited, def_stmt))
111093 + return;
111094 +
111095 + switch (gimple_code(def_stmt)) {
111096 + case GIMPLE_NOP:
111097 + case GIMPLE_ASM:
111098 + case GIMPLE_CALL:
111099 + break;
111100 + case GIMPLE_PHI: {
111101 + unsigned int i, n = gimple_phi_num_args(def_stmt);
111102 +
111103 + pointer_set_insert(visited, def_stmt);
111104 +
111105 + for (i = 0; i < n; i++) {
111106 + tree arg = gimple_phi_arg_def(def_stmt, i);
111107 +
111108 + walk_use_def_ptr(visited, arg);
111109 + }
111110 + }
111111 + case GIMPLE_ASSIGN:
111112 + switch (gimple_num_ops(def_stmt)) {
111113 + case 2:
111114 + walk_use_def_ptr(visited, gimple_assign_rhs1(def_stmt));
111115 + return;
111116 + case 3:
111117 + if (skip_ptr_minus(def_stmt))
111118 + return;
111119 +
111120 + walk_use_def_ptr(visited, gimple_assign_rhs1(def_stmt));
111121 + walk_use_def_ptr(visited, gimple_assign_rhs2(def_stmt));
111122 + return;
111123 + default:
111124 + return;
111125 + }
111126 + default:
111127 + debug_gimple_stmt((gimple)def_stmt);
111128 + error("%s: unknown gimple code", __func__);
111129 + gcc_unreachable();
111130 + }
111131 +}
111132 +
111133 +// Look for a ptr - ptr expression (e.g., cpuset_common_file_read() s - page)
111134 +static void insert_mark_not_intentional_asm_at_ptr(const_tree arg)
111135 +{
111136 + struct pointer_set_t *visited;
111137 +
111138 + visited = pointer_set_create();
111139 + walk_use_def_ptr(visited, arg);
111140 + pointer_set_destroy(visited);
111141 +}
111142 +
111143 +// Determine the return value and insert the asm stmt to mark the return stmt.
111144 +static void insert_asm_ret(gimple stmt)
111145 +{
111146 + tree ret;
111147 +
111148 + ret = gimple_return_retval(stmt);
111149 + create_size_overflow_asm(stmt, ret, 0);
111150 +}
111151 +
111152 +// Determine the correct arg index and arg and insert the asm stmt to mark the stmt.
111153 +static void insert_asm_arg(gimple stmt, unsigned int orig_argnum)
111154 +{
111155 + tree arg;
111156 + unsigned int argnum;
111157 +
111158 + argnum = get_correct_arg_count(orig_argnum, gimple_call_fndecl(stmt));
111159 + gcc_assert(argnum != 0);
111160 + if (argnum == CANNOT_FIND_ARG)
111161 + return;
111162 +
111163 + arg = gimple_call_arg(stmt, argnum - 1);
111164 + gcc_assert(arg != NULL_TREE);
111165 +
111166 + // skip all ptr - ptr expressions
111167 + insert_mark_not_intentional_asm_at_ptr(arg);
111168 +
111169 + create_size_overflow_asm(stmt, arg, argnum);
111170 +}
111171 +
111172 +// If a function arg or the return value is marked by the size_overflow attribute then set its index in the array.
111173 +static void set_argnum_attribute(const_tree attr, bool *argnums)
111174 +{
111175 + unsigned int argnum;
111176 + tree attr_value;
111177 +
111178 + for (attr_value = TREE_VALUE(attr); attr_value; attr_value = TREE_CHAIN(attr_value)) {
111179 + argnum = TREE_INT_CST_LOW(TREE_VALUE(attr_value));
111180 + argnums[argnum] = true;
111181 + }
111182 +}
111183 +
111184 +// If a function arg or the return value is in the hash table then set its index in the array.
111185 +static void set_argnum_hash(tree fndecl, bool *argnums)
111186 +{
111187 + unsigned int num;
111188 + const struct size_overflow_hash *hash;
111189 +
111190 + hash = get_function_hash(DECL_ORIGIN(fndecl));
111191 + if (!hash)
111192 + return;
111193 +
111194 + for (num = 0; num <= MAX_PARAM; num++) {
111195 + if (!(hash->param & (1U << num)))
111196 + continue;
111197 +
111198 + argnums[num] = true;
111199 + }
111200 +}
111201 +
111202 +static bool is_all_the_argnums_empty(bool *argnums)
111203 +{
111204 + unsigned int i;
111205 +
111206 + for (i = 0; i <= MAX_PARAM; i++)
111207 + if (argnums[i])
111208 + return false;
111209 + return true;
111210 +}
111211 +
111212 +// Check whether the arguments or the return value of the function are in the hash table or are marked by the size_overflow attribute.
111213 +static void search_interesting_args(tree fndecl, bool *argnums)
111214 +{
111215 + const_tree attr;
111216 +
111217 + set_argnum_hash(fndecl, argnums);
111218 + if (!is_all_the_argnums_empty(argnums))
111219 + return;
111220 +
111221 + attr = lookup_attribute("size_overflow", DECL_ATTRIBUTES(fndecl));
111222 + if (attr && TREE_VALUE(attr))
111223 + set_argnum_attribute(attr, argnums);
111224 +}
111225 +
111226 +/*
111227 + * Look up the intentional_overflow attribute that turns off ipa based duplication
111228 + * on the callee function.
111229 + */
111230 +static bool is_mark_turn_off_attribute(gimple stmt)
111231 +{
111232 + enum mark mark;
111233 + const_tree fndecl = gimple_call_fndecl(stmt);
111234 +
111235 + mark = get_intentional_attr_type(DECL_ORIGIN(fndecl));
111236 + if (mark == MARK_TURN_OFF)
111237 + return true;
111238 + return false;
111239 +}
111240 +
111241 +// If the argument(s) of the callee function is/are in the hash table or are marked by an attribute then mark the call stmt with an asm stmt
111242 +static void handle_interesting_function(gimple stmt)
111243 +{
111244 + unsigned int argnum;
111245 + tree fndecl;
111246 + bool orig_argnums[MAX_PARAM + 1] = {false};
111247 +
111248 + if (gimple_call_num_args(stmt) == 0)
111249 + return;
111250 + fndecl = gimple_call_fndecl(stmt);
111251 + if (fndecl == NULL_TREE)
111252 + return;
111253 + fndecl = DECL_ORIGIN(fndecl);
111254 +
111255 + if (is_mark_turn_off_attribute(stmt)) {
111256 + create_mark_asm(stmt, MARK_TURN_OFF);
111257 + return;
111258 + }
111259 +
111260 + search_interesting_args(fndecl, orig_argnums);
111261 +
111262 + for (argnum = 1; argnum < MAX_PARAM; argnum++)
111263 + if (orig_argnums[argnum])
111264 + insert_asm_arg(stmt, argnum);
111265 +}
111266 +
111267 +// If the return value of the caller function is in hash table (its index is 0) then mark the return stmt with an asm stmt
111268 +static void handle_interesting_ret(gimple stmt)
111269 +{
111270 + bool orig_argnums[MAX_PARAM + 1] = {false};
111271 +
111272 + search_interesting_args(current_function_decl, orig_argnums);
111273 +
111274 + if (orig_argnums[0])
111275 + insert_asm_ret(stmt);
111276 +}
111277 +
111278 +// Iterate over all the stmts and search for call and return stmts and mark them if they're in the hash table
111279 +static unsigned int search_interesting_functions(void)
111280 +{
111281 + basic_block bb;
111282 +
111283 + FOR_ALL_BB_FN(bb, cfun) {
111284 + gimple_stmt_iterator gsi;
111285 +
111286 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
111287 + gimple stmt = gsi_stmt(gsi);
111288 +
111289 + if (is_size_overflow_asm(stmt))
111290 + continue;
111291 +
111292 + if (is_gimple_call(stmt))
111293 + handle_interesting_function(stmt);
111294 + else if (gimple_code(stmt) == GIMPLE_RETURN)
111295 + handle_interesting_ret(stmt);
111296 + }
111297 + }
111298 + return 0;
111299 +}
111300 +
111301 +/*
111302 + * A lot of functions get inlined before the ipa passes so after the build_ssa gimple pass
111303 + * this pass inserts asm stmts to mark the interesting args
111304 + * that the ipa pass will detect and insert the size overflow checks for.
111305 + */
111306 +#if BUILDING_GCC_VERSION >= 4009
111307 +static const struct pass_data insert_size_overflow_asm_pass_data = {
111308 +#else
111309 +static struct gimple_opt_pass insert_size_overflow_asm_pass = {
111310 + .pass = {
111311 +#endif
111312 + .type = GIMPLE_PASS,
111313 + .name = "insert_size_overflow_asm",
111314 +#if BUILDING_GCC_VERSION >= 4008
111315 + .optinfo_flags = OPTGROUP_NONE,
111316 +#endif
111317 +#if BUILDING_GCC_VERSION >= 4009
111318 + .has_gate = false,
111319 + .has_execute = true,
111320 +#else
111321 + .gate = NULL,
111322 + .execute = search_interesting_functions,
111323 + .sub = NULL,
111324 + .next = NULL,
111325 + .static_pass_number = 0,
111326 +#endif
111327 + .tv_id = TV_NONE,
111328 + .properties_required = PROP_cfg,
111329 + .properties_provided = 0,
111330 + .properties_destroyed = 0,
111331 + .todo_flags_start = 0,
111332 + .todo_flags_finish = TODO_dump_func | TODO_verify_ssa | TODO_verify_stmts | TODO_remove_unused_locals | TODO_update_ssa_no_phi | TODO_cleanup_cfg | TODO_ggc_collect | TODO_verify_flow
111333 +#if BUILDING_GCC_VERSION < 4009
111334 + }
111335 +#endif
111336 +};
111337 +
111338 +#if BUILDING_GCC_VERSION >= 4009
111339 +namespace {
111340 +class insert_size_overflow_asm_pass : public gimple_opt_pass {
111341 +public:
111342 + insert_size_overflow_asm_pass() : gimple_opt_pass(insert_size_overflow_asm_pass_data, g) {}
111343 + unsigned int execute() { return search_interesting_functions(); }
111344 +};
111345 +}
111346 +#endif
111347 +
111348 +struct opt_pass *make_insert_size_overflow_asm_pass(void)
111349 +{
111350 +#if BUILDING_GCC_VERSION >= 4009
111351 + return new insert_size_overflow_asm_pass();
111352 +#else
111353 + return &insert_size_overflow_asm_pass.pass;
111354 +#endif
111355 +}
111356 diff --git a/tools/gcc/size_overflow_plugin/insert_size_overflow_check_core.c b/tools/gcc/size_overflow_plugin/insert_size_overflow_check_core.c
111357 new file mode 100644
111358 index 0000000..88469e9
111359 --- /dev/null
111360 +++ b/tools/gcc/size_overflow_plugin/insert_size_overflow_check_core.c
111361 @@ -0,0 +1,902 @@
111362 +/*
111363 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
111364 + * Licensed under the GPL v2, or (at your option) v3
111365 + *
111366 + * Homepage:
111367 + * http://www.grsecurity.net/~ephox/overflow_plugin/
111368 + *
111369 + * Documentation:
111370 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
111371 + *
111372 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
111373 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
111374 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
111375 + *
111376 + * Usage:
111377 + * $ make
111378 + * $ make run
111379 + */
111380 +
111381 +#include "gcc-common.h"
111382 +#include "size_overflow.h"
111383 +
111384 +#define MIN_CHECK true
111385 +#define MAX_CHECK false
111386 +
111387 +static tree get_size_overflow_type(struct visited *visited, const_gimple stmt, const_tree node)
111388 +{
111389 + const_tree type;
111390 + tree new_type;
111391 +
111392 + gcc_assert(node != NULL_TREE);
111393 +
111394 + type = TREE_TYPE(node);
111395 +
111396 + if (pointer_set_contains(visited->my_stmts, stmt))
111397 + return TREE_TYPE(node);
111398 +
111399 + switch (TYPE_MODE(type)) {
111400 + case QImode:
111401 + new_type = size_overflow_type_HI;
111402 + break;
111403 + case HImode:
111404 + new_type = size_overflow_type_SI;
111405 + break;
111406 + case SImode:
111407 + new_type = size_overflow_type_DI;
111408 + break;
111409 + case DImode:
111410 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
111411 + new_type = TYPE_UNSIGNED(type) ? unsigned_intDI_type_node : intDI_type_node;
111412 + else
111413 + new_type = size_overflow_type_TI;
111414 + break;
111415 + case TImode:
111416 + gcc_assert(!TYPE_UNSIGNED(type));
111417 + new_type = size_overflow_type_TI;
111418 + break;
111419 + default:
111420 + debug_tree((tree)node);
111421 + error("%s: unsupported gcc configuration (%qE).", __func__, current_function_decl);
111422 + gcc_unreachable();
111423 + }
111424 +
111425 + if (TYPE_QUALS(type) != 0)
111426 + return build_qualified_type(new_type, TYPE_QUALS(type));
111427 + return new_type;
111428 +}
111429 +
111430 +static tree get_lhs(const_gimple stmt)
111431 +{
111432 + switch (gimple_code(stmt)) {
111433 + case GIMPLE_ASSIGN:
111434 + case GIMPLE_CALL:
111435 + return gimple_get_lhs(stmt);
111436 + case GIMPLE_PHI:
111437 + return gimple_phi_result(stmt);
111438 + default:
111439 + return NULL_TREE;
111440 + }
111441 +}
111442 +
111443 +static tree cast_to_new_size_overflow_type(struct visited *visited, gimple stmt, tree rhs, tree size_overflow_type, bool before)
111444 +{
111445 + gimple_stmt_iterator gsi;
111446 + tree lhs;
111447 + gimple new_stmt;
111448 +
111449 + if (rhs == NULL_TREE)
111450 + return NULL_TREE;
111451 +
111452 + gsi = gsi_for_stmt(stmt);
111453 + new_stmt = build_cast_stmt(visited, size_overflow_type, rhs, CREATE_NEW_VAR, &gsi, before, false);
111454 + pointer_set_insert(visited->my_stmts, new_stmt);
111455 +
111456 + lhs = get_lhs(new_stmt);
111457 + gcc_assert(lhs != NULL_TREE);
111458 + return lhs;
111459 +}
111460 +
111461 +tree create_assign(struct visited *visited, gimple oldstmt, tree rhs1, bool before)
111462 +{
111463 + tree lhs, dst_type;
111464 + gimple_stmt_iterator gsi;
111465 +
111466 + if (rhs1 == NULL_TREE) {
111467 + debug_gimple_stmt(oldstmt);
111468 + error("%s: rhs1 is NULL_TREE", __func__);
111469 + gcc_unreachable();
111470 + }
111471 +
111472 + switch (gimple_code(oldstmt)) {
111473 + case GIMPLE_ASM:
111474 + lhs = rhs1;
111475 + break;
111476 + case GIMPLE_CALL:
111477 + case GIMPLE_ASSIGN:
111478 + lhs = gimple_get_lhs(oldstmt);
111479 + break;
111480 + default:
111481 + debug_gimple_stmt(oldstmt);
111482 + gcc_unreachable();
111483 + }
111484 +
111485 + gsi = gsi_for_stmt(oldstmt);
111486 + pointer_set_insert(visited->stmts, oldstmt);
111487 + if (lookup_stmt_eh_lp(oldstmt) != 0) {
111488 + basic_block next_bb, cur_bb;
111489 + const_edge e;
111490 +
111491 + gcc_assert(before == false);
111492 + gcc_assert(stmt_can_throw_internal(oldstmt));
111493 + gcc_assert(gimple_code(oldstmt) == GIMPLE_CALL);
111494 + gcc_assert(!gsi_end_p(gsi));
111495 +
111496 + cur_bb = gimple_bb(oldstmt);
111497 + next_bb = cur_bb->next_bb;
111498 + e = find_edge(cur_bb, next_bb);
111499 + gcc_assert(e != NULL);
111500 + gcc_assert(e->flags & EDGE_FALLTHRU);
111501 +
111502 + gsi = gsi_after_labels(next_bb);
111503 + gcc_assert(!gsi_end_p(gsi));
111504 +
111505 + before = true;
111506 + oldstmt = gsi_stmt(gsi);
111507 + }
111508 +
111509 + dst_type = get_size_overflow_type(visited, oldstmt, lhs);
111510 +
111511 + if (is_gimple_constant(rhs1))
111512 + return cast_a_tree(dst_type, rhs1);
111513 + return cast_to_new_size_overflow_type(visited, oldstmt, rhs1, dst_type, before);
111514 +}
111515 +
111516 +tree dup_assign(struct visited *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3)
111517 +{
111518 + gimple stmt;
111519 + gimple_stmt_iterator gsi;
111520 + tree size_overflow_type, new_var, lhs = gimple_assign_lhs(oldstmt);
111521 +
111522 + if (pointer_set_contains(visited->my_stmts, oldstmt))
111523 + return lhs;
111524 +
111525 + if (gimple_num_ops(oldstmt) != 4 && rhs1 == NULL_TREE) {
111526 + rhs1 = gimple_assign_rhs1(oldstmt);
111527 + rhs1 = create_assign(visited, oldstmt, rhs1, BEFORE_STMT);
111528 + }
111529 + if (gimple_num_ops(oldstmt) == 3 && rhs2 == NULL_TREE) {
111530 + rhs2 = gimple_assign_rhs2(oldstmt);
111531 + rhs2 = create_assign(visited, oldstmt, rhs2, BEFORE_STMT);
111532 + }
111533 +
111534 + stmt = gimple_copy(oldstmt);
111535 + gimple_set_location(stmt, gimple_location(oldstmt));
111536 + pointer_set_insert(visited->my_stmts, stmt);
111537 +
111538 + if (gimple_assign_rhs_code(oldstmt) == WIDEN_MULT_EXPR)
111539 + gimple_assign_set_rhs_code(stmt, MULT_EXPR);
111540 +
111541 + size_overflow_type = get_size_overflow_type(visited, oldstmt, node);
111542 +
111543 + new_var = create_new_var(size_overflow_type);
111544 + new_var = make_ssa_name(new_var, stmt);
111545 + gimple_assign_set_lhs(stmt, new_var);
111546 +
111547 + if (rhs1 != NULL_TREE)
111548 + gimple_assign_set_rhs1(stmt, rhs1);
111549 +
111550 + if (rhs2 != NULL_TREE)
111551 + gimple_assign_set_rhs2(stmt, rhs2);
111552 +#if BUILDING_GCC_VERSION >= 4006
111553 + if (rhs3 != NULL_TREE)
111554 + gimple_assign_set_rhs3(stmt, rhs3);
111555 +#endif
111556 + gimple_set_vuse(stmt, gimple_vuse(oldstmt));
111557 + gimple_set_vdef(stmt, gimple_vdef(oldstmt));
111558 +
111559 + gsi = gsi_for_stmt(oldstmt);
111560 + gsi_insert_after(&gsi, stmt, GSI_SAME_STMT);
111561 + update_stmt(stmt);
111562 + pointer_set_insert(visited->stmts, oldstmt);
111563 + return gimple_assign_lhs(stmt);
111564 +}
111565 +
111566 +static tree cast_parm_decl(struct visited *visited, tree phi_ssa_name, tree arg, tree size_overflow_type, basic_block bb)
111567 +{
111568 + gimple assign;
111569 + gimple_stmt_iterator gsi;
111570 + basic_block first_bb;
111571 +
111572 + gcc_assert(SSA_NAME_IS_DEFAULT_DEF(arg));
111573 +
111574 + if (bb->index == 0) {
111575 + first_bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
111576 + gcc_assert(dom_info_available_p(CDI_DOMINATORS));
111577 + set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
111578 + bb = first_bb;
111579 + }
111580 +
111581 + gsi = gsi_after_labels(bb);
111582 + assign = build_cast_stmt(visited, size_overflow_type, arg, phi_ssa_name, &gsi, BEFORE_STMT, false);
111583 + pointer_set_insert(visited->my_stmts, assign);
111584 +
111585 + return gimple_assign_lhs(assign);
111586 +}
111587 +
111588 +static tree use_phi_ssa_name(struct visited *visited, tree ssa_name_var, tree new_arg)
111589 +{
111590 + gimple_stmt_iterator gsi;
111591 + gimple assign, def_stmt = get_def_stmt(new_arg);
111592 +
111593 + if (gimple_code(def_stmt) == GIMPLE_PHI) {
111594 + gsi = gsi_after_labels(gimple_bb(def_stmt));
111595 + assign = build_cast_stmt(visited, TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, BEFORE_STMT, true);
111596 + } else {
111597 + gsi = gsi_for_stmt(def_stmt);
111598 + assign = build_cast_stmt(visited, TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, AFTER_STMT, true);
111599 + }
111600 +
111601 + pointer_set_insert(visited->my_stmts, assign);
111602 + return gimple_assign_lhs(assign);
111603 +}
111604 +
111605 +static tree cast_visited_phi_arg(struct visited *visited, tree ssa_name_var, tree arg, tree size_overflow_type)
111606 +{
111607 + basic_block bb;
111608 + gimple_stmt_iterator gsi;
111609 + const_gimple def_stmt;
111610 + gimple assign;
111611 +
111612 + def_stmt = get_def_stmt(arg);
111613 + bb = gimple_bb(def_stmt);
111614 + gcc_assert(bb->index != 0);
111615 + gsi = gsi_after_labels(bb);
111616 +
111617 + assign = build_cast_stmt(visited, size_overflow_type, arg, ssa_name_var, &gsi, BEFORE_STMT, false);
111618 + pointer_set_insert(visited->my_stmts, assign);
111619 + return gimple_assign_lhs(assign);
111620 +}
111621 +
111622 +static tree create_new_phi_arg(struct visited *visited, tree ssa_name_var, tree new_arg, gimple oldstmt, unsigned int i)
111623 +{
111624 + tree size_overflow_type;
111625 + tree arg;
111626 + const_gimple def_stmt;
111627 +
111628 + if (new_arg != NULL_TREE && is_gimple_constant(new_arg))
111629 + return new_arg;
111630 +
111631 + arg = gimple_phi_arg_def(oldstmt, i);
111632 + def_stmt = get_def_stmt(arg);
111633 + gcc_assert(def_stmt != NULL);
111634 + size_overflow_type = get_size_overflow_type(visited, oldstmt, arg);
111635 +
111636 + switch (gimple_code(def_stmt)) {
111637 + case GIMPLE_PHI:
111638 + return cast_visited_phi_arg(visited, ssa_name_var, arg, size_overflow_type);
111639 + case GIMPLE_NOP: {
111640 + basic_block bb;
111641 +
111642 + bb = gimple_phi_arg_edge(oldstmt, i)->src;
111643 + return cast_parm_decl(visited, ssa_name_var, arg, size_overflow_type, bb);
111644 + }
111645 + case GIMPLE_ASM: {
111646 + gimple_stmt_iterator gsi;
111647 + gimple assign, stmt = get_def_stmt(arg);
111648 +
111649 + gsi = gsi_for_stmt(stmt);
111650 + assign = build_cast_stmt(visited, size_overflow_type, arg, ssa_name_var, &gsi, AFTER_STMT, false);
111651 + pointer_set_insert(visited->my_stmts, assign);
111652 + return gimple_assign_lhs(assign);
111653 + }
111654 + default:
111655 + gcc_assert(new_arg != NULL_TREE);
111656 + gcc_assert(types_compatible_p(TREE_TYPE(new_arg), size_overflow_type));
111657 + return use_phi_ssa_name(visited, ssa_name_var, new_arg);
111658 + }
111659 +}
111660 +
111661 +static gimple overflow_create_phi_node(struct visited *visited, gimple oldstmt, tree result)
111662 +{
111663 + basic_block bb;
111664 + gimple phi;
111665 + gimple_seq seq;
111666 + gimple_stmt_iterator gsi = gsi_for_stmt(oldstmt);
111667 +
111668 + bb = gsi_bb(gsi);
111669 +
111670 + if (result == NULL_TREE) {
111671 + tree old_result = gimple_phi_result(oldstmt);
111672 + tree size_overflow_type = get_size_overflow_type(visited, oldstmt, old_result);
111673 +
111674 + result = create_new_var(size_overflow_type);
111675 + }
111676 +
111677 + phi = create_phi_node(result, bb);
111678 + gimple_phi_set_result(phi, make_ssa_name(result, phi));
111679 + seq = phi_nodes(bb);
111680 + gsi = gsi_last(seq);
111681 + gsi_remove(&gsi, false);
111682 +
111683 + gsi = gsi_for_stmt(oldstmt);
111684 + gsi_insert_after(&gsi, phi, GSI_NEW_STMT);
111685 + gimple_set_bb(phi, bb);
111686 + return phi;
111687 +}
111688 +
111689 +#if BUILDING_GCC_VERSION <= 4007
111690 +static tree create_new_phi_node(struct visited *visited, VEC(tree, heap) **args, tree ssa_name_var, gimple oldstmt)
111691 +#else
111692 +static tree create_new_phi_node(struct visited *visited, vec<tree, va_heap, vl_embed> *&args, tree ssa_name_var, gimple oldstmt)
111693 +#endif
111694 +{
111695 + gimple new_phi;
111696 + unsigned int i;
111697 + tree arg, result;
111698 + location_t loc = gimple_location(oldstmt);
111699 +
111700 +#if BUILDING_GCC_VERSION <= 4007
111701 + gcc_assert(!VEC_empty(tree, *args));
111702 +#else
111703 + gcc_assert(!args->is_empty());
111704 +#endif
111705 +
111706 + new_phi = overflow_create_phi_node(visited, oldstmt, ssa_name_var);
111707 + result = gimple_phi_result(new_phi);
111708 + ssa_name_var = SSA_NAME_VAR(result);
111709 +
111710 +#if BUILDING_GCC_VERSION <= 4007
111711 + FOR_EACH_VEC_ELT(tree, *args, i, arg) {
111712 +#else
111713 + FOR_EACH_VEC_SAFE_ELT(args, i, arg) {
111714 +#endif
111715 + arg = create_new_phi_arg(visited, ssa_name_var, arg, oldstmt, i);
111716 + add_phi_arg(new_phi, arg, gimple_phi_arg_edge(oldstmt, i), loc);
111717 + }
111718 +
111719 +#if BUILDING_GCC_VERSION <= 4007
111720 + VEC_free(tree, heap, *args);
111721 +#else
111722 + vec_free(args);
111723 +#endif
111724 + update_stmt(new_phi);
111725 + pointer_set_insert(visited->my_stmts, new_phi);
111726 + return result;
111727 +}
111728 +
111729 +static tree handle_phi(struct visited *visited, struct cgraph_node *caller_node, tree orig_result)
111730 +{
111731 + tree ssa_name_var = NULL_TREE;
111732 +#if BUILDING_GCC_VERSION <= 4007
111733 + VEC(tree, heap) *args = NULL;
111734 +#else
111735 + vec<tree, va_heap, vl_embed> *args = NULL;
111736 +#endif
111737 + gimple oldstmt = get_def_stmt(orig_result);
111738 + unsigned int i, len = gimple_phi_num_args(oldstmt);
111739 +
111740 + pointer_set_insert(visited->stmts, oldstmt);
111741 + for (i = 0; i < len; i++) {
111742 + tree arg, new_arg;
111743 +
111744 + arg = gimple_phi_arg_def(oldstmt, i);
111745 + new_arg = expand(visited, caller_node, arg);
111746 +
111747 + if (ssa_name_var == NULL_TREE && new_arg != NULL_TREE)
111748 + ssa_name_var = SSA_NAME_VAR(new_arg);
111749 +
111750 + if (is_gimple_constant(arg)) {
111751 + tree size_overflow_type = get_size_overflow_type(visited, oldstmt, arg);
111752 +
111753 + new_arg = cast_a_tree(size_overflow_type, arg);
111754 + }
111755 +
111756 +#if BUILDING_GCC_VERSION <= 4007
111757 + VEC_safe_push(tree, heap, args, new_arg);
111758 +#else
111759 + vec_safe_push(args, new_arg);
111760 +#endif
111761 + }
111762 +
111763 +#if BUILDING_GCC_VERSION <= 4007
111764 + return create_new_phi_node(visited, &args, ssa_name_var, oldstmt);
111765 +#else
111766 + return create_new_phi_node(visited, args, ssa_name_var, oldstmt);
111767 +#endif
111768 +}
111769 +
111770 +static tree create_cast_assign(struct visited *visited, gimple stmt)
111771 +{
111772 + tree rhs1 = gimple_assign_rhs1(stmt);
111773 + tree lhs = gimple_assign_lhs(stmt);
111774 + const_tree rhs1_type = TREE_TYPE(rhs1);
111775 + const_tree lhs_type = TREE_TYPE(lhs);
111776 +
111777 + if (TYPE_UNSIGNED(rhs1_type) == TYPE_UNSIGNED(lhs_type))
111778 + return create_assign(visited, stmt, lhs, AFTER_STMT);
111779 +
111780 + return create_assign(visited, stmt, rhs1, AFTER_STMT);
111781 +}
111782 +
111783 +static bool skip_lhs_cast_check(const_gimple stmt)
111784 +{
111785 + const_tree rhs = gimple_assign_rhs1(stmt);
111786 + const_gimple def_stmt = get_def_stmt(rhs);
111787 +
111788 + // 3.8.2 kernel/futex_compat.c compat_exit_robust_list(): get_user() 64 ulong -> int (compat_long_t), int max
111789 + if (gimple_code(def_stmt) == GIMPLE_ASM)
111790 + return true;
111791 +
111792 + if (is_const_plus_unsigned_signed_truncation(rhs))
111793 + return true;
111794 +
111795 + return false;
111796 +}
111797 +
111798 +static tree create_string_param(tree string)
111799 +{
111800 + tree i_type, a_type;
111801 + const int length = TREE_STRING_LENGTH(string);
111802 +
111803 + gcc_assert(length > 0);
111804 +
111805 + i_type = build_index_type(build_int_cst(NULL_TREE, length - 1));
111806 + a_type = build_array_type(char_type_node, i_type);
111807 +
111808 + TREE_TYPE(string) = a_type;
111809 + TREE_CONSTANT(string) = 1;
111810 + TREE_READONLY(string) = 1;
111811 +
111812 + return build1(ADDR_EXPR, ptr_type_node, string);
111813 +}
111814 +
111815 +static void insert_cond(basic_block cond_bb, tree arg, enum tree_code cond_code, tree type_value)
111816 +{
111817 + gimple cond_stmt;
111818 + gimple_stmt_iterator gsi = gsi_last_bb(cond_bb);
111819 +
111820 + cond_stmt = gimple_build_cond(cond_code, arg, type_value, NULL_TREE, NULL_TREE);
111821 + gsi_insert_after(&gsi, cond_stmt, GSI_CONTINUE_LINKING);
111822 + update_stmt(cond_stmt);
111823 +}
111824 +
111825 +static void insert_cond_result(struct cgraph_node *caller_node, basic_block bb_true, const_gimple stmt, const_tree arg, bool min)
111826 +{
111827 + gimple func_stmt;
111828 + const_gimple def_stmt;
111829 + const_tree loc_line;
111830 + tree loc_file, ssa_name, current_func;
111831 + expanded_location xloc;
111832 + char *ssa_name_buf;
111833 + int len;
111834 + struct cgraph_edge *edge;
111835 + struct cgraph_node *callee_node;
111836 + int frequency;
111837 + gimple_stmt_iterator gsi = gsi_start_bb(bb_true);
111838 +
111839 + def_stmt = get_def_stmt(arg);
111840 + xloc = expand_location(gimple_location(def_stmt));
111841 +
111842 + if (!gimple_has_location(def_stmt)) {
111843 + xloc = expand_location(gimple_location(stmt));
111844 + if (!gimple_has_location(stmt))
111845 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
111846 + }
111847 +
111848 + loc_line = build_int_cstu(unsigned_type_node, xloc.line);
111849 +
111850 + loc_file = build_string(strlen(xloc.file) + 1, xloc.file);
111851 + loc_file = create_string_param(loc_file);
111852 +
111853 + current_func = build_string(DECL_NAME_LENGTH(current_function_decl) + 1, DECL_NAME_POINTER(current_function_decl));
111854 + current_func = create_string_param(current_func);
111855 +
111856 + gcc_assert(DECL_NAME(SSA_NAME_VAR(arg)) != NULL);
111857 + call_count++;
111858 + len = asprintf(&ssa_name_buf, "%s_%u %s, count: %u\n", DECL_NAME_POINTER(SSA_NAME_VAR(arg)), SSA_NAME_VERSION(arg), min ? "min" : "max", call_count);
111859 + gcc_assert(len > 0);
111860 + ssa_name = build_string(len + 1, ssa_name_buf);
111861 + free(ssa_name_buf);
111862 + ssa_name = create_string_param(ssa_name);
111863 +
111864 + // void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
111865 + func_stmt = gimple_build_call(report_size_overflow_decl, 4, loc_file, loc_line, current_func, ssa_name);
111866 + gsi_insert_after(&gsi, func_stmt, GSI_CONTINUE_LINKING);
111867 +
111868 + callee_node = cgraph_get_create_node(report_size_overflow_decl);
111869 + frequency = compute_call_stmt_bb_frequency(current_function_decl, bb_true);
111870 +
111871 + edge = cgraph_create_edge(caller_node, callee_node, func_stmt, bb_true->count, frequency, bb_true->loop_depth);
111872 + gcc_assert(edge != NULL);
111873 +}
111874 +
111875 +static void insert_check_size_overflow(struct cgraph_node *caller_node, gimple stmt, enum tree_code cond_code, tree arg, tree type_value, bool before, bool min)
111876 +{
111877 + basic_block cond_bb, join_bb, bb_true;
111878 + edge e;
111879 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
111880 +
111881 + cond_bb = gimple_bb(stmt);
111882 + if (before)
111883 + gsi_prev(&gsi);
111884 + if (gsi_end_p(gsi))
111885 + e = split_block_after_labels(cond_bb);
111886 + else
111887 + e = split_block(cond_bb, gsi_stmt(gsi));
111888 + cond_bb = e->src;
111889 + join_bb = e->dest;
111890 + e->flags = EDGE_FALSE_VALUE;
111891 + e->probability = REG_BR_PROB_BASE;
111892 +
111893 + bb_true = create_empty_bb(cond_bb);
111894 + make_edge(cond_bb, bb_true, EDGE_TRUE_VALUE);
111895 + make_edge(cond_bb, join_bb, EDGE_FALSE_VALUE);
111896 + make_edge(bb_true, join_bb, EDGE_FALLTHRU);
111897 +
111898 + gcc_assert(dom_info_available_p(CDI_DOMINATORS));
111899 + set_immediate_dominator(CDI_DOMINATORS, bb_true, cond_bb);
111900 + set_immediate_dominator(CDI_DOMINATORS, join_bb, cond_bb);
111901 +
111902 + if (current_loops != NULL) {
111903 + gcc_assert(cond_bb->loop_father == join_bb->loop_father);
111904 + add_bb_to_loop(bb_true, cond_bb->loop_father);
111905 + }
111906 +
111907 + insert_cond(cond_bb, arg, cond_code, type_value);
111908 + insert_cond_result(caller_node, bb_true, stmt, arg, min);
111909 +
111910 +// print_the_code_insertions(stmt);
111911 +}
111912 +
111913 +void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before)
111914 +{
111915 + const_tree rhs_type = TREE_TYPE(rhs);
111916 + tree cast_rhs_type, type_max_type, type_min_type, type_max, type_min;
111917 +
111918 + gcc_assert(rhs_type != NULL_TREE);
111919 + if (TREE_CODE(rhs_type) == POINTER_TYPE)
111920 + return;
111921 +
111922 + gcc_assert(TREE_CODE(rhs_type) == INTEGER_TYPE || TREE_CODE(rhs_type) == ENUMERAL_TYPE);
111923 +
111924 + if (is_const_plus_unsigned_signed_truncation(rhs))
111925 + return;
111926 +
111927 + type_max = cast_a_tree(size_overflow_type, TYPE_MAX_VALUE(rhs_type));
111928 + // typemax (-1) < typemin (0)
111929 + if (TREE_OVERFLOW(type_max))
111930 + return;
111931 +
111932 + type_min = cast_a_tree(size_overflow_type, TYPE_MIN_VALUE(rhs_type));
111933 +
111934 + cast_rhs_type = TREE_TYPE(cast_rhs);
111935 + type_max_type = TREE_TYPE(type_max);
111936 + gcc_assert(types_compatible_p(cast_rhs_type, type_max_type));
111937 +
111938 + insert_check_size_overflow(caller_node, stmt, GT_EXPR, cast_rhs, type_max, before, MAX_CHECK);
111939 +
111940 + // special case: get_size_overflow_type(), 32, u64->s
111941 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode) && TYPE_UNSIGNED(size_overflow_type) && !TYPE_UNSIGNED(rhs_type))
111942 + return;
111943 +
111944 + type_min_type = TREE_TYPE(type_min);
111945 + gcc_assert(types_compatible_p(type_max_type, type_min_type));
111946 + insert_check_size_overflow(caller_node, stmt, LT_EXPR, cast_rhs, type_min, before, MIN_CHECK);
111947 +}
111948 +
111949 +static tree create_cast_overflow_check(struct visited *visited, struct cgraph_node *caller_node, tree new_rhs1, gimple stmt)
111950 +{
111951 + bool cast_lhs, cast_rhs;
111952 + tree lhs = gimple_assign_lhs(stmt);
111953 + tree rhs = gimple_assign_rhs1(stmt);
111954 + const_tree lhs_type = TREE_TYPE(lhs);
111955 + const_tree rhs_type = TREE_TYPE(rhs);
111956 + enum machine_mode lhs_mode = TYPE_MODE(lhs_type);
111957 + enum machine_mode rhs_mode = TYPE_MODE(rhs_type);
111958 + unsigned int lhs_size = GET_MODE_BITSIZE(lhs_mode);
111959 + unsigned int rhs_size = GET_MODE_BITSIZE(rhs_mode);
111960 +
111961 + static bool check_lhs[3][4] = {
111962 + // ss su us uu
111963 + { false, true, true, false }, // lhs > rhs
111964 + { false, false, false, false }, // lhs = rhs
111965 + { true, true, true, true }, // lhs < rhs
111966 + };
111967 +
111968 + static bool check_rhs[3][4] = {
111969 + // ss su us uu
111970 + { true, false, true, true }, // lhs > rhs
111971 + { true, false, true, true }, // lhs = rhs
111972 + { true, false, true, true }, // lhs < rhs
111973 + };
111974 +
111975 + // skip lhs check on signed SI -> HI cast or signed SI -> QI cast !!!!
111976 + if (rhs_mode == SImode && !TYPE_UNSIGNED(rhs_type) && (lhs_mode == HImode || lhs_mode == QImode))
111977 + return create_assign(visited, stmt, lhs, AFTER_STMT);
111978 +
111979 + if (lhs_size > rhs_size) {
111980 + cast_lhs = check_lhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
111981 + cast_rhs = check_rhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
111982 + } else if (lhs_size == rhs_size) {
111983 + cast_lhs = check_lhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
111984 + cast_rhs = check_rhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
111985 + } else {
111986 + cast_lhs = check_lhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
111987 + cast_rhs = check_rhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
111988 + }
111989 +
111990 + if (!cast_lhs && !cast_rhs)
111991 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
111992 +
111993 + if (cast_lhs && !skip_lhs_cast_check(stmt))
111994 + check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, lhs, BEFORE_STMT);
111995 +
111996 + if (cast_rhs)
111997 + check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, rhs, BEFORE_STMT);
111998 +
111999 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
112000 +}
112001 +
112002 +static tree handle_unary_rhs(struct visited *visited, struct cgraph_node *caller_node, gimple stmt)
112003 +{
112004 + enum tree_code rhs_code;
112005 + tree rhs1, new_rhs1, lhs = gimple_assign_lhs(stmt);
112006 +
112007 + if (pointer_set_contains(visited->my_stmts, stmt))
112008 + return lhs;
112009 +
112010 + rhs1 = gimple_assign_rhs1(stmt);
112011 + if (TREE_CODE(TREE_TYPE(rhs1)) == POINTER_TYPE)
112012 + return create_assign(visited, stmt, lhs, AFTER_STMT);
112013 +
112014 + new_rhs1 = expand(visited, caller_node, rhs1);
112015 +
112016 + if (new_rhs1 == NULL_TREE)
112017 + return create_cast_assign(visited, stmt);
112018 +
112019 + if (pointer_set_contains(visited->no_cast_check, stmt))
112020 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
112021 +
112022 + rhs_code = gimple_assign_rhs_code(stmt);
112023 + if (rhs_code == BIT_NOT_EXPR || rhs_code == NEGATE_EXPR) {
112024 + tree size_overflow_type = get_size_overflow_type(visited, stmt, rhs1);
112025 +
112026 + new_rhs1 = cast_to_new_size_overflow_type(visited, stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
112027 + check_size_overflow(caller_node, stmt, size_overflow_type, new_rhs1, rhs1, BEFORE_STMT);
112028 + return create_assign(visited, stmt, lhs, AFTER_STMT);
112029 + }
112030 +
112031 + if (!gimple_assign_cast_p(stmt))
112032 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
112033 +
112034 + return create_cast_overflow_check(visited, caller_node, new_rhs1, stmt);
112035 +}
112036 +
112037 +static tree handle_unary_ops(struct visited *visited, struct cgraph_node *caller_node, gimple stmt)
112038 +{
112039 + tree rhs1, lhs = gimple_assign_lhs(stmt);
112040 + gimple def_stmt = get_def_stmt(lhs);
112041 +
112042 + gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP);
112043 + rhs1 = gimple_assign_rhs1(def_stmt);
112044 +
112045 + if (is_gimple_constant(rhs1))
112046 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
112047 +
112048 + switch (TREE_CODE(rhs1)) {
112049 + case SSA_NAME: {
112050 + tree ret = handle_unary_rhs(visited, caller_node, def_stmt);
112051 +
112052 + if (gimple_assign_cast_p(stmt))
112053 + unsigned_signed_cast_intentional_overflow(visited, stmt);
112054 + return ret;
112055 + }
112056 + case ARRAY_REF:
112057 + case BIT_FIELD_REF:
112058 + case ADDR_EXPR:
112059 + case COMPONENT_REF:
112060 + case INDIRECT_REF:
112061 +#if BUILDING_GCC_VERSION >= 4006
112062 + case MEM_REF:
112063 +#endif
112064 + case TARGET_MEM_REF:
112065 + case VIEW_CONVERT_EXPR:
112066 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
112067 + case PARM_DECL:
112068 + case VAR_DECL:
112069 + return create_assign(visited, stmt, lhs, AFTER_STMT);
112070 +
112071 + default:
112072 + debug_gimple_stmt(def_stmt);
112073 + debug_tree(rhs1);
112074 + gcc_unreachable();
112075 + }
112076 +}
112077 +
112078 +static void __unused print_the_code_insertions(const_gimple stmt)
112079 +{
112080 + location_t loc = gimple_location(stmt);
112081 +
112082 + inform(loc, "Integer size_overflow check applied here.");
112083 +}
112084 +
112085 +static tree handle_binary_ops(struct visited *visited, struct cgraph_node *caller_node, tree lhs)
112086 +{
112087 + enum intentional_overflow_type res;
112088 + tree rhs1, rhs2, new_lhs;
112089 + gimple def_stmt = get_def_stmt(lhs);
112090 + tree new_rhs1 = NULL_TREE;
112091 + tree new_rhs2 = NULL_TREE;
112092 +
112093 + rhs1 = gimple_assign_rhs1(def_stmt);
112094 + rhs2 = gimple_assign_rhs2(def_stmt);
112095 +
112096 + /* no DImode/TImode division in the 32/64 bit kernel */
112097 + switch (gimple_assign_rhs_code(def_stmt)) {
112098 + case RDIV_EXPR:
112099 + case TRUNC_DIV_EXPR:
112100 + case CEIL_DIV_EXPR:
112101 + case FLOOR_DIV_EXPR:
112102 + case ROUND_DIV_EXPR:
112103 + case TRUNC_MOD_EXPR:
112104 + case CEIL_MOD_EXPR:
112105 + case FLOOR_MOD_EXPR:
112106 + case ROUND_MOD_EXPR:
112107 + case EXACT_DIV_EXPR:
112108 + case POINTER_PLUS_EXPR:
112109 + case BIT_AND_EXPR:
112110 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
112111 + default:
112112 + break;
112113 + }
112114 +
112115 + new_lhs = handle_integer_truncation(visited, caller_node, lhs);
112116 + if (new_lhs != NULL_TREE)
112117 + return new_lhs;
112118 +
112119 + if (TREE_CODE(rhs1) == SSA_NAME)
112120 + new_rhs1 = expand(visited, caller_node, rhs1);
112121 + if (TREE_CODE(rhs2) == SSA_NAME)
112122 + new_rhs2 = expand(visited, caller_node, rhs2);
112123 +
112124 + res = add_mul_intentional_overflow(def_stmt);
112125 + if (res != NO_INTENTIONAL_OVERFLOW) {
112126 + new_lhs = dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
112127 + insert_cast_expr(visited, get_def_stmt(new_lhs), res);
112128 + return new_lhs;
112129 + }
112130 +
112131 + if (skip_expr_on_double_type(def_stmt)) {
112132 + new_lhs = dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
112133 + insert_cast_expr(visited, get_def_stmt(new_lhs), NO_INTENTIONAL_OVERFLOW);
112134 + return new_lhs;
112135 + }
112136 +
112137 + if (is_a_neg_overflow(def_stmt, rhs2))
112138 + return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs1, NULL_TREE);
112139 + if (is_a_neg_overflow(def_stmt, rhs1))
112140 + return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs2, new_rhs2);
112141 +
112142 +
112143 + if (is_a_constant_overflow(def_stmt, rhs2))
112144 + return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs1), def_stmt, new_rhs1, NULL_TREE);
112145 + if (is_a_constant_overflow(def_stmt, rhs1))
112146 + return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs2), def_stmt, new_rhs2, new_rhs2);
112147 +
112148 + // the const is between 0 and (signed) MAX
112149 + if (is_gimple_constant(rhs1))
112150 + new_rhs1 = create_assign(visited, def_stmt, rhs1, BEFORE_STMT);
112151 + if (is_gimple_constant(rhs2))
112152 + new_rhs2 = create_assign(visited, def_stmt, rhs2, BEFORE_STMT);
112153 +
112154 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
112155 +}
112156 +
112157 +#if BUILDING_GCC_VERSION >= 4006
112158 +static tree get_new_rhs(struct visited *visited, struct cgraph_node *caller_node, tree size_overflow_type, tree rhs)
112159 +{
112160 + if (is_gimple_constant(rhs))
112161 + return cast_a_tree(size_overflow_type, rhs);
112162 + if (TREE_CODE(rhs) != SSA_NAME)
112163 + return NULL_TREE;
112164 + return expand(visited, caller_node, rhs);
112165 +}
112166 +
112167 +static tree handle_ternary_ops(struct visited *visited, struct cgraph_node *caller_node, tree lhs)
112168 +{
112169 + tree rhs1, rhs2, rhs3, new_rhs1, new_rhs2, new_rhs3, size_overflow_type;
112170 + gimple def_stmt = get_def_stmt(lhs);
112171 +
112172 + size_overflow_type = get_size_overflow_type(visited, def_stmt, lhs);
112173 +
112174 + rhs1 = gimple_assign_rhs1(def_stmt);
112175 + rhs2 = gimple_assign_rhs2(def_stmt);
112176 + rhs3 = gimple_assign_rhs3(def_stmt);
112177 + new_rhs1 = get_new_rhs(visited, caller_node, size_overflow_type, rhs1);
112178 + new_rhs2 = get_new_rhs(visited, caller_node, size_overflow_type, rhs2);
112179 + new_rhs3 = get_new_rhs(visited, caller_node, size_overflow_type, rhs3);
112180 +
112181 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, new_rhs3);
112182 +}
112183 +#endif
112184 +
112185 +static tree get_my_stmt_lhs(struct visited *visited, gimple stmt)
112186 +{
112187 + gimple_stmt_iterator gsi;
112188 + gimple next_stmt = NULL;
112189 +
112190 + gsi = gsi_for_stmt(stmt);
112191 +
112192 + do {
112193 + gsi_next(&gsi);
112194 + next_stmt = gsi_stmt(gsi);
112195 +
112196 + if (gimple_code(stmt) == GIMPLE_PHI && !pointer_set_contains(visited->my_stmts, next_stmt))
112197 + return NULL_TREE;
112198 +
112199 + if (pointer_set_contains(visited->my_stmts, next_stmt) && !pointer_set_contains(visited->skip_expr_casts, next_stmt))
112200 + break;
112201 +
112202 + gcc_assert(pointer_set_contains(visited->my_stmts, next_stmt));
112203 + } while (!gsi_end_p(gsi));
112204 +
112205 + gcc_assert(next_stmt);
112206 + return get_lhs(next_stmt);
112207 +}
112208 +
112209 +static tree expand_visited(struct visited *visited, gimple def_stmt)
112210 +{
112211 + gimple_stmt_iterator gsi;
112212 + enum gimple_code code = gimple_code(def_stmt);
112213 +
112214 + if (code == GIMPLE_ASM)
112215 + return NULL_TREE;
112216 +
112217 + gsi = gsi_for_stmt(def_stmt);
112218 + gsi_next(&gsi);
112219 +
112220 + if (gimple_code(def_stmt) == GIMPLE_PHI && gsi_end_p(gsi))
112221 + return NULL_TREE;
112222 + return get_my_stmt_lhs(visited, def_stmt);
112223 +}
112224 +
112225 +tree expand(struct visited *visited, struct cgraph_node *caller_node, tree lhs)
112226 +{
112227 + gimple def_stmt;
112228 +
112229 + def_stmt = get_def_stmt(lhs);
112230 +
112231 + if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
112232 + return NULL_TREE;
112233 +
112234 + if (pointer_set_contains(visited->my_stmts, def_stmt))
112235 + return lhs;
112236 +
112237 + if (pointer_set_contains(visited->stmts, def_stmt))
112238 + return expand_visited(visited, def_stmt);
112239 +
112240 + switch (gimple_code(def_stmt)) {
112241 + case GIMPLE_PHI:
112242 + return handle_phi(visited, caller_node, lhs);
112243 + case GIMPLE_CALL:
112244 + case GIMPLE_ASM:
112245 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
112246 + case GIMPLE_ASSIGN:
112247 + switch (gimple_num_ops(def_stmt)) {
112248 + case 2:
112249 + return handle_unary_ops(visited, caller_node, def_stmt);
112250 + case 3:
112251 + return handle_binary_ops(visited, caller_node, lhs);
112252 +#if BUILDING_GCC_VERSION >= 4006
112253 + case 4:
112254 + return handle_ternary_ops(visited, caller_node, lhs);
112255 +#endif
112256 + }
112257 + default:
112258 + debug_gimple_stmt(def_stmt);
112259 + error("%s: unknown gimple code", __func__);
112260 + gcc_unreachable();
112261 + }
112262 +}
112263 +
112264 diff --git a/tools/gcc/size_overflow_plugin/insert_size_overflow_check_ipa.c b/tools/gcc/size_overflow_plugin/insert_size_overflow_check_ipa.c
112265 new file mode 100644
112266 index 0000000..715a590
112267 --- /dev/null
112268 +++ b/tools/gcc/size_overflow_plugin/insert_size_overflow_check_ipa.c
112269 @@ -0,0 +1,1141 @@
112270 +/*
112271 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
112272 + * Licensed under the GPL v2, or (at your option) v3
112273 + *
112274 + * Homepage:
112275 + * http://www.grsecurity.net/~ephox/overflow_plugin/
112276 + *
112277 + * Documentation:
112278 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
112279 + *
112280 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
112281 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
112282 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
112283 + *
112284 + * Usage:
112285 + * $ make
112286 + * $ make run
112287 + */
112288 +
112289 +#include "gcc-common.h"
112290 +#include "size_overflow.h"
112291 +
112292 +#define VEC_LEN 128
112293 +#define RET_CHECK NULL_TREE
112294 +#define WRONG_NODE 32
112295 +#define NOT_INTENTIONAL_ASM NULL
112296 +
112297 +unsigned int call_count;
112298 +
112299 +static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs);
112300 +static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs);
112301 +
112302 +struct visited_fns {
112303 + struct visited_fns *next;
112304 + const_tree fndecl;
112305 + unsigned int num;
112306 + const_gimple first_stmt;
112307 +};
112308 +
112309 +struct next_cgraph_node {
112310 + struct next_cgraph_node *next;
112311 + struct cgraph_node *current_function;
112312 + tree callee_fndecl;
112313 + unsigned int num;
112314 +};
112315 +
112316 +// Don't want to duplicate entries in next_cgraph_node
112317 +static bool is_in_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, const_tree fndecl, unsigned int num)
112318 +{
112319 + const_tree new_callee_fndecl;
112320 + struct next_cgraph_node *cur_node;
112321 +
112322 + if (fndecl == RET_CHECK)
112323 + new_callee_fndecl = NODE_DECL(node);
112324 + else
112325 + new_callee_fndecl = fndecl;
112326 +
112327 + for (cur_node = head; cur_node; cur_node = cur_node->next) {
112328 + if (!operand_equal_p(NODE_DECL(cur_node->current_function), NODE_DECL(node), 0))
112329 + continue;
112330 + if (!operand_equal_p(cur_node->callee_fndecl, new_callee_fndecl, 0))
112331 + continue;
112332 + if (num == cur_node->num)
112333 + return true;
112334 + }
112335 + return false;
112336 +}
112337 +
112338 +/* Add a next_cgraph_node into the list for handle_function().
112339 + * handle_function() iterates over all the next cgraph nodes and
112340 + * starts the overflow check insertion process.
112341 + */
112342 +static struct next_cgraph_node *create_new_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, tree fndecl, unsigned int num)
112343 +{
112344 + struct next_cgraph_node *new_node;
112345 +
112346 + if (is_in_next_cgraph_node(head, node, fndecl, num))
112347 + return head;
112348 +
112349 + new_node = (struct next_cgraph_node *)xmalloc(sizeof(*new_node));
112350 + new_node->current_function = node;
112351 + new_node->next = NULL;
112352 + new_node->num = num;
112353 + if (fndecl == RET_CHECK)
112354 + new_node->callee_fndecl = NODE_DECL(node);
112355 + else
112356 + new_node->callee_fndecl = fndecl;
112357 +
112358 + if (!head)
112359 + return new_node;
112360 +
112361 + new_node->next = head;
112362 + return new_node;
112363 +}
112364 +
112365 +static struct next_cgraph_node *create_new_next_cgraph_nodes(struct next_cgraph_node *head, struct cgraph_node *node, unsigned int num)
112366 +{
112367 + struct cgraph_edge *e;
112368 +
112369 + if (num == 0)
112370 + return create_new_next_cgraph_node(head, node, RET_CHECK, num);
112371 +
112372 + for (e = node->callers; e; e = e->next_caller) {
112373 + tree fndecl = gimple_call_fndecl(e->call_stmt);
112374 +
112375 + gcc_assert(fndecl != NULL_TREE);
112376 + head = create_new_next_cgraph_node(head, e->caller, fndecl, num);
112377 + }
112378 +
112379 + return head;
112380 +}
112381 +
112382 +struct missing_functions {
112383 + struct missing_functions *next;
112384 + const_tree node;
112385 + tree fndecl;
112386 +};
112387 +
112388 +static struct missing_functions *create_new_missing_function(struct missing_functions *missing_fn_head, tree node)
112389 +{
112390 + struct missing_functions *new_function;
112391 +
112392 + new_function = (struct missing_functions *)xmalloc(sizeof(*new_function));
112393 + new_function->node = node;
112394 + new_function->next = NULL;
112395 +
112396 + if (TREE_CODE(node) == FUNCTION_DECL)
112397 + new_function->fndecl = node;
112398 + else
112399 + new_function->fndecl = current_function_decl;
112400 + gcc_assert(new_function->fndecl);
112401 +
112402 + if (!missing_fn_head)
112403 + return new_function;
112404 +
112405 + new_function->next = missing_fn_head;
112406 + return new_function;
112407 +}
112408 +
112409 +/* If the function is missing from the hash table and it is a static function
112410 + * then create a next_cgraph_node from it for handle_function()
112411 + */
112412 +static struct next_cgraph_node *check_missing_overflow_attribute_and_create_next_node(struct next_cgraph_node *cnodes, struct missing_functions *missing_fn_head)
112413 +{
112414 + unsigned int num;
112415 + const_tree orig_fndecl;
112416 + struct cgraph_node *next_node = NULL;
112417 +
112418 + orig_fndecl = DECL_ORIGIN(missing_fn_head->fndecl);
112419 +
112420 + num = get_function_num(missing_fn_head->node, orig_fndecl);
112421 + if (num == CANNOT_FIND_ARG)
112422 + return cnodes;
112423 +
112424 + if (!is_missing_function(orig_fndecl, num))
112425 + return cnodes;
112426 +
112427 + next_node = cgraph_get_node(missing_fn_head->fndecl);
112428 + if (next_node && next_node->local.local)
112429 + cnodes = create_new_next_cgraph_nodes(cnodes, next_node, num);
112430 + return cnodes;
112431 +}
112432 +
112433 +/* Search for missing size_overflow attributes on the last nodes in ipa and collect them
112434 + * into the next_cgraph_node list. They will be the next interesting returns or callees.
112435 + */
112436 +static struct next_cgraph_node *search_overflow_attribute(struct next_cgraph_node *cnodes, struct interesting_node *cur_node)
112437 +{
112438 + unsigned int i;
112439 + tree node;
112440 + struct missing_functions *cur, *missing_fn_head = NULL;
112441 +
112442 +#if BUILDING_GCC_VERSION <= 4007
112443 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, node) {
112444 +#else
112445 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, node) {
112446 +#endif
112447 + switch (TREE_CODE(node)) {
112448 + case PARM_DECL:
112449 + if (TREE_CODE(TREE_TYPE(node)) != INTEGER_TYPE)
112450 + break;
112451 + case FUNCTION_DECL:
112452 + missing_fn_head = create_new_missing_function(missing_fn_head, node);
112453 + break;
112454 + default:
112455 + break;
112456 + }
112457 + }
112458 +
112459 + while (missing_fn_head) {
112460 + cnodes = check_missing_overflow_attribute_and_create_next_node(cnodes, missing_fn_head);
112461 +
112462 + cur = missing_fn_head->next;
112463 + free(missing_fn_head);
112464 + missing_fn_head = cur;
112465 + }
112466 +
112467 + return cnodes;
112468 +}
112469 +
112470 +static void walk_phi_set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree result)
112471 +{
112472 + gimple phi = get_def_stmt(result);
112473 + unsigned int i, n = gimple_phi_num_args(phi);
112474 +
112475 + pointer_set_insert(visited, phi);
112476 + for (i = 0; i < n; i++) {
112477 + const_tree arg = gimple_phi_arg_def(phi, i);
112478 +
112479 + set_conditions(visited, interesting_conditions, arg);
112480 + }
112481 +}
112482 +
112483 +enum conditions {
112484 + FROM_CONST, NOT_UNARY, CAST, RET, PHI
112485 +};
112486 +
112487 +// Search for constants, cast assignments and binary/ternary assignments
112488 +static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs)
112489 +{
112490 + gimple def_stmt = get_def_stmt(lhs);
112491 +
112492 + if (is_gimple_constant(lhs)) {
112493 + interesting_conditions[FROM_CONST] = true;
112494 + return;
112495 + }
112496 +
112497 + if (!def_stmt)
112498 + return;
112499 +
112500 + if (pointer_set_contains(visited, def_stmt))
112501 + return;
112502 +
112503 + switch (gimple_code(def_stmt)) {
112504 + case GIMPLE_CALL:
112505 + if (lhs == gimple_return_retval(def_stmt))
112506 + interesting_conditions[RET] = true;
112507 + return;
112508 + case GIMPLE_NOP:
112509 + case GIMPLE_ASM:
112510 + return;
112511 + case GIMPLE_PHI:
112512 + interesting_conditions[PHI] = true;
112513 + return walk_phi_set_conditions(visited, interesting_conditions, lhs);
112514 + case GIMPLE_ASSIGN:
112515 + if (gimple_num_ops(def_stmt) == 2) {
112516 + const_tree rhs = gimple_assign_rhs1(def_stmt);
112517 +
112518 + if (gimple_assign_cast_p(def_stmt))
112519 + interesting_conditions[CAST] = true;
112520 +
112521 + return set_conditions(visited, interesting_conditions, rhs);
112522 + } else {
112523 + interesting_conditions[NOT_UNARY] = true;
112524 + return;
112525 + }
112526 + default:
112527 + debug_gimple_stmt(def_stmt);
112528 + gcc_unreachable();
112529 + }
112530 +}
112531 +
112532 +// determine whether duplication will be necessary or not.
112533 +static void search_interesting_conditions(struct interesting_node *cur_node, bool *interesting_conditions)
112534 +{
112535 + struct pointer_set_t *visited;
112536 +
112537 + if (gimple_assign_cast_p(cur_node->first_stmt))
112538 + interesting_conditions[CAST] = true;
112539 + else if (is_gimple_assign(cur_node->first_stmt) && gimple_num_ops(cur_node->first_stmt) > 2)
112540 + interesting_conditions[NOT_UNARY] = true;
112541 +
112542 + visited = pointer_set_create();
112543 + set_conditions(visited, interesting_conditions, cur_node->node);
112544 + pointer_set_destroy(visited);
112545 +}
112546 +
112547 +// Remove the size_overflow asm stmt and create an assignment from the input and output of the asm
112548 +static void replace_size_overflow_asm_with_assign(gimple asm_stmt, tree lhs, tree rhs)
112549 +{
112550 + gimple assign;
112551 + gimple_stmt_iterator gsi;
112552 +
112553 + // already removed
112554 + if (gimple_bb(asm_stmt) == NULL)
112555 + return;
112556 + gsi = gsi_for_stmt(asm_stmt);
112557 +
112558 + assign = gimple_build_assign(lhs, rhs);
112559 + gsi_insert_before(&gsi, assign, GSI_SAME_STMT);
112560 + SSA_NAME_DEF_STMT(lhs) = assign;
112561 +
112562 + gsi_remove(&gsi, true);
112563 +}
112564 +
112565 +/* Get the fndecl of an interesting stmt, the fndecl is the caller function if the interesting
112566 + * stmt is a return otherwise it is the callee function.
112567 + */
112568 +const_tree get_interesting_orig_fndecl(const_gimple stmt, unsigned int argnum)
112569 +{
112570 + const_tree fndecl;
112571 +
112572 + if (argnum == 0)
112573 + fndecl = current_function_decl;
112574 + else
112575 + fndecl = gimple_call_fndecl(stmt);
112576 +
112577 + if (fndecl == NULL_TREE)
112578 + return NULL_TREE;
112579 +
112580 + return DECL_ORIGIN(fndecl);
112581 +}
112582 +
112583 +// e.g., 3.8.2, 64, arch/x86/ia32/ia32_signal.c copy_siginfo_from_user32(): compat_ptr() u32 max
112584 +static bool skip_asm(const_tree arg)
112585 +{
112586 + gimple def_stmt = get_def_stmt(arg);
112587 +
112588 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
112589 + return false;
112590 +
112591 + def_stmt = get_def_stmt(gimple_assign_rhs1(def_stmt));
112592 + return def_stmt && gimple_code(def_stmt) == GIMPLE_ASM;
112593 +}
112594 +
112595 +static void walk_use_def_phi(struct pointer_set_t *visited, struct interesting_node *cur_node, tree result)
112596 +{
112597 + gimple phi = get_def_stmt(result);
112598 + unsigned int i, n = gimple_phi_num_args(phi);
112599 +
112600 + pointer_set_insert(visited, phi);
112601 + for (i = 0; i < n; i++) {
112602 + tree arg = gimple_phi_arg_def(phi, i);
112603 +
112604 + walk_use_def(visited, cur_node, arg);
112605 + }
112606 +}
112607 +
112608 +static void walk_use_def_binary(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
112609 +{
112610 + gimple def_stmt = get_def_stmt(lhs);
112611 + tree rhs1, rhs2;
112612 +
112613 + rhs1 = gimple_assign_rhs1(def_stmt);
112614 + rhs2 = gimple_assign_rhs2(def_stmt);
112615 +
112616 + walk_use_def(visited, cur_node, rhs1);
112617 + walk_use_def(visited, cur_node, rhs2);
112618 +}
112619 +
112620 +static void insert_last_node(struct interesting_node *cur_node, tree node)
112621 +{
112622 + unsigned int i;
112623 + tree element;
112624 + enum tree_code code;
112625 +
112626 + gcc_assert(node != NULL_TREE);
112627 +
112628 + if (is_gimple_constant(node))
112629 + return;
112630 +
112631 + code = TREE_CODE(node);
112632 + if (code == VAR_DECL) {
112633 + node = DECL_ORIGIN(node);
112634 + code = TREE_CODE(node);
112635 + }
112636 +
112637 + if (code != PARM_DECL && code != FUNCTION_DECL && code != COMPONENT_REF)
112638 + return;
112639 +
112640 +#if BUILDING_GCC_VERSION <= 4007
112641 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, element) {
112642 +#else
112643 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, element) {
112644 +#endif
112645 + if (operand_equal_p(node, element, 0))
112646 + return;
112647 + }
112648 +
112649 +#if BUILDING_GCC_VERSION <= 4007
112650 + gcc_assert(VEC_length(tree, cur_node->last_nodes) < VEC_LEN);
112651 + VEC_safe_push(tree, gc, cur_node->last_nodes, node);
112652 +#else
112653 + gcc_assert(cur_node->last_nodes->length() < VEC_LEN);
112654 + vec_safe_push(cur_node->last_nodes, node);
112655 +#endif
112656 +}
112657 +
112658 +// a size_overflow asm stmt in the control flow doesn't stop the recursion
112659 +static void handle_asm_stmt(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs, const_gimple stmt)
112660 +{
112661 + if (!is_size_overflow_asm(stmt))
112662 + walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
112663 +}
112664 +
112665 +/* collect the parm_decls and fndecls (for checking a missing size_overflow attribute (ret or arg) or intentional_overflow)
112666 + * and component refs (for checking the intentional_overflow attribute).
112667 + */
112668 +static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
112669 +{
112670 + const_gimple def_stmt;
112671 +
112672 + if (TREE_CODE(lhs) != SSA_NAME) {
112673 + insert_last_node(cur_node, lhs);
112674 + return;
112675 + }
112676 +
112677 + def_stmt = get_def_stmt(lhs);
112678 + if (!def_stmt)
112679 + return;
112680 +
112681 + if (pointer_set_insert(visited, def_stmt))
112682 + return;
112683 +
112684 + switch (gimple_code(def_stmt)) {
112685 + case GIMPLE_NOP:
112686 + return walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
112687 + case GIMPLE_ASM:
112688 + return handle_asm_stmt(visited, cur_node, lhs, def_stmt);
112689 + case GIMPLE_CALL: {
112690 + tree fndecl = gimple_call_fndecl(def_stmt);
112691 +
112692 + if (fndecl == NULL_TREE)
112693 + return;
112694 + insert_last_node(cur_node, fndecl);
112695 + return;
112696 + }
112697 + case GIMPLE_PHI:
112698 + return walk_use_def_phi(visited, cur_node, lhs);
112699 + case GIMPLE_ASSIGN:
112700 + switch (gimple_num_ops(def_stmt)) {
112701 + case 2:
112702 + return walk_use_def(visited, cur_node, gimple_assign_rhs1(def_stmt));
112703 + case 3:
112704 + return walk_use_def_binary(visited, cur_node, lhs);
112705 + }
112706 + default:
112707 + debug_gimple_stmt((gimple)def_stmt);
112708 + error("%s: unknown gimple code", __func__);
112709 + gcc_unreachable();
112710 + }
112711 +}
112712 +
112713 +// Collect all the last nodes for checking the intentional_overflow and size_overflow attributes
112714 +static void set_last_nodes(struct interesting_node *cur_node)
112715 +{
112716 + struct pointer_set_t *visited;
112717 +
112718 + visited = pointer_set_create();
112719 + walk_use_def(visited, cur_node, cur_node->node);
112720 + pointer_set_destroy(visited);
112721 +}
112722 +
112723 +enum precond {
112724 + NO_ATTRIBUTE_SEARCH, NO_CHECK_INSERT, NONE
112725 +};
112726 +
112727 +/* If there is a mark_turn_off intentional attribute on the caller or the callee then there is no duplication and missing size_overflow attribute check anywhere.
112728 + * There is only missing size_overflow attribute checking if the intentional_overflow attribute is the mark_no type.
112729 + * Stmt duplication is unnecessary if there are no binary/ternary assignements or if the unary assignment isn't a cast.
112730 + * It skips the possible error codes too.
112731 + */
112732 +static enum precond check_preconditions(struct interesting_node *cur_node)
112733 +{
112734 + bool interesting_conditions[5] = {false, false, false, false, false};
112735 +
112736 + set_last_nodes(cur_node);
112737 +
112738 + check_intentional_attribute_ipa(cur_node);
112739 + if (cur_node->intentional_attr_decl == MARK_TURN_OFF || cur_node->intentional_attr_cur_fndecl == MARK_TURN_OFF)
112740 + return NO_ATTRIBUTE_SEARCH;
112741 +
112742 + search_interesting_conditions(cur_node, interesting_conditions);
112743 +
112744 + // error code: a phi, unary assign (not cast) and returns only
112745 + if (!interesting_conditions[NOT_UNARY] && interesting_conditions[PHI] && interesting_conditions[RET] && !interesting_conditions[CAST])
112746 + return NO_ATTRIBUTE_SEARCH;
112747 +
112748 + // error code: def_stmts trace back to a constant and there are no binary/ternary assigments
112749 + if (interesting_conditions[CAST] && interesting_conditions[FROM_CONST] && !interesting_conditions[NOT_UNARY])
112750 + return NO_ATTRIBUTE_SEARCH;
112751 +
112752 + // unnecessary overflow check
112753 + if (!interesting_conditions[CAST] && !interesting_conditions[NOT_UNARY])
112754 + return NO_CHECK_INSERT;
112755 +
112756 + if (cur_node->intentional_attr_cur_fndecl != MARK_NO)
112757 + return NO_CHECK_INSERT;
112758 +
112759 + return NONE;
112760 +}
112761 +
112762 +static tree cast_to_orig_type(struct visited *visited, gimple stmt, const_tree orig_node, tree new_node)
112763 +{
112764 + const_gimple assign;
112765 + tree orig_type = TREE_TYPE(orig_node);
112766 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
112767 +
112768 + assign = build_cast_stmt(visited, orig_type, new_node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
112769 + return gimple_assign_lhs(assign);
112770 +}
112771 +
112772 +static void change_orig_node(struct visited *visited, struct interesting_node *cur_node, tree new_node)
112773 +{
112774 + void (*set_rhs)(gimple, tree);
112775 + gimple stmt = cur_node->first_stmt;
112776 + const_tree orig_node = cur_node->node;
112777 +
112778 + switch (gimple_code(stmt)) {
112779 + case GIMPLE_RETURN:
112780 + gimple_return_set_retval(stmt, cast_to_orig_type(visited, stmt, orig_node, new_node));
112781 + break;
112782 + case GIMPLE_CALL:
112783 + gimple_call_set_arg(stmt, cur_node->num - 1, cast_to_orig_type(visited, stmt, orig_node, new_node));
112784 + break;
112785 + case GIMPLE_ASSIGN:
112786 + switch (cur_node->num) {
112787 + case 1:
112788 + set_rhs = &gimple_assign_set_rhs1;
112789 + break;
112790 + case 2:
112791 + set_rhs = &gimple_assign_set_rhs2;
112792 + break;
112793 +#if BUILDING_GCC_VERSION >= 4006
112794 + case 3:
112795 + set_rhs = &gimple_assign_set_rhs3;
112796 + break;
112797 +#endif
112798 + default:
112799 + gcc_unreachable();
112800 + }
112801 +
112802 + set_rhs(stmt, cast_to_orig_type(visited, stmt, orig_node, new_node));
112803 + break;
112804 + default:
112805 + debug_gimple_stmt(stmt);
112806 + gcc_unreachable();
112807 + }
112808 +
112809 + update_stmt(stmt);
112810 +}
112811 +
112812 +static struct visited *create_visited(void)
112813 +{
112814 + struct visited *new_node;
112815 +
112816 + new_node = (struct visited *)xmalloc(sizeof(*new_node));
112817 + new_node->stmts = pointer_set_create();
112818 + new_node->my_stmts = pointer_set_create();
112819 + new_node->skip_expr_casts = pointer_set_create();
112820 + new_node->no_cast_check = pointer_set_create();
112821 + return new_node;
112822 +}
112823 +
112824 +static void free_visited(struct visited *visited)
112825 +{
112826 + pointer_set_destroy(visited->stmts);
112827 + pointer_set_destroy(visited->my_stmts);
112828 + pointer_set_destroy(visited->skip_expr_casts);
112829 + pointer_set_destroy(visited->no_cast_check);
112830 +
112831 + free(visited);
112832 +}
112833 +
112834 +/* This function calls the main recursion function (expand) that duplicates the stmts. Before that it checks the intentional_overflow attribute and asm stmts,
112835 + * it decides whether the duplication is necessary or not and it searches for missing size_overflow attributes. After expand() it changes the orig node to the duplicated node
112836 + * in the original stmt (first stmt) and it inserts the overflow check for the arg of the callee or for the return value.
112837 + */
112838 +static struct next_cgraph_node *handle_interesting_stmt(struct visited *visited, struct next_cgraph_node *cnodes, struct interesting_node *cur_node, struct cgraph_node *caller_node)
112839 +{
112840 + enum precond ret;
112841 + tree new_node, orig_node = cur_node->node;
112842 +
112843 + ret = check_preconditions(cur_node);
112844 + if (ret == NO_ATTRIBUTE_SEARCH)
112845 + return cnodes;
112846 +
112847 + cnodes = search_overflow_attribute(cnodes, cur_node);
112848 +
112849 + if (ret == NO_CHECK_INSERT)
112850 + return cnodes;
112851 +
112852 + new_node = expand(visited, caller_node, orig_node);
112853 + if (new_node == NULL_TREE)
112854 + return cnodes;
112855 +
112856 + change_orig_node(visited, cur_node, new_node);
112857 + check_size_overflow(caller_node, cur_node->first_stmt, TREE_TYPE(new_node), new_node, orig_node, BEFORE_STMT);
112858 +
112859 + return cnodes;
112860 +}
112861 +
112862 +// Check visited_fns interesting nodes.
112863 +static bool is_in_interesting_node(struct interesting_node *head, const_gimple first_stmt, const_tree node, unsigned int num)
112864 +{
112865 + struct interesting_node *cur;
112866 +
112867 + for (cur = head; cur; cur = cur->next) {
112868 + if (!operand_equal_p(node, cur->node, 0))
112869 + continue;
112870 + if (num != cur->num)
112871 + continue;
112872 + if (first_stmt == cur->first_stmt)
112873 + return true;
112874 + }
112875 + return false;
112876 +}
112877 +
112878 +/* Create an interesting node. The ipa pass starts to duplicate from these stmts.
112879 + first_stmt: it is the call or assignment or ret stmt, change_orig_node() will change the original node (retval, or function arg) in this
112880 + last_nodes: they are the last stmts in the recursion (they haven't a def_stmt). They are useful in the missing size_overflow attribute check and
112881 + the intentional_overflow attribute check. They are collected by set_last_nodes().
112882 + num: arg count of a call stmt or 0 when it is a ret
112883 + node: the recursion starts from here, it is a call arg or a return value
112884 + fndecl: the fndecl of the interesting node when the node is an arg. it is the fndecl of the callee function otherwise it is the fndecl of the caller (current_function_fndecl) function.
112885 + intentional_attr_decl: intentional_overflow attribute of the callee function
112886 + intentional_attr_cur_fndecl: intentional_overflow attribute of the caller function
112887 + intentional_mark_from_gimple: the intentional overflow type of size_overflow asm stmt from gimple if it exists
112888 + */
112889 +static struct interesting_node *create_new_interesting_node(struct interesting_node *head, gimple first_stmt, tree node, unsigned int num, gimple asm_stmt)
112890 +{
112891 + struct interesting_node *new_node;
112892 + tree fndecl;
112893 + enum gimple_code code;
112894 +
112895 + gcc_assert(node != NULL_TREE);
112896 + code = gimple_code(first_stmt);
112897 + gcc_assert(code == GIMPLE_CALL || code == GIMPLE_ASM || code == GIMPLE_ASSIGN || code == GIMPLE_RETURN);
112898 +
112899 + if (num == CANNOT_FIND_ARG)
112900 + return head;
112901 +
112902 + if (skip_types(node))
112903 + return head;
112904 +
112905 + if (skip_asm(node))
112906 + return head;
112907 +
112908 + if (is_gimple_call(first_stmt))
112909 + fndecl = gimple_call_fndecl(first_stmt);
112910 + else
112911 + fndecl = current_function_decl;
112912 +
112913 + if (fndecl == NULL_TREE)
112914 + return head;
112915 +
112916 + if (is_in_interesting_node(head, first_stmt, node, num))
112917 + return head;
112918 +
112919 + new_node = (struct interesting_node *)xmalloc(sizeof(*new_node));
112920 +
112921 + new_node->next = NULL;
112922 + new_node->first_stmt = first_stmt;
112923 +#if BUILDING_GCC_VERSION <= 4007
112924 + new_node->last_nodes = VEC_alloc(tree, gc, VEC_LEN);
112925 +#else
112926 + vec_alloc(new_node->last_nodes, VEC_LEN);
112927 +#endif
112928 + new_node->num = num;
112929 + new_node->node = node;
112930 + new_node->fndecl = fndecl;
112931 + new_node->intentional_attr_decl = MARK_NO;
112932 + new_node->intentional_attr_cur_fndecl = MARK_NO;
112933 + new_node->intentional_mark_from_gimple = asm_stmt;
112934 +
112935 + if (!head)
112936 + return new_node;
112937 +
112938 + new_node->next = head;
112939 + return new_node;
112940 +}
112941 +
112942 +/* Check the ret stmts in the functions on the next cgraph node list (these functions will be in the hash table and they are reachable from ipa).
112943 + * If the ret stmt is in the next cgraph node list then it's an interesting ret.
112944 + */
112945 +static struct interesting_node *handle_stmt_by_cgraph_nodes_ret(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
112946 +{
112947 + struct next_cgraph_node *cur_node;
112948 + tree ret = gimple_return_retval(stmt);
112949 +
112950 + if (ret == NULL_TREE)
112951 + return head;
112952 +
112953 + for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
112954 + if (!operand_equal_p(cur_node->callee_fndecl, DECL_ORIGIN(current_function_decl), 0))
112955 + continue;
112956 + if (cur_node->num == 0)
112957 + head = create_new_interesting_node(head, stmt, ret, 0, NOT_INTENTIONAL_ASM);
112958 + }
112959 +
112960 + return head;
112961 +}
112962 +
112963 +/* Check the call stmts in the functions on the next cgraph node list (these functions will be in the hash table and they are reachable from ipa).
112964 + * If the call stmt is in the next cgraph node list then it's an interesting call.
112965 + */
112966 +static struct interesting_node *handle_stmt_by_cgraph_nodes_call(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
112967 +{
112968 + unsigned int argnum;
112969 + tree arg;
112970 + const_tree fndecl;
112971 + struct next_cgraph_node *cur_node;
112972 +
112973 + fndecl = gimple_call_fndecl(stmt);
112974 + if (fndecl == NULL_TREE)
112975 + return head;
112976 +
112977 + for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
112978 + if (!operand_equal_p(cur_node->callee_fndecl, fndecl, 0))
112979 + continue;
112980 + argnum = get_correct_arg_count(cur_node->num, fndecl);
112981 + gcc_assert(argnum != CANNOT_FIND_ARG);
112982 + if (argnum == 0)
112983 + continue;
112984 +
112985 + arg = gimple_call_arg(stmt, argnum - 1);
112986 + head = create_new_interesting_node(head, stmt, arg, argnum, NOT_INTENTIONAL_ASM);
112987 + }
112988 +
112989 + return head;
112990 +}
112991 +
112992 +static unsigned int check_ops(const_tree orig_node, const_tree node, unsigned int ret_count)
112993 +{
112994 + if (!operand_equal_p(orig_node, node, 0))
112995 + return WRONG_NODE;
112996 + if (skip_types(node))
112997 + return WRONG_NODE;
112998 + return ret_count;
112999 +}
113000 +
113001 +// Get the index of the rhs node in an assignment
113002 +static unsigned int get_assign_ops_count(const_gimple stmt, tree node)
113003 +{
113004 + const_tree rhs1, rhs2;
113005 + unsigned int ret;
113006 +
113007 + gcc_assert(stmt);
113008 + gcc_assert(is_gimple_assign(stmt));
113009 +
113010 + rhs1 = gimple_assign_rhs1(stmt);
113011 + gcc_assert(rhs1 != NULL_TREE);
113012 +
113013 + switch (gimple_num_ops(stmt)) {
113014 + case 2:
113015 + return check_ops(node, rhs1, 1);
113016 + case 3:
113017 + ret = check_ops(node, rhs1, 1);
113018 + if (ret != WRONG_NODE)
113019 + return ret;
113020 +
113021 + rhs2 = gimple_assign_rhs2(stmt);
113022 + gcc_assert(rhs2 != NULL_TREE);
113023 + return check_ops(node, rhs2, 2);
113024 + default:
113025 + gcc_unreachable();
113026 + }
113027 +}
113028 +
113029 +// Find the correct arg number of a call stmt. It is needed when the interesting function is a cloned function.
113030 +static unsigned int find_arg_number_gimple(const_tree arg, const_gimple stmt)
113031 +{
113032 + unsigned int i;
113033 +
113034 + if (gimple_call_fndecl(stmt) == NULL_TREE)
113035 + return CANNOT_FIND_ARG;
113036 +
113037 + for (i = 0; i < gimple_call_num_args(stmt); i++) {
113038 + tree node;
113039 +
113040 + node = gimple_call_arg(stmt, i);
113041 + if (!operand_equal_p(arg, node, 0))
113042 + continue;
113043 + if (!skip_types(node))
113044 + return i + 1;
113045 + }
113046 +
113047 + return CANNOT_FIND_ARG;
113048 +}
113049 +
113050 +/* starting from the size_overflow asm stmt collect interesting stmts. They can be
113051 + * any of return, call or assignment stmts (because of inlining).
113052 + */
113053 +static struct interesting_node *get_interesting_ret_or_call(struct pointer_set_t *visited, struct interesting_node *head, tree node, gimple intentional_asm)
113054 +{
113055 + use_operand_p use_p;
113056 + imm_use_iterator imm_iter;
113057 + unsigned int argnum;
113058 +
113059 + gcc_assert(TREE_CODE(node) == SSA_NAME);
113060 +
113061 + if (pointer_set_insert(visited, node))
113062 + return head;
113063 +
113064 + FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
113065 + gimple stmt = USE_STMT(use_p);
113066 +
113067 + if (stmt == NULL)
113068 + return head;
113069 + if (is_gimple_debug(stmt))
113070 + continue;
113071 +
113072 + switch (gimple_code(stmt)) {
113073 + case GIMPLE_CALL:
113074 + argnum = find_arg_number_gimple(node, stmt);
113075 + head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
113076 + break;
113077 + case GIMPLE_RETURN:
113078 + head = create_new_interesting_node(head, stmt, node, 0, intentional_asm);
113079 + break;
113080 + case GIMPLE_ASSIGN:
113081 + argnum = get_assign_ops_count(stmt, node);
113082 + head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
113083 + break;
113084 + case GIMPLE_PHI: {
113085 + tree result = gimple_phi_result(stmt);
113086 + head = get_interesting_ret_or_call(visited, head, result, intentional_asm);
113087 + break;
113088 + }
113089 + case GIMPLE_ASM:
113090 + if (gimple_asm_noutputs(stmt) != 0)
113091 + break;
113092 + if (!is_size_overflow_asm(stmt))
113093 + break;
113094 + head = create_new_interesting_node(head, stmt, node, 1, intentional_asm);
113095 + break;
113096 + case GIMPLE_COND:
113097 + case GIMPLE_SWITCH:
113098 + break;
113099 + default:
113100 + debug_gimple_stmt(stmt);
113101 + gcc_unreachable();
113102 + break;
113103 + }
113104 + }
113105 + return head;
113106 +}
113107 +
113108 +static void remove_size_overflow_asm(gimple stmt)
113109 +{
113110 + gimple_stmt_iterator gsi;
113111 + tree input, output;
113112 +
113113 + if (!is_size_overflow_asm(stmt))
113114 + return;
113115 +
113116 + if (gimple_asm_noutputs(stmt) == 0) {
113117 + gsi = gsi_for_stmt(stmt);
113118 + ipa_remove_stmt_references(cgraph_get_create_node(current_function_decl), stmt);
113119 + gsi_remove(&gsi, true);
113120 + return;
113121 + }
113122 +
113123 + input = gimple_asm_input_op(stmt, 0);
113124 + output = gimple_asm_output_op(stmt, 0);
113125 + replace_size_overflow_asm_with_assign(stmt, TREE_VALUE(output), TREE_VALUE(input));
113126 +}
113127 +
113128 +/* handle the size_overflow asm stmts from the gimple pass and collect the interesting stmts.
113129 + * If the asm stmt is a parm_decl kind (noutputs == 0) then remove it.
113130 + * If it is a simple asm stmt then replace it with an assignment from the asm input to the asm output.
113131 + */
113132 +static struct interesting_node *handle_stmt_by_size_overflow_asm(gimple stmt, struct interesting_node *head)
113133 +{
113134 + const_tree output;
113135 + struct pointer_set_t *visited;
113136 + gimple intentional_asm = NOT_INTENTIONAL_ASM;
113137 +
113138 + if (!is_size_overflow_asm(stmt))
113139 + return head;
113140 +
113141 + if (is_size_overflow_intentional_asm_yes(stmt) || is_size_overflow_intentional_asm_turn_off(stmt))
113142 + intentional_asm = stmt;
113143 +
113144 + gcc_assert(gimple_asm_ninputs(stmt) == 1);
113145 +
113146 + if (gimple_asm_noutputs(stmt) == 0 && is_size_overflow_intentional_asm_turn_off(stmt))
113147 + return head;
113148 +
113149 + if (gimple_asm_noutputs(stmt) == 0) {
113150 + const_tree input;
113151 +
113152 + if (!is_size_overflow_intentional_asm_turn_off(stmt))
113153 + return head;
113154 +
113155 + input = gimple_asm_input_op(stmt, 0);
113156 + remove_size_overflow_asm(stmt);
113157 + if (is_gimple_constant(TREE_VALUE(input)))
113158 + return head;
113159 + visited = pointer_set_create();
113160 + head = get_interesting_ret_or_call(visited, head, TREE_VALUE(input), intentional_asm);
113161 + pointer_set_destroy(visited);
113162 + return head;
113163 + }
113164 +
113165 + if (!is_size_overflow_intentional_asm_yes(stmt) && !is_size_overflow_intentional_asm_turn_off(stmt))
113166 + remove_size_overflow_asm(stmt);
113167 +
113168 + visited = pointer_set_create();
113169 + output = gimple_asm_output_op(stmt, 0);
113170 + head = get_interesting_ret_or_call(visited, head, TREE_VALUE(output), intentional_asm);
113171 + pointer_set_destroy(visited);
113172 + return head;
113173 +}
113174 +
113175 +/* Iterate over all the stmts of a function and look for the size_overflow asm stmts (they were created in the gimple pass)
113176 + * or a call stmt or a return stmt and store them in the interesting_node list
113177 + */
113178 +static struct interesting_node *collect_interesting_stmts(struct next_cgraph_node *next_node)
113179 +{
113180 + basic_block bb;
113181 + struct interesting_node *head = NULL;
113182 +
113183 + FOR_ALL_BB_FN(bb, cfun) {
113184 + gimple_stmt_iterator gsi;
113185 +
113186 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
113187 + enum gimple_code code;
113188 + gimple stmt = gsi_stmt(gsi);
113189 +
113190 + code = gimple_code(stmt);
113191 +
113192 + if (code == GIMPLE_ASM)
113193 + head = handle_stmt_by_size_overflow_asm(stmt, head);
113194 +
113195 + if (!next_node)
113196 + continue;
113197 + if (code == GIMPLE_CALL)
113198 + head = handle_stmt_by_cgraph_nodes_call(head, stmt, next_node);
113199 + if (code == GIMPLE_RETURN)
113200 + head = handle_stmt_by_cgraph_nodes_ret(head, stmt, next_node);
113201 + }
113202 + }
113203 + return head;
113204 +}
113205 +
113206 +static void free_interesting_node(struct interesting_node *head)
113207 +{
113208 + struct interesting_node *cur;
113209 +
113210 + while (head) {
113211 + cur = head->next;
113212 +#if BUILDING_GCC_VERSION <= 4007
113213 + VEC_free(tree, gc, head->last_nodes);
113214 +#else
113215 + vec_free(head->last_nodes);
113216 +#endif
113217 + free(head);
113218 + head = cur;
113219 + }
113220 +}
113221 +
113222 +static struct visited_fns *insert_visited_fns_function(struct visited_fns *head, struct interesting_node *cur_node)
113223 +{
113224 + struct visited_fns *new_visited_fns;
113225 +
113226 + new_visited_fns = (struct visited_fns *)xmalloc(sizeof(*new_visited_fns));
113227 + new_visited_fns->fndecl = cur_node->fndecl;
113228 + new_visited_fns->num = cur_node->num;
113229 + new_visited_fns->first_stmt = cur_node->first_stmt;
113230 + new_visited_fns->next = NULL;
113231 +
113232 + if (!head)
113233 + return new_visited_fns;
113234 +
113235 + new_visited_fns->next = head;
113236 + return new_visited_fns;
113237 +}
113238 +
113239 +/* Check whether the function was already visited_fns. If the fndecl, the arg count of the fndecl and the first_stmt (call or return) are same then
113240 + * it is a visited_fns function.
113241 + */
113242 +static bool is_visited_fns_function(struct visited_fns *head, struct interesting_node *cur_node)
113243 +{
113244 + struct visited_fns *cur;
113245 +
113246 + if (!head)
113247 + return false;
113248 +
113249 + for (cur = head; cur; cur = cur->next) {
113250 + if (cur_node->first_stmt != cur->first_stmt)
113251 + continue;
113252 + if (!operand_equal_p(cur_node->fndecl, cur->fndecl, 0))
113253 + continue;
113254 + if (cur_node->num == cur->num)
113255 + return true;
113256 + }
113257 + return false;
113258 +}
113259 +
113260 +static void free_next_cgraph_node(struct next_cgraph_node *head)
113261 +{
113262 + struct next_cgraph_node *cur;
113263 +
113264 + while (head) {
113265 + cur = head->next;
113266 + free(head);
113267 + head = cur;
113268 + }
113269 +}
113270 +
113271 +static void remove_all_size_overflow_asm(void)
113272 +{
113273 + basic_block bb;
113274 +
113275 + FOR_ALL_BB_FN(bb, cfun) {
113276 + gimple_stmt_iterator si;
113277 +
113278 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
113279 + remove_size_overflow_asm(gsi_stmt(si));
113280 + }
113281 +}
113282 +
113283 +/* Main recursive walk of the ipa pass: iterate over the collected interesting stmts in a function
113284 + * (they are interesting if they have an associated size_overflow asm stmt) and recursively walk
113285 + * the newly collected interesting functions (they are interesting if there is control flow between
113286 + * the interesting stmts and them).
113287 + */
113288 +static struct visited_fns *handle_function(struct cgraph_node *node, struct next_cgraph_node *next_node, struct visited_fns *visited_fns)
113289 +{
113290 + struct visited *visited;
113291 + struct interesting_node *head, *cur_node;
113292 + struct next_cgraph_node *cur_cnodes, *cnodes_head = NULL;
113293 +
113294 + set_current_function_decl(NODE_DECL(node));
113295 + call_count = 0;
113296 +
113297 + head = collect_interesting_stmts(next_node);
113298 +
113299 + visited = create_visited();
113300 + for (cur_node = head; cur_node; cur_node = cur_node->next) {
113301 + if (is_visited_fns_function(visited_fns, cur_node))
113302 + continue;
113303 + cnodes_head = handle_interesting_stmt(visited, cnodes_head, cur_node, node);
113304 + visited_fns = insert_visited_fns_function(visited_fns, cur_node);
113305 + }
113306 +
113307 + free_visited(visited);
113308 + free_interesting_node(head);
113309 + remove_all_size_overflow_asm();
113310 + unset_current_function_decl();
113311 +
113312 + for (cur_cnodes = cnodes_head; cur_cnodes; cur_cnodes = cur_cnodes->next)
113313 + visited_fns = handle_function(cur_cnodes->current_function, cur_cnodes, visited_fns);
113314 +
113315 + free_next_cgraph_node(cnodes_head);
113316 + return visited_fns;
113317 +}
113318 +
113319 +static void free_visited_fns(struct visited_fns *head)
113320 +{
113321 + struct visited_fns *cur;
113322 +
113323 + while (head) {
113324 + cur = head->next;
113325 + free(head);
113326 + head = cur;
113327 + }
113328 +}
113329 +
113330 +// Main entry point of the ipa pass: erases the plf flag of all stmts and iterates over all the functions
113331 +unsigned int search_function(void)
113332 +{
113333 + struct cgraph_node *node;
113334 + struct visited_fns *visited_fns = NULL;
113335 +
113336 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
113337 + gcc_assert(cgraph_function_flags_ready);
113338 +#if BUILDING_GCC_VERSION <= 4007
113339 + gcc_assert(node->reachable);
113340 +#endif
113341 +
113342 + visited_fns = handle_function(node, NULL, visited_fns);
113343 + }
113344 +
113345 + free_visited_fns(visited_fns);
113346 + return 0;
113347 +}
113348 +
113349 +#if BUILDING_GCC_VERSION >= 4009
113350 +static const struct pass_data insert_size_overflow_check_data = {
113351 +#else
113352 +static struct ipa_opt_pass_d insert_size_overflow_check = {
113353 + .pass = {
113354 +#endif
113355 + .type = SIMPLE_IPA_PASS,
113356 + .name = "size_overflow",
113357 +#if BUILDING_GCC_VERSION >= 4008
113358 + .optinfo_flags = OPTGROUP_NONE,
113359 +#endif
113360 +#if BUILDING_GCC_VERSION >= 4009
113361 + .has_gate = false,
113362 + .has_execute = true,
113363 +#else
113364 + .gate = NULL,
113365 + .execute = search_function,
113366 + .sub = NULL,
113367 + .next = NULL,
113368 + .static_pass_number = 0,
113369 +#endif
113370 + .tv_id = TV_NONE,
113371 + .properties_required = 0,
113372 + .properties_provided = 0,
113373 + .properties_destroyed = 0,
113374 + .todo_flags_start = 0,
113375 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_remove_unused_locals | TODO_ggc_collect | TODO_verify_flow | TODO_dump_cgraph | TODO_dump_func | TODO_update_ssa_no_phi,
113376 +#if BUILDING_GCC_VERSION < 4009
113377 + },
113378 + .generate_summary = NULL,
113379 + .write_summary = NULL,
113380 + .read_summary = NULL,
113381 +#if BUILDING_GCC_VERSION >= 4006
113382 + .write_optimization_summary = NULL,
113383 + .read_optimization_summary = NULL,
113384 +#endif
113385 + .stmt_fixup = NULL,
113386 + .function_transform_todo_flags_start = 0,
113387 + .function_transform = NULL,
113388 + .variable_transform = NULL,
113389 +#endif
113390 +};
113391 +
113392 +#if BUILDING_GCC_VERSION >= 4009
113393 +namespace {
113394 +class insert_size_overflow_check : public ipa_opt_pass_d {
113395 +public:
113396 + insert_size_overflow_check() : ipa_opt_pass_d(insert_size_overflow_check_data, g, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL) {}
113397 + unsigned int execute() { return search_function(); }
113398 +};
113399 +}
113400 +#endif
113401 +
113402 +struct opt_pass *make_insert_size_overflow_check(void)
113403 +{
113404 +#if BUILDING_GCC_VERSION >= 4009
113405 + return new insert_size_overflow_check();
113406 +#else
113407 + return &insert_size_overflow_check.pass;
113408 +#endif
113409 +}
113410 +
113411 diff --git a/tools/gcc/size_overflow_plugin/intentional_overflow.c b/tools/gcc/size_overflow_plugin/intentional_overflow.c
113412 new file mode 100644
113413 index 0000000..38904bc
113414 --- /dev/null
113415 +++ b/tools/gcc/size_overflow_plugin/intentional_overflow.c
113416 @@ -0,0 +1,733 @@
113417 +/*
113418 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
113419 + * Licensed under the GPL v2, or (at your option) v3
113420 + *
113421 + * Homepage:
113422 + * http://www.grsecurity.net/~ephox/overflow_plugin/
113423 + *
113424 + * Documentation:
113425 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
113426 + *
113427 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
113428 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
113429 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
113430 + *
113431 + * Usage:
113432 + * $ make
113433 + * $ make run
113434 + */
113435 +
113436 +#include "gcc-common.h"
113437 +#include "size_overflow.h"
113438 +
113439 +/* Get the param of the intentional_overflow attribute.
113440 + * * 0: MARK_NOT_INTENTIONAL
113441 + * * 1..MAX_PARAM: MARK_YES
113442 + * * -1: MARK_TURN_OFF
113443 + */
113444 +static tree get_attribute_param(const_tree decl)
113445 +{
113446 + const_tree attr;
113447 +
113448 + if (decl == NULL_TREE)
113449 + return NULL_TREE;
113450 +
113451 + attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(decl));
113452 + if (!attr || !TREE_VALUE(attr))
113453 + return NULL_TREE;
113454 +
113455 + return TREE_VALUE(attr);
113456 +}
113457 +
113458 +// MARK_TURN_OFF
113459 +bool is_turn_off_intentional_attr(const_tree decl)
113460 +{
113461 + const_tree param_head;
113462 +
113463 + param_head = get_attribute_param(decl);
113464 + if (param_head == NULL_TREE)
113465 + return false;
113466 +
113467 + if (TREE_INT_CST_HIGH(TREE_VALUE(param_head)) == -1)
113468 + return true;
113469 + return false;
113470 +}
113471 +
113472 +// MARK_NOT_INTENTIONAL
113473 +bool is_end_intentional_intentional_attr(const_tree decl, unsigned int argnum)
113474 +{
113475 + const_tree param_head;
113476 +
113477 + if (argnum == 0)
113478 + return false;
113479 +
113480 + param_head = get_attribute_param(decl);
113481 + if (param_head == NULL_TREE)
113482 + return false;
113483 +
113484 + if (!TREE_INT_CST_LOW(TREE_VALUE(param_head)))
113485 + return true;
113486 + return false;
113487 +}
113488 +
113489 +// MARK_YES
113490 +bool is_yes_intentional_attr(const_tree decl, unsigned int argnum)
113491 +{
113492 + tree param, param_head;
113493 +
113494 + if (argnum == 0)
113495 + return false;
113496 +
113497 + param_head = get_attribute_param(decl);
113498 + for (param = param_head; param; param = TREE_CHAIN(param))
113499 + if (argnum == TREE_INT_CST_LOW(TREE_VALUE(param)))
113500 + return true;
113501 + return false;
113502 +}
113503 +
113504 +void print_missing_intentional(enum mark callee_attr, enum mark caller_attr, const_tree decl, unsigned int argnum)
113505 +{
113506 + location_t loc;
113507 +
113508 + if (caller_attr == MARK_NO || caller_attr == MARK_NOT_INTENTIONAL || caller_attr == MARK_TURN_OFF)
113509 + return;
113510 +
113511 + if (callee_attr == MARK_NOT_INTENTIONAL || callee_attr == MARK_YES)
113512 + return;
113513 +
113514 + loc = DECL_SOURCE_LOCATION(decl);
113515 + inform(loc, "The intentional_overflow attribute is missing from +%s+%u+", DECL_NAME_POINTER(decl), argnum);
113516 +}
113517 +
113518 +// Get the field decl of a component ref for intentional_overflow checking
113519 +static const_tree search_field_decl(const_tree comp_ref)
113520 +{
113521 + const_tree field = NULL_TREE;
113522 + unsigned int i, len = TREE_OPERAND_LENGTH(comp_ref);
113523 +
113524 + for (i = 0; i < len; i++) {
113525 + field = TREE_OPERAND(comp_ref, i);
113526 + if (TREE_CODE(field) == FIELD_DECL)
113527 + break;
113528 + }
113529 + gcc_assert(TREE_CODE(field) == FIELD_DECL);
113530 + return field;
113531 +}
113532 +
113533 +/* Get the type of the intentional_overflow attribute of a node
113534 + * * MARK_TURN_OFF
113535 + * * MARK_YES
113536 + * * MARK_NO
113537 + * * MARK_NOT_INTENTIONAL
113538 + */
113539 +enum mark get_intentional_attr_type(const_tree node)
113540 +{
113541 + const_tree cur_decl;
113542 +
113543 + if (node == NULL_TREE)
113544 + return MARK_NO;
113545 +
113546 + switch (TREE_CODE(node)) {
113547 + case COMPONENT_REF:
113548 + cur_decl = search_field_decl(node);
113549 + if (is_turn_off_intentional_attr(cur_decl))
113550 + return MARK_TURN_OFF;
113551 + if (is_end_intentional_intentional_attr(cur_decl, 1))
113552 + return MARK_YES;
113553 + break;
113554 + case PARM_DECL: {
113555 + unsigned int argnum;
113556 +
113557 + cur_decl = DECL_ORIGIN(current_function_decl);
113558 + argnum = find_arg_number_tree(node, cur_decl);
113559 + if (argnum == CANNOT_FIND_ARG)
113560 + return MARK_NO;
113561 + if (is_yes_intentional_attr(cur_decl, argnum))
113562 + return MARK_YES;
113563 + if (is_end_intentional_intentional_attr(cur_decl, argnum))
113564 + return MARK_NOT_INTENTIONAL;
113565 + break;
113566 + }
113567 + case FUNCTION_DECL:
113568 + if (is_turn_off_intentional_attr(DECL_ORIGIN(node)))
113569 + return MARK_TURN_OFF;
113570 + break;
113571 + default:
113572 + break;
113573 + }
113574 + return MARK_NO;
113575 +}
113576 +
113577 +// Search for the intentional_overflow attribute on the last nodes
113578 +static enum mark search_last_nodes_intentional(struct interesting_node *cur_node)
113579 +{
113580 + unsigned int i;
113581 + tree last_node;
113582 + enum mark mark = MARK_NO;
113583 +
113584 +#if BUILDING_GCC_VERSION <= 4007
113585 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, last_node) {
113586 +#else
113587 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, last_node) {
113588 +#endif
113589 + mark = get_intentional_attr_type(last_node);
113590 + if (mark != MARK_NO)
113591 + break;
113592 + }
113593 + return mark;
113594 +}
113595 +
113596 +/* Check the intentional kind of size_overflow asm stmt (created by the gimple pass) and
113597 + * set the appropriate intentional_overflow type. Delete the asm stmt in the end.
113598 + */
113599 +static bool is_intentional_attribute_from_gimple(struct interesting_node *cur_node)
113600 +{
113601 + if (!cur_node->intentional_mark_from_gimple)
113602 + return false;
113603 +
113604 + if (is_size_overflow_intentional_asm_yes(cur_node->intentional_mark_from_gimple))
113605 + cur_node->intentional_attr_cur_fndecl = MARK_YES;
113606 + else
113607 + cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
113608 +
113609 + // skip param decls
113610 + if (gimple_asm_noutputs(cur_node->intentional_mark_from_gimple) == 0)
113611 + return true;
113612 + return true;
113613 +}
113614 +
113615 +/* Search intentional_overflow attribute on caller and on callee too.
113616 + * 0</MARK_YES: no dup, search size_overflow and intentional_overflow attributes
113617 + * 0/MARK_NOT_INTENTIONAL: no dup, search size_overflow attribute (int)
113618 + * -1/MARK_TURN_OFF: no dup, no search, current_function_decl -> no dup
113619 +*/
113620 +void check_intentional_attribute_ipa(struct interesting_node *cur_node)
113621 +{
113622 + const_tree fndecl;
113623 +
113624 + if (is_intentional_attribute_from_gimple(cur_node))
113625 + return;
113626 +
113627 + if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
113628 + cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
113629 + return;
113630 + }
113631 +
113632 + if (gimple_code(cur_node->first_stmt) == GIMPLE_ASM) {
113633 + cur_node->intentional_attr_cur_fndecl = MARK_NOT_INTENTIONAL;
113634 + return;
113635 + }
113636 +
113637 + if (gimple_code(cur_node->first_stmt) == GIMPLE_ASSIGN)
113638 + return;
113639 +
113640 + fndecl = get_interesting_orig_fndecl(cur_node->first_stmt, cur_node->num);
113641 + if (is_turn_off_intentional_attr(fndecl)) {
113642 + cur_node->intentional_attr_decl = MARK_TURN_OFF;
113643 + return;
113644 + }
113645 +
113646 + if (is_end_intentional_intentional_attr(fndecl, cur_node->num))
113647 + cur_node->intentional_attr_decl = MARK_NOT_INTENTIONAL;
113648 + else if (is_yes_intentional_attr(fndecl, cur_node->num))
113649 + cur_node->intentional_attr_decl = MARK_YES;
113650 +
113651 + cur_node->intentional_attr_cur_fndecl = search_last_nodes_intentional(cur_node);
113652 + print_missing_intentional(cur_node->intentional_attr_decl, cur_node->intentional_attr_cur_fndecl, cur_node->fndecl, cur_node->num);
113653 +}
113654 +
113655 +bool is_a_cast_and_const_overflow(const_tree no_const_rhs)
113656 +{
113657 + const_tree rhs1, lhs, rhs1_type, lhs_type;
113658 + enum machine_mode lhs_mode, rhs_mode;
113659 + gimple def_stmt = get_def_stmt(no_const_rhs);
113660 +
113661 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
113662 + return false;
113663 +
113664 + rhs1 = gimple_assign_rhs1(def_stmt);
113665 + lhs = gimple_assign_lhs(def_stmt);
113666 + rhs1_type = TREE_TYPE(rhs1);
113667 + lhs_type = TREE_TYPE(lhs);
113668 + rhs_mode = TYPE_MODE(rhs1_type);
113669 + lhs_mode = TYPE_MODE(lhs_type);
113670 + if (TYPE_UNSIGNED(lhs_type) == TYPE_UNSIGNED(rhs1_type) || lhs_mode != rhs_mode)
113671 + return false;
113672 +
113673 + return true;
113674 +}
113675 +
113676 +static unsigned int uses_num(tree node)
113677 +{
113678 + imm_use_iterator imm_iter;
113679 + use_operand_p use_p;
113680 + unsigned int num = 0;
113681 +
113682 + FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
113683 + gimple use_stmt = USE_STMT(use_p);
113684 +
113685 + if (use_stmt == NULL)
113686 + return num;
113687 + if (is_gimple_debug(use_stmt))
113688 + continue;
113689 + if (gimple_assign_cast_p(use_stmt) && is_size_overflow_type(gimple_assign_lhs(use_stmt)))
113690 + continue;
113691 + num++;
113692 + }
113693 + return num;
113694 +}
113695 +
113696 +static bool no_uses(tree node)
113697 +{
113698 + return !uses_num(node);
113699 +}
113700 +
113701 +// 3.8.5 mm/page-writeback.c __ilog2_u64(): ret, uint + uintmax; uint -> int; int max
113702 +bool is_const_plus_unsigned_signed_truncation(const_tree lhs)
113703 +{
113704 + tree rhs1, lhs_type, rhs_type, rhs2, not_const_rhs;
113705 + gimple def_stmt = get_def_stmt(lhs);
113706 +
113707 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
113708 + return false;
113709 +
113710 + rhs1 = gimple_assign_rhs1(def_stmt);
113711 + rhs_type = TREE_TYPE(rhs1);
113712 + lhs_type = TREE_TYPE(lhs);
113713 + if (TYPE_UNSIGNED(lhs_type) || !TYPE_UNSIGNED(rhs_type))
113714 + return false;
113715 + if (TYPE_MODE(lhs_type) != TYPE_MODE(rhs_type))
113716 + return false;
113717 +
113718 + def_stmt = get_def_stmt(rhs1);
113719 + if (!def_stmt || !is_gimple_assign(def_stmt) || gimple_num_ops(def_stmt) != 3)
113720 + return false;
113721 +
113722 + if (gimple_assign_rhs_code(def_stmt) != PLUS_EXPR)
113723 + return false;
113724 +
113725 + rhs1 = gimple_assign_rhs1(def_stmt);
113726 + rhs2 = gimple_assign_rhs2(def_stmt);
113727 + if (!is_gimple_constant(rhs1) && !is_gimple_constant(rhs2))
113728 + return false;
113729 +
113730 + if (is_gimple_constant(rhs2))
113731 + not_const_rhs = rhs1;
113732 + else
113733 + not_const_rhs = rhs2;
113734 +
113735 + return no_uses(not_const_rhs);
113736 +}
113737 +
113738 +static bool is_lt_signed_type_max(const_tree rhs)
113739 +{
113740 + const_tree new_type, type_max, type = TREE_TYPE(rhs);
113741 +
113742 + if (!TYPE_UNSIGNED(type))
113743 + return true;
113744 +
113745 + switch (TYPE_MODE(type)) {
113746 + case QImode:
113747 + new_type = intQI_type_node;
113748 + break;
113749 + case HImode:
113750 + new_type = intHI_type_node;
113751 + break;
113752 + case SImode:
113753 + new_type = intSI_type_node;
113754 + break;
113755 + case DImode:
113756 + new_type = intDI_type_node;
113757 + break;
113758 + default:
113759 + debug_tree((tree)type);
113760 + gcc_unreachable();
113761 + }
113762 +
113763 + type_max = TYPE_MAX_VALUE(new_type);
113764 + if (!tree_int_cst_lt(type_max, rhs))
113765 + return true;
113766 +
113767 + return false;
113768 +}
113769 +
113770 +static bool is_gt_zero(const_tree rhs)
113771 +{
113772 + const_tree type = TREE_TYPE(rhs);
113773 +
113774 + if (TYPE_UNSIGNED(type))
113775 + return true;
113776 +
113777 + if (!tree_int_cst_lt(rhs, integer_zero_node))
113778 + return true;
113779 +
113780 + return false;
113781 +}
113782 +
113783 +bool is_a_constant_overflow(const_gimple stmt, const_tree rhs)
113784 +{
113785 + if (gimple_assign_rhs_code(stmt) == MIN_EXPR)
113786 + return false;
113787 + if (!is_gimple_constant(rhs))
113788 + return false;
113789 +
113790 + // If the const is between 0 and the max value of the signed type of the same bitsize then there is no intentional overflow
113791 + if (is_lt_signed_type_max(rhs) && is_gt_zero(rhs))
113792 + return false;
113793 +
113794 + return true;
113795 +}
113796 +
113797 +static tree change_assign_rhs(struct visited *visited, gimple stmt, const_tree orig_rhs, tree new_rhs)
113798 +{
113799 + gimple assign;
113800 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
113801 + tree origtype = TREE_TYPE(orig_rhs);
113802 +
113803 + gcc_assert(is_gimple_assign(stmt));
113804 +
113805 + assign = build_cast_stmt(visited, origtype, new_rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
113806 + pointer_set_insert(visited->my_stmts, assign);
113807 + return gimple_assign_lhs(assign);
113808 +}
113809 +
113810 +tree handle_intentional_overflow(struct visited *visited, struct cgraph_node *caller_node, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs2)
113811 +{
113812 + tree new_rhs, orig_rhs;
113813 + void (*gimple_assign_set_rhs)(gimple, tree);
113814 + tree rhs1 = gimple_assign_rhs1(stmt);
113815 + tree rhs2 = gimple_assign_rhs2(stmt);
113816 + tree lhs = gimple_assign_lhs(stmt);
113817 +
113818 + if (!check_overflow)
113819 + return create_assign(visited, stmt, lhs, AFTER_STMT);
113820 +
113821 + if (change_rhs == NULL_TREE)
113822 + return create_assign(visited, stmt, lhs, AFTER_STMT);
113823 +
113824 + if (new_rhs2 == NULL_TREE) {
113825 + orig_rhs = rhs1;
113826 + gimple_assign_set_rhs = &gimple_assign_set_rhs1;
113827 + } else {
113828 + orig_rhs = rhs2;
113829 + gimple_assign_set_rhs = &gimple_assign_set_rhs2;
113830 + }
113831 +
113832 + check_size_overflow(caller_node, stmt, TREE_TYPE(change_rhs), change_rhs, orig_rhs, BEFORE_STMT);
113833 +
113834 + new_rhs = change_assign_rhs(visited, stmt, orig_rhs, change_rhs);
113835 + gimple_assign_set_rhs(stmt, new_rhs);
113836 + update_stmt(stmt);
113837 +
113838 + return create_assign(visited, stmt, lhs, AFTER_STMT);
113839 +}
113840 +
113841 +static bool is_subtraction_special(struct visited *visited, const_gimple stmt)
113842 +{
113843 + gimple rhs1_def_stmt, rhs2_def_stmt;
113844 + const_tree rhs1_def_stmt_rhs1, rhs2_def_stmt_rhs1, rhs1_def_stmt_lhs, rhs2_def_stmt_lhs;
113845 + enum machine_mode rhs1_def_stmt_rhs1_mode, rhs2_def_stmt_rhs1_mode, rhs1_def_stmt_lhs_mode, rhs2_def_stmt_lhs_mode;
113846 + const_tree rhs1 = gimple_assign_rhs1(stmt);
113847 + const_tree rhs2 = gimple_assign_rhs2(stmt);
113848 +
113849 + if (is_gimple_constant(rhs1) || is_gimple_constant(rhs2))
113850 + return false;
113851 +
113852 + gcc_assert(TREE_CODE(rhs1) == SSA_NAME && TREE_CODE(rhs2) == SSA_NAME);
113853 +
113854 + if (gimple_assign_rhs_code(stmt) != MINUS_EXPR)
113855 + return false;
113856 +
113857 + rhs1_def_stmt = get_def_stmt(rhs1);
113858 + rhs2_def_stmt = get_def_stmt(rhs2);
113859 + if (!gimple_assign_cast_p(rhs1_def_stmt) || !gimple_assign_cast_p(rhs2_def_stmt))
113860 + return false;
113861 +
113862 + rhs1_def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
113863 + rhs2_def_stmt_rhs1 = gimple_assign_rhs1(rhs2_def_stmt);
113864 + rhs1_def_stmt_lhs = gimple_assign_lhs(rhs1_def_stmt);
113865 + rhs2_def_stmt_lhs = gimple_assign_lhs(rhs2_def_stmt);
113866 + rhs1_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_rhs1));
113867 + rhs2_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_rhs1));
113868 + rhs1_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_lhs));
113869 + rhs2_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_lhs));
113870 + if (GET_MODE_BITSIZE(rhs1_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs1_def_stmt_lhs_mode))
113871 + return false;
113872 + if (GET_MODE_BITSIZE(rhs2_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs2_def_stmt_lhs_mode))
113873 + return false;
113874 +
113875 + pointer_set_insert(visited->no_cast_check, rhs1_def_stmt);
113876 + pointer_set_insert(visited->no_cast_check, rhs2_def_stmt);
113877 + return true;
113878 +}
113879 +
113880 +static gimple create_binary_assign(struct visited *visited, enum tree_code code, gimple stmt, tree rhs1, tree rhs2)
113881 +{
113882 + gimple assign;
113883 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
113884 + tree type = TREE_TYPE(rhs1);
113885 + tree lhs = create_new_var(type);
113886 +
113887 + gcc_assert(types_compatible_p(type, TREE_TYPE(rhs2)));
113888 + assign = gimple_build_assign_with_ops(code, lhs, rhs1, rhs2);
113889 + gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
113890 +
113891 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
113892 + update_stmt(assign);
113893 + pointer_set_insert(visited->my_stmts, assign);
113894 + return assign;
113895 +}
113896 +
113897 +static tree cast_to_TI_type(struct visited *visited, gimple stmt, tree node)
113898 +{
113899 + gimple_stmt_iterator gsi;
113900 + gimple cast_stmt;
113901 + tree type = TREE_TYPE(node);
113902 +
113903 + if (types_compatible_p(type, intTI_type_node))
113904 + return node;
113905 +
113906 + gsi = gsi_for_stmt(stmt);
113907 + cast_stmt = build_cast_stmt(visited, intTI_type_node, node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
113908 + pointer_set_insert(visited->my_stmts, cast_stmt);
113909 + return gimple_assign_lhs(cast_stmt);
113910 +}
113911 +
113912 +static tree get_def_stmt_rhs(struct visited *visited, const_tree var)
113913 +{
113914 + tree rhs1, def_stmt_rhs1;
113915 + gimple rhs1_def_stmt, def_stmt_rhs1_def_stmt, def_stmt;
113916 +
113917 + def_stmt = get_def_stmt(var);
113918 + if (!gimple_assign_cast_p(def_stmt))
113919 + return NULL_TREE;
113920 + gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP && pointer_set_contains(visited->my_stmts, def_stmt) && gimple_assign_cast_p(def_stmt));
113921 +
113922 + rhs1 = gimple_assign_rhs1(def_stmt);
113923 + rhs1_def_stmt = get_def_stmt(rhs1);
113924 + if (!gimple_assign_cast_p(rhs1_def_stmt))
113925 + return rhs1;
113926 +
113927 + def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
113928 + def_stmt_rhs1_def_stmt = get_def_stmt(def_stmt_rhs1);
113929 +
113930 + switch (gimple_code(def_stmt_rhs1_def_stmt)) {
113931 + case GIMPLE_CALL:
113932 + case GIMPLE_NOP:
113933 + case GIMPLE_ASM:
113934 + case GIMPLE_PHI:
113935 + return def_stmt_rhs1;
113936 + case GIMPLE_ASSIGN:
113937 + return rhs1;
113938 + default:
113939 + debug_gimple_stmt(def_stmt_rhs1_def_stmt);
113940 + gcc_unreachable();
113941 + }
113942 +}
113943 +
113944 +tree handle_integer_truncation(struct visited *visited, struct cgraph_node *caller_node, const_tree lhs)
113945 +{
113946 + tree new_rhs1, new_rhs2;
113947 + tree new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1, new_lhs;
113948 + gimple assign, stmt = get_def_stmt(lhs);
113949 + tree rhs1 = gimple_assign_rhs1(stmt);
113950 + tree rhs2 = gimple_assign_rhs2(stmt);
113951 +
113952 + if (!is_subtraction_special(visited, stmt))
113953 + return NULL_TREE;
113954 +
113955 + new_rhs1 = expand(visited, caller_node, rhs1);
113956 + new_rhs2 = expand(visited, caller_node, rhs2);
113957 +
113958 + new_rhs1_def_stmt_rhs1 = get_def_stmt_rhs(visited, new_rhs1);
113959 + new_rhs2_def_stmt_rhs1 = get_def_stmt_rhs(visited, new_rhs2);
113960 +
113961 + if (new_rhs1_def_stmt_rhs1 == NULL_TREE || new_rhs2_def_stmt_rhs1 == NULL_TREE)
113962 + return NULL_TREE;
113963 +
113964 + if (!types_compatible_p(TREE_TYPE(new_rhs1_def_stmt_rhs1), TREE_TYPE(new_rhs2_def_stmt_rhs1))) {
113965 + new_rhs1_def_stmt_rhs1 = cast_to_TI_type(visited, stmt, new_rhs1_def_stmt_rhs1);
113966 + new_rhs2_def_stmt_rhs1 = cast_to_TI_type(visited, stmt, new_rhs2_def_stmt_rhs1);
113967 + }
113968 +
113969 + assign = create_binary_assign(visited, MINUS_EXPR, stmt, new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1);
113970 + new_lhs = gimple_assign_lhs(assign);
113971 + check_size_overflow(caller_node, assign, TREE_TYPE(new_lhs), new_lhs, rhs1, AFTER_STMT);
113972 +
113973 + return dup_assign(visited, stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
113974 +}
113975 +
113976 +bool is_a_neg_overflow(const_gimple stmt, const_tree rhs)
113977 +{
113978 + const_gimple def_stmt;
113979 +
113980 + if (TREE_CODE(rhs) != SSA_NAME)
113981 + return false;
113982 +
113983 + if (gimple_assign_rhs_code(stmt) != PLUS_EXPR)
113984 + return false;
113985 +
113986 + def_stmt = get_def_stmt(rhs);
113987 + if (!is_gimple_assign(def_stmt) || gimple_assign_rhs_code(def_stmt) != BIT_NOT_EXPR)
113988 + return false;
113989 +
113990 + return true;
113991 +}
113992 +
113993 +/* e.g., drivers/acpi/acpica/utids.c acpi_ut_execute_CID()
113994 + * ((count - 1) * sizeof(struct acpi_pnp_dee_id_list) -> (count + fffffff) * 16
113995 + * fffffff * 16 > signed max -> truncate
113996 + */
113997 +static bool look_for_mult_and_add(const_gimple stmt)
113998 +{
113999 + const_tree res;
114000 + tree rhs1, rhs2, def_rhs1, def_rhs2, const_rhs, def_const_rhs;
114001 + const_gimple def_stmt;
114002 +
114003 + if (!stmt || gimple_code(stmt) == GIMPLE_NOP)
114004 + return false;
114005 + if (!is_gimple_assign(stmt))
114006 + return false;
114007 + if (gimple_assign_rhs_code(stmt) != MULT_EXPR)
114008 + return false;
114009 +
114010 + rhs1 = gimple_assign_rhs1(stmt);
114011 + rhs2 = gimple_assign_rhs2(stmt);
114012 + if (is_gimple_constant(rhs1)) {
114013 + const_rhs = rhs1;
114014 + def_stmt = get_def_stmt(rhs2);
114015 + } else if (is_gimple_constant(rhs2)) {
114016 + const_rhs = rhs2;
114017 + def_stmt = get_def_stmt(rhs1);
114018 + } else
114019 + return false;
114020 +
114021 + if (gimple_assign_rhs_code(def_stmt) != PLUS_EXPR && gimple_assign_rhs_code(def_stmt) != MINUS_EXPR)
114022 + return false;
114023 +
114024 + def_rhs1 = gimple_assign_rhs1(def_stmt);
114025 + def_rhs2 = gimple_assign_rhs2(def_stmt);
114026 + if (is_gimple_constant(def_rhs1))
114027 + def_const_rhs = def_rhs1;
114028 + else if (is_gimple_constant(def_rhs2))
114029 + def_const_rhs = def_rhs2;
114030 + else
114031 + return false;
114032 +
114033 + res = fold_binary_loc(gimple_location(def_stmt), MULT_EXPR, TREE_TYPE(const_rhs), const_rhs, def_const_rhs);
114034 + if (is_lt_signed_type_max(res) && is_gt_zero(res))
114035 + return false;
114036 + return true;
114037 +}
114038 +
114039 +enum intentional_overflow_type add_mul_intentional_overflow(const_gimple stmt)
114040 +{
114041 + const_gimple def_stmt_1, def_stmt_2;
114042 + const_tree rhs1, rhs2;
114043 + bool add_mul_rhs1, add_mul_rhs2;
114044 +
114045 + rhs1 = gimple_assign_rhs1(stmt);
114046 + def_stmt_1 = get_def_stmt(rhs1);
114047 + add_mul_rhs1 = look_for_mult_and_add(def_stmt_1);
114048 +
114049 + rhs2 = gimple_assign_rhs2(stmt);
114050 + def_stmt_2 = get_def_stmt(rhs2);
114051 + add_mul_rhs2 = look_for_mult_and_add(def_stmt_2);
114052 +
114053 + if (add_mul_rhs1)
114054 + return RHS1_INTENTIONAL_OVERFLOW;
114055 + if (add_mul_rhs2)
114056 + return RHS2_INTENTIONAL_OVERFLOW;
114057 + return NO_INTENTIONAL_OVERFLOW;
114058 +}
114059 +
114060 +static gimple get_dup_stmt(struct visited *visited, gimple stmt)
114061 +{
114062 + gimple my_stmt;
114063 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
114064 +
114065 + gsi_next(&gsi);
114066 + my_stmt = gsi_stmt(gsi);
114067 +
114068 + gcc_assert(pointer_set_contains(visited->my_stmts, my_stmt));
114069 + gcc_assert(gimple_assign_rhs_code(stmt) == gimple_assign_rhs_code(my_stmt));
114070 +
114071 + return my_stmt;
114072 +}
114073 +
114074 +/* unsigned type -> unary or binary assign (rhs1 or rhs2 is constant)
114075 + * unsigned type cast to signed type, unsigned type: no more uses
114076 + * e.g., lib/vsprintf.c:simple_strtol()
114077 + * _10 = (unsigned long int) _9
114078 + * _11 = -_10;
114079 + * _12 = (long int) _11; (_11_ no more uses)
114080 + */
114081 +static bool is_call_or_cast(gimple stmt)
114082 +{
114083 + return gimple_assign_cast_p(stmt) || is_gimple_call(stmt);
114084 +}
114085 +
114086 +static bool is_unsigned_cast_or_call_def_stmt(const_tree node)
114087 +{
114088 + const_tree rhs;
114089 + gimple def_stmt;
114090 +
114091 + if (node == NULL_TREE)
114092 + return true;
114093 + if (is_gimple_constant(node))
114094 + return true;
114095 +
114096 + def_stmt = get_def_stmt(node);
114097 + if (!def_stmt)
114098 + return false;
114099 +
114100 + if (is_call_or_cast(def_stmt))
114101 + return true;
114102 +
114103 + if (!is_gimple_assign(def_stmt) || gimple_num_ops(def_stmt) != 2)
114104 + return false;
114105 + rhs = gimple_assign_rhs1(def_stmt);
114106 + def_stmt = get_def_stmt(rhs);
114107 + if (!def_stmt)
114108 + return false;
114109 + return is_call_or_cast(def_stmt);
114110 +}
114111 +
114112 +void unsigned_signed_cast_intentional_overflow(struct visited *visited, gimple stmt)
114113 +{
114114 + unsigned int use_num;
114115 + gimple so_stmt;
114116 + const_gimple def_stmt;
114117 + const_tree rhs1, rhs2;
114118 + tree rhs = gimple_assign_rhs1(stmt);
114119 + tree lhs_type = TREE_TYPE(gimple_assign_lhs(stmt));
114120 + const_tree rhs_type = TREE_TYPE(rhs);
114121 +
114122 + if (!(TYPE_UNSIGNED(rhs_type) && !TYPE_UNSIGNED(lhs_type)))
114123 + return;
114124 + if (GET_MODE_BITSIZE(TYPE_MODE(rhs_type)) != GET_MODE_BITSIZE(TYPE_MODE(lhs_type)))
114125 + return;
114126 + use_num = uses_num(rhs);
114127 + if (use_num != 1)
114128 + return;
114129 +
114130 + def_stmt = get_def_stmt(rhs);
114131 + if (!def_stmt)
114132 + return;
114133 + if (!is_gimple_assign(def_stmt))
114134 + return;
114135 +
114136 + rhs1 = gimple_assign_rhs1(def_stmt);
114137 + if (!is_unsigned_cast_or_call_def_stmt(rhs1))
114138 + return;
114139 +
114140 + rhs2 = gimple_assign_rhs2(def_stmt);
114141 + if (!is_unsigned_cast_or_call_def_stmt(rhs2))
114142 + return;
114143 + if (gimple_num_ops(def_stmt) == 3 && !is_gimple_constant(rhs1) && !is_gimple_constant(rhs2))
114144 + return;
114145 +
114146 + so_stmt = get_dup_stmt(visited, stmt);
114147 + create_up_and_down_cast(visited, so_stmt, lhs_type, gimple_assign_rhs1(so_stmt));
114148 +}
114149 +
114150 diff --git a/tools/gcc/size_overflow_plugin/misc.c b/tools/gcc/size_overflow_plugin/misc.c
114151 new file mode 100644
114152 index 0000000..4bddad2
114153 --- /dev/null
114154 +++ b/tools/gcc/size_overflow_plugin/misc.c
114155 @@ -0,0 +1,203 @@
114156 +/*
114157 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
114158 + * Licensed under the GPL v2, or (at your option) v3
114159 + *
114160 + * Homepage:
114161 + * http://www.grsecurity.net/~ephox/overflow_plugin/
114162 + *
114163 + * Documentation:
114164 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
114165 + *
114166 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
114167 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
114168 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
114169 + *
114170 + * Usage:
114171 + * $ make
114172 + * $ make run
114173 + */
114174 +
114175 +#include "gcc-common.h"
114176 +#include "size_overflow.h"
114177 +
114178 +void set_current_function_decl(tree fndecl)
114179 +{
114180 + gcc_assert(fndecl != NULL_TREE);
114181 +
114182 + push_cfun(DECL_STRUCT_FUNCTION(fndecl));
114183 + calculate_dominance_info(CDI_DOMINATORS);
114184 + current_function_decl = fndecl;
114185 +}
114186 +
114187 +void unset_current_function_decl(void)
114188 +{
114189 + free_dominance_info(CDI_DOMINATORS);
114190 + pop_cfun();
114191 + current_function_decl = NULL_TREE;
114192 +}
114193 +
114194 +static bool is_bool(const_tree node)
114195 +{
114196 + const_tree type;
114197 +
114198 + if (node == NULL_TREE)
114199 + return false;
114200 +
114201 + type = TREE_TYPE(node);
114202 + if (!INTEGRAL_TYPE_P(type))
114203 + return false;
114204 + if (TREE_CODE(type) == BOOLEAN_TYPE)
114205 + return true;
114206 + if (TYPE_PRECISION(type) == 1)
114207 + return true;
114208 + return false;
114209 +}
114210 +
114211 +bool skip_types(const_tree var)
114212 +{
114213 + tree type;
114214 + enum tree_code code;
114215 +
114216 + if (is_gimple_constant(var))
114217 + return true;
114218 +
114219 + switch (TREE_CODE(var)) {
114220 + case ADDR_EXPR:
114221 +#if BUILDING_GCC_VERSION >= 4006
114222 + case MEM_REF:
114223 +#endif
114224 + case ARRAY_REF:
114225 + case BIT_FIELD_REF:
114226 + case INDIRECT_REF:
114227 + case TARGET_MEM_REF:
114228 + case COMPONENT_REF:
114229 + case VAR_DECL:
114230 + case VIEW_CONVERT_EXPR:
114231 + return true;
114232 + default:
114233 + break;
114234 + }
114235 +
114236 + code = TREE_CODE(var);
114237 + gcc_assert(code == SSA_NAME || code == PARM_DECL);
114238 +
114239 + type = TREE_TYPE(var);
114240 + switch (TREE_CODE(type)) {
114241 + case INTEGER_TYPE:
114242 + case ENUMERAL_TYPE:
114243 + return false;
114244 + case BOOLEAN_TYPE:
114245 + return is_bool(var);
114246 + default:
114247 + return true;
114248 + }
114249 +}
114250 +
114251 +gimple get_def_stmt(const_tree node)
114252 +{
114253 + gcc_assert(node != NULL_TREE);
114254 +
114255 + if (skip_types(node))
114256 + return NULL;
114257 +
114258 + if (TREE_CODE(node) != SSA_NAME)
114259 + return NULL;
114260 + return SSA_NAME_DEF_STMT(node);
114261 +}
114262 +
114263 +tree create_new_var(tree type)
114264 +{
114265 + tree new_var = create_tmp_var(type, "cicus");
114266 +
114267 + add_referenced_var(new_var);
114268 + return new_var;
114269 +}
114270 +
114271 +static bool skip_cast(tree dst_type, const_tree rhs, bool force)
114272 +{
114273 + const_gimple def_stmt = get_def_stmt(rhs);
114274 +
114275 + if (force)
114276 + return false;
114277 +
114278 + if (is_gimple_constant(rhs))
114279 + return false;
114280 +
114281 + if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
114282 + return false;
114283 +
114284 + if (!types_compatible_p(dst_type, TREE_TYPE(rhs)))
114285 + return false;
114286 +
114287 + // DI type can be on 32 bit (from create_assign) but overflow type stays DI
114288 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
114289 + return false;
114290 +
114291 + return true;
114292 +}
114293 +
114294 +tree cast_a_tree(tree type, tree var)
114295 +{
114296 + gcc_assert(type != NULL_TREE);
114297 + gcc_assert(var != NULL_TREE);
114298 + gcc_assert(fold_convertible_p(type, var));
114299 +
114300 + return fold_convert(type, var);
114301 +}
114302 +
114303 +gimple build_cast_stmt(struct visited *visited, tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before, bool force)
114304 +{
114305 + gimple assign, def_stmt;
114306 +
114307 + gcc_assert(dst_type != NULL_TREE && rhs != NULL_TREE);
114308 + gcc_assert(!is_gimple_constant(rhs));
114309 + if (gsi_end_p(*gsi) && before == AFTER_STMT)
114310 + gcc_unreachable();
114311 +
114312 + def_stmt = get_def_stmt(rhs);
114313 + if (def_stmt && gimple_code(def_stmt) != GIMPLE_NOP && skip_cast(dst_type, rhs, force) && pointer_set_contains(visited->my_stmts, def_stmt))
114314 + return def_stmt;
114315 +
114316 + if (lhs == CREATE_NEW_VAR)
114317 + lhs = create_new_var(dst_type);
114318 +
114319 + assign = gimple_build_assign(lhs, cast_a_tree(dst_type, rhs));
114320 +
114321 + if (!gsi_end_p(*gsi)) {
114322 + location_t loc = gimple_location(gsi_stmt(*gsi));
114323 + gimple_set_location(assign, loc);
114324 + }
114325 +
114326 + gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
114327 +
114328 + if (before)
114329 + gsi_insert_before(gsi, assign, GSI_NEW_STMT);
114330 + else
114331 + gsi_insert_after(gsi, assign, GSI_NEW_STMT);
114332 + update_stmt(assign);
114333 + return assign;
114334 +}
114335 +
114336 +bool is_size_overflow_type(const_tree var)
114337 +{
114338 + const char *name;
114339 + const_tree type_name, type;
114340 +
114341 + if (var == NULL_TREE)
114342 + return false;
114343 +
114344 + type = TREE_TYPE(var);
114345 + type_name = TYPE_NAME(type);
114346 + if (type_name == NULL_TREE)
114347 + return false;
114348 +
114349 + if (DECL_P(type_name))
114350 + name = DECL_NAME_POINTER(type_name);
114351 + else
114352 + name = IDENTIFIER_POINTER(type_name);
114353 +
114354 + if (!strncmp(name, "size_overflow_type", 18))
114355 + return true;
114356 + return false;
114357 +}
114358 +
114359 diff --git a/tools/gcc/size_overflow_plugin/remove_unnecessary_dup.c b/tools/gcc/size_overflow_plugin/remove_unnecessary_dup.c
114360 new file mode 100644
114361 index 0000000..7c9e6d1
114362 --- /dev/null
114363 +++ b/tools/gcc/size_overflow_plugin/remove_unnecessary_dup.c
114364 @@ -0,0 +1,138 @@
114365 +/*
114366 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
114367 + * Licensed under the GPL v2, or (at your option) v3
114368 + *
114369 + * Homepage:
114370 + * http://www.grsecurity.net/~ephox/overflow_plugin/
114371 + *
114372 + * Documentation:
114373 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
114374 + *
114375 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
114376 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
114377 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
114378 + *
114379 + * Usage:
114380 + * $ make
114381 + * $ make run
114382 + */
114383 +
114384 +#include "gcc-common.h"
114385 +#include "size_overflow.h"
114386 +
114387 +bool skip_expr_on_double_type(const_gimple stmt)
114388 +{
114389 + enum tree_code code = gimple_assign_rhs_code(stmt);
114390 +
114391 + switch (code) {
114392 + case RSHIFT_EXPR:
114393 + case TRUNC_DIV_EXPR:
114394 + case CEIL_DIV_EXPR:
114395 + case FLOOR_DIV_EXPR:
114396 + case ROUND_DIV_EXPR:
114397 + case EXACT_DIV_EXPR:
114398 + case RDIV_EXPR:
114399 + case TRUNC_MOD_EXPR:
114400 + case CEIL_MOD_EXPR:
114401 + case FLOOR_MOD_EXPR:
114402 + case ROUND_MOD_EXPR:
114403 + return true;
114404 + default:
114405 + return false;
114406 + }
114407 +}
114408 +
114409 +void create_up_and_down_cast(struct visited *visited, gimple use_stmt, tree orig_type, tree rhs)
114410 +{
114411 + const_tree orig_rhs1;
114412 + tree down_lhs, new_lhs, dup_type = TREE_TYPE(rhs);
114413 + gimple down_cast, up_cast;
114414 + gimple_stmt_iterator gsi = gsi_for_stmt(use_stmt);
114415 +
114416 + down_cast = build_cast_stmt(visited, orig_type, rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
114417 + down_lhs = gimple_assign_lhs(down_cast);
114418 +
114419 + gsi = gsi_for_stmt(use_stmt);
114420 + up_cast = build_cast_stmt(visited, dup_type, down_lhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
114421 + new_lhs = gimple_assign_lhs(up_cast);
114422 +
114423 + orig_rhs1 = gimple_assign_rhs1(use_stmt);
114424 + if (operand_equal_p(orig_rhs1, rhs, 0))
114425 + gimple_assign_set_rhs1(use_stmt, new_lhs);
114426 + else
114427 + gimple_assign_set_rhs2(use_stmt, new_lhs);
114428 + update_stmt(use_stmt);
114429 +
114430 + pointer_set_insert(visited->my_stmts, up_cast);
114431 + pointer_set_insert(visited->my_stmts, down_cast);
114432 + pointer_set_insert(visited->skip_expr_casts, up_cast);
114433 + pointer_set_insert(visited->skip_expr_casts, down_cast);
114434 +}
114435 +
114436 +static tree get_proper_unsigned_half_type(const_tree node)
114437 +{
114438 + tree new_type, type;
114439 +
114440 + gcc_assert(is_size_overflow_type(node));
114441 +
114442 + type = TREE_TYPE(node);
114443 + switch (TYPE_MODE(type)) {
114444 + case HImode:
114445 + new_type = unsigned_intQI_type_node;
114446 + break;
114447 + case SImode:
114448 + new_type = unsigned_intHI_type_node;
114449 + break;
114450 + case DImode:
114451 + new_type = unsigned_intSI_type_node;
114452 + break;
114453 + case TImode:
114454 + new_type = unsigned_intDI_type_node;
114455 + break;
114456 + default:
114457 + gcc_unreachable();
114458 + }
114459 +
114460 + if (TYPE_QUALS(type) != 0)
114461 + return build_qualified_type(new_type, TYPE_QUALS(type));
114462 + return new_type;
114463 +}
114464 +
114465 +static void insert_cast_rhs(struct visited *visited, gimple stmt, tree rhs)
114466 +{
114467 + tree type;
114468 +
114469 + if (rhs == NULL_TREE)
114470 + return;
114471 + if (!is_size_overflow_type(rhs))
114472 + return;
114473 +
114474 + type = get_proper_unsigned_half_type(rhs);
114475 + if (is_gimple_constant(rhs))
114476 + return;
114477 + create_up_and_down_cast(visited, stmt, type, rhs);
114478 +}
114479 +
114480 +static void insert_cast(struct visited *visited, gimple stmt, tree rhs)
114481 +{
114482 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode) && !is_size_overflow_type(rhs))
114483 + return;
114484 + gcc_assert(is_size_overflow_type(rhs));
114485 + insert_cast_rhs(visited, stmt, rhs);
114486 +}
114487 +
114488 +void insert_cast_expr(struct visited *visited, gimple stmt, enum intentional_overflow_type type)
114489 +{
114490 + tree rhs1, rhs2;
114491 +
114492 + if (type == NO_INTENTIONAL_OVERFLOW || type == RHS1_INTENTIONAL_OVERFLOW) {
114493 + rhs1 = gimple_assign_rhs1(stmt);
114494 + insert_cast(visited, stmt, rhs1);
114495 + }
114496 +
114497 + if (type == NO_INTENTIONAL_OVERFLOW || type == RHS2_INTENTIONAL_OVERFLOW) {
114498 + rhs2 = gimple_assign_rhs2(stmt);
114499 + insert_cast(visited, stmt, rhs2);
114500 + }
114501 +}
114502 +
114503 diff --git a/tools/gcc/size_overflow_plugin/size_overflow.h b/tools/gcc/size_overflow_plugin/size_overflow.h
114504 new file mode 100644
114505 index 0000000..e5b4e50
114506 --- /dev/null
114507 +++ b/tools/gcc/size_overflow_plugin/size_overflow.h
114508 @@ -0,0 +1,127 @@
114509 +#ifndef SIZE_OVERFLOW_H
114510 +#define SIZE_OVERFLOW_H
114511 +
114512 +#define CREATE_NEW_VAR NULL_TREE
114513 +#define CANNOT_FIND_ARG 32
114514 +#define MAX_PARAM 31
114515 +#define BEFORE_STMT true
114516 +#define AFTER_STMT false
114517 +
114518 +#define TURN_OFF_ASM_STR "# size_overflow MARK_TURN_OFF "
114519 +#define YES_ASM_STR "# size_overflow MARK_YES "
114520 +#define OK_ASM_STR "# size_overflow "
114521 +
114522 +enum mark {
114523 + MARK_NO, MARK_YES, MARK_NOT_INTENTIONAL, MARK_TURN_OFF
114524 +};
114525 +
114526 +enum intentional_overflow_type {
114527 + NO_INTENTIONAL_OVERFLOW, RHS1_INTENTIONAL_OVERFLOW, RHS2_INTENTIONAL_OVERFLOW
114528 +};
114529 +
114530 +struct visited {
114531 + struct pointer_set_t *stmts;
114532 + struct pointer_set_t *my_stmts;
114533 + struct pointer_set_t *skip_expr_casts;
114534 + struct pointer_set_t *no_cast_check;
114535 +};
114536 +
114537 +// size_overflow_plugin.c
114538 +extern tree report_size_overflow_decl;
114539 +extern tree size_overflow_type_HI;
114540 +extern tree size_overflow_type_SI;
114541 +extern tree size_overflow_type_DI;
114542 +extern tree size_overflow_type_TI;
114543 +
114544 +
114545 +// size_overflow_plugin_hash.c
114546 +struct size_overflow_hash {
114547 + const struct size_overflow_hash * const next;
114548 + const char * const name;
114549 + const unsigned int param;
114550 +};
114551 +
114552 +struct interesting_node {
114553 + struct interesting_node *next;
114554 + gimple first_stmt;
114555 + const_tree fndecl;
114556 + tree node;
114557 +#if BUILDING_GCC_VERSION <= 4007
114558 + VEC(tree, gc) *last_nodes;
114559 +#else
114560 + vec<tree, va_gc> *last_nodes;
114561 +#endif
114562 + unsigned int num;
114563 + enum mark intentional_attr_decl;
114564 + enum mark intentional_attr_cur_fndecl;
114565 + gimple intentional_mark_from_gimple;
114566 +};
114567 +
114568 +extern bool is_size_overflow_asm(const_gimple stmt);
114569 +extern unsigned int get_function_num(const_tree node, const_tree orig_fndecl);
114570 +extern unsigned int get_correct_arg_count(unsigned int argnum, const_tree fndecl);
114571 +extern bool is_missing_function(const_tree orig_fndecl, unsigned int num);
114572 +extern bool is_a_return_check(const_tree node);
114573 +extern const struct size_overflow_hash *get_function_hash(const_tree fndecl);
114574 +extern unsigned int find_arg_number_tree(const_tree arg, const_tree func);
114575 +
114576 +
114577 +// size_overflow_debug.c
114578 +extern struct opt_pass *make_dump_pass(void);
114579 +
114580 +
114581 +// intentional_overflow.c
114582 +extern enum mark get_intentional_attr_type(const_tree node);
114583 +extern bool is_size_overflow_intentional_asm_yes(const_gimple stmt);
114584 +extern bool is_size_overflow_intentional_asm_turn_off(const_gimple stmt);
114585 +extern bool is_end_intentional_intentional_attr(const_tree decl, unsigned int argnum);
114586 +extern bool is_yes_intentional_attr(const_tree decl, unsigned int argnum);
114587 +extern bool is_turn_off_intentional_attr(const_tree decl);
114588 +extern void print_missing_intentional(enum mark callee_attr, enum mark caller_attr, const_tree decl, unsigned int argnum);
114589 +extern void check_intentional_attribute_ipa(struct interesting_node *cur_node);
114590 +extern bool is_a_cast_and_const_overflow(const_tree no_const_rhs);
114591 +extern bool is_const_plus_unsigned_signed_truncation(const_tree lhs);
114592 +extern bool is_a_constant_overflow(const_gimple stmt, const_tree rhs);
114593 +extern tree handle_intentional_overflow(struct visited *visited, struct cgraph_node *caller_node, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs2);
114594 +extern tree handle_integer_truncation(struct visited *visited, struct cgraph_node *caller_node, const_tree lhs);
114595 +extern bool is_a_neg_overflow(const_gimple stmt, const_tree rhs);
114596 +extern enum intentional_overflow_type add_mul_intentional_overflow(const_gimple def_stmt);
114597 +extern void unsigned_signed_cast_intentional_overflow(struct visited *visited, gimple stmt);
114598 +
114599 +
114600 +// insert_size_overflow_check_ipa.c
114601 +extern unsigned int search_function(void);
114602 +extern unsigned int call_count;
114603 +extern struct opt_pass *make_insert_size_overflow_check(void);
114604 +extern const_tree get_interesting_orig_fndecl(const_gimple stmt, unsigned int argnum);
114605 +
114606 +
114607 +// insert_size_overflow_asm.c
114608 +extern struct opt_pass *make_insert_size_overflow_asm_pass(void);
114609 +
114610 +
114611 +// misc.c
114612 +extern void set_current_function_decl(tree fndecl);
114613 +extern void unset_current_function_decl(void);
114614 +extern gimple get_def_stmt(const_tree node);
114615 +extern tree create_new_var(tree type);
114616 +extern gimple build_cast_stmt(struct visited *visited, tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before, bool force);
114617 +extern bool skip_types(const_tree var);
114618 +extern tree cast_a_tree(tree type, tree var);
114619 +extern bool is_size_overflow_type(const_tree var);
114620 +
114621 +
114622 +// insert_size_overflow_check_core.c
114623 +extern tree expand(struct visited *visited, struct cgraph_node *caller_node, tree lhs);
114624 +extern void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before);
114625 +extern tree dup_assign(struct visited *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3);
114626 +extern tree create_assign(struct visited *visited, gimple oldstmt, tree rhs1, bool before);
114627 +
114628 +
114629 +// remove_unnecessary_dup.c
114630 +extern struct opt_pass *make_remove_unnecessary_dup_pass(void);
114631 +extern void insert_cast_expr(struct visited *visited, gimple stmt, enum intentional_overflow_type type);
114632 +extern bool skip_expr_on_double_type(const_gimple stmt);
114633 +extern void create_up_and_down_cast(struct visited *visited, gimple use_stmt, tree orig_type, tree rhs);
114634 +
114635 +#endif
114636 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_debug.c b/tools/gcc/size_overflow_plugin/size_overflow_debug.c
114637 new file mode 100644
114638 index 0000000..4378111
114639 --- /dev/null
114640 +++ b/tools/gcc/size_overflow_plugin/size_overflow_debug.c
114641 @@ -0,0 +1,116 @@
114642 +/*
114643 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
114644 + * Licensed under the GPL v2, or (at your option) v3
114645 + *
114646 + * Homepage:
114647 + * http://www.grsecurity.net/~ephox/overflow_plugin/
114648 + *
114649 + * Documentation:
114650 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
114651 + *
114652 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
114653 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
114654 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
114655 + *
114656 + * Usage:
114657 + * $ make
114658 + * $ make run
114659 + */
114660 +
114661 +#include "gcc-common.h"
114662 +
114663 +static unsigned int dump_functions(void)
114664 +{
114665 + struct cgraph_node *node;
114666 +
114667 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
114668 + basic_block bb;
114669 +
114670 + push_cfun(DECL_STRUCT_FUNCTION(NODE_DECL(node)));
114671 + current_function_decl = NODE_DECL(node);
114672 +
114673 + fprintf(stderr, "-----------------------------------------\n%s\n-----------------------------------------\n", DECL_NAME_POINTER(current_function_decl));
114674 +
114675 + FOR_ALL_BB_FN(bb, cfun) {
114676 + gimple_stmt_iterator si;
114677 +
114678 + fprintf(stderr, "<bb %u>:\n", bb->index);
114679 + for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si))
114680 + debug_gimple_stmt(gsi_stmt(si));
114681 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
114682 + debug_gimple_stmt(gsi_stmt(si));
114683 + fprintf(stderr, "\n");
114684 + }
114685 +
114686 + fprintf(stderr, "-------------------------------------------------------------------------\n");
114687 +
114688 + pop_cfun();
114689 + current_function_decl = NULL_TREE;
114690 + }
114691 +
114692 + fprintf(stderr, "###############################################################################\n");
114693 +
114694 + return 0;
114695 +}
114696 +
114697 +#if BUILDING_GCC_VERSION >= 4009
114698 +static const struct pass_data dump_pass_data = {
114699 +#else
114700 +static struct ipa_opt_pass_d dump_pass = {
114701 + .pass = {
114702 +#endif
114703 + .type = SIMPLE_IPA_PASS,
114704 + .name = "dump",
114705 +#if BUILDING_GCC_VERSION >= 4008
114706 + .optinfo_flags = OPTGROUP_NONE,
114707 +#endif
114708 +#if BUILDING_GCC_VERSION >= 4009
114709 + .has_gate = false,
114710 + .has_execute = true,
114711 +#else
114712 + .gate = NULL,
114713 + .execute = dump_functions,
114714 + .sub = NULL,
114715 + .next = NULL,
114716 + .static_pass_number = 0,
114717 +#endif
114718 + .tv_id = TV_NONE,
114719 + .properties_required = 0,
114720 + .properties_provided = 0,
114721 + .properties_destroyed = 0,
114722 + .todo_flags_start = 0,
114723 + .todo_flags_finish = 0,
114724 +#if BUILDING_GCC_VERSION < 4009
114725 + },
114726 + .generate_summary = NULL,
114727 + .write_summary = NULL,
114728 + .read_summary = NULL,
114729 +#if BUILDING_GCC_VERSION >= 4006
114730 + .write_optimization_summary = NULL,
114731 + .read_optimization_summary = NULL,
114732 +#endif
114733 + .stmt_fixup = NULL,
114734 + .function_transform_todo_flags_start = 0,
114735 + .function_transform = NULL,
114736 + .variable_transform = NULL,
114737 +#endif
114738 +};
114739 +
114740 +#if BUILDING_GCC_VERSION >= 4009
114741 +namespace {
114742 +class dump_pass : public ipa_opt_pass_d {
114743 +public:
114744 + dump_pass() : ipa_opt_pass_d(dump_pass_data, g, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL) {}
114745 + unsigned int execute() { return dump_functions(); }
114746 +};
114747 +}
114748 +#endif
114749 +
114750 +struct opt_pass *make_dump_pass(void)
114751 +{
114752 +#if BUILDING_GCC_VERSION >= 4009
114753 + return new dump_pass();
114754 +#else
114755 + return &dump_pass.pass;
114756 +#endif
114757 +}
114758 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_hash.data b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
114759 new file mode 100644
114760 index 0000000..386792a
114761 --- /dev/null
114762 +++ b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
114763 @@ -0,0 +1,5808 @@
114764 +intel_fake_agp_alloc_by_type_1 intel_fake_agp_alloc_by_type 1 1 NULL
114765 +storvsc_connect_to_vsp_22 storvsc_connect_to_vsp 2 22 NULL
114766 +compat_sock_setsockopt_23 compat_sock_setsockopt 5 23 NULL
114767 +carl9170_alloc_27 carl9170_alloc 1 27 NULL
114768 +sel_read_policyvers_55 sel_read_policyvers 3 55 NULL nohasharray
114769 +padzero_55 padzero 1 55 &sel_read_policyvers_55
114770 +cfg80211_disconnected_57 cfg80211_disconnected 4 57 NULL
114771 +__skb_to_sgvec_72 __skb_to_sgvec 0 72 NULL
114772 +snd_korg1212_copy_to_92 snd_korg1212_copy_to 6 92 NULL
114773 +load_msg_95 load_msg 2 95 NULL
114774 +ipath_verbs_send_117 ipath_verbs_send 5-3 117 NULL
114775 +init_q_132 init_q 4 132 NULL
114776 +memstick_alloc_host_142 memstick_alloc_host 1 142 NULL
114777 +hva_to_gfn_memslot_149 hva_to_gfn_memslot 0-1 149 NULL
114778 +ping_v6_sendmsg_152 ping_v6_sendmsg 4 152 NULL
114779 +tracing_trace_options_write_153 tracing_trace_options_write 3 153 NULL nohasharray
114780 +ext4_ext_get_actual_len_153 ext4_ext_get_actual_len 0 153 &tracing_trace_options_write_153
114781 +pci_request_selected_regions_169 pci_request_selected_regions 0 169 NULL
114782 +xfs_buf_item_get_format_189 xfs_buf_item_get_format 2 189 NULL
114783 +iscsi_session_setup_196 iscsi_session_setup 4-5 196 NULL
114784 +ll_xattr_cache_seq_write_250 ll_xattr_cache_seq_write 3 250 NULL
114785 +br_port_info_size_268 br_port_info_size 0 268 NULL
114786 +read_file_war_stats_292 read_file_war_stats 3 292 NULL
114787 +SYSC_connect_304 SYSC_connect 3 304 NULL
114788 +syslog_print_307 syslog_print 2 307 NULL
114789 +dn_setsockopt_314 dn_setsockopt 5 314 NULL
114790 +mlx5_core_access_reg_361 mlx5_core_access_reg 3-5 361 NULL
114791 +aio_read_events_ring_410 aio_read_events_ring 3 410 NULL
114792 +lbs_rdmac_read_418 lbs_rdmac_read 3 418 NULL
114793 +snd_ca0106_ptr_read_467 snd_ca0106_ptr_read 0 467 NULL
114794 +cfs_trace_set_debug_mb_usrstr_486 cfs_trace_set_debug_mb_usrstr 2 486 NULL
114795 +nvme_trans_modesel_data_488 nvme_trans_modesel_data 4 488 NULL
114796 +iwl_dbgfs_protection_mode_write_502 iwl_dbgfs_protection_mode_write 3 502 NULL
114797 +rx_rx_defrag_end_read_505 rx_rx_defrag_end_read 3 505 NULL
114798 +ocfs2_validate_meta_ecc_bhs_527 ocfs2_validate_meta_ecc_bhs 0 527 NULL
114799 +zlib_deflate_workspacesize_537 zlib_deflate_workspacesize 0-1-2 537 NULL
114800 +iwl_dbgfs_wowlan_sram_read_540 iwl_dbgfs_wowlan_sram_read 3 540 NULL
114801 +sco_sock_setsockopt_552 sco_sock_setsockopt 5 552 NULL
114802 +lpfc_nlp_state_name_556 lpfc_nlp_state_name 2 556 NULL
114803 +snd_aw2_saa7146_get_hw_ptr_playback_558 snd_aw2_saa7146_get_hw_ptr_playback 0 558 NULL
114804 +start_isoc_chain_565 start_isoc_chain 2 565 NULL nohasharray
114805 +dev_hard_header_565 dev_hard_header 0 565 &start_isoc_chain_565
114806 +smk_write_load_self2_591 smk_write_load_self2 3 591 NULL
114807 +btrfs_stack_file_extent_offset_607 btrfs_stack_file_extent_offset 0 607 NULL
114808 +ni_gpct_device_construct_610 ni_gpct_device_construct 5 610 NULL
114809 +fuse_request_alloc_nofs_617 fuse_request_alloc_nofs 1 617 NULL
114810 +ptlrpc_lprocfs_nrs_seq_write_621 ptlrpc_lprocfs_nrs_seq_write 3 621 NULL
114811 +viafb_dfpl_proc_write_627 viafb_dfpl_proc_write 3 627 NULL
114812 +ceph_osdc_new_request_635 ceph_osdc_new_request 6 635 NULL
114813 +cfs_hash_bkt_size_643 cfs_hash_bkt_size 0 643 NULL
114814 +unlink_queued_645 unlink_queued 4 645 NULL
114815 +dtim_interval_read_654 dtim_interval_read 3 654 NULL
114816 +mem_rx_free_mem_blks_read_675 mem_rx_free_mem_blks_read 3 675 NULL
114817 +persistent_ram_vmap_709 persistent_ram_vmap 2-1 709 NULL
114818 +sctp_setsockopt_peer_addr_params_734 sctp_setsockopt_peer_addr_params 3 734 NULL
114819 +dvb_video_write_754 dvb_video_write 3 754 NULL
114820 +cfs_trace_allocate_string_buffer_781 cfs_trace_allocate_string_buffer 2 781 NULL
114821 +ath6kl_disconnect_timeout_write_794 ath6kl_disconnect_timeout_write 3 794 NULL
114822 +snd_pcm_drain_811 snd_pcm_drain 0 811 NULL
114823 +if_writecmd_815 if_writecmd 2 815 NULL
114824 +aac_change_queue_depth_825 aac_change_queue_depth 2 825 NULL
114825 +error_state_read_859 error_state_read 6 859 NULL
114826 +o2net_send_message_vec_879 o2net_send_message_vec 4 879 NULL nohasharray
114827 +iwl_dbgfs_fh_reg_read_879 iwl_dbgfs_fh_reg_read 3 879 &o2net_send_message_vec_879
114828 +snd_pcm_action_single_905 snd_pcm_action_single 0 905 NULL
114829 +carl9170_cmd_buf_950 carl9170_cmd_buf 3 950 NULL
114830 +__nodes_weight_956 __nodes_weight 0 956 NULL
114831 +bnx2x_fill_fw_str_968 bnx2x_fill_fw_str 3 968 NULL
114832 +mnt_want_write_975 mnt_want_write 0 975 NULL
114833 +usnic_ib_qp_grp_dump_hdr_989 usnic_ib_qp_grp_dump_hdr 2 989 NULL
114834 +memcmp_990 memcmp 0 990 NULL
114835 +smk_write_cipso2_1021 smk_write_cipso2 3 1021 NULL
114836 +gigaset_initdriver_1060 gigaset_initdriver 2 1060 NULL
114837 +mce_request_packet_1073 mce_request_packet 3 1073 NULL
114838 +agp_create_memory_1075 agp_create_memory 1 1075 NULL
114839 +_scsih_adjust_queue_depth_1083 _scsih_adjust_queue_depth 2 1083 NULL
114840 +llcp_sock_sendmsg_1092 llcp_sock_sendmsg 4 1092 NULL
114841 +nfs4_init_nonuniform_client_string_1097 nfs4_init_nonuniform_client_string 3 1097 NULL
114842 +cfg80211_report_obss_beacon_1133 cfg80211_report_obss_beacon 3 1133 NULL
114843 +i2400m_rx_ctl_1157 i2400m_rx_ctl 4 1157 NULL
114844 +ipc_alloc_1192 ipc_alloc 1 1192 NULL
114845 +ib_create_send_mad_1196 ib_create_send_mad 5 1196 NULL
114846 +pstore_ftrace_knob_write_1198 pstore_ftrace_knob_write 3 1198 NULL
114847 +i2400m_rx_ctl_ack_1199 i2400m_rx_ctl_ack 3 1199 NULL
114848 +dgrp_dpa_read_1204 dgrp_dpa_read 3 1204 NULL
114849 +i2cdev_read_1206 i2cdev_read 3 1206 NULL
114850 +lov_ost_pool_init_1215 lov_ost_pool_init 2 1215 NULL
114851 +fsync_buffers_list_1219 fsync_buffers_list 0 1219 NULL
114852 +kernfs_file_direct_read_1238 kernfs_file_direct_read 3 1238 NULL
114853 +acpi_battery_write_alarm_1240 acpi_battery_write_alarm 3 1240 NULL
114854 +drm_primary_helper_create_plane_1262 drm_primary_helper_create_plane 3 1262 NULL
114855 +ocfs2_extend_file_1266 ocfs2_extend_file 3 1266 NULL
114856 +qla4xxx_change_queue_depth_1268 qla4xxx_change_queue_depth 2 1268 NULL
114857 +ioctl_private_iw_point_1273 ioctl_private_iw_point 7 1273 NULL
114858 +SyS_flistxattr_1287 SyS_flistxattr 3 1287 NULL
114859 +tx_frag_in_process_called_read_1290 tx_frag_in_process_called_read 3 1290 NULL
114860 +posix_acl_xattr_set_1301 posix_acl_xattr_set 4 1301 NULL
114861 +ffs_1322 ffs 0 1322 NULL
114862 +qlcnic_pci_sriov_configure_1327 qlcnic_pci_sriov_configure 2 1327 NULL
114863 +btrfs_submit_compressed_write_1347 btrfs_submit_compressed_write 5 1347 NULL
114864 +snd_pcm_lib_write1_1358 snd_pcm_lib_write1 0-3 1358 NULL
114865 +ipx_sendmsg_1362 ipx_sendmsg 4 1362 NULL
114866 +fw_stats_raw_read_1369 fw_stats_raw_read 3 1369 NULL
114867 +ocfs2_prepare_inode_for_write_1372 ocfs2_prepare_inode_for_write 3 1372 NULL
114868 +sctp_setsockopt_initmsg_1383 sctp_setsockopt_initmsg 3 1383 NULL
114869 +do_msgsnd_1387 do_msgsnd 4 1387 NULL
114870 +SYSC_io_getevents_1392 SYSC_io_getevents 3 1392 NULL
114871 +cfs_trace_copyout_string_1416 cfs_trace_copyout_string 2 1416 NULL
114872 +init_rs_internal_1436 init_rs_internal 1 1436 NULL
114873 +stack_max_size_read_1445 stack_max_size_read 3 1445 NULL
114874 +tx_queue_len_read_1463 tx_queue_len_read 3 1463 NULL
114875 +xprt_alloc_1475 xprt_alloc 2 1475 NULL
114876 +SYSC_syslog_1477 SYSC_syslog 3 1477 NULL
114877 +sta_num_ps_buf_frames_read_1488 sta_num_ps_buf_frames_read 3 1488 NULL
114878 +fpregs_set_1497 fpregs_set 4 1497 NULL
114879 +tomoyo_round2_1518 tomoyo_round2 0 1518 NULL
114880 +alloc_perm_bits_1532 alloc_perm_bits 2 1532 NULL
114881 +ath6kl_init_get_fwcaps_1557 ath6kl_init_get_fwcaps 3 1557 NULL
114882 +ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime_1589 ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime 3 1589 NULL
114883 +ipath_ht_handle_hwerrors_1592 ipath_ht_handle_hwerrors 3 1592 NULL
114884 +packet_buffer_init_1607 packet_buffer_init 2 1607 NULL
114885 +btmrvl_hscmd_read_1614 btmrvl_hscmd_read 3 1614 NULL
114886 +v9fs_fid_xattr_get_1618 v9fs_fid_xattr_get 0 1618 NULL
114887 +ikconfig_read_current_1658 ikconfig_read_current 3 1658 NULL
114888 +mei_cl_recv_1665 mei_cl_recv 3 1665 NULL
114889 +rmap_add_1677 rmap_add 3 1677 NULL
114890 +configfs_read_file_1683 configfs_read_file 3 1683 NULL
114891 +iwl_dbgfs_d0i3_refs_read_1705 iwl_dbgfs_d0i3_refs_read 3 1705 NULL
114892 +pdu_write_u_1710 pdu_write_u 3 1710 NULL
114893 +coda_psdev_write_1711 coda_psdev_write 3 1711 NULL
114894 +btrfs_dir_data_len_1714 btrfs_dir_data_len 0 1714 NULL
114895 +internal_create_group_1733 internal_create_group 0 1733 NULL
114896 +dev_irnet_read_1741 dev_irnet_read 3 1741 NULL
114897 +usb_ep_align_maybe_1743 usb_ep_align_maybe 0-3 1743 NULL
114898 +tx_frag_called_read_1748 tx_frag_called_read 3 1748 NULL
114899 +cosa_write_1774 cosa_write 3 1774 NULL
114900 +fcoe_ctlr_device_add_1793 fcoe_ctlr_device_add 3 1793 NULL
114901 +__nodelist_scnprintf_1815 __nodelist_scnprintf 2-0 1815 NULL
114902 +sb_issue_zeroout_1884 sb_issue_zeroout 3 1884 NULL
114903 +rx_defrag_called_read_1897 rx_defrag_called_read 3 1897 NULL
114904 +nfs_parse_server_name_1899 nfs_parse_server_name 2 1899 NULL
114905 +SyS_add_key_1900 SyS_add_key 4 1900 NULL
114906 +uhid_char_read_1920 uhid_char_read 3 1920 NULL
114907 +tx_tx_retry_data_read_1926 tx_tx_retry_data_read 3 1926 NULL
114908 +bdev_erase_1933 bdev_erase 3 1933 NULL
114909 +ext3_fiemap_1936 ext3_fiemap 4 1936 NULL
114910 +cyttsp_probe_1940 cyttsp_probe 4 1940 NULL
114911 +ieee80211_if_fmt_dot11MeshConfirmTimeout_1945 ieee80211_if_fmt_dot11MeshConfirmTimeout 3 1945 NULL
114912 +__assign_irq_vector_1961 __assign_irq_vector 0 1961 NULL
114913 +ivtv_v4l2_read_1964 ivtv_v4l2_read 3 1964 NULL
114914 +sel_read_avc_hash_stats_1984 sel_read_avc_hash_stats 3 1984 NULL
114915 +gpio_power_write_1991 gpio_power_write 3 1991 NULL
114916 +__alloc_bootmem_node_1992 __alloc_bootmem_node 2 1992 NULL
114917 +rx_rx_defrag_read_2010 rx_rx_defrag_read 3 2010 NULL
114918 +ocfs2_global_qinit_alloc_2018 ocfs2_global_qinit_alloc 0 2018 NULL
114919 +write_flush_pipefs_2021 write_flush_pipefs 3 2021 NULL
114920 +BcmCopySection_2035 BcmCopySection 5 2035 NULL
114921 +ath6kl_fwlog_mask_read_2050 ath6kl_fwlog_mask_read 3 2050 NULL
114922 +ocfs2_expand_inline_dir_2063 ocfs2_expand_inline_dir 3 2063 NULL
114923 +__generic_copy_from_user_intel_2073 __generic_copy_from_user_intel 0-3 2073 NULL
114924 +diva_set_driver_dbg_mask_2077 diva_set_driver_dbg_mask 0 2077 NULL
114925 +iwl_dbgfs_current_sleep_command_read_2081 iwl_dbgfs_current_sleep_command_read 3 2081 NULL
114926 +idetape_chrdev_read_2097 idetape_chrdev_read 3 2097 NULL
114927 +__set_print_fmt_2106 __set_print_fmt 0 2106 NULL
114928 +iwl_dbgfs_log_event_read_2107 iwl_dbgfs_log_event_read 3 2107 NULL
114929 +ecryptfs_encrypt_and_encode_filename_2109 ecryptfs_encrypt_and_encode_filename 6 2109 NULL
114930 +btrfs_file_extent_inline_len_2116 btrfs_file_extent_inline_len 0 2116 NULL
114931 +enable_read_2117 enable_read 3 2117 NULL
114932 +pcf50633_write_block_2124 pcf50633_write_block 2-3 2124 NULL
114933 +check_load_and_stores_2143 check_load_and_stores 2 2143 NULL
114934 +iov_iter_count_2152 iov_iter_count 0 2152 NULL
114935 +__copy_to_user_ll_2157 __copy_to_user_ll 0-3 2157 NULL
114936 +_ore_get_io_state_2166 _ore_get_io_state 3-4-5 2166 NULL
114937 +bio_integrity_alloc_2194 bio_integrity_alloc 3 2194 NULL
114938 +picolcd_debug_reset_write_2195 picolcd_debug_reset_write 3 2195 NULL
114939 +u32_array_read_2219 u32_array_read 3 2219 NULL nohasharray
114940 +mei_dbgfs_read_meclients_2219 mei_dbgfs_read_meclients 3 2219 &u32_array_read_2219
114941 +ieee80211_if_read_dot11MeshHWMPRannInterval_2249 ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 NULL
114942 +netlbl_secattr_catmap_walk_2255 netlbl_secattr_catmap_walk 0-2 2255 NULL
114943 +sel_write_avc_cache_threshold_2256 sel_write_avc_cache_threshold 3 2256 NULL
114944 +do_update_counters_2259 do_update_counters 4 2259 NULL
114945 +ath6kl_wmi_bssinfo_event_rx_2275 ath6kl_wmi_bssinfo_event_rx 3 2275 NULL
114946 +debug_debug5_read_2291 debug_debug5_read 3 2291 NULL
114947 +sr_read_cmd_2299 sr_read_cmd 5 2299 NULL
114948 +kvm_clear_guest_page_2308 kvm_clear_guest_page 4 2308 NULL
114949 +intel_sdvo_set_value_2311 intel_sdvo_set_value 4 2311 NULL
114950 +picolcd_fb_write_2318 picolcd_fb_write 3 2318 NULL nohasharray
114951 +hfsplus_find_init_2318 hfsplus_find_init 0 2318 &picolcd_fb_write_2318
114952 +dice_hwdep_read_2326 dice_hwdep_read 3 2326 NULL
114953 +__erst_read_to_erange_2341 __erst_read_to_erange 0 2341 NULL
114954 +zr364xx_read_2354 zr364xx_read 3 2354 NULL
114955 +viafb_iga2_odev_proc_write_2363 viafb_iga2_odev_proc_write 3 2363 NULL
114956 +xfs_buf_map_from_irec_2368 xfs_buf_map_from_irec 5 2368 NULL nohasharray
114957 +rose_recvmsg_2368 rose_recvmsg 4 2368 &xfs_buf_map_from_irec_2368
114958 +il_dbgfs_sensitivity_read_2370 il_dbgfs_sensitivity_read 3 2370 NULL
114959 +rxpipe_rx_prep_beacon_drop_read_2403 rxpipe_rx_prep_beacon_drop_read 3 2403 NULL
114960 +isdn_v110_open_2418 isdn_v110_open 3 2418 NULL
114961 +raid1_size_2419 raid1_size 0-2 2419 NULL
114962 +arch_msi_check_device_2449 arch_msi_check_device 0 2449 NULL
114963 +b43legacy_debugfs_read_2473 b43legacy_debugfs_read 3 2473 NULL
114964 +wiphy_new_2482 wiphy_new 2 2482 NULL
114965 +bio_alloc_bioset_2484 bio_alloc_bioset 2 2484 NULL
114966 +squashfs_read_fragment_index_table_2506 squashfs_read_fragment_index_table 4 2506 NULL
114967 +v9fs_cached_file_read_2514 v9fs_cached_file_read 3 2514 NULL
114968 +ext4_get_inode_loc_2516 ext4_get_inode_loc 0 2516 NULL
114969 +batadv_tvlv_container_list_size_2524 batadv_tvlv_container_list_size 0 2524 NULL
114970 +smk_write_syslog_2529 smk_write_syslog 3 2529 NULL
114971 +__ceph_setxattr_2532 __ceph_setxattr 4 2532 NULL
114972 +gspca_dev_probe_2570 gspca_dev_probe 4 2570 NULL
114973 +pcm_sanity_check_2574 pcm_sanity_check 0 2574 NULL
114974 +mdc_max_rpcs_in_flight_seq_write_2594 mdc_max_rpcs_in_flight_seq_write 3 2594 NULL
114975 +slot_bytes_2609 slot_bytes 0 2609 NULL
114976 +smk_write_logging_2618 smk_write_logging 3 2618 NULL
114977 +switch_status_2629 switch_status 5 2629 NULL
114978 +tcp_xmit_size_goal_2661 tcp_xmit_size_goal 2 2661 NULL
114979 +osc_build_ppga_2670 osc_build_ppga 2 2670 NULL
114980 +ffs_ep0_read_2672 ffs_ep0_read 3 2672 NULL
114981 +oti6858_write_2692 oti6858_write 4 2692 NULL
114982 +nfc_llcp_send_ui_frame_2702 nfc_llcp_send_ui_frame 5 2702 NULL
114983 +memcpy_fromiovecend_2707 memcpy_fromiovecend 3-4 2707 NULL
114984 +lprocfs_stats_counter_size_2708 lprocfs_stats_counter_size 0 2708 NULL
114985 +xfs_readdir_2767 xfs_readdir 3 2767 NULL
114986 +fsl_edma_alloc_desc_2769 fsl_edma_alloc_desc 2 2769 NULL
114987 +mon_bin_ioctl_2771 mon_bin_ioctl 3 2771 NULL
114988 +set_msr_hyperv_pw_2785 set_msr_hyperv_pw 3 2785 NULL
114989 +device_add_attrs_2789 device_add_attrs 0 2789 NULL
114990 +iwl_dbgfs_clear_ucode_statistics_write_2804 iwl_dbgfs_clear_ucode_statistics_write 3 2804 NULL
114991 +sel_read_enforce_2828 sel_read_enforce 3 2828 NULL
114992 +vb2_dc_get_userptr_2829 vb2_dc_get_userptr 2-3 2829 NULL nohasharray
114993 +snd_pcm_reset_2829 snd_pcm_reset 0 2829 &vb2_dc_get_userptr_2829
114994 +wait_for_avail_2847 wait_for_avail 0 2847 NULL
114995 +sfq_alloc_2861 sfq_alloc 1 2861 NULL
114996 +irnet_ctrl_read_2863 irnet_ctrl_read 4 2863 NULL
114997 +move_addr_to_user_2868 move_addr_to_user 2 2868 NULL
114998 +nla_padlen_2883 nla_padlen 1 2883 NULL
114999 +cmm_write_2896 cmm_write 3 2896 NULL
115000 +osc_import_seq_write_2923 osc_import_seq_write 3 2923 NULL
115001 +xfs_trans_get_buf_map_2927 xfs_trans_get_buf_map 4 2927 NULL
115002 +nes_read_indexed_2946 nes_read_indexed 0 2946 NULL
115003 +tm6000_i2c_recv_regs16_2949 tm6000_i2c_recv_regs16 5 2949 NULL
115004 +i40e_dbg_prep_dump_buf_2951 i40e_dbg_prep_dump_buf 2 2951 NULL
115005 +set_fast_connectable_2952 set_fast_connectable 4 2952 NULL
115006 +free_area_init_core_2962 free_area_init_core 2-3 2962 NULL
115007 +bio_setup_sector_2970 bio_setup_sector 3 2970 NULL
115008 +do_strnlen_user_2976 do_strnlen_user 0-2 2976 NULL
115009 +p9_nr_pages_2992 p9_nr_pages 0-2 2992 NULL
115010 +lov_stripetype_seq_write_3013 lov_stripetype_seq_write 3 3013 NULL
115011 +do_dmabuf_dirty_sou_3017 do_dmabuf_dirty_sou 7 3017 NULL
115012 +depth_write_3021 depth_write 3 3021 NULL
115013 +snd_azf3328_codec_inl_3022 snd_azf3328_codec_inl 0 3022 NULL
115014 +nvme_split_and_submit_3027 nvme_split_and_submit 3 3027 NULL
115015 +kvm_unmap_hva_3028 kvm_unmap_hva 2 3028 NULL
115016 +xfrm_dst_alloc_copy_3034 xfrm_dst_alloc_copy 3 3034 NULL
115017 +lpfc_idiag_mbxacc_write_3038 lpfc_idiag_mbxacc_write 3 3038 NULL nohasharray
115018 +iwl_dbgfs_sleep_level_override_read_3038 iwl_dbgfs_sleep_level_override_read 3 3038 &lpfc_idiag_mbxacc_write_3038
115019 +nr_free_buffer_pages_3044 nr_free_buffer_pages 0 3044 NULL
115020 +il3945_ucode_rx_stats_read_3048 il3945_ucode_rx_stats_read 3 3048 NULL
115021 +qp_alloc_ppn_set_3068 qp_alloc_ppn_set 2-4 3068 NULL
115022 +__blk_end_bidi_request_3070 __blk_end_bidi_request 3-4 3070 NULL
115023 +dac960_user_command_proc_write_3071 dac960_user_command_proc_write 3 3071 NULL
115024 +read_file_antenna_diversity_3077 read_file_antenna_diversity 3 3077 NULL
115025 +ttusb2_msg_3100 ttusb2_msg 4 3100 NULL
115026 +rb_alloc_3102 rb_alloc 1 3102 NULL
115027 +simple_write_to_buffer_3122 simple_write_to_buffer 5-2 3122 NULL
115028 +print_time_3132 print_time 0 3132 NULL
115029 +fill_write_buffer_3142 fill_write_buffer 3 3142 NULL
115030 +CIFSSMBSetPosixACL_3154 CIFSSMBSetPosixACL 5 3154 NULL
115031 +uv_num_possible_blades_3177 uv_num_possible_blades 0 3177 NULL
115032 +uinput_ioctl_handler_3181 uinput_ioctl_handler 2 3181 NULL nohasharray
115033 +uvc_video_stats_dump_3181 uvc_video_stats_dump 3 3181 &uinput_ioctl_handler_3181
115034 +compat_do_ip6t_set_ctl_3184 compat_do_ip6t_set_ctl 4 3184 NULL
115035 +mempool_create_node_3191 mempool_create_node 1 3191 NULL
115036 +alloc_context_3194 alloc_context 1 3194 NULL
115037 +shmem_pread_slow_3198 shmem_pread_slow 3-2 3198 NULL
115038 +codec_reg_write_file_3204 codec_reg_write_file 3 3204 NULL
115039 +SyS_sendto_3219 SyS_sendto 6 3219 NULL
115040 +btrfs_prealloc_file_range_3227 btrfs_prealloc_file_range 3 3227 NULL
115041 +kimage_crash_alloc_3233 kimage_crash_alloc 3 3233 NULL
115042 +do_read_log_to_user_3236 do_read_log_to_user 4 3236 NULL
115043 +ext3_xattr_find_entry_3237 ext3_xattr_find_entry 0 3237 NULL
115044 +key_key_read_3241 key_key_read 3 3241 NULL
115045 +__ilog2_u64_3284 __ilog2_u64 0 3284 NULL
115046 +ieee80211_if_write_beacon_loss_3296 ieee80211_if_write_beacon_loss 3 3296 NULL
115047 +cgroup_name_3300 cgroup_name 3 3300 NULL
115048 +__set_extent_bit_3305 __set_extent_bit 0 3305 NULL
115049 +__iovec_copy_from_user_inatomic_3314 __iovec_copy_from_user_inatomic 4-3-0 3314 NULL
115050 +_iwl_dbgfs_d3_sram_write_3315 _iwl_dbgfs_d3_sram_write 3 3315 NULL
115051 +dbDiscardAG_3322 dbDiscardAG 3 3322 NULL
115052 +read_from_oldmem_3337 read_from_oldmem 2 3337 NULL
115053 +sysfs_create_group_3339 sysfs_create_group 0 3339 NULL
115054 +tty_port_register_device_attr_3341 tty_port_register_device_attr 3 3341 NULL
115055 +il_dbgfs_interrupt_read_3351 il_dbgfs_interrupt_read 3 3351 NULL
115056 +gsm_control_rls_3353 gsm_control_rls 3 3353 NULL
115057 +scnprintf_3360 scnprintf 0-2 3360 NULL
115058 +sr_read_3366 sr_read 3 3366 NULL
115059 +mtdchar_writeoob_3393 mtdchar_writeoob 4 3393 NULL
115060 +isdn_readbchan_3401 isdn_readbchan 0-5 3401 NULL
115061 +mei_io_cb_alloc_resp_buf_3414 mei_io_cb_alloc_resp_buf 2 3414 NULL
115062 +pci_add_cap_save_buffer_3426 pci_add_cap_save_buffer 3 3426 NULL
115063 +crystalhd_create_dio_pool_3427 crystalhd_create_dio_pool 2 3427 NULL
115064 +SyS_msgsnd_3436 SyS_msgsnd 3 3436 NULL
115065 +softsynth_write_3455 softsynth_write 3 3455 NULL
115066 +snd_pcm_lib_readv_transfer_3464 snd_pcm_lib_readv_transfer 5-4-2 3464 NULL
115067 +security_context_to_sid_default_3492 security_context_to_sid_default 2 3492 NULL
115068 +xfrm_migrate_msgsize_3496 xfrm_migrate_msgsize 1 3496 NULL
115069 +mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL
115070 +SyS_semtimedop_3532 SyS_semtimedop 3 3532 NULL
115071 +SyS_readv_3539 SyS_readv 3 3539 NULL
115072 +btrfs_dir_name_len_3549 btrfs_dir_name_len 0 3549 NULL
115073 +alloc_smp_resp_3566 alloc_smp_resp 1 3566 NULL
115074 +evtchn_read_3569 evtchn_read 3 3569 NULL
115075 +ll_track_ppid_seq_write_3582 ll_track_ppid_seq_write 3 3582 NULL
115076 +vc_resize_3585 vc_resize 3-2 3585 NULL
115077 +kvm_mmu_notifier_change_pte_3596 kvm_mmu_notifier_change_pte 3 3596 NULL
115078 +sctp_getsockopt_events_3607 sctp_getsockopt_events 2 3607 NULL
115079 +edac_mc_alloc_3611 edac_mc_alloc 4 3611 NULL
115080 +tx_tx_starts_read_3617 tx_tx_starts_read 3 3617 NULL
115081 +aligned_kmalloc_3628 aligned_kmalloc 1 3628 NULL
115082 +ath6kl_disconnect_timeout_read_3650 ath6kl_disconnect_timeout_read 3 3650 NULL
115083 +i915_compat_ioctl_3656 i915_compat_ioctl 2 3656 NULL
115084 +_iwl_dbgfs_tx_flush_write_3675 _iwl_dbgfs_tx_flush_write 3 3675 NULL
115085 +snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 NULL
115086 +ci_ll_write_3740 ci_ll_write 4 3740 NULL
115087 +sctp_setsockopt_auth_key_3793 sctp_setsockopt_auth_key 3 3793 NULL
115088 +ncp_file_write_3813 ncp_file_write 3 3813 NULL
115089 +llc_ui_recvmsg_3826 llc_ui_recvmsg 4 3826 NULL
115090 +hfsplus_direct_IO_3835 hfsplus_direct_IO 4 3835 NULL
115091 +create_one_cdev_3852 create_one_cdev 2 3852 NULL
115092 +smk_read_onlycap_3855 smk_read_onlycap 3 3855 NULL
115093 +get_fd_set_3866 get_fd_set 1 3866 NULL
115094 +garp_attr_create_3883 garp_attr_create 3 3883 NULL
115095 +efivarfs_file_read_3893 efivarfs_file_read 3 3893 NULL
115096 +nvram_write_3894 nvram_write 3 3894 NULL
115097 +pipeline_pre_proc_swi_read_3898 pipeline_pre_proc_swi_read 3 3898 NULL
115098 +comedi_buf_read_n_available_3899 comedi_buf_read_n_available 0 3899 NULL
115099 +vcs_write_3910 vcs_write 3 3910 NULL
115100 +SyS_move_pages_3920 SyS_move_pages 2 3920 NULL
115101 +brcmf_debugfs_fws_stats_read_3947 brcmf_debugfs_fws_stats_read 3 3947 NULL
115102 +mite_bytes_written_to_memory_lb_3987 mite_bytes_written_to_memory_lb 0 3987 NULL
115103 +do_add_counters_3992 do_add_counters 3 3992 NULL
115104 +obd_alloc_memmd_4002 obd_alloc_memmd 0 4002 NULL
115105 +userspace_status_4004 userspace_status 4 4004 NULL
115106 +mei_write_4005 mei_write 3 4005 NULL nohasharray
115107 +xfs_check_block_4005 xfs_check_block 4 4005 &mei_write_4005
115108 +snd_hdsp_capture_copy_4011 snd_hdsp_capture_copy 5 4011 NULL
115109 +blk_end_request_4024 blk_end_request 3 4024 NULL
115110 +ext4_xattr_find_entry_4025 ext4_xattr_find_entry 0 4025 NULL
115111 +mtip_hw_read_registers_4037 mtip_hw_read_registers 3 4037 NULL
115112 +read_file_queues_4078 read_file_queues 3 4078 NULL
115113 +fbcon_do_set_font_4079 fbcon_do_set_font 2-3 4079 NULL
115114 +tm6000_read_4151 tm6000_read 3 4151 NULL
115115 +mpt_raid_phys_disk_get_num_paths_4155 mpt_raid_phys_disk_get_num_paths 0 4155 NULL
115116 +msg_bits_4158 msg_bits 0-3-4 4158 NULL
115117 +get_alua_req_4166 get_alua_req 3 4166 NULL
115118 +blk_dropped_read_4168 blk_dropped_read 3 4168 NULL
115119 +read_file_bool_4180 read_file_bool 3 4180 NULL
115120 +vring_new_virtqueue_4199 vring_new_virtqueue 2 4199 NULL
115121 +_osd_req_list_objects_4204 _osd_req_list_objects 6 4204 NULL
115122 +__snd_gf1_read_addr_4210 __snd_gf1_read_addr 0 4210 NULL
115123 +ath6kl_force_roam_write_4282 ath6kl_force_roam_write 3 4282 NULL
115124 +goldfish_audio_write_4284 goldfish_audio_write 3 4284 NULL
115125 +get_connectors_for_crtc_4291 get_connectors_for_crtc 0 4291 NULL
115126 +__usbnet_read_cmd_4299 __usbnet_read_cmd 7 4299 NULL
115127 +dvb_ringbuffer_pkt_read_user_4303 dvb_ringbuffer_pkt_read_user 2-3-5 4303 NULL
115128 +count_strings_4315 count_strings 0 4315 NULL
115129 +nouveau_fifo_create__4327 nouveau_fifo_create_ 5-6 4327 NULL
115130 +snd_rawmidi_kernel_read_4328 snd_rawmidi_kernel_read 3 4328 NULL
115131 +ima_eventdigest_init_common_4338 ima_eventdigest_init_common 2 4338 NULL
115132 +__copy_from_user_inatomic_4365 __copy_from_user_inatomic 3-0 4365 NULL
115133 +irda_sendmsg_4388 irda_sendmsg 4 4388 NULL
115134 +cxacru_cm_get_array_4412 cxacru_cm_get_array 4 4412 NULL nohasharray
115135 +access_process_vm_4412 access_process_vm 0 4412 &cxacru_cm_get_array_4412
115136 +libfc_vport_create_4415 libfc_vport_create 2 4415 NULL
115137 +rtw_android_get_rssi_4421 rtw_android_get_rssi 0 4421 NULL
115138 +do_pages_stat_4437 do_pages_stat 2 4437 NULL
115139 +at76_set_card_command_4471 at76_set_card_command 4 4471 NULL
115140 +snd_seq_expand_var_event_4481 snd_seq_expand_var_event 0-5 4481 NULL
115141 +vmbus_establish_gpadl_4495 vmbus_establish_gpadl 3 4495 NULL
115142 +set_link_security_4502 set_link_security 4 4502 NULL
115143 +ll_max_readahead_per_file_mb_seq_write_4531 ll_max_readahead_per_file_mb_seq_write 3 4531 NULL
115144 +tty_register_device_4544 tty_register_device 2 4544 NULL
115145 +fsl_edma_prep_slave_sg_4555 fsl_edma_prep_slave_sg 3 4555 NULL
115146 +btrfs_file_extent_inline_item_len_4575 btrfs_file_extent_inline_item_len 0 4575 NULL
115147 +xfs_buf_get_maps_4581 xfs_buf_get_maps 2 4581 NULL
115148 +bch_alloc_4593 bch_alloc 1 4593 NULL
115149 +ll_rw_extents_stats_seq_write_4633 ll_rw_extents_stats_seq_write 3 4633 NULL
115150 +iwl_dbgfs_tx_queue_read_4635 iwl_dbgfs_tx_queue_read 3 4635 NULL
115151 +skb_add_data_nocache_4682 skb_add_data_nocache 4 4682 NULL
115152 +cx18_read_pos_4683 cx18_read_pos 3 4683 NULL
115153 +short_retry_limit_read_4687 short_retry_limit_read 3 4687 NULL
115154 +kone_receive_4690 kone_receive 4 4690 NULL
115155 +hash_netportnet6_expire_4702 hash_netportnet6_expire 4 4702 NULL
115156 +cxgbi_alloc_big_mem_4707 cxgbi_alloc_big_mem 1 4707 NULL
115157 +show_header_4722 show_header 3 4722 NULL nohasharray
115158 +ati_create_gatt_pages_4722 ati_create_gatt_pages 1 4722 &show_header_4722
115159 +ll_rw_offset_stats_seq_write_4736 ll_rw_offset_stats_seq_write 3 4736 NULL nohasharray
115160 +bitmap_startwrite_4736 bitmap_startwrite 2 4736 &ll_rw_offset_stats_seq_write_4736
115161 +lu_buf_alloc_4753 lu_buf_alloc 2 4753 NULL
115162 +pwr_rcvd_bcns_cnt_read_4774 pwr_rcvd_bcns_cnt_read 3 4774 NULL
115163 +create_subvol_4791 create_subvol 4 4791 NULL
115164 +ncp__vol2io_4804 ncp__vol2io 5 4804 NULL
115165 +C_SYSC_setsockopt_4806 C_SYSC_setsockopt 5 4806 NULL
115166 +repair_io_failure_4815 repair_io_failure 4-3 4815 NULL
115167 +comedi_buf_write_free_4847 comedi_buf_write_free 2 4847 NULL
115168 +gigaset_if_receive_4861 gigaset_if_receive 3 4861 NULL
115169 +key_tx_spec_read_4862 key_tx_spec_read 3 4862 NULL
115170 +ocfs2_defrag_extent_4873 ocfs2_defrag_extent 2 4873 NULL
115171 +hid_register_field_4874 hid_register_field 2-3 4874 NULL
115172 +vga_arb_read_4886 vga_arb_read 3 4886 NULL
115173 +ieee80211_if_fmt_ave_beacon_4941 ieee80211_if_fmt_ave_beacon 3 4941 NULL
115174 +compat_rawv6_setsockopt_4967 compat_rawv6_setsockopt 5 4967 NULL
115175 +ath10k_read_chip_id_4969 ath10k_read_chip_id 3 4969 NULL
115176 +skb_network_header_len_4971 skb_network_header_len 0 4971 NULL
115177 +ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval_4976 ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval 3 4976 NULL
115178 +compat_SyS_ipc_5000 compat_SyS_ipc 3 5000 NULL
115179 +do_mincore_5018 do_mincore 0-2-1 5018 NULL
115180 +btrfs_punch_hole_5041 btrfs_punch_hole 2 5041 NULL
115181 +cfg80211_rx_mgmt_5056 cfg80211_rx_mgmt 5 5056 NULL
115182 +ocfs2_check_range_for_holes_5066 ocfs2_check_range_for_holes 2-3 5066 NULL
115183 +snd_mixart_BA1_read_5082 snd_mixart_BA1_read 5 5082 NULL
115184 +snd_emu10k1_ptr20_read_5087 snd_emu10k1_ptr20_read 0 5087 NULL
115185 +kfifo_copy_from_user_5091 kfifo_copy_from_user 3-4-0 5091 NULL nohasharray
115186 +get_random_bytes_5091 get_random_bytes 2 5091 &kfifo_copy_from_user_5091 nohasharray
115187 +blk_rq_sectors_5091 blk_rq_sectors 0 5091 &get_random_bytes_5091
115188 +sound_write_5102 sound_write 3 5102 NULL
115189 +i40e_dbg_netdev_ops_write_5117 i40e_dbg_netdev_ops_write 3 5117 NULL
115190 +qib_7220_handle_hwerrors_5142 qib_7220_handle_hwerrors 3 5142 NULL
115191 +__uwb_addr_print_5161 __uwb_addr_print 2 5161 NULL
115192 +iwl_dbgfs_status_read_5171 iwl_dbgfs_status_read 3 5171 NULL
115193 +acpi_pcc_get_sqty_5176 acpi_pcc_get_sqty 0 5176 NULL
115194 +trf7970a_read_cont_5179 trf7970a_read_cont 4 5179 NULL
115195 +ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL
115196 +dwc2_hcd_urb_alloc_5217 dwc2_hcd_urb_alloc 2 5217 NULL
115197 +ath6kl_debug_roam_tbl_event_5224 ath6kl_debug_roam_tbl_event 3 5224 NULL
115198 +r592_write_fifo_pio_5315 r592_write_fifo_pio 3 5315 NULL
115199 +sbc_get_write_same_sectors_5317 sbc_get_write_same_sectors 0 5317 NULL
115200 +pwr_elp_enter_read_5324 pwr_elp_enter_read 3 5324 NULL
115201 +uinput_ioctl_5342 uinput_ioctl 2 5342 NULL
115202 +cq_free_res_5355 cq_free_res 5 5355 NULL
115203 +ps_pspoll_utilization_read_5361 ps_pspoll_utilization_read 3 5361 NULL
115204 +cciss_allocate_sg_chain_blocks_5368 cciss_allocate_sg_chain_blocks 3-2 5368 NULL
115205 +xfs_efd_init_5463 xfs_efd_init 3 5463 NULL
115206 +ll_xattr_cache_refill_5468 ll_xattr_cache_refill 0 5468 NULL
115207 +kernfs_fop_write_5471 kernfs_fop_write 3 5471 NULL
115208 +xfs_efi_init_5476 xfs_efi_init 2 5476 NULL
115209 +pci_enable_msix_exact_5482 pci_enable_msix_exact 3-0 5482 NULL
115210 +cifs_security_flags_proc_write_5484 cifs_security_flags_proc_write 3 5484 NULL
115211 +tty_write_5494 tty_write 3 5494 NULL
115212 +tomoyo_update_domain_5498 tomoyo_update_domain 2 5498 NULL nohasharray
115213 +ieee80211_if_fmt_last_beacon_5498 ieee80211_if_fmt_last_beacon 3 5498 &tomoyo_update_domain_5498
115214 +__max_nr_grant_frames_5505 __max_nr_grant_frames 0 5505 NULL
115215 +ieee80211_if_fmt_auto_open_plinks_5534 ieee80211_if_fmt_auto_open_plinks 3 5534 NULL
115216 +get_entry_msg_len_5552 get_entry_msg_len 0 5552 NULL
115217 +le_readq_5557 le_readq 0 5557 NULL
115218 +inw_5558 inw 0 5558 NULL
115219 +bioset_create_5580 bioset_create 1 5580 NULL
115220 +oz_ep_alloc_5587 oz_ep_alloc 1 5587 NULL
115221 +__remove_suid_5618 __remove_suid 0 5618 NULL
115222 +SYSC_fsetxattr_5639 SYSC_fsetxattr 4 5639 NULL
115223 +ext4_xattr_get_5661 ext4_xattr_get 0 5661 NULL
115224 +posix_clock_register_5662 posix_clock_register 2 5662 NULL
115225 +get_arg_5694 get_arg 3 5694 NULL
115226 +subbuf_read_actor_5708 subbuf_read_actor 3 5708 NULL
115227 +vmw_kms_readback_5727 vmw_kms_readback 6 5727 NULL
115228 +rts51x_transfer_data_partial_5735 rts51x_transfer_data_partial 6 5735 NULL
115229 +sctp_setsockopt_autoclose_5775 sctp_setsockopt_autoclose 3 5775 NULL
115230 +__vxge_hw_blockpool_malloc_5786 __vxge_hw_blockpool_malloc 2 5786 NULL
115231 +nvme_trans_bdev_char_page_5797 nvme_trans_bdev_char_page 3 5797 NULL
115232 +skb_copy_datagram_iovec_5806 skb_copy_datagram_iovec 2-4 5806 NULL
115233 +nv50_disp_pioc_create__5812 nv50_disp_pioc_create_ 5 5812 NULL
115234 +ceph_x_encrypt_buflen_5829 ceph_x_encrypt_buflen 0-1 5829 NULL
115235 +ceph_msg_new_5846 ceph_msg_new 2 5846 NULL
115236 +setup_req_5848 setup_req 3 5848 NULL
115237 +ria_page_count_5849 ria_page_count 0 5849 NULL
115238 +rx_filter_max_arp_queue_dep_read_5851 rx_filter_max_arp_queue_dep_read 3 5851 NULL
115239 +uinput_compat_ioctl_5861 uinput_compat_ioctl 2 5861 NULL
115240 +lprocfs_fid_width_seq_write_5889 lprocfs_fid_width_seq_write 3 5889 NULL
115241 +port_show_regs_5904 port_show_regs 3 5904 NULL
115242 +rbd_segment_length_5907 rbd_segment_length 0-3-2 5907 NULL
115243 +uhci_debug_read_5911 uhci_debug_read 3 5911 NULL
115244 +lbs_highsnr_read_5931 lbs_highsnr_read 3 5931 NULL
115245 +ps_poll_ps_poll_timeouts_read_5934 ps_poll_ps_poll_timeouts_read 3 5934 NULL
115246 +edac_device_alloc_ctl_info_5941 edac_device_alloc_ctl_info 1 5941 NULL
115247 +ll_statahead_one_5962 ll_statahead_one 3 5962 NULL
115248 +__apu_get_register_5967 __apu_get_register 0 5967 NULL
115249 +ieee80211_if_fmt_rc_rateidx_mask_5ghz_5971 ieee80211_if_fmt_rc_rateidx_mask_5ghz 3 5971 NULL
115250 +SyS_semop_5980 SyS_semop 3 5980 NULL
115251 +alloc_msg_6072 alloc_msg 1 6072 NULL
115252 +sctp_setsockopt_connectx_6073 sctp_setsockopt_connectx 3 6073 NULL
115253 +rts51x_ms_rw_multi_sector_6076 rts51x_ms_rw_multi_sector 3-4 6076 NULL
115254 +__mnt_want_write_6091 __mnt_want_write 0 6091 NULL
115255 +ipmi_addr_length_6110 ipmi_addr_length 0 6110 NULL nohasharray
115256 +force_static_address_read_6110 force_static_address_read 3 6110 &ipmi_addr_length_6110
115257 +dfs_global_file_write_6112 dfs_global_file_write 3 6112 NULL
115258 +nouveau_parent_create__6131 nouveau_parent_create_ 7 6131 NULL
115259 +ieee80211_if_fmt_beacon_timeout_6153 ieee80211_if_fmt_beacon_timeout 3 6153 NULL
115260 +ivtv_copy_buf_to_user_6159 ivtv_copy_buf_to_user 4 6159 NULL
115261 +maybe_insert_hole_6167 maybe_insert_hole 3 6167 NULL
115262 +wl1251_cmd_template_set_6172 wl1251_cmd_template_set 4 6172 NULL
115263 +SyS_setgroups_6182 SyS_setgroups 1 6182 NULL
115264 +mxt_show_instance_6207 mxt_show_instance 2-0 6207 NULL
115265 +v4l2_ctrl_new_std_menu_6221 v4l2_ctrl_new_std_menu 4 6221 NULL
115266 +mqueue_read_file_6228 mqueue_read_file 3 6228 NULL
115267 +f_hidg_read_6238 f_hidg_read 3 6238 NULL
115268 +fbcon_prepare_logo_6246 fbcon_prepare_logo 5 6246 NULL
115269 +of_gpio_count_6270 of_gpio_count 0 6270 NULL
115270 +tx_tx_start_null_frame_read_6281 tx_tx_start_null_frame_read 3 6281 NULL
115271 +snd_hda_override_conn_list_6282 snd_hda_override_conn_list 3-0 6282 NULL nohasharray
115272 +xenbus_file_write_6282 xenbus_file_write 3 6282 &snd_hda_override_conn_list_6282
115273 +posix_acl_fix_xattr_to_user_6283 posix_acl_fix_xattr_to_user 2 6283 NULL
115274 +serial_port_in_6291 serial_port_in 0 6291 NULL
115275 +qlcnic_sriov_alloc_bc_msg_6309 qlcnic_sriov_alloc_bc_msg 2 6309 NULL
115276 +hfa384x_inw_6329 hfa384x_inw 0 6329 NULL nohasharray
115277 +SyS_mincore_6329 SyS_mincore 1-2 6329 &hfa384x_inw_6329
115278 +fuse_get_req_for_background_6337 fuse_get_req_for_background 2 6337 NULL
115279 +ucs2_strnlen_6342 ucs2_strnlen 0 6342 NULL
115280 +regcache_sync_block_raw_6350 regcache_sync_block_raw 5-4 6350 NULL
115281 +mei_dbgfs_read_devstate_6352 mei_dbgfs_read_devstate 3 6352 NULL
115282 +_proc_do_string_6376 _proc_do_string 2 6376 NULL
115283 +osd_req_read_sg_kern_6378 osd_req_read_sg_kern 5 6378 NULL
115284 +posix_acl_fix_xattr_userns_6420 posix_acl_fix_xattr_userns 4 6420 NULL
115285 +add_transaction_credits_6422 add_transaction_credits 2-3 6422 NULL
115286 +ipr_change_queue_depth_6431 ipr_change_queue_depth 2 6431 NULL
115287 +__alloc_bootmem_node_nopanic_6432 __alloc_bootmem_node_nopanic 2 6432 NULL
115288 +ieee80211_if_fmt_dot11MeshMaxRetries_6476 ieee80211_if_fmt_dot11MeshMaxRetries 3 6476 NULL
115289 +qp_memcpy_from_queue_6479 qp_memcpy_from_queue 5-4 6479 NULL
115290 +cipso_v4_map_lvl_hton_6490 cipso_v4_map_lvl_hton 0 6490 NULL
115291 +dbg_intr_buf_6501 dbg_intr_buf 2 6501 NULL
115292 +mei_read_6507 mei_read 3 6507 NULL
115293 +rndis_set_oid_6547 rndis_set_oid 4 6547 NULL
115294 +wdm_read_6549 wdm_read 3 6549 NULL
115295 +dm_stats_create_6551 dm_stats_create 4-2-3 6551 NULL
115296 +fb_alloc_cmap_6554 fb_alloc_cmap 2 6554 NULL
115297 +SyS_semtimedop_6563 SyS_semtimedop 3 6563 NULL
115298 +snd_pcm_hw_refine_old_user_6586 snd_pcm_hw_refine_old_user 0 6586 NULL
115299 +ecryptfs_filldir_6622 ecryptfs_filldir 3 6622 NULL
115300 +process_rcvd_data_6679 process_rcvd_data 3 6679 NULL
115301 +pvscsi_allocate_rings_6689 pvscsi_allocate_rings 0 6689 NULL
115302 +btrfs_lookup_csums_range_6696 btrfs_lookup_csums_range 2-3 6696 NULL
115303 +ps_pspoll_max_apturn_read_6699 ps_pspoll_max_apturn_read 3 6699 NULL
115304 +bnad_debugfs_write_regrd_6706 bnad_debugfs_write_regrd 3 6706 NULL
115305 +mpeg_read_6708 mpeg_read 3 6708 NULL
115306 +ibmpex_query_sensor_count_6709 ibmpex_query_sensor_count 0 6709 NULL
115307 +video_proc_write_6724 video_proc_write 3 6724 NULL
115308 +posix_acl_xattr_count_6725 posix_acl_xattr_count 0-1 6725 NULL
115309 +kobject_add_varg_6781 kobject_add_varg 0 6781 NULL
115310 +iwl_dbgfs_channels_read_6784 iwl_dbgfs_channels_read 3 6784 NULL
115311 +ieee80211_if_read_6785 ieee80211_if_read 3 6785 NULL
115312 +zone_spanned_pages_in_node_6787 zone_spanned_pages_in_node 0-3-4 6787 NULL
115313 +hdlcdrv_register_6792 hdlcdrv_register 2 6792 NULL
115314 +ll_xattr_cache_find_6798 ll_xattr_cache_find 0 6798 NULL
115315 +tx_tx_done_data_read_6799 tx_tx_done_data_read 3 6799 NULL
115316 +lbs_rdrf_write_6826 lbs_rdrf_write 3 6826 NULL
115317 +calc_pages_for_6838 calc_pages_for 0-2-1 6838 NULL
115318 +mon_bin_read_6841 mon_bin_read 3 6841 NULL
115319 +snd_cs4281_BA0_read_6847 snd_cs4281_BA0_read 5 6847 NULL
115320 +perf_output_sample_ustack_6868 perf_output_sample_ustack 2 6868 NULL
115321 +dio_complete_6879 dio_complete 0-3-2 6879 NULL
115322 +raw_seticmpfilter_6888 raw_seticmpfilter 3 6888 NULL nohasharray
115323 +ieee80211_if_fmt_path_refresh_time_6888 ieee80211_if_fmt_path_refresh_time 3 6888 &raw_seticmpfilter_6888
115324 +dlmfs_file_write_6892 dlmfs_file_write 3 6892 NULL
115325 +proc_sessionid_read_6911 proc_sessionid_read 3 6911 NULL nohasharray
115326 +spi_show_regs_6911 spi_show_regs 3 6911 &proc_sessionid_read_6911 nohasharray
115327 +acm_alloc_minor_6911 acm_alloc_minor 0 6911 &spi_show_regs_6911
115328 +__kfifo_dma_in_finish_r_6913 __kfifo_dma_in_finish_r 2-3 6913 NULL
115329 +cache_do_downcall_6926 cache_do_downcall 3 6926 NULL
115330 +ipath_verbs_send_dma_6929 ipath_verbs_send_dma 6 6929 NULL
115331 +qsfp_cks_6945 qsfp_cks 2-0 6945 NULL
115332 +tg3_nvram_write_block_unbuffered_6955 tg3_nvram_write_block_unbuffered 3 6955 NULL
115333 +pch_uart_hal_read_6961 pch_uart_hal_read 0 6961 NULL
115334 +i40e_dbg_dump_write_6973 i40e_dbg_dump_write 3 6973 NULL nohasharray
115335 +rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 &i40e_dbg_dump_write_6973
115336 +request_key_async_6990 request_key_async 4 6990 NULL
115337 +tpl_write_6998 tpl_write 3 6998 NULL
115338 +r871x_set_wpa_ie_7000 r871x_set_wpa_ie 3 7000 NULL
115339 +cipso_v4_gentag_enum_7006 cipso_v4_gentag_enum 0 7006 NULL
115340 +tracing_cpumask_read_7010 tracing_cpumask_read 3 7010 NULL
115341 +ld_usb_write_7022 ld_usb_write 3 7022 NULL
115342 +wimax_msg_7030 wimax_msg 4 7030 NULL
115343 +ceph_kvmalloc_7033 ceph_kvmalloc 1 7033 NULL
115344 +ipath_get_base_info_7043 ipath_get_base_info 3 7043 NULL
115345 +snd_pcm_oss_bytes_7051 snd_pcm_oss_bytes 2 7051 NULL
115346 +nouveau_device_create__7063 nouveau_device_create_ 7 7063 NULL
115347 +hci_sock_recvmsg_7072 hci_sock_recvmsg 4 7072 NULL
115348 +event_enable_read_7074 event_enable_read 3 7074 NULL
115349 +tipc_send_packet_7091 tipc_send_packet 4 7091 NULL nohasharray
115350 +beacon_interval_read_7091 beacon_interval_read 3 7091 &tipc_send_packet_7091
115351 +pipeline_enc_rx_stat_fifo_int_read_7107 pipeline_enc_rx_stat_fifo_int_read 3 7107 NULL
115352 +osc_resend_count_seq_write_7120 osc_resend_count_seq_write 3 7120 NULL
115353 +qib_format_hwerrors_7133 qib_format_hwerrors 5 7133 NULL
115354 +kvm_mmu_notifier_test_young_7139 kvm_mmu_notifier_test_young 3 7139 NULL
115355 +qlcnic_enable_msix_7144 qlcnic_enable_msix 2 7144 NULL
115356 +__alloc_objio_seg_7203 __alloc_objio_seg 1 7203 NULL
115357 +rx_rate_rx_frames_per_rates_read_7282 rx_rate_rx_frames_per_rates_read 3 7282 NULL
115358 +security_inode_need_killpriv_7322 security_inode_need_killpriv 0 7322 NULL
115359 +pci_vpd_info_field_size_7324 pci_vpd_info_field_size 0 7324 NULL
115360 +mgmt_control_7349 mgmt_control 3 7349 NULL
115361 +at_est2timeout_7365 at_est2timeout 0-1 7365 NULL
115362 +ieee80211_if_read_dot11MeshHWMPactivePathTimeout_7368 ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 NULL
115363 +ath10k_read_fw_stats_7387 ath10k_read_fw_stats 3 7387 NULL
115364 +hweight_long_7388 hweight_long 0 7388 NULL
115365 +sl_change_mtu_7396 sl_change_mtu 2 7396 NULL
115366 +_ore_add_stripe_unit_7399 _ore_add_stripe_unit 6-3 7399 NULL
115367 +audmux_read_file_7400 audmux_read_file 3 7400 NULL
115368 +readb_7401 readb 0 7401 NULL
115369 +tipc_recvmsg_7402 tipc_recvmsg 4 7402 NULL
115370 +drm_property_create_blob_7414 drm_property_create_blob 2 7414 NULL
115371 +__copy_to_user_nocheck_7443 __copy_to_user_nocheck 0-3 7443 NULL
115372 +ip_options_get_alloc_7448 ip_options_get_alloc 1 7448 NULL
115373 +SYSC_setgroups_7454 SYSC_setgroups 1 7454 NULL
115374 +rt2x00debug_read_queue_stats_7455 rt2x00debug_read_queue_stats 3 7455 NULL
115375 +l2tp_ip6_sendmsg_7461 l2tp_ip6_sendmsg 4 7461 NULL
115376 +garp_request_join_7471 garp_request_join 4 7471 NULL
115377 +snd_pcm_lib_read1_7491 snd_pcm_lib_read1 0-3 7491 NULL
115378 +ahash_instance_headroom_7509 ahash_instance_headroom 0 7509 NULL nohasharray
115379 +sdhci_alloc_host_7509 sdhci_alloc_host 2 7509 &ahash_instance_headroom_7509
115380 +array_zalloc_7519 array_zalloc 1-2 7519 NULL
115381 +sk_convert_filter_7541 sk_convert_filter 2 7541 NULL
115382 +ath10k_read_htt_stats_mask_7557 ath10k_read_htt_stats_mask 3 7557 NULL
115383 +smk_read_mapped_7562 smk_read_mapped 3 7562 NULL
115384 +netvsc_get_slots_7565 netvsc_get_slots 0 7565 NULL
115385 +cfs_cpt_num_estimate_7571 cfs_cpt_num_estimate 0 7571 NULL
115386 +groups_alloc_7614 groups_alloc 1 7614 NULL nohasharray
115387 +create_dir_7614 create_dir 0 7614 &groups_alloc_7614
115388 +_rtw_zmalloc_7636 _rtw_zmalloc 1 7636 NULL
115389 +fault_inject_write_7662 fault_inject_write 3 7662 NULL
115390 +acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 2-1 7685 NULL
115391 +acpi_ns_get_pathname_length_7699 acpi_ns_get_pathname_length 0 7699 NULL
115392 +dev_write_7708 dev_write 3 7708 NULL
115393 +pci_raw_set_power_state_7729 pci_raw_set_power_state 0 7729 NULL
115394 +vxge_device_register_7752 vxge_device_register 4 7752 NULL
115395 +ubi_io_read_vid_hdr_7766 ubi_io_read_vid_hdr 0 7766 NULL
115396 +iwl_dbgfs_bt_cmd_read_7770 iwl_dbgfs_bt_cmd_read 3 7770 NULL
115397 +alloc_candev_7776 alloc_candev 1-2 7776 NULL
115398 +dfs_global_file_read_7787 dfs_global_file_read 3 7787 NULL
115399 +bnx2_nvram_write_7790 bnx2_nvram_write 4-2 7790 NULL
115400 +lustre_packed_msg_size_7792 lustre_packed_msg_size 0 7792 NULL nohasharray
115401 +diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 &lustre_packed_msg_size_7792
115402 +cfs_trace_dump_debug_buffer_usrstr_7861 cfs_trace_dump_debug_buffer_usrstr 2 7861 NULL
115403 +tipc_alloc_entry_7875 tipc_alloc_entry 2 7875 NULL
115404 +dvb_dmxdev_read_sec_7892 dvb_dmxdev_read_sec 4 7892 NULL
115405 +xfs_trans_get_efi_7898 xfs_trans_get_efi 2 7898 NULL
115406 +libfc_host_alloc_7917 libfc_host_alloc 2 7917 NULL
115407 +f_hidg_write_7932 f_hidg_write 3 7932 NULL
115408 +integrity_digsig_verify_7956 integrity_digsig_verify 3-0 7956 NULL
115409 +smk_write_load_self_7958 smk_write_load_self 3 7958 NULL
115410 +tt3650_ci_msg_locked_8013 tt3650_ci_msg_locked 4 8013 NULL
115411 +vcs_read_8017 vcs_read 3 8017 NULL
115412 +vhost_add_used_and_signal_n_8038 vhost_add_used_and_signal_n 4 8038 NULL
115413 +ms_read_multiple_pages_8052 ms_read_multiple_pages 5-4 8052 NULL
115414 +dgrp_mon_read_8065 dgrp_mon_read 3 8065 NULL
115415 +spi_write_then_read_8073 spi_write_then_read 5-3 8073 NULL
115416 +qla4xxx_post_ping_evt_work_8074 qla4xxx_post_ping_evt_work 4 8074 NULL
115417 +venus_lookup_8121 venus_lookup 4 8121 NULL
115418 +ieee80211_if_fmt_num_buffered_multicast_8127 ieee80211_if_fmt_num_buffered_multicast 3 8127 NULL
115419 +__sk_mem_schedule_8185 __sk_mem_schedule 2 8185 NULL
115420 +ieee80211_if_fmt_dot11MeshHoldingTimeout_8187 ieee80211_if_fmt_dot11MeshHoldingTimeout 3 8187 NULL
115421 +recent_mt_proc_write_8206 recent_mt_proc_write 3 8206 NULL
115422 +rt2x00debug_write_bbp_8212 rt2x00debug_write_bbp 3 8212 NULL
115423 +ad7879_spi_multi_read_8218 ad7879_spi_multi_read 3 8218 NULL
115424 +play_iframe_8219 play_iframe 3 8219 NULL
115425 +kvm_mmu_page_set_gfn_8225 kvm_mmu_page_set_gfn 2 8225 NULL
115426 +sctp_ssnmap_size_8228 sctp_ssnmap_size 0-1-2 8228 NULL
115427 +check_xattr_ref_inode_8244 check_xattr_ref_inode 0 8244 NULL
115428 +t3_init_l2t_8261 t3_init_l2t 1 8261 NULL
115429 +init_cdev_8274 init_cdev 1 8274 NULL
115430 +rproc_recovery_write_8281 rproc_recovery_write 3 8281 NULL
115431 +qib_decode_7220_err_8315 qib_decode_7220_err 3 8315 NULL
115432 +snd_pcm_update_state_8320 snd_pcm_update_state 0 8320 NULL
115433 +ipwireless_send_packet_8328 ipwireless_send_packet 4 8328 NULL
115434 +rtw_cfg80211_rx_action_8329 rtw_cfg80211_rx_action 3 8329 NULL
115435 +tracing_entries_read_8345 tracing_entries_read 3 8345 NULL
115436 +ieee80211_if_fmt_ht_opmode_8347 ieee80211_if_fmt_ht_opmode 3 8347 NULL
115437 +generic_write_sync_8358 generic_write_sync 0 8358 NULL
115438 +ping_getfrag_8360 ping_getfrag 4-3 8360 NULL
115439 +ath6kl_lrssi_roam_write_8362 ath6kl_lrssi_roam_write 3 8362 NULL
115440 +xdi_copy_from_user_8395 xdi_copy_from_user 4 8395 NULL
115441 +zd_rf_scnprint_id_8406 zd_rf_scnprint_id 0-3 8406 NULL
115442 +smk_write_change_rule_8411 smk_write_change_rule 3 8411 NULL nohasharray
115443 +uvc_v4l2_ioctl_8411 uvc_v4l2_ioctl 2 8411 &smk_write_change_rule_8411
115444 +roccat_common2_sysfs_read_8431 roccat_common2_sysfs_read 6 8431 NULL
115445 +afs_cell_lookup_8482 afs_cell_lookup 2 8482 NULL
115446 +fore200e_chunk_alloc_8501 fore200e_chunk_alloc 4-3 8501 NULL
115447 +batadv_tt_len_8502 batadv_tt_len 0-1 8502 NULL
115448 +dev_config_8506 dev_config 3 8506 NULL
115449 +ACL_to_cifs_posix_8509 ACL_to_cifs_posix 3 8509 NULL
115450 +opticon_process_data_packet_8524 opticon_process_data_packet 3 8524 NULL
115451 +user_on_off_8552 user_on_off 2 8552 NULL
115452 +profile_remove_8556 profile_remove 3 8556 NULL
115453 +cache_slow_downcall_8570 cache_slow_downcall 2 8570 NULL nohasharray
115454 +pci_msi_check_device_8570 pci_msi_check_device 0 8570 &cache_slow_downcall_8570
115455 +isr_dma0_done_read_8574 isr_dma0_done_read 3 8574 NULL
115456 +tower_write_8580 tower_write 3 8580 NULL
115457 +cfs_cpt_number_8618 cfs_cpt_number 0 8618 NULL
115458 +shash_setkey_unaligned_8620 shash_setkey_unaligned 3 8620 NULL
115459 +it821x_firmware_command_8628 it821x_firmware_command 3 8628 NULL
115460 +scsi_dma_map_8632 scsi_dma_map 0 8632 NULL
115461 +fuse_send_write_pages_8636 fuse_send_write_pages 0-5 8636 NULL
115462 +mlx5_vzalloc_8663 mlx5_vzalloc 1 8663 NULL
115463 +dio_bio_alloc_8677 dio_bio_alloc 5 8677 NULL
115464 +lbs_bcnmiss_read_8678 lbs_bcnmiss_read 3 8678 NULL
115465 +rproc_trace_read_8686 rproc_trace_read 3 8686 NULL
115466 +skb_frag_size_8695 skb_frag_size 0 8695 NULL
115467 +arcfb_write_8702 arcfb_write 3 8702 NULL
115468 +i_size_read_8703 i_size_read 0 8703 NULL nohasharray
115469 +init_header_8703 init_header 0 8703 &i_size_read_8703
115470 +ctrl_out_8712 ctrl_out 3-5 8712 NULL
115471 +tracing_max_lat_write_8728 tracing_max_lat_write 3 8728 NULL
115472 +jffs2_acl_count_8729 jffs2_acl_count 0-1 8729 NULL
115473 +__create_irqs_8733 __create_irqs 2 8733 NULL
115474 +tx_tx_exch_expiry_read_8749 tx_tx_exch_expiry_read 3 8749 NULL
115475 +compound_order_8750 compound_order 0 8750 NULL
115476 +yurex_write_8761 yurex_write 3 8761 NULL
115477 +joydev_compat_ioctl_8765 joydev_compat_ioctl 2 8765 NULL
115478 +kstrtoint_from_user_8778 kstrtoint_from_user 2 8778 NULL
115479 +paging32_prefetch_gpte_8783 paging32_prefetch_gpte 4 8783 NULL
115480 +ext4_try_to_write_inline_data_8785 ext4_try_to_write_inline_data 3-4 8785 NULL
115481 +__bitmap_weight_8796 __bitmap_weight 0 8796 NULL
115482 +metronomefb_write_8823 metronomefb_write 3 8823 NULL
115483 +SyS_llistxattr_8824 SyS_llistxattr 3 8824 NULL
115484 +extent_read_full_page_8826 extent_read_full_page 0 8826 NULL
115485 +ll_xattr_cache_get_8829 ll_xattr_cache_get 0 8829 NULL
115486 +get_queue_depth_8833 get_queue_depth 0 8833 NULL
115487 +dvb_ringbuffer_pkt_next_8834 dvb_ringbuffer_pkt_next 0-2 8834 NULL
115488 +usb_ep_queue_8839 usb_ep_queue 0 8839 NULL
115489 +iwl_rx_packet_len_8854 iwl_rx_packet_len 0 8854 NULL
115490 +debug_debug1_read_8856 debug_debug1_read 3 8856 NULL
115491 +wa_nep_queue_8858 wa_nep_queue 2 8858 NULL
115492 +radeon_drm_ioctl_8875 radeon_drm_ioctl 2 8875 NULL
115493 +compressed_bio_size_8887 compressed_bio_size 0-2 8887 NULL
115494 +ab3100_get_set_reg_8890 ab3100_get_set_reg 3 8890 NULL nohasharray
115495 +tracing_max_lat_read_8890 tracing_max_lat_read 3 8890 &ab3100_get_set_reg_8890
115496 +sdio_max_byte_size_8907 sdio_max_byte_size 0 8907 NULL
115497 +sysfs_merge_group_8917 sysfs_merge_group 0 8917 NULL
115498 +write_file_ani_8918 write_file_ani 3 8918 NULL
115499 +layout_commit_8926 layout_commit 3 8926 NULL
115500 +cp2112_hid_get_8933 cp2112_hid_get 4 8933 NULL
115501 +adjust_priv_size_8935 adjust_priv_size 0-1 8935 NULL
115502 +driver_stats_read_8944 driver_stats_read 3 8944 NULL
115503 +read_file_tgt_stats_8959 read_file_tgt_stats 3 8959 NULL
115504 +usb_allocate_stream_buffers_8964 usb_allocate_stream_buffers 3 8964 NULL
115505 +qib_qsfp_dump_8966 qib_qsfp_dump 0-3 8966 NULL
115506 +venus_mkdir_8967 venus_mkdir 4 8967 NULL
115507 +seq_open_net_8968 seq_open_net 4 8968 NULL nohasharray
115508 +vol_cdev_read_8968 vol_cdev_read 3 8968 &seq_open_net_8968
115509 +bio_integrity_get_tag_8974 bio_integrity_get_tag 3 8974 NULL
115510 +sony_register_touchpad_8981 sony_register_touchpad 2 8981 NULL
115511 +jbd2_journal_blocks_per_page_9004 jbd2_journal_blocks_per_page 0 9004 NULL
115512 +il_dbgfs_clear_ucode_stats_write_9016 il_dbgfs_clear_ucode_stats_write 3 9016 NULL
115513 +snd_emu10k1_ptr_read_9026 snd_emu10k1_ptr_read 0-2 9026 NULL
115514 +nla_put_9042 nla_put 3 9042 NULL
115515 +sta_tx_latency_stat_header_9050 sta_tx_latency_stat_header 0-3-4 9050 NULL
115516 +snd_emu10k1_synth_copy_from_user_9061 snd_emu10k1_synth_copy_from_user 3-5 9061 NULL
115517 +snd_gus_dram_peek_9062 snd_gus_dram_peek 4 9062 NULL
115518 +fib_info_hash_alloc_9075 fib_info_hash_alloc 1 9075 NULL
115519 +create_queues_9088 create_queues 2-3 9088 NULL
115520 +ftdi_prepare_write_buffer_9093 ftdi_prepare_write_buffer 3 9093 NULL
115521 +adxl34x_spi_read_block_9108 adxl34x_spi_read_block 3 9108 NULL
115522 +caif_stream_sendmsg_9110 caif_stream_sendmsg 4 9110 NULL nohasharray
115523 +gfn_to_rmap_9110 gfn_to_rmap 2-3 9110 &caif_stream_sendmsg_9110
115524 +udf_direct_IO_9111 udf_direct_IO 4 9111 NULL
115525 +pmcraid_change_queue_depth_9116 pmcraid_change_queue_depth 2 9116 NULL
115526 +vb2_dma_sg_alloc_9157 vb2_dma_sg_alloc 2 9157 NULL
115527 +dbg_command_buf_9165 dbg_command_buf 2 9165 NULL
115528 +isr_irqs_read_9181 isr_irqs_read 3 9181 NULL
115529 +count_leading_zeros_9183 count_leading_zeros 0 9183 NULL
115530 +altera_swap_ir_9194 altera_swap_ir 2 9194 NULL
115531 +snd_m3_get_pointer_9206 snd_m3_get_pointer 0 9206 NULL
115532 +iwl_dbgfs_frame_stats_read_9211 iwl_dbgfs_frame_stats_read 3 9211 NULL
115533 +virtqueue_add_9217 virtqueue_add 4-5 9217 NULL
115534 +tx_tx_prepared_descs_read_9221 tx_tx_prepared_descs_read 3 9221 NULL
115535 +sctp_getsockopt_delayed_ack_9232 sctp_getsockopt_delayed_ack 2 9232 NULL
115536 +hfsplus_bnode_read_u16_9262 hfsplus_bnode_read_u16 0 9262 NULL
115537 +hdpvr_read_9273 hdpvr_read 3 9273 NULL
115538 +flakey_status_9274 flakey_status 5 9274 NULL
115539 +iwl_dbgfs_stations_read_9309 iwl_dbgfs_stations_read 3 9309 NULL
115540 +ceph_sync_setxattr_9310 ceph_sync_setxattr 4 9310 NULL
115541 +ieee80211_if_fmt_txpower_9334 ieee80211_if_fmt_txpower 3 9334 NULL
115542 +nvme_trans_fmt_get_parm_header_9340 nvme_trans_fmt_get_parm_header 2 9340 NULL
115543 +ocfs2_orphan_for_truncate_9342 ocfs2_orphan_for_truncate 4 9342 NULL
115544 +ll_direct_rw_pages_9361 ll_direct_rw_pages 0 9361 NULL
115545 +sta_beacon_loss_count_read_9370 sta_beacon_loss_count_read 3 9370 NULL
115546 +virtqueue_add_outbuf_9395 virtqueue_add_outbuf 3 9395 NULL
115547 +read_9397 read 3 9397 NULL
115548 +hash_ipportip4_expire_9415 hash_ipportip4_expire 4 9415 NULL
115549 +btrfs_drop_extents_9423 btrfs_drop_extents 4 9423 NULL
115550 +bm_realloc_pages_9431 bm_realloc_pages 2 9431 NULL
115551 +ffs_ep0_write_9438 ffs_ep0_write 3 9438 NULL
115552 +ieee80211_if_fmt_fwded_unicast_9454 ieee80211_if_fmt_fwded_unicast 3 9454 NULL
115553 +get_registers_9470 get_registers 4 9470 NULL nohasharray
115554 +agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 &get_registers_9470
115555 +crypt_status_9492 crypt_status 5 9492 NULL
115556 +lbs_threshold_write_9502 lbs_threshold_write 5 9502 NULL
115557 +lp_write_9511 lp_write 3 9511 NULL
115558 +mext_calc_swap_extents_9517 mext_calc_swap_extents 4 9517 NULL
115559 +scsi_tgt_kspace_exec_9522 scsi_tgt_kspace_exec 8 9522 NULL
115560 +ll_max_read_ahead_whole_mb_seq_write_9528 ll_max_read_ahead_whole_mb_seq_write 3 9528 NULL
115561 +read_file_dma_9530 read_file_dma 3 9530 NULL
115562 +iwl_dbgfs_bf_params_read_9542 iwl_dbgfs_bf_params_read 3 9542 NULL
115563 +il_dbgfs_missed_beacon_write_9546 il_dbgfs_missed_beacon_write 3 9546 NULL
115564 +compat_SyS_pwritev64_9548 compat_SyS_pwritev64 3 9548 NULL
115565 +fw_node_create_9559 fw_node_create 2 9559 NULL
115566 +kobj_map_9566 kobj_map 2-3 9566 NULL
115567 +f2fs_read_data_pages_9574 f2fs_read_data_pages 4 9574 NULL
115568 +snd_emu10k1_fx8010_read_9605 snd_emu10k1_fx8010_read 5-6 9605 NULL
115569 +lov_ost_pool_add_9626 lov_ost_pool_add 3 9626 NULL
115570 +saa7164_buffer_alloc_user_9627 saa7164_buffer_alloc_user 2 9627 NULL
115571 +ceph_copy_user_to_page_vector_9635 ceph_copy_user_to_page_vector 4-3 9635 NULL
115572 +acpi_ex_insert_into_field_9638 acpi_ex_insert_into_field 3 9638 NULL
115573 +ll_checksum_seq_write_9648 ll_checksum_seq_write 3 9648 NULL
115574 +ocfs2_xattr_get_rec_9652 ocfs2_xattr_get_rec 0 9652 NULL
115575 +queue_received_packet_9657 queue_received_packet 5 9657 NULL
115576 +tipc_port_mcast_xmit_9663 tipc_port_mcast_xmit 4 9663 NULL
115577 +snd_opl4_mem_proc_write_9670 snd_opl4_mem_proc_write 5 9670 NULL
115578 +dns_query_9676 dns_query 3 9676 NULL
115579 +qib_7322_handle_hwerrors_9678 qib_7322_handle_hwerrors 3 9678 NULL
115580 +__erst_read_from_storage_9690 __erst_read_from_storage 0 9690 NULL
115581 +vx_transfer_end_9701 vx_transfer_end 0 9701 NULL
115582 +fuse_iter_npages_9705 fuse_iter_npages 0 9705 NULL nohasharray
115583 +ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 &fuse_iter_npages_9705
115584 +cfg80211_tx_mlme_mgmt_9715 cfg80211_tx_mlme_mgmt 3 9715 NULL
115585 +parse_uac2_sample_rate_range_9718 parse_uac2_sample_rate_range 0 9718 NULL
115586 +btrfs_stack_file_extent_num_bytes_9720 btrfs_stack_file_extent_num_bytes 0 9720 NULL
115587 +SYSC_ppoll_9721 SYSC_ppoll 2 9721 NULL
115588 +nla_get_u8_9736 nla_get_u8 0 9736 NULL
115589 +ieee80211_if_fmt_num_mcast_sta_9738 ieee80211_if_fmt_num_mcast_sta 3 9738 NULL
115590 +ddb_input_read_9743 ddb_input_read 3-0 9743 NULL
115591 +regmap_multi_reg_write_bypassed_9751 regmap_multi_reg_write_bypassed 3 9751 NULL nohasharray
115592 +sta_last_ack_signal_read_9751 sta_last_ack_signal_read 3 9751 &regmap_multi_reg_write_bypassed_9751
115593 +btrfs_super_root_9763 btrfs_super_root 0 9763 NULL
115594 +__blk_queue_init_tags_9778 __blk_queue_init_tags 2 9778 NULL
115595 +kvm_age_hva_9795 kvm_age_hva 2 9795 NULL
115596 +udpv6_recvmsg_9813 udpv6_recvmsg 4 9813 NULL nohasharray
115597 +ieee80211_if_read_state_9813 ieee80211_if_read_state 3 9813 &udpv6_recvmsg_9813
115598 +pmcraid_alloc_sglist_9864 pmcraid_alloc_sglist 1 9864 NULL
115599 +btrfs_free_reserved_extent_9867 btrfs_free_reserved_extent 2 9867 NULL
115600 +wil_read_file_ioblob_9878 wil_read_file_ioblob 3 9878 NULL
115601 +snd_midi_event_new_9893 snd_midi_event_new 1 9893 NULL nohasharray
115602 +bm_register_write_9893 bm_register_write 3 9893 &snd_midi_event_new_9893
115603 +snd_gf1_pcm_playback_copy_9895 snd_gf1_pcm_playback_copy 3-5 9895 NULL
115604 +nonpaging_page_fault_9908 nonpaging_page_fault 2 9908 NULL
115605 +iwl_dbgfs_prph_reg_read_9928 iwl_dbgfs_prph_reg_read 3 9928 NULL
115606 +root_nfs_parse_options_9937 root_nfs_parse_options 3 9937 NULL
115607 +pstore_ftrace_knob_read_9947 pstore_ftrace_knob_read 3 9947 NULL
115608 +read_file_misc_9948 read_file_misc 3 9948 NULL
115609 +csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 3-4 9957 NULL
115610 +SyS_gethostname_9964 SyS_gethostname 2 9964 NULL
115611 +get_free_serial_index_9969 get_free_serial_index 0 9969 NULL
115612 +btrfs_add_link_9973 btrfs_add_link 5 9973 NULL
115613 +SYSC_move_pages_9986 SYSC_move_pages 2 9986 NULL
115614 +aat2870_dump_reg_10019 aat2870_dump_reg 0 10019 NULL
115615 +ieee80211_set_probe_resp_10077 ieee80211_set_probe_resp 3 10077 NULL
115616 +get_elem_size_10110 get_elem_size 0-2 10110 NULL nohasharray
115617 +dynamic_ps_timeout_read_10110 dynamic_ps_timeout_read 3 10110 &get_elem_size_10110
115618 +gfs2_meta_read_10112 gfs2_meta_read 0 10112 NULL
115619 +SyS_migrate_pages_10134 SyS_migrate_pages 2 10134 NULL
115620 +aes_decrypt_packets_read_10155 aes_decrypt_packets_read 3 10155 NULL
115621 +rx_out_of_mem_read_10157 rx_out_of_mem_read 3 10157 NULL
115622 +hidg_alloc_ep_req_10159 hidg_alloc_ep_req 2 10159 NULL
115623 +asd_store_update_bios_10165 asd_store_update_bios 4 10165 NULL
115624 +kstrtol_from_user_10168 kstrtol_from_user 2 10168 NULL
115625 +proc_pid_attr_read_10173 proc_pid_attr_read 3 10173 NULL
115626 +jffs2_user_setxattr_10182 jffs2_user_setxattr 4 10182 NULL
115627 +cciss_proc_write_10259 cciss_proc_write 3 10259 NULL
115628 +__qlcnic_pci_sriov_enable_10281 __qlcnic_pci_sriov_enable 2 10281 NULL
115629 +snd_rme9652_capture_copy_10287 snd_rme9652_capture_copy 5 10287 NULL
115630 +ubi_leb_change_10289 ubi_leb_change 0 10289 NULL
115631 +read_emulate_10310 read_emulate 2-4 10310 NULL
115632 +read_file_spectral_count_10320 read_file_spectral_count 3 10320 NULL
115633 +compat_SyS_writev_10327 compat_SyS_writev 3 10327 NULL
115634 +tun_sendmsg_10337 tun_sendmsg 4 10337 NULL
115635 +ufx_alloc_urb_list_10349 ufx_alloc_urb_list 3 10349 NULL
115636 +dbAllocAny_10354 dbAllocAny 0 10354 NULL
115637 +ath6kl_listen_int_read_10355 ath6kl_listen_int_read 3 10355 NULL
115638 +ms_write_multiple_pages_10362 ms_write_multiple_pages 6-5 10362 NULL
115639 +sta_ht_capa_read_10366 sta_ht_capa_read 3 10366 NULL
115640 +ecryptfs_decode_and_decrypt_filename_10379 ecryptfs_decode_and_decrypt_filename 5 10379 NULL
115641 +led_classdev_register_10384 led_classdev_register 0 10384 NULL
115642 +do_compat_pselect_10398 do_compat_pselect 1 10398 NULL
115643 +fwtty_rx_10434 fwtty_rx 3 10434 NULL
115644 +event_phy_transmit_error_read_10471 event_phy_transmit_error_read 3 10471 NULL
115645 +hash_ipportip6_expire_10478 hash_ipportip6_expire 4 10478 NULL
115646 +nouveau_pwr_create__10483 nouveau_pwr_create_ 4 10483 NULL
115647 +ext4_itable_unused_count_10501 ext4_itable_unused_count 0 10501 NULL
115648 +qib_alloc_fast_reg_page_list_10507 qib_alloc_fast_reg_page_list 2 10507 NULL
115649 +sel_write_disable_10511 sel_write_disable 3 10511 NULL
115650 +osd_req_write_sg_kern_10514 osd_req_write_sg_kern 5 10514 NULL
115651 +rds_message_alloc_10517 rds_message_alloc 1 10517 NULL
115652 +qlcnic_pci_sriov_enable_10519 qlcnic_pci_sriov_enable 2 10519 NULL
115653 +snd_pcm_hw_params_user_10520 snd_pcm_hw_params_user 0 10520 NULL
115654 +kstrtouint_from_user_10536 kstrtouint_from_user 2 10536 NULL nohasharray
115655 +snd_pcm_lib_read_10536 snd_pcm_lib_read 0-3 10536 &kstrtouint_from_user_10536
115656 +ext4_write_begin_10576 ext4_write_begin 3-4 10576 NULL
115657 +scrub_remap_extent_10588 scrub_remap_extent 2 10588 NULL
115658 +otp_read_10594 otp_read 2-4-5 10594 NULL
115659 +supply_map_read_file_10608 supply_map_read_file 3 10608 NULL
115660 +ima_show_htable_violations_10619 ima_show_htable_violations 3 10619 NULL
115661 +fq_alloc_node_10633 fq_alloc_node 1 10633 NULL
115662 +nfs_idmap_lookup_id_10660 nfs_idmap_lookup_id 2 10660 NULL nohasharray
115663 +ubi_io_write_vid_hdr_10660 ubi_io_write_vid_hdr 0 10660 &nfs_idmap_lookup_id_10660
115664 +efx_max_tx_len_10662 efx_max_tx_len 0-2 10662 NULL
115665 +parport_write_10669 parport_write 0 10669 NULL
115666 +edge_write_10692 edge_write 4 10692 NULL
115667 +ubi_wl_get_peb_10699 ubi_wl_get_peb 0 10699 NULL
115668 +selinux_inode_setxattr_10708 selinux_inode_setxattr 4 10708 NULL nohasharray
115669 +inl_10708 inl 0 10708 &selinux_inode_setxattr_10708
115670 +shash_async_setkey_10720 shash_async_setkey 3 10720 NULL nohasharray
115671 +pvr2_ioread_read_10720 pvr2_ioread_read 3 10720 &shash_async_setkey_10720
115672 +spi_sync_10731 spi_sync 0 10731 NULL
115673 +sctp_getsockopt_maxseg_10737 sctp_getsockopt_maxseg 2 10737 NULL nohasharray
115674 +apu_get_register_10737 apu_get_register 0 10737 &sctp_getsockopt_maxseg_10737
115675 +SyS_io_getevents_10756 SyS_io_getevents 3 10756 NULL
115676 +vhost_add_used_n_10760 vhost_add_used_n 3 10760 NULL
115677 +rd_build_prot_space_10761 rd_build_prot_space 2-3 10761 NULL
115678 +kvm_read_guest_atomic_10765 kvm_read_guest_atomic 4 10765 NULL
115679 +__qp_memcpy_to_queue_10779 __qp_memcpy_to_queue 2-4 10779 NULL
115680 +diva_set_trace_filter_10820 diva_set_trace_filter 0-1 10820 NULL
115681 +lbs_sleepparams_read_10840 lbs_sleepparams_read 3 10840 NULL
115682 +ida_get_new_above_10853 ida_get_new_above 0 10853 NULL
115683 +fuse_conn_max_background_read_10855 fuse_conn_max_background_read 3 10855 NULL
115684 +snd_pcm_oss_write1_10872 snd_pcm_oss_write1 3 10872 NULL
115685 +wiidebug_drm_write_10879 wiidebug_drm_write 3 10879 NULL
115686 +get_scq_10897 get_scq 2 10897 NULL
115687 +tifm_alloc_adapter_10903 tifm_alloc_adapter 1 10903 NULL
115688 +lprocfs_wr_atomic_10912 lprocfs_wr_atomic 3 10912 NULL
115689 +__copy_from_user_10918 __copy_from_user 0-3 10918 NULL
115690 +kobject_add_10919 kobject_add 0 10919 NULL
115691 +ar9003_dump_modal_eeprom_10959 ar9003_dump_modal_eeprom 3-2-0 10959 NULL
115692 +ci_port_test_write_10962 ci_port_test_write 3 10962 NULL
115693 +bm_entry_read_10976 bm_entry_read 3 10976 NULL
115694 +sched_autogroup_write_10984 sched_autogroup_write 3 10984 NULL
115695 +xfrm_hash_alloc_10997 xfrm_hash_alloc 1 10997 NULL
115696 +rx_filter_accum_arp_pend_requests_read_11003 rx_filter_accum_arp_pend_requests_read 3 11003 NULL
115697 +SetLineNumber_11023 SetLineNumber 0 11023 NULL
115698 +pci_msi_vec_count_11046 pci_msi_vec_count 0 11046 NULL
115699 +tda10048_writeregbulk_11050 tda10048_writeregbulk 4 11050 NULL
115700 +qlcnic_83xx_calculate_msix_vector_11063 qlcnic_83xx_calculate_msix_vector 0 11063 NULL nohasharray
115701 +insert_inline_extent_backref_11063 insert_inline_extent_backref 8 11063 &qlcnic_83xx_calculate_msix_vector_11063
115702 +tcp_send_mss_11079 tcp_send_mss 0 11079 NULL
115703 +snd_pcm_delay_11081 snd_pcm_delay 0 11081 NULL
115704 +count_argc_11083 count_argc 0 11083 NULL
115705 +kvm_write_guest_cached_11106 kvm_write_guest_cached 4 11106 NULL
115706 +tw_change_queue_depth_11116 tw_change_queue_depth 2 11116 NULL
115707 +page_offset_11120 page_offset 0 11120 NULL
115708 +cea_db_payload_len_11124 cea_db_payload_len 0 11124 NULL nohasharray
115709 +tracing_buffers_read_11124 tracing_buffers_read 3 11124 &cea_db_payload_len_11124
115710 +alloc_alien_cache_11127 alloc_alien_cache 2 11127 NULL
115711 +snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 3-4 11172 NULL
115712 +il_dbgfs_rx_queue_read_11221 il_dbgfs_rx_queue_read 3 11221 NULL
115713 +comedi_alloc_spriv_11234 comedi_alloc_spriv 2 11234 NULL
115714 +of_irq_count_11253 of_irq_count 0 11253 NULL
115715 +hugetlbfs_read_11268 hugetlbfs_read 3 11268 NULL
115716 +ath6kl_power_params_write_11274 ath6kl_power_params_write 3 11274 NULL
115717 +__proc_daemon_file_11305 __proc_daemon_file 5 11305 NULL
115718 +ext4_xattr_check_names_11314 ext4_xattr_check_names 0 11314 NULL
115719 +bcache_dev_sectors_dirty_add_11315 bcache_dev_sectors_dirty_add 3-4 11315 NULL
115720 +sk_filter_size_11316 sk_filter_size 0 11316 NULL nohasharray
115721 +tcp_send_rcvq_11316 tcp_send_rcvq 3 11316 &sk_filter_size_11316
115722 +construct_key_11329 construct_key 3 11329 NULL nohasharray
115723 +__kfifo_out_peek_11329 __kfifo_out_peek 0-3 11329 &construct_key_11329
115724 +next_segment_11330 next_segment 0-2-1 11330 NULL
115725 +persistent_ram_buffer_map_11332 persistent_ram_buffer_map 1-2 11332 NULL
115726 +ext4_get_inline_size_11349 ext4_get_inline_size 0 11349 NULL
115727 +sel_write_create_11353 sel_write_create 3 11353 NULL nohasharray
115728 +nl80211_send_mgmt_11353 nl80211_send_mgmt 7 11353 &sel_write_create_11353
115729 +of_get_available_child_count_11361 of_get_available_child_count 0 11361 NULL
115730 +qib_get_base_info_11369 qib_get_base_info 3 11369 NULL
115731 +tcf_register_action_11381 tcf_register_action 2 11381 NULL nohasharray
115732 +nft_value_dump_11381 nft_value_dump 3 11381 &tcf_register_action_11381
115733 +isku_sysfs_read_keys_capslock_11392 isku_sysfs_read_keys_capslock 6 11392 NULL
115734 +dev_irnet_write_11398 dev_irnet_write 3 11398 NULL
115735 +lprocfs_wr_evict_client_11402 lprocfs_wr_evict_client 3 11402 NULL
115736 +___alloc_bootmem_11410 ___alloc_bootmem 1 11410 NULL
115737 +str_to_user_11411 str_to_user 2 11411 NULL
115738 +mem_fw_gen_free_mem_blks_read_11413 mem_fw_gen_free_mem_blks_read 3 11413 NULL
115739 +ath6kl_wmi_test_rx_11414 ath6kl_wmi_test_rx 3 11414 NULL
115740 +adis16480_show_firmware_revision_11417 adis16480_show_firmware_revision 3 11417 NULL
115741 +trace_options_read_11419 trace_options_read 3 11419 NULL
115742 +i40e_dbg_command_write_11421 i40e_dbg_command_write 3 11421 NULL
115743 +xd_read_multiple_pages_11422 xd_read_multiple_pages 5-4 11422 NULL
115744 +bttv_read_11432 bttv_read 3 11432 NULL
115745 +create_zero_mask_11453 create_zero_mask 0-1 11453 NULL
115746 +do_blockdev_direct_IO_11455 do_blockdev_direct_IO 0-6 11455 NULL
115747 +sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 NULL nohasharray
115748 +pci_set_power_state_11479 pci_set_power_state 0 11479 &sca3000_read_first_n_hw_rb_11479
115749 +xfs_file_buffered_aio_write_11492 xfs_file_buffered_aio_write 4 11492 NULL
115750 +sd_do_mode_sense_11507 sd_do_mode_sense 5 11507 NULL
115751 +kmem_zalloc_11510 kmem_zalloc 1 11510 NULL
115752 +ll_direct_IO_26_seg_11518 ll_direct_IO_26_seg 0 11518 NULL
115753 +twl_direction_in_11527 twl_direction_in 2 11527 NULL
115754 +skb_cow_data_11565 skb_cow_data 0 11565 NULL
115755 +lpfc_idiag_ctlacc_write_11576 lpfc_idiag_ctlacc_write 3 11576 NULL
115756 +oprofilefs_ulong_to_user_11582 oprofilefs_ulong_to_user 3 11582 NULL
115757 +batadv_iv_ogm_orig_add_if_11586 batadv_iv_ogm_orig_add_if 2 11586 NULL
115758 +snd_pcm_action_11589 snd_pcm_action 0 11589 NULL
115759 +fw_device_op_ioctl_11595 fw_device_op_ioctl 2 11595 NULL
115760 +batadv_iv_ogm_orig_del_if_11604 batadv_iv_ogm_orig_del_if 2 11604 NULL
115761 +SYSC_mq_timedsend_11607 SYSC_mq_timedsend 3 11607 NULL
115762 +C_SYSC_migrate_pages_11618 C_SYSC_migrate_pages 2 11618 NULL
115763 +sisusb_send_bridge_packet_11649 sisusb_send_bridge_packet 2 11649 NULL
115764 +nla_total_size_11658 nla_total_size 1-0 11658 NULL
115765 +slab_ksize_11664 slab_ksize 0 11664 NULL
115766 +ide_queue_pc_tail_11673 ide_queue_pc_tail 5 11673 NULL
115767 +compat_SyS_msgsnd_11675 compat_SyS_msgsnd 3 11675 NULL
115768 +btrfs_alloc_delayed_item_11678 btrfs_alloc_delayed_item 1 11678 NULL
115769 +sctp_setsockopt_hmac_ident_11687 sctp_setsockopt_hmac_ident 3 11687 NULL
115770 +split_11691 split 2 11691 NULL
115771 +compat_SyS_keyctl_11695 compat_SyS_keyctl 4 11695 NULL nohasharray
115772 +snd_ctl_elem_user_tlv_11695 snd_ctl_elem_user_tlv 3 11695 &compat_SyS_keyctl_11695
115773 +blk_rq_cur_bytes_11723 blk_rq_cur_bytes 0 11723 NULL
115774 +dm_bio_prison_create_11749 dm_bio_prison_create 1 11749 NULL
115775 +iwl_dbgfs_qos_read_11753 iwl_dbgfs_qos_read 3 11753 NULL
115776 +ieee80211_get_num_supported_channels_11768 ieee80211_get_num_supported_channels 0 11768 NULL
115777 +tipc_sendmsg_11769 tipc_sendmsg 4 11769 NULL
115778 +ps_pspoll_timeouts_read_11776 ps_pspoll_timeouts_read 3 11776 NULL
115779 +btrfs_key_blockptr_11786 btrfs_key_blockptr 0 11786 NULL
115780 +pcpu_fc_alloc_11818 pcpu_fc_alloc 2 11818 NULL
115781 +zerocopy_sg_from_iovec_11828 zerocopy_sg_from_iovec 3 11828 NULL
115782 +sctp_setsockopt_maxseg_11829 sctp_setsockopt_maxseg 3 11829 NULL
115783 +rts51x_read_status_11830 rts51x_read_status 4 11830 NULL
115784 +unix_stream_connect_11844 unix_stream_connect 3 11844 NULL
115785 +pci_enable_msix_range_11852 pci_enable_msix_range 0-4 11852 NULL
115786 +ecryptfs_copy_filename_11868 ecryptfs_copy_filename 4 11868 NULL
115787 +ieee80211_rx_bss_info_11887 ieee80211_rx_bss_info 3 11887 NULL
115788 +mdc_rename_11899 mdc_rename 4-6 11899 NULL
115789 +xstateregs_get_11906 xstateregs_get 4 11906 NULL
115790 +ti_write_11916 ti_write 4 11916 NULL
115791 +fs_devrw_entry_11924 fs_devrw_entry 3 11924 NULL
115792 +atomic_sub_return_11939 atomic_sub_return 0-1 11939 NULL
115793 +r1_sync_page_io_11963 r1_sync_page_io 3 11963 NULL
115794 +read_and_add_raw_conns_11987 read_and_add_raw_conns 0 11987 NULL
115795 +ftdi_elan_total_command_size_12045 ftdi_elan_total_command_size 0 12045 NULL
115796 +ieee80211_if_read_user_power_level_12050 ieee80211_if_read_user_power_level 3 12050 NULL
115797 +il4965_ucode_tx_stats_read_12064 il4965_ucode_tx_stats_read 3 12064 NULL
115798 +ptc_proc_write_12076 ptc_proc_write 3 12076 NULL
115799 +batadv_tt_global_size_mod_12085 batadv_tt_global_size_mod 3 12085 NULL
115800 +rtw_malloc2d_12102 rtw_malloc2d 1-2-3 12102 NULL
115801 +alloc_bulk_urbs_generic_12127 alloc_bulk_urbs_generic 5 12127 NULL
115802 +set_powered_12129 set_powered 4 12129 NULL
115803 +ramoops_init_prz_12134 ramoops_init_prz 5 12134 NULL
115804 +xfs_handle_to_dentry_12135 xfs_handle_to_dentry 3 12135 NULL
115805 +rawv6_seticmpfilter_12137 rawv6_seticmpfilter 5 12137 NULL
115806 +rawsock_recvmsg_12144 rawsock_recvmsg 4 12144 NULL
115807 +get_idx_gc_leb_12148 get_idx_gc_leb 0 12148 NULL
115808 +btmrvl_sdio_host_to_card_12152 btmrvl_sdio_host_to_card 3 12152 NULL
115809 +vmbus_open_12154 vmbus_open 2-3 12154 NULL
115810 +fnic_reset_stats_write_12177 fnic_reset_stats_write 3 12177 NULL
115811 +LNetEQAlloc_12178 LNetEQAlloc 1 12178 NULL
115812 +ddp_make_gl_12179 ddp_make_gl 1 12179 NULL
115813 +compat_do_arpt_set_ctl_12184 compat_do_arpt_set_ctl 4 12184 NULL
115814 +ip_generic_getfrag_12187 ip_generic_getfrag 3-4 12187 NULL
115815 +snd_pcm_kernel_ioctl_12219 snd_pcm_kernel_ioctl 0 12219 NULL
115816 +fuse_get_req_12221 fuse_get_req 2 12221 NULL nohasharray
115817 +aat2870_reg_read_file_12221 aat2870_reg_read_file 3 12221 &fuse_get_req_12221
115818 +__alloc_bootmem_low_nopanic_12235 __alloc_bootmem_low_nopanic 1 12235 NULL
115819 +usnic_ib_qp_grp_dump_rows_12239 usnic_ib_qp_grp_dump_rows 3 12239 NULL
115820 +ib_uverbs_unmarshall_recv_12251 ib_uverbs_unmarshall_recv 5 12251 NULL
115821 +shash_compat_setkey_12267 shash_compat_setkey 3 12267 NULL
115822 +add_sctp_bind_addr_12269 add_sctp_bind_addr 3 12269 NULL
115823 +SYSC_vm86_12279 SYSC_vm86 2 12279 NULL
115824 +note_last_dentry_12285 note_last_dentry 3 12285 NULL
115825 +roundup_to_multiple_of_64_12288 roundup_to_multiple_of_64 0-1 12288 NULL nohasharray
115826 +il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 &roundup_to_multiple_of_64_12288
115827 +bt_sock_recvmsg_12316 bt_sock_recvmsg 4 12316 NULL
115828 +usnic_transport_sock_to_str_12322 usnic_transport_sock_to_str 2-0 12322 NULL
115829 +pcbit_writecmd_12332 pcbit_writecmd 2 12332 NULL
115830 +mptctl_ioctl_12355 mptctl_ioctl 2 12355 NULL
115831 +__nf_ct_ext_add_length_12364 __nf_ct_ext_add_length 3 12364 NULL
115832 +xfs_iext_inline_to_direct_12384 xfs_iext_inline_to_direct 2 12384 NULL
115833 +write_file_dump_12391 write_file_dump 3 12391 NULL nohasharray
115834 +populate_dir_12391 populate_dir 0 12391 &write_file_dump_12391
115835 +hbucket_elem_add_12416 hbucket_elem_add 3 12416 NULL
115836 +ieee80211_if_read_num_mcast_sta_12419 ieee80211_if_read_num_mcast_sta 3 12419 NULL
115837 +cfs_array_alloc_12441 cfs_array_alloc 2 12441 NULL
115838 +skb_do_copy_data_nocache_12465 skb_do_copy_data_nocache 5 12465 NULL
115839 +x25_sendmsg_12487 x25_sendmsg 4 12487 NULL
115840 +fnic_trace_ctrl_read_12497 fnic_trace_ctrl_read 3 12497 NULL
115841 +qib_alloc_fast_reg_mr_12526 qib_alloc_fast_reg_mr 2 12526 NULL
115842 +write_inode_now_12565 write_inode_now 0 12565 NULL
115843 +hvc_alloc_12579 hvc_alloc 4 12579 NULL
115844 +pcpu_extend_area_map_12589 pcpu_extend_area_map 2 12589 NULL
115845 +_iwl_dbgfs_prph_reg_write_12597 _iwl_dbgfs_prph_reg_write 3 12597 NULL
115846 +tlbflush_write_file_12598 tlbflush_write_file 3 12598 NULL
115847 +vhci_put_user_12604 vhci_put_user 4 12604 NULL
115848 +sdhci_pltfm_init_12627 sdhci_pltfm_init 3 12627 NULL
115849 +pwr_rcvd_awake_bcns_cnt_read_12632 pwr_rcvd_awake_bcns_cnt_read 3 12632 NULL
115850 +pn_sendmsg_12640 pn_sendmsg 4 12640 NULL
115851 +dwc3_link_state_write_12641 dwc3_link_state_write 3 12641 NULL
115852 +nr_recvmsg_12649 nr_recvmsg 4 12649 NULL
115853 +rtw_android_get_link_speed_12655 rtw_android_get_link_speed 0 12655 NULL
115854 +ocfs2_read_block_12659 ocfs2_read_block 0 12659 NULL
115855 +sel_read_class_12669 sel_read_class 3 12669 NULL nohasharray
115856 +sparse_mem_maps_populate_node_12669 sparse_mem_maps_populate_node 4 12669 &sel_read_class_12669
115857 +ext4_writepage_trans_blocks_12674 ext4_writepage_trans_blocks 0 12674 NULL
115858 +iwl_dbgfs_calib_disabled_write_12707 iwl_dbgfs_calib_disabled_write 3 12707 NULL
115859 +ieee80211_if_read_num_buffered_multicast_12716 ieee80211_if_read_num_buffered_multicast 3 12716 NULL
115860 +ivtv_write_12721 ivtv_write 3 12721 NULL
115861 +key_rx_spec_read_12736 key_rx_spec_read 3 12736 NULL
115862 +__mei_cl_async_send_12737 __mei_cl_async_send 3 12737 NULL
115863 +ieee80211_if_read_dot11MeshMaxRetries_12756 ieee80211_if_read_dot11MeshMaxRetries 3 12756 NULL
115864 +listxattr_12769 listxattr 3 12769 NULL
115865 +sctp_ssnmap_init_12772 sctp_ssnmap_init 3-2 12772 NULL
115866 +scsi_adjust_queue_depth_12802 scsi_adjust_queue_depth 3 12802 NULL
115867 +xfs_inumbers_fmt_12817 xfs_inumbers_fmt 3 12817 NULL
115868 +SyS_add_key_12834 SyS_add_key 4 12834 NULL
115869 +TSS_authhmac_12839 TSS_authhmac 3 12839 NULL
115870 +spidev_sync_12842 spidev_sync 0 12842 NULL
115871 +spidev_ioctl_12846 spidev_ioctl 2 12846 NULL
115872 +ath9k_dump_4k_modal_eeprom_12883 ath9k_dump_4k_modal_eeprom 3-2 12883 NULL
115873 +get_leb_cnt_12892 get_leb_cnt 0-2 12892 NULL
115874 +get_virtual_node_size_12908 get_virtual_node_size 0 12908 NULL
115875 +rds_pages_in_vec_12922 rds_pages_in_vec 0 12922 NULL
115876 +do_inode_permission_12946 do_inode_permission 0 12946 NULL
115877 +bm_status_write_12964 bm_status_write 3 12964 NULL
115878 +raid56_parity_recover_12987 raid56_parity_recover 5 12987 NULL
115879 +TransmitTcb_12989 TransmitTcb 4 12989 NULL
115880 +sk_peek_offset_12991 sk_peek_offset 0 12991 NULL
115881 +__btrfs_direct_write_13007 __btrfs_direct_write 4-0 13007 NULL
115882 +bset_prev_bytes_13020 bset_prev_bytes 0 13020 NULL
115883 +subsystem_filter_write_13022 subsystem_filter_write 3 13022 NULL
115884 +generic_segment_checks_13041 generic_segment_checks 0 13041 NULL
115885 +ocfs2_write_begin_13045 ocfs2_write_begin 3-4 13045 NULL
115886 +__dn_setsockopt_13060 __dn_setsockopt 5 13060 NULL nohasharray
115887 +ptlrpc_lprocfs_threads_min_seq_write_13060 ptlrpc_lprocfs_threads_min_seq_write 3 13060 &__dn_setsockopt_13060
115888 +biovec_create_pool_13079 biovec_create_pool 2 13079 NULL
115889 +xattr_getsecurity_13090 xattr_getsecurity 0 13090 NULL
115890 +ttm_dma_pool_alloc_new_pages_13105 ttm_dma_pool_alloc_new_pages 3 13105 NULL
115891 +snd_rme96_playback_copy_13111 snd_rme96_playback_copy 5 13111 NULL
115892 +bfad_debugfs_read_13119 bfad_debugfs_read 3 13119 NULL
115893 +blk_update_request_13146 blk_update_request 3 13146 NULL
115894 +caif_stream_recvmsg_13173 caif_stream_recvmsg 4 13173 NULL
115895 +pwr_disable_ps_read_13176 pwr_disable_ps_read 3 13176 NULL
115896 +ucs2_strlen_13178 ucs2_strlen 0 13178 NULL
115897 +dgrp_net_ioctl_13183 dgrp_net_ioctl 2 13183 NULL
115898 +create_trace_uprobe_13184 create_trace_uprobe 1 13184 NULL
115899 +comedi_read_13199 comedi_read 3 13199 NULL
115900 +hash_ipport4_expire_13201 hash_ipport4_expire 4 13201 NULL
115901 +mmc_ext_csd_read_13205 mmc_ext_csd_read 3 13205 NULL
115902 +svm_msrpm_offset_13220 svm_msrpm_offset 0-1 13220 NULL
115903 +fnic_trace_ctrl_write_13229 fnic_trace_ctrl_write 3 13229 NULL
115904 +_iwl_dbgfs_disable_power_off_write_13243 _iwl_dbgfs_disable_power_off_write 3 13243 NULL
115905 +asix_read_cmd_13245 asix_read_cmd 5 13245 NULL
115906 +init_tid_tabs_13252 init_tid_tabs 2-3-4 13252 NULL
115907 +bio_integrity_trim_13259 bio_integrity_trim 3-2 13259 NULL
115908 +simple_attr_write_13260 simple_attr_write 3 13260 NULL
115909 +pmcraid_notify_aen_13274 pmcraid_notify_aen 3 13274 NULL
115910 +il4965_stats_flag_13281 il4965_stats_flag 0-3 13281 NULL
115911 +lpfc_idiag_mbxacc_get_setup_13282 lpfc_idiag_mbxacc_get_setup 0 13282 NULL
115912 +sd_major_13294 sd_major 0-1 13294 NULL
115913 +read_file_phy_err_13318 read_file_phy_err 3 13318 NULL
115914 +kvm_read_nested_guest_page_13337 kvm_read_nested_guest_page 5 13337 NULL
115915 +round_event_name_len_13348 round_event_name_len 0 13348 NULL
115916 +iso_sched_alloc_13377 iso_sched_alloc 1 13377 NULL nohasharray
115917 +wep_key_not_found_read_13377 wep_key_not_found_read 3 13377 &iso_sched_alloc_13377
115918 +ext4_meta_trans_blocks_13380 ext4_meta_trans_blocks 0-3-2 13380 NULL
115919 +lov_mds_md_size_13388 lov_mds_md_size 0-1 13388 NULL nohasharray
115920 +dis_bypass_write_13388 dis_bypass_write 3 13388 &lov_mds_md_size_13388
115921 +netxen_alloc_sds_rings_13417 netxen_alloc_sds_rings 2 13417 NULL
115922 +sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 NULL
115923 +ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 7-8-9 13443 NULL
115924 +sb_init_dio_done_wq_13482 sb_init_dio_done_wq 0 13482 NULL
115925 +data_read_13494 data_read 3 13494 NULL
115926 +core_status_13515 core_status 4 13515 NULL
115927 +smk_write_mapped_13519 smk_write_mapped 3 13519 NULL
115928 +bm_init_13529 bm_init 2 13529 NULL
115929 +request_any_context_irq_13530 request_any_context_irq 0 13530 NULL
115930 +llcp_sock_recvmsg_13556 llcp_sock_recvmsg 4 13556 NULL
115931 +SyS_vm86_13557 SyS_vm86 2 13557 NULL
115932 +ieee80211_if_read_ap_power_level_13558 ieee80211_if_read_ap_power_level 3 13558 NULL
115933 +hash_net4_expire_13559 hash_net4_expire 4 13559 NULL
115934 +ubifs_get_idx_gc_leb_13566 ubifs_get_idx_gc_leb 0 13566 NULL
115935 +read_file_antenna_13574 read_file_antenna 3 13574 NULL
115936 +cache_write_13589 cache_write 3 13589 NULL
115937 +Rd_Indx_13602 Rd_Indx 3-2 13602 NULL
115938 +wm8994_bulk_write_13615 wm8994_bulk_write 2-3 13615 NULL
115939 +pmcraid_get_minor_13619 pmcraid_get_minor 0 13619 NULL
115940 +packet_snd_13634 packet_snd 3 13634 NULL
115941 +blk_msg_write_13655 blk_msg_write 3 13655 NULL
115942 +cache_downcall_13666 cache_downcall 3 13666 NULL
115943 +ext3_xattr_list_entries_13682 ext3_xattr_list_entries 0 13682 NULL
115944 +fw_iso_buffer_alloc_13704 fw_iso_buffer_alloc 2 13704 NULL
115945 +audit_unpack_string_13748 audit_unpack_string 3 13748 NULL
115946 +ieee802154_alloc_device_13767 ieee802154_alloc_device 1 13767 NULL
115947 +fb_sys_read_13778 fb_sys_read 3 13778 NULL
115948 +ath6kl_mgmt_powersave_ap_13791 ath6kl_mgmt_powersave_ap 6 13791 NULL
115949 +random_read_13815 random_read 3 13815 NULL
115950 +mutex_lock_interruptible_nested_13817 mutex_lock_interruptible_nested 0 13817 NULL
115951 +hsi_register_board_info_13820 hsi_register_board_info 2 13820 NULL
115952 +___mei_cl_send_13821 ___mei_cl_send 3 13821 NULL
115953 +enc_pools_insert_13849 enc_pools_insert 3 13849 NULL
115954 +evdev_ioctl_compat_13851 evdev_ioctl_compat 2 13851 NULL
115955 +compat_ip_setsockopt_13870 compat_ip_setsockopt 5 13870 NULL
115956 +qp_memcpy_to_queue_13886 qp_memcpy_to_queue 5-2 13886 NULL
115957 +snd_pcm_aio_read_13900 snd_pcm_aio_read 3 13900 NULL
115958 +cfg80211_inform_bss_width_13933 cfg80211_inform_bss_width 9 13933 NULL
115959 +ext3_xattr_block_get_13936 ext3_xattr_block_get 0 13936 NULL
115960 +ieee80211_if_read_dot11MeshForwarding_13940 ieee80211_if_read_dot11MeshForwarding 3 13940 NULL nohasharray
115961 +ocfs2_xa_value_truncate_13940 ocfs2_xa_value_truncate 2 13940 &ieee80211_if_read_dot11MeshForwarding_13940
115962 +iwl_dbgfs_protection_mode_read_13943 iwl_dbgfs_protection_mode_read 3 13943 NULL
115963 +ieee80211_if_read_min_discovery_timeout_13946 ieee80211_if_read_min_discovery_timeout 3 13946 NULL
115964 +lpfc_idiag_queacc_read_13950 lpfc_idiag_queacc_read 3 13950 NULL nohasharray
115965 +pagecache_write_end_13950 pagecache_write_end 0 13950 &lpfc_idiag_queacc_read_13950
115966 +osc_grant_shrink_interval_seq_write_13952 osc_grant_shrink_interval_seq_write 3 13952 NULL
115967 +snd_pcm_plug_slave_size_13967 snd_pcm_plug_slave_size 0-2 13967 NULL
115968 +qcam_read_13977 qcam_read 3 13977 NULL
115969 +dsp_read_13980 dsp_read 2 13980 NULL
115970 +dvb_demux_read_13981 dvb_demux_read 3 13981 NULL
115971 +sddr09_write_data_14014 sddr09_write_data 3 14014 NULL
115972 +btrfs_get_blocks_direct_14016 btrfs_get_blocks_direct 2 14016 NULL
115973 +dmi_format_ids_14018 dmi_format_ids 2 14018 NULL
115974 +iscsi_create_flashnode_conn_14022 iscsi_create_flashnode_conn 4 14022 NULL
115975 +pci_add_ext_cap_save_buffer_14032 pci_add_ext_cap_save_buffer 3 14032 NULL
115976 +dvb_usercopy_14036 dvb_usercopy 2 14036 NULL
115977 +read_def_modal_eeprom_14041 read_def_modal_eeprom 3 14041 NULL
115978 +ieee80211_if_fmt_aid_14055 ieee80211_if_fmt_aid 3 14055 NULL
115979 +ovs_nla_alloc_flow_actions_14056 ovs_nla_alloc_flow_actions 1 14056 NULL
115980 +sta_agg_status_read_14058 sta_agg_status_read 3 14058 NULL
115981 +lov_stripeoffset_seq_write_14078 lov_stripeoffset_seq_write 3 14078 NULL
115982 +do_proc_readlink_14096 do_proc_readlink 3 14096 NULL
115983 +ext4_journal_blocks_per_page_14127 ext4_journal_blocks_per_page 0 14127 NULL
115984 +isku_sysfs_read_light_14140 isku_sysfs_read_light 6 14140 NULL
115985 +em_canid_change_14150 em_canid_change 3 14150 NULL
115986 +gsm_dlci_data_14155 gsm_dlci_data 3 14155 NULL
115987 +midi_alloc_ep_req_14159 midi_alloc_ep_req 2 14159 NULL
115988 +print_input_mask_14168 print_input_mask 3-0 14168 NULL
115989 +ocfs2_xattr_value_truncate_14183 ocfs2_xattr_value_truncate 3 14183 NULL
115990 +datafab_read_data_14186 datafab_read_data 4 14186 NULL
115991 +hfsplus_brec_find_14200 hfsplus_brec_find 0 14200 NULL
115992 +alloc_async_14208 alloc_async 1 14208 NULL
115993 +ath6kl_regread_write_14220 ath6kl_regread_write 3 14220 NULL
115994 +ieee80211_if_write_uapsd_max_sp_len_14233 ieee80211_if_write_uapsd_max_sp_len 3 14233 NULL
115995 +dma_declare_coherent_memory_14244 dma_declare_coherent_memory 4 14244 NULL
115996 +btrfs_token_file_extent_ram_bytes_14247 btrfs_token_file_extent_ram_bytes 0 14247 NULL
115997 +ath6kl_connect_event_14267 ath6kl_connect_event 7-8-9 14267 NULL
115998 +rr_status_14293 rr_status 5 14293 NULL
115999 +read_default_ldt_14302 read_default_ldt 2 14302 NULL
116000 +oo_objects_14319 oo_objects 0 14319 NULL
116001 +ll_get_user_pages_14328 ll_get_user_pages 3-2-0 14328 NULL
116002 +p9_client_zc_rpc_14345 p9_client_zc_rpc 7 14345 NULL
116003 +alloc_tx_struct_14349 alloc_tx_struct 1 14349 NULL
116004 +hash_ipportnet4_expire_14354 hash_ipportnet4_expire 4 14354 NULL
116005 +snd_pcm_lib_readv_14363 snd_pcm_lib_readv 0-3 14363 NULL
116006 +lowpan_read_14369 lowpan_read 3 14369 NULL
116007 +ath6kl_regdump_read_14393 ath6kl_regdump_read 3 14393 NULL
116008 +smk_write_onlycap_14400 smk_write_onlycap 3 14400 NULL
116009 +mtd_concat_create_14416 mtd_concat_create 2 14416 NULL
116010 +get_kcore_size_14425 get_kcore_size 0 14425 NULL
116011 +_iwl_dbgfs_sram_write_14439 _iwl_dbgfs_sram_write 3 14439 NULL
116012 +block_size_14443 block_size 0 14443 NULL
116013 +lmv_user_md_size_14456 lmv_user_md_size 0-1 14456 NULL
116014 +snd_emu10k1_proc_spdif_status_14457 snd_emu10k1_proc_spdif_status 4-5 14457 NULL
116015 +ath10k_write_htt_stats_mask_14458 ath10k_write_htt_stats_mask 3 14458 NULL
116016 +lustre_msg_size_v2_14470 lustre_msg_size_v2 0 14470 NULL
116017 +dma_transfer_size_14473 dma_transfer_size 0 14473 NULL
116018 +udplite_getfrag_14479 udplite_getfrag 3-4 14479 NULL
116019 +ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 NULL
116020 +split_state_14491 split_state 0 14491 NULL
116021 +ocfs2_debug_read_14507 ocfs2_debug_read 3 14507 NULL
116022 +dataflash_read_user_otp_14536 dataflash_read_user_otp 3-2 14536 NULL nohasharray
116023 +ep0_write_14536 ep0_write 3 14536 &dataflash_read_user_otp_14536
116024 +picolcd_debug_eeprom_read_14549 picolcd_debug_eeprom_read 3 14549 NULL
116025 +qp_host_alloc_queue_14566 qp_host_alloc_queue 1 14566 NULL
116026 +SyS_setdomainname_14569 SyS_setdomainname 2 14569 NULL
116027 +idmap_pipe_downcall_14591 idmap_pipe_downcall 3 14591 NULL
116028 +ceph_osdc_alloc_request_14597 ceph_osdc_alloc_request 3 14597 NULL
116029 +dbJoin_14644 dbJoin 0 14644 NULL
116030 +profile_replace_14652 profile_replace 3 14652 NULL
116031 +usnic_vnic_dump_14662 usnic_vnic_dump 3 14662 NULL
116032 +min_bytes_needed_14675 min_bytes_needed 0 14675 NULL
116033 +nvme_trans_log_info_exceptions_14677 nvme_trans_log_info_exceptions 3 14677 NULL
116034 +pipeline_enc_tx_stat_fifo_int_read_14680 pipeline_enc_tx_stat_fifo_int_read 3 14680 NULL
116035 +ieee80211_if_fmt_rc_rateidx_mask_2ghz_14683 ieee80211_if_fmt_rc_rateidx_mask_2ghz 3 14683 NULL
116036 +SyS_fsetxattr_14702 SyS_fsetxattr 4 14702 NULL
116037 +persistent_ram_ecc_string_14704 persistent_ram_ecc_string 0 14704 NULL
116038 +u_audio_playback_14709 u_audio_playback 3 14709 NULL
116039 +rtw_cbuf_alloc_14710 rtw_cbuf_alloc 1 14710 NULL
116040 +vfd_write_14717 vfd_write 3 14717 NULL
116041 +__blk_end_request_14729 __blk_end_request 3 14729 NULL
116042 +raid1_resize_14740 raid1_resize 2 14740 NULL
116043 +i915_error_state_buf_init_14742 i915_error_state_buf_init 2 14742 NULL
116044 +btrfs_inode_extref_name_len_14752 btrfs_inode_extref_name_len 0 14752 NULL
116045 +rx_rx_cmplt_read_14753 rx_rx_cmplt_read 3 14753 NULL
116046 +regmap_range_read_file_14775 regmap_range_read_file 3 14775 NULL
116047 +sta_dev_read_14782 sta_dev_read 3 14782 NULL
116048 +keys_proc_write_14792 keys_proc_write 3 14792 NULL
116049 +ext4_kvmalloc_14796 ext4_kvmalloc 1 14796 NULL
116050 +__kfifo_in_14797 __kfifo_in 3-0 14797 NULL
116051 +hpet_readl_14801 hpet_readl 0 14801 NULL nohasharray
116052 +snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 &hpet_readl_14801
116053 +do_tune_cpucache_14828 do_tune_cpucache 2 14828 NULL
116054 +mrp_attr_create_14853 mrp_attr_create 3 14853 NULL
116055 +lcd_write_14857 lcd_write 3 14857 NULL
116056 +get_user_cpu_mask_14861 get_user_cpu_mask 2 14861 NULL
116057 +gmux_index_read8_14890 gmux_index_read8 0 14890 NULL
116058 +acpi_os_allocate_14892 acpi_os_allocate 1 14892 NULL
116059 +SYSC_readv_14901 SYSC_readv 3 14901 NULL
116060 +__arch_hweight64_14923 __arch_hweight64 0 14923 NULL nohasharray
116061 +qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 5-2 14923 &__arch_hweight64_14923
116062 +ocfs2_expand_nonsparse_inode_14936 ocfs2_expand_nonsparse_inode 3-4 14936 NULL
116063 +queue_cnt_14951 queue_cnt 0 14951 NULL
116064 +unix_dgram_recvmsg_14952 unix_dgram_recvmsg 4 14952 NULL
116065 +videobuf_read_stream_14956 videobuf_read_stream 3 14956 NULL
116066 +mce_flush_rx_buffer_14976 mce_flush_rx_buffer 2 14976 NULL
116067 +setkey_14987 setkey 3 14987 NULL nohasharray
116068 +gpio_twl4030_write_14987 gpio_twl4030_write 1 14987 &setkey_14987
116069 +blk_integrity_tuple_size_15027 blk_integrity_tuple_size 0 15027 NULL
116070 +read_file_node_aggr_15040 read_file_node_aggr 3 15040 NULL
116071 +cld_pipe_downcall_15058 cld_pipe_downcall 3 15058 NULL
116072 +ieee80211_if_read_uapsd_max_sp_len_15067 ieee80211_if_read_uapsd_max_sp_len 3 15067 NULL
116073 +nfs4_write_cached_acl_15070 nfs4_write_cached_acl 4 15070 NULL
116074 +ntfs_copy_from_user_15072 ntfs_copy_from_user 0-5-3 15072 NULL
116075 +pppoe_recvmsg_15073 pppoe_recvmsg 4 15073 NULL
116076 +smscore_load_firmware_family2_15086 smscore_load_firmware_family2 3 15086 NULL
116077 +btrfs_readpage_15094 btrfs_readpage 0 15094 NULL
116078 +compat_SyS_pwritev_15118 compat_SyS_pwritev 3 15118 NULL
116079 +hex_dump_to_buffer_15121 hex_dump_to_buffer 6 15121 NULL
116080 +start_port_15124 start_port 0 15124 NULL
116081 +ipwireless_ppp_mru_15153 ipwireless_ppp_mru 0 15153 NULL
116082 +self_check_not_bad_15175 self_check_not_bad 0 15175 NULL
116083 +SYSC_setdomainname_15180 SYSC_setdomainname 2 15180 NULL
116084 +iscsi_create_endpoint_15193 iscsi_create_endpoint 1 15193 NULL
116085 +mtt_alloc_res_15211 mtt_alloc_res 5 15211 NULL
116086 +bfad_debugfs_write_regrd_15218 bfad_debugfs_write_regrd 3 15218 NULL
116087 +iwl_dbgfs_sram_write_15239 iwl_dbgfs_sram_write 3 15239 NULL
116088 +il_dbgfs_rx_stats_read_15243 il_dbgfs_rx_stats_read 3 15243 NULL
116089 +simple_strtol_15273 simple_strtol 0 15273 NULL
116090 +fw_realloc_buffer_15280 fw_realloc_buffer 2 15280 NULL
116091 +kovaplus_sysfs_read_15337 kovaplus_sysfs_read 6 15337 NULL
116092 +ioread16_15342 ioread16 0 15342 NULL
116093 +ept_prefetch_gpte_15348 ept_prefetch_gpte 4 15348 NULL
116094 +acpi_ut_create_string_object_15360 acpi_ut_create_string_object 1 15360 NULL
116095 +ext4_direct_IO_15369 ext4_direct_IO 4 15369 NULL
116096 +graph_depth_read_15371 graph_depth_read 3 15371 NULL
116097 +fq_codel_zalloc_15378 fq_codel_zalloc 1 15378 NULL
116098 +alloc_fddidev_15382 alloc_fddidev 1 15382 NULL
116099 +pipeline_csum_to_rx_xfer_swi_read_15403 pipeline_csum_to_rx_xfer_swi_read 3 15403 NULL
116100 +get_modalias_15406 get_modalias 2 15406 NULL
116101 +blockdev_direct_IO_15408 blockdev_direct_IO 5 15408 NULL
116102 +__videobuf_copy_to_user_15423 __videobuf_copy_to_user 4-0 15423 NULL
116103 +rtw_cfg80211_rx_action_p2p_15432 rtw_cfg80211_rx_action_p2p 3 15432 NULL
116104 +tcp_mtu_to_mss_15438 tcp_mtu_to_mss 2-0 15438 NULL
116105 +hpsa_change_queue_depth_15449 hpsa_change_queue_depth 2 15449 NULL
116106 +insert_old_idx_znode_15500 insert_old_idx_znode 0 15500 NULL
116107 +zd_chip_is_zd1211b_15518 zd_chip_is_zd1211b 0 15518 NULL
116108 +ifx_spi_write_15531 ifx_spi_write 3 15531 NULL
116109 +p9_check_zc_errors_15534 p9_check_zc_errors 4 15534 NULL
116110 +xfrm_state_mtu_15548 xfrm_state_mtu 0-2 15548 NULL
116111 +snd_pcm_channel_info_15572 snd_pcm_channel_info 0 15572 NULL
116112 +persistent_status_15574 persistent_status 4 15574 NULL
116113 +bnx2fc_process_unsol_compl_15576 bnx2fc_process_unsol_compl 2 15576 NULL
116114 +vme_user_write_15587 vme_user_write 3 15587 NULL
116115 +compat_fillonedir_15620 compat_fillonedir 3 15620 NULL
116116 +proc_loginuid_read_15631 proc_loginuid_read 3 15631 NULL
116117 +tomoyo_scan_bprm_15642 tomoyo_scan_bprm 2-4 15642 NULL nohasharray
116118 +pipeline_hs_tx_stat_fifo_int_read_15642 pipeline_hs_tx_stat_fifo_int_read 3 15642 &tomoyo_scan_bprm_15642 nohasharray
116119 +sk_memory_allocated_add_15642 sk_memory_allocated_add 2 15642 &pipeline_hs_tx_stat_fifo_int_read_15642
116120 +joydev_handle_JSIOCSBTNMAP_15643 joydev_handle_JSIOCSBTNMAP 3 15643 NULL
116121 +fs_path_add_15648 fs_path_add 3 15648 NULL
116122 +__do_readpage_15652 __do_readpage 0 15652 NULL
116123 +xsd_read_15653 xsd_read 3 15653 NULL
116124 +unix_bind_15668 unix_bind 3 15668 NULL
116125 +dm_read_15674 dm_read 3 15674 NULL nohasharray
116126 +SyS_connect_15674 SyS_connect 3 15674 &dm_read_15674
116127 +uinput_str_to_user_15695 uinput_str_to_user 3 15695 NULL
116128 +__sk_migrate_realloc_15709 __sk_migrate_realloc 3 15709 NULL
116129 +tracing_snapshot_write_15719 tracing_snapshot_write 3 15719 NULL
116130 +HiSax_readstatus_15752 HiSax_readstatus 2 15752 NULL
116131 +smk_read_direct_15803 smk_read_direct 3 15803 NULL
116132 +gnttab_expand_15817 gnttab_expand 1 15817 NULL nohasharray
116133 +nameseq_list_15817 nameseq_list 3-0 15817 &gnttab_expand_15817
116134 +afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 NULL
116135 +table_size_15851 table_size 0-1-2 15851 NULL
116136 +write_file_tx99_15856 write_file_tx99 3 15856 NULL
116137 +media_entity_init_15870 media_entity_init 2-4 15870 NULL nohasharray
116138 +ubi_io_write_15870 ubi_io_write 0 15870 &media_entity_init_15870
116139 +__mptctl_ioctl_15875 __mptctl_ioctl 2 15875 NULL
116140 +parse_audio_stream_data_15937 parse_audio_stream_data 3 15937 NULL
116141 +power_read_15939 power_read 3 15939 NULL
116142 +lpfc_idiag_drbacc_read_15948 lpfc_idiag_drbacc_read 3 15948 NULL
116143 +snd_pcm_lib_read_transfer_15952 snd_pcm_lib_read_transfer 5-2-4 15952 NULL
116144 +memblock_virt_alloc_try_nid_15954 memblock_virt_alloc_try_nid 1 15954 NULL
116145 +viafb_vt1636_proc_write_16018 viafb_vt1636_proc_write 3 16018 NULL
116146 +dccp_recvmsg_16056 dccp_recvmsg 4 16056 NULL
116147 +read_file_spectral_period_16057 read_file_spectral_period 3 16057 NULL
116148 +si5351_msynth_params_address_16062 si5351_msynth_params_address 0-1 16062 NULL
116149 +isr_tx_exch_complete_read_16103 isr_tx_exch_complete_read 3 16103 NULL
116150 +isr_hw_pm_mode_changes_read_16110 isr_hw_pm_mode_changes_read 3 16110 NULL nohasharray
116151 +dma_tx_requested_read_16110 dma_tx_requested_read 3 16110 &isr_hw_pm_mode_changes_read_16110
116152 +snd_dma_pointer_16126 snd_dma_pointer 0-2 16126 NULL
116153 +fsm_init_16134 fsm_init 2 16134 NULL
116154 +ext4_xattr_block_get_16148 ext4_xattr_block_get 0 16148 NULL
116155 +optimal_reclaimed_pages_16172 optimal_reclaimed_pages 0 16172 NULL
116156 +mapping_level_16188 mapping_level 2-0 16188 NULL
116157 +i40e_allocate_virt_mem_d_16191 i40e_allocate_virt_mem_d 3 16191 NULL
116158 +ath10k_htt_rx_ring_size_16201 ath10k_htt_rx_ring_size 0 16201 NULL
116159 +cipso_v4_map_cat_rng_hton_16203 cipso_v4_map_cat_rng_hton 0 16203 NULL
116160 +SyS_pselect6_16210 SyS_pselect6 1 16210 NULL
116161 +create_table_16213 create_table 2 16213 NULL
116162 +ath9k_hw_ar9287_dump_eeprom_16224 ath9k_hw_ar9287_dump_eeprom 5-4 16224 NULL
116163 +atomic_read_file_16227 atomic_read_file 3 16227 NULL
116164 +BcmGetSectionValStartOffset_16235 BcmGetSectionValStartOffset 0 16235 NULL
116165 +lov_prep_brw_set_16246 lov_prep_brw_set 3 16246 NULL
116166 +i40e_dbg_dump_read_16247 i40e_dbg_dump_read 3 16247 NULL
116167 +il_dbgfs_disable_ht40_write_16249 il_dbgfs_disable_ht40_write 3 16249 NULL
116168 +SyS_fgetxattr_16254 SyS_fgetxattr 4 16254 NULL
116169 +reiserfs_acl_count_16265 reiserfs_acl_count 0-1 16265 NULL
116170 +ocfs2_xattr_bucket_value_truncate_16279 ocfs2_xattr_bucket_value_truncate 4 16279 NULL
116171 +nand_bch_init_16280 nand_bch_init 3-2 16280 NULL nohasharray
116172 +drbd_setsockopt_16280 drbd_setsockopt 5 16280 &nand_bch_init_16280
116173 +account_16283 account 0-4-2 16283 NULL nohasharray
116174 +mirror_status_16283 mirror_status 5 16283 &account_16283
116175 +jumpshot_read_data_16287 jumpshot_read_data 4 16287 NULL
116176 +mo_xattr_get_16288 mo_xattr_get 0 16288 NULL
116177 +stk_allocate_buffers_16291 stk_allocate_buffers 2 16291 NULL
116178 +rbd_segment_offset_16293 rbd_segment_offset 0-2 16293 NULL
116179 +rsc_mgr_init_16299 rsc_mgr_init 3 16299 NULL
116180 +kvm_handle_hva_range_16312 kvm_handle_hva_range 3-2 16312 NULL
116181 +sysfs_create_groups_16360 sysfs_create_groups 0 16360 NULL
116182 +total_ps_buffered_read_16365 total_ps_buffered_read 3 16365 NULL
116183 +iscsi_tcp_conn_setup_16376 iscsi_tcp_conn_setup 2 16376 NULL
116184 +i8042_create_kbd_port_16379 i8042_create_kbd_port 0 16379 NULL
116185 +ieee80211_if_read_tsf_16420 ieee80211_if_read_tsf 3 16420 NULL
116186 +rxrpc_server_keyring_16431 rxrpc_server_keyring 3 16431 NULL
116187 +__bio_add_page_16435 __bio_add_page 0-4 16435 NULL
116188 +cmdline_store_16442 cmdline_store 4 16442 NULL
116189 +btrfs_truncate_inode_items_16452 btrfs_truncate_inode_items 4 16452 NULL
116190 +netlink_change_ngroups_16457 netlink_change_ngroups 2 16457 NULL
116191 +req_capsule_get_size_16467 req_capsule_get_size 0 16467 NULL
116192 +tracing_readme_read_16493 tracing_readme_read 3 16493 NULL
116193 +KEY_OFFSET_16504 KEY_OFFSET 0 16504 NULL
116194 +snd_interval_max_16529 snd_interval_max 0 16529 NULL
116195 +raid10_resize_16537 raid10_resize 2 16537 NULL
116196 +lpfc_debugfs_read_16566 lpfc_debugfs_read 3 16566 NULL
116197 +agp_allocate_memory_wrap_16576 agp_allocate_memory_wrap 1 16576 NULL
116198 +lustre_msg_hdr_size_v2_16589 lustre_msg_hdr_size_v2 0 16589 NULL
116199 +gmux_index_read32_16604 gmux_index_read32 0 16604 NULL
116200 +compat_SyS_migrate_pages_16618 compat_SyS_migrate_pages 2 16618 NULL
116201 +rtw_set_wpa_ie_16633 rtw_set_wpa_ie 3 16633 NULL
116202 +btrfs_get_token_32_16651 btrfs_get_token_32 0 16651 NULL
116203 +__wa_populate_dto_urb_16699 __wa_populate_dto_urb 3-4 16699 NULL
116204 +__proc_lnet_buffers_16717 __proc_lnet_buffers 5 16717 NULL
116205 +__copy_to_user_swizzled_16748 __copy_to_user_swizzled 3-4 16748 NULL
116206 +arcmsr_adjust_disk_queue_depth_16756 arcmsr_adjust_disk_queue_depth 2 16756 NULL
116207 +blk_rq_map_user_iov_16772 blk_rq_map_user_iov 5 16772 NULL
116208 +i2o_parm_issue_16790 i2o_parm_issue 0 16790 NULL
116209 +get_server_iovec_16804 get_server_iovec 2 16804 NULL
116210 +drm_malloc_ab_16831 drm_malloc_ab 1-2 16831 NULL
116211 +scsi_mode_sense_16835 scsi_mode_sense 5 16835 NULL
116212 +hfsplus_min_io_size_16859 hfsplus_min_io_size 0 16859 NULL
116213 +alloc_idx_lebs_16872 alloc_idx_lebs 2 16872 NULL
116214 +carl9170_debugfs_ampdu_state_read_16873 carl9170_debugfs_ampdu_state_read 3 16873 NULL
116215 +st_write_16874 st_write 3 16874 NULL
116216 +__kfifo_peek_n_16877 __kfifo_peek_n 0 16877 NULL
116217 +psb_unlocked_ioctl_16926 psb_unlocked_ioctl 2 16926 NULL nohasharray
116218 +snd_gf1_mem_proc_dump_16926 snd_gf1_mem_proc_dump 5 16926 &psb_unlocked_ioctl_16926
116219 +_sp2d_alloc_16944 _sp2d_alloc 1-2-3 16944 NULL
116220 +squashfs_read_table_16945 squashfs_read_table 3 16945 NULL
116221 +keyctl_instantiate_key_iov_16969 keyctl_instantiate_key_iov 3 16969 NULL
116222 +ceph_read_dir_17005 ceph_read_dir 3 17005 NULL
116223 +copy_counters_to_user_17027 copy_counters_to_user 5 17027 NULL
116224 +C_SYSC_keyctl_17041 C_SYSC_keyctl 4 17041 NULL
116225 +jffs2_trusted_setxattr_17048 jffs2_trusted_setxattr 4 17048 NULL
116226 +__arch_hweight32_17060 __arch_hweight32 0 17060 NULL
116227 +sddr55_read_data_17072 sddr55_read_data 4 17072 NULL
116228 +dvb_dvr_read_17073 dvb_dvr_read 3 17073 NULL
116229 +simple_transaction_read_17076 simple_transaction_read 3 17076 NULL
116230 +carl9170_debugfs_mem_usage_read_17084 carl9170_debugfs_mem_usage_read 3 17084 NULL
116231 +entry_length_17093 entry_length 0 17093 NULL
116232 +write_mem_17114 write_mem 3 17114 NULL
116233 +pvr2_hdw_state_report_17121 pvr2_hdw_state_report 3 17121 NULL
116234 +nouveau_instobj_create__17144 nouveau_instobj_create_ 4 17144 NULL
116235 +jumpshot_write_data_17151 jumpshot_write_data 4 17151 NULL
116236 +sep_read_17161 sep_read 3 17161 NULL
116237 +befs_nls2utf_17163 befs_nls2utf 3 17163 NULL
116238 +tx_tx_start_templates_read_17164 tx_tx_start_templates_read 3 17164 NULL
116239 +UniStrnlen_17169 UniStrnlen 0 17169 NULL
116240 +access_remote_vm_17189 access_remote_vm 0 17189 NULL nohasharray
116241 +iwl_dbgfs_txfifo_flush_write_17189 iwl_dbgfs_txfifo_flush_write 3 17189 &access_remote_vm_17189
116242 +iscsit_find_cmd_from_itt_or_dump_17194 iscsit_find_cmd_from_itt_or_dump 3 17194 NULL nohasharray
116243 +driver_state_read_17194 driver_state_read 3 17194 &iscsit_find_cmd_from_itt_or_dump_17194
116244 +sync_request_17208 sync_request 2 17208 NULL
116245 +dn_recvmsg_17213 dn_recvmsg 4 17213 NULL
116246 +lprocfs_read_frac_helper_17261 lprocfs_read_frac_helper 0 17261 NULL
116247 +error_error_frame_cts_nul_flid_read_17262 error_error_frame_cts_nul_flid_read 3 17262 NULL
116248 +alloc_ep_17269 alloc_ep 1 17269 NULL
116249 +pg_read_17276 pg_read 3 17276 NULL
116250 +raw_recvmsg_17277 raw_recvmsg 4 17277 NULL
116251 +hmac_sha256_17278 hmac_sha256 2 17278 NULL
116252 +neigh_hash_grow_17283 neigh_hash_grow 2 17283 NULL
116253 +minstrel_stats_read_17290 minstrel_stats_read 3 17290 NULL
116254 +ieee80211_if_fmt_dot11MeshForwarding_17301 ieee80211_if_fmt_dot11MeshForwarding 3 17301 NULL
116255 +mb_cache_create_17307 mb_cache_create 2 17307 NULL
116256 +gnttab_map_frames_v2_17314 gnttab_map_frames_v2 2 17314 NULL
116257 +ieee80211_if_read_dot11MeshHWMPperrMinInterval_17346 ieee80211_if_read_dot11MeshHWMPperrMinInterval 3 17346 NULL
116258 +ath6kl_wmi_send_mgmt_cmd_17347 ath6kl_wmi_send_mgmt_cmd 7 17347 NULL
116259 +mdc_import_seq_write_17409 mdc_import_seq_write 3 17409 NULL
116260 +lpfc_debugfs_dif_err_write_17424 lpfc_debugfs_dif_err_write 3 17424 NULL
116261 +sta_connected_time_read_17435 sta_connected_time_read 3 17435 NULL
116262 +libcfs_ipif_enumerate_17445 libcfs_ipif_enumerate 0 17445 NULL
116263 +nla_get_u32_17455 nla_get_u32 0 17455 NULL
116264 +__ref_totlen_17461 __ref_totlen 0 17461 NULL
116265 +probe_kernel_write_17481 probe_kernel_write 3 17481 NULL
116266 +TSS_rawhmac_17486 TSS_rawhmac 3 17486 NULL
116267 +lbs_highrssi_write_17515 lbs_highrssi_write 3 17515 NULL
116268 +qp_free_res_17541 qp_free_res 5 17541 NULL
116269 +__copy_to_user_17551 __copy_to_user 0-3 17551 NULL
116270 +copy_from_user_17559 copy_from_user 3-0 17559 NULL
116271 +snd_pcm_action_lock_irq_17569 snd_pcm_action_lock_irq 0 17569 NULL
116272 +hash_netport4_expire_17573 hash_netport4_expire 4 17573 NULL
116273 +acpi_ut_create_package_object_17594 acpi_ut_create_package_object 1 17594 NULL
116274 +neigh_hash_alloc_17595 neigh_hash_alloc 1 17595 NULL
116275 +osst_execute_17607 osst_execute 7-6 17607 NULL
116276 +ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout_17618 ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout 3 17618 NULL
116277 +dma_map_page_17628 dma_map_page 0 17628 NULL
116278 +twl4030_set_gpio_direction_17645 twl4030_set_gpio_direction 1 17645 NULL
116279 +SYSC_migrate_pages_17657 SYSC_migrate_pages 2 17657 NULL
116280 +packet_setsockopt_17662 packet_setsockopt 5 17662 NULL nohasharray
116281 +ubi_io_read_data_17662 ubi_io_read_data 0 17662 &packet_setsockopt_17662
116282 +pwr_enable_ps_read_17686 pwr_enable_ps_read 3 17686 NULL
116283 +filemap_fdatawait_17688 filemap_fdatawait 0 17688 NULL
116284 +venus_rename_17707 venus_rename 4-5 17707 NULL
116285 +exofs_read_lookup_dev_table_17733 exofs_read_lookup_dev_table 3 17733 NULL
116286 +sctpprobe_read_17741 sctpprobe_read 3 17741 NULL
116287 +ubifs_leb_change_17789 ubifs_leb_change 0 17789 NULL
116288 +shrink_slab_node_17794 shrink_slab_node 3 17794 NULL
116289 +lpuart_copy_rx_to_tty_17801 lpuart_copy_rx_to_tty 3 17801 NULL
116290 +gnet_stats_copy_app_17821 gnet_stats_copy_app 3 17821 NULL
116291 +cipso_v4_gentag_rbm_17836 cipso_v4_gentag_rbm 0 17836 NULL
116292 +em28xx_audio_ep_packet_size_17844 em28xx_audio_ep_packet_size 0 17844 NULL
116293 +dm_stats_message_17863 dm_stats_message 5 17863 NULL
116294 +sisusb_send_bulk_msg_17864 sisusb_send_bulk_msg 3 17864 NULL
116295 +alloc_sja1000dev_17868 alloc_sja1000dev 1 17868 NULL
116296 +virtio_cread32_17873 virtio_cread32 0 17873 NULL
116297 +ray_cs_essid_proc_write_17875 ray_cs_essid_proc_write 3 17875 NULL
116298 +orinoco_set_key_17878 orinoco_set_key 5-7 17878 NULL nohasharray
116299 +i40e_align_l2obj_base_17878 i40e_align_l2obj_base 0-1 17878 &orinoco_set_key_17878
116300 +init_per_cpu_17880 init_per_cpu 1 17880 NULL
116301 +ieee80211_if_fmt_dot11MeshMaxPeerLinks_17883 ieee80211_if_fmt_dot11MeshMaxPeerLinks 3 17883 NULL
116302 +ieee80211_if_fmt_dot11MeshHWMPRootMode_17890 ieee80211_if_fmt_dot11MeshHWMPRootMode 3 17890 NULL
116303 +dev_pm_opp_get_opp_count_17911 dev_pm_opp_get_opp_count 0 17911 NULL
116304 +xfs_buf_associate_memory_17915 xfs_buf_associate_memory 3 17915 NULL
116305 +tipc_port_iovec_rcv_17921 tipc_port_iovec_rcv 3 17921 NULL
116306 +scsi_bufflen_17933 scsi_bufflen 0 17933 NULL
116307 +__mutex_lock_check_stamp_17947 __mutex_lock_check_stamp 0 17947 NULL
116308 +beacon_interval_write_17952 beacon_interval_write 3 17952 NULL
116309 +calc_nr_buckets_17976 calc_nr_buckets 0 17976 NULL
116310 +ext4_ext_calc_credits_for_single_extent_17983 ext4_ext_calc_credits_for_single_extent 0-2 17983 NULL
116311 +smk_write_cipso_17989 smk_write_cipso 3 17989 NULL
116312 +gnttab_max_grant_frames_17993 gnttab_max_grant_frames 0 17993 NULL
116313 +pvr2_v4l2_read_18006 pvr2_v4l2_read 3 18006 NULL
116314 +cpufreq_add_dev_symlink_18028 cpufreq_add_dev_symlink 0 18028 NULL
116315 +o2hb_highest_node_18034 o2hb_highest_node 0 18034 NULL
116316 +cryptd_alloc_instance_18048 cryptd_alloc_instance 2-3 18048 NULL
116317 +__btrfs_drop_extents_18049 __btrfs_drop_extents 5 18049 NULL
116318 +ddebug_proc_write_18055 ddebug_proc_write 3 18055 NULL
116319 +lua_sysfs_read_18062 lua_sysfs_read 6 18062 NULL
116320 +fpregs_get_18066 fpregs_get 4 18066 NULL
116321 +kvm_read_guest_page_18074 kvm_read_guest_page 5 18074 NULL
116322 +SYSC_pselect6_18076 SYSC_pselect6 1 18076 NULL
116323 +SYSC_semtimedop_18091 SYSC_semtimedop 3 18091 NULL
116324 +mpi_alloc_18094 mpi_alloc 1 18094 NULL
116325 +hfs_direct_IO_18104 hfs_direct_IO 4 18104 NULL
116326 +dfs_file_read_18116 dfs_file_read 3 18116 NULL
116327 +svc_getnl_18120 svc_getnl 0 18120 NULL
116328 +paging32_gpte_to_gfn_lvl_18131 paging32_gpte_to_gfn_lvl 0-2-1 18131 NULL
116329 +selinux_inode_setsecurity_18148 selinux_inode_setsecurity 4 18148 NULL
116330 +is_idx_node_in_use_18165 is_idx_node_in_use 0 18165 NULL
116331 +pccard_store_cis_18176 pccard_store_cis 6 18176 NULL
116332 +snd_pcm_hw_refine_user_18204 snd_pcm_hw_refine_user 0 18204 NULL
116333 +orinoco_add_extscan_result_18207 orinoco_add_extscan_result 3 18207 NULL
116334 +gsm_control_message_18209 gsm_control_message 4 18209 NULL
116335 +do_ipv6_setsockopt_18215 do_ipv6_setsockopt 5 18215 NULL
116336 +gnttab_alloc_grant_references_18240 gnttab_alloc_grant_references 1 18240 NULL
116337 +alloc_trace_uprobe_18247 alloc_trace_uprobe 3 18247 NULL
116338 +rfcomm_sock_setsockopt_18254 rfcomm_sock_setsockopt 5 18254 NULL
116339 +qdisc_class_hash_alloc_18262 qdisc_class_hash_alloc 1 18262 NULL
116340 +gfs2_alloc_sort_buffer_18275 gfs2_alloc_sort_buffer 1 18275 NULL
116341 +alloc_ring_18278 alloc_ring 2-4 18278 NULL
116342 +find_dirty_idx_leb_18280 find_dirty_idx_leb 0 18280 NULL
116343 +bio_phys_segments_18281 bio_phys_segments 0 18281 NULL nohasharray
116344 +nouveau_subdev_create__18281 nouveau_subdev_create_ 7 18281 &bio_phys_segments_18281
116345 +ext4_readpages_18283 ext4_readpages 4 18283 NULL
116346 +mmc_send_bus_test_18285 mmc_send_bus_test 4 18285 NULL
116347 +um_idi_write_18293 um_idi_write 3 18293 NULL
116348 +nouveau_disp_create__18305 nouveau_disp_create_ 4-7 18305 NULL
116349 +vga_r_18310 vga_r 0 18310 NULL
116350 +class_add_profile_18315 class_add_profile 1-3-5 18315 NULL
116351 +csio_mem_read_18319 csio_mem_read 3 18319 NULL
116352 +alloc_and_copy_string_18321 alloc_and_copy_string 2 18321 NULL
116353 +ecryptfs_send_message_18322 ecryptfs_send_message 2 18322 NULL
116354 +bio_integrity_advance_18324 bio_integrity_advance 2 18324 NULL
116355 +copy_page_to_iter_18345 copy_page_to_iter 3-0 18345 NULL
116356 +lcd_proc_write_18351 lcd_proc_write 3 18351 NULL
116357 +pwr_power_save_off_read_18355 pwr_power_save_off_read 3 18355 NULL
116358 +SyS_process_vm_readv_18366 SyS_process_vm_readv 3-5 18366 NULL
116359 +ep_io_18367 ep_io 0 18367 NULL
116360 +qib_user_sdma_num_pages_18371 qib_user_sdma_num_pages 0 18371 NULL
116361 +__ceph_getxattr_18386 __ceph_getxattr 0 18386 NULL
116362 +ci_role_write_18388 ci_role_write 3 18388 NULL
116363 +adis16136_show_serial_18402 adis16136_show_serial 3 18402 NULL
116364 +rtl8169_rx_fill_18416 rtl8169_rx_fill 0 18416 NULL
116365 +memblock_virt_alloc_node_nopanic_18431 memblock_virt_alloc_node_nopanic 1 18431 NULL
116366 +iscsi_create_flashnode_sess_18433 iscsi_create_flashnode_sess 4 18433 NULL
116367 +snd_hda_get_connections_18437 snd_hda_get_connections 0 18437 NULL
116368 +fuse_perform_write_18457 fuse_perform_write 4 18457 NULL
116369 +regset_tls_set_18459 regset_tls_set 4 18459 NULL
116370 +pci_vpd_lrdt_size_18479 pci_vpd_lrdt_size 0 18479 NULL nohasharray
116371 +mite_bytes_in_transit_18479 mite_bytes_in_transit 0 18479 &pci_vpd_lrdt_size_18479
116372 +udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 NULL
116373 +btrfs_fiemap_18501 btrfs_fiemap 3 18501 NULL
116374 +__copy_user_zeroing_intel_18510 __copy_user_zeroing_intel 0-3 18510 NULL
116375 +snd_vx_inb_18514 snd_vx_inb 0 18514 NULL
116376 +snd_gus_dram_poke_18525 snd_gus_dram_poke 4 18525 NULL
116377 +nouveau_fifo_channel_create__18530 nouveau_fifo_channel_create_ 9 18530 NULL
116378 +tipc_send2port_18531 tipc_send2port 4 18531 NULL
116379 +seq_copy_in_user_18543 seq_copy_in_user 3 18543 NULL
116380 +sas_change_queue_depth_18555 sas_change_queue_depth 2 18555 NULL
116381 +smk_write_rules_list_18565 smk_write_rules_list 3 18565 NULL
116382 +debug_output_18575 debug_output 3 18575 NULL
116383 +filemap_fdatawait_range_18600 filemap_fdatawait_range 0 18600 NULL nohasharray
116384 +slabinfo_write_18600 slabinfo_write 3 18600 &filemap_fdatawait_range_18600
116385 +iowarrior_write_18604 iowarrior_write 3 18604 NULL
116386 +from_buffer_18625 from_buffer 3 18625 NULL
116387 +snd_pcm_oss_write3_18657 snd_pcm_oss_write3 0-3 18657 NULL
116388 +ieee80211_if_fmt_rssi_threshold_18664 ieee80211_if_fmt_rssi_threshold 3 18664 NULL
116389 +xfs_iext_insert_18667 xfs_iext_insert 3 18667 NULL
116390 +fnic_stats_debugfs_read_18688 fnic_stats_debugfs_read 3 18688 NULL
116391 +echo_client_prep_commit_18693 echo_client_prep_commit 8 18693 NULL
116392 +iwl_dbgfs_rx_handlers_read_18708 iwl_dbgfs_rx_handlers_read 3 18708 NULL
116393 +ceph_alloc_page_vector_18710 ceph_alloc_page_vector 1 18710 NULL
116394 +blk_rq_bytes_18715 blk_rq_bytes 0 18715 NULL
116395 +nfs4_init_callback_netid_18717 nfs4_init_callback_netid 3 18717 NULL
116396 +snd_als4k_gcr_read_addr_18741 snd_als4k_gcr_read_addr 0 18741 NULL
116397 +o2hb_debug_create_18744 o2hb_debug_create 4 18744 NULL
116398 +__erst_read_to_erange_from_nvram_18748 __erst_read_to_erange_from_nvram 0 18748 NULL
116399 +wep_packets_read_18751 wep_packets_read 3 18751 NULL
116400 +read_file_dump_nfcal_18766 read_file_dump_nfcal 3 18766 NULL
116401 +SyS_lsetxattr_18776 SyS_lsetxattr 4 18776 NULL
116402 +alloc_fcdev_18780 alloc_fcdev 1 18780 NULL
116403 +dm_stats_print_18815 dm_stats_print 7 18815 NULL
116404 +sys_modify_ldt_18824 sys_modify_ldt 3 18824 NULL
116405 +mtf_test_write_18844 mtf_test_write 3 18844 NULL
116406 +sctp_setsockopt_events_18862 sctp_setsockopt_events 3 18862 NULL
116407 +ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL
116408 +xlog_find_verify_log_record_18870 xlog_find_verify_log_record 2 18870 NULL
116409 +ceph_setxattr_18913 ceph_setxattr 4 18913 NULL
116410 +ieee80211_rx_mgmt_disassoc_18927 ieee80211_rx_mgmt_disassoc 3 18927 NULL
116411 +snapshot_write_next_18937 snapshot_write_next 0 18937 NULL
116412 +__nla_reserve_18974 __nla_reserve 3 18974 NULL
116413 +__blockdev_direct_IO_18977 __blockdev_direct_IO 0-6 18977 NULL
116414 +find_dirtiest_idx_leb_19001 find_dirtiest_idx_leb 0 19001 NULL
116415 +layout_in_gaps_19006 layout_in_gaps 2 19006 NULL
116416 +huge_page_size_19008 huge_page_size 0 19008 NULL
116417 +hash_netport6_expire_19013 hash_netport6_expire 4 19013 NULL
116418 +sysfs_create_dir_ns_19033 sysfs_create_dir_ns 0 19033 NULL
116419 +revalidate_19043 revalidate 2 19043 NULL
116420 +afs_vnode_store_data_19048 afs_vnode_store_data 2-3-4-5 19048 NULL
116421 +osc_pinger_recov_seq_write_19056 osc_pinger_recov_seq_write 3 19056 NULL nohasharray
116422 +do_vm86_irq_handling_19056 do_vm86_irq_handling 2 19056 &osc_pinger_recov_seq_write_19056
116423 +create_gpadl_header_19064 create_gpadl_header 2 19064 NULL
116424 +ceph_create_snap_context_19082 ceph_create_snap_context 1 19082 NULL
116425 +sta_last_seq_ctrl_read_19106 sta_last_seq_ctrl_read 3 19106 NULL
116426 +cifs_readv_from_socket_19109 cifs_readv_from_socket 3 19109 NULL
116427 +skb_gro_offset_19123 skb_gro_offset 0 19123 NULL
116428 +snd_als4k_iobase_readl_19136 snd_als4k_iobase_readl 0 19136 NULL
116429 +alloc_irdadev_19140 alloc_irdadev 1 19140 NULL
116430 +sleep_auth_read_19159 sleep_auth_read 3 19159 NULL
116431 +smk_write_access2_19170 smk_write_access2 3 19170 NULL
116432 +iwl_dbgfs_reply_tx_error_read_19205 iwl_dbgfs_reply_tx_error_read 3 19205 NULL
116433 +__copy_to_user_inatomic_19214 __copy_to_user_inatomic 3-0 19214 NULL
116434 +dev_counters_read_19216 dev_counters_read 3 19216 NULL
116435 +wbcir_tx_19219 wbcir_tx 3 19219 NULL
116436 +snd_mask_max_19224 snd_mask_max 0 19224 NULL
116437 +snd_pcm_capture_rewind_19229 snd_pcm_capture_rewind 0-2 19229 NULL
116438 +bio_alloc_mddev_19238 bio_alloc_mddev 2 19238 NULL
116439 +ucma_query_19260 ucma_query 4 19260 NULL
116440 +il_dbgfs_rxon_filter_flags_read_19281 il_dbgfs_rxon_filter_flags_read 3 19281 NULL
116441 +batadv_tt_save_orig_buffer_19288 batadv_tt_save_orig_buffer 4 19288 NULL nohasharray
116442 +cfg80211_rx_unprot_mlme_mgmt_19288 cfg80211_rx_unprot_mlme_mgmt 3 19288 &batadv_tt_save_orig_buffer_19288
116443 +qc_capture_19298 qc_capture 3 19298 NULL
116444 +ocfs2_prepare_inode_for_refcount_19303 ocfs2_prepare_inode_for_refcount 3-4 19303 NULL
116445 +event_tx_stuck_read_19305 event_tx_stuck_read 3 19305 NULL
116446 +debug_read_19322 debug_read 3 19322 NULL
116447 +cfg80211_inform_bss_19332 cfg80211_inform_bss 8 19332 NULL nohasharray
116448 +lbs_host_sleep_write_19332 lbs_host_sleep_write 3 19332 &cfg80211_inform_bss_19332
116449 +closure_sub_19359 closure_sub 2 19359 NULL
116450 +firmware_data_write_19360 firmware_data_write 6-5 19360 NULL
116451 +read_zero_19366 read_zero 3 19366 NULL
116452 +interpret_user_input_19393 interpret_user_input 2 19393 NULL
116453 +sync_fill_pt_info_19397 sync_fill_pt_info 0 19397 NULL
116454 +pep_recvmsg_19402 pep_recvmsg 4 19402 NULL
116455 +hid_hw_raw_request_19408 hid_hw_raw_request 0 19408 NULL
116456 +dvbdmx_write_19423 dvbdmx_write 3 19423 NULL
116457 +SyS_sched_getaffinity_19444 SyS_sched_getaffinity 2 19444 NULL
116458 +xfrm_alg_auth_len_19454 xfrm_alg_auth_len 0 19454 NULL
116459 +gnet_stats_copy_19458 gnet_stats_copy 4 19458 NULL
116460 +gp2ap020a00f_get_thresh_reg_19468 gp2ap020a00f_get_thresh_reg 0 19468 NULL
116461 +sky2_read16_19475 sky2_read16 0 19475 NULL
116462 +kstrtoll_from_user_19500 kstrtoll_from_user 2 19500 NULL
116463 +ext4_add_new_descs_19509 ext4_add_new_descs 3 19509 NULL
116464 +batadv_tvlv_container_register_19520 batadv_tvlv_container_register 5 19520 NULL
116465 +cfc_write_array_to_buffer_19529 cfc_write_array_to_buffer 3 19529 NULL
116466 +nfc_llcp_build_tlv_19536 nfc_llcp_build_tlv 3 19536 NULL
116467 +gfn_to_index_19558 gfn_to_index 0-1-3-2 19558 NULL
116468 +ocfs2_control_message_19564 ocfs2_control_message 3 19564 NULL
116469 +nfsd_read_19568 nfsd_read 5 19568 NULL
116470 +ieee80211_key_alloc_19575 ieee80211_key_alloc 3 19575 NULL
116471 +mnt_want_write_file_19579 mnt_want_write_file 0 19579 NULL
116472 +bm_status_read_19583 bm_status_read 3 19583 NULL
116473 +load_xattr_datum_19594 load_xattr_datum 0 19594 NULL
116474 +__mei_cl_recv_19636 __mei_cl_recv 3 19636 NULL
116475 +LoadBitmap_19658 LoadBitmap 2 19658 NULL
116476 +memblock_virt_alloc_low_nopanic_19714 memblock_virt_alloc_low_nopanic 1 19714 NULL
116477 +ocfs2_control_get_this_node_19721 ocfs2_control_get_this_node 0 19721 NULL
116478 +read_reg_19723 read_reg 0 19723 NULL
116479 +wm8350_block_write_19727 wm8350_block_write 2-3 19727 NULL
116480 +memcpy_toiovecend_19736 memcpy_toiovecend 4-3 19736 NULL
116481 +snd_es1968_get_dma_ptr_19747 snd_es1968_get_dma_ptr 0 19747 NULL
116482 +p9_client_read_19750 p9_client_read 5-0 19750 NULL
116483 +pnpbios_proc_write_19758 pnpbios_proc_write 3 19758 NULL
116484 +ocfs2_readpages_19759 ocfs2_readpages 4 19759 NULL
116485 +jffs2_acl_from_medium_19762 jffs2_acl_from_medium 2 19762 NULL
116486 +irda_setsockopt_19824 irda_setsockopt 5 19824 NULL
116487 +vfs_getxattr_19832 vfs_getxattr 0 19832 NULL
116488 +crypt_alloc_buffer_19846 crypt_alloc_buffer 2 19846 NULL
116489 +cfg80211_mlme_register_mgmt_19852 cfg80211_mlme_register_mgmt 5 19852 NULL
116490 +__nla_put_19857 __nla_put 3 19857 NULL
116491 +mrp_request_join_19882 mrp_request_join 4 19882 NULL
116492 +aes_decrypt_interrupt_read_19910 aes_decrypt_interrupt_read 3 19910 NULL
116493 +ps_upsd_max_apturn_read_19918 ps_upsd_max_apturn_read 3 19918 NULL
116494 +mangle_name_19923 mangle_name 0 19923 NULL
116495 +cgroup_task_count_19930 cgroup_task_count 0 19930 NULL
116496 +guest_read_tsc_19931 guest_read_tsc 0 19931 NULL
116497 +iwl_dbgfs_rx_queue_read_19943 iwl_dbgfs_rx_queue_read 3 19943 NULL
116498 +cfg80211_rx_assoc_resp_19944 cfg80211_rx_assoc_resp 4 19944 NULL
116499 +ll_xattr_cache_list_19954 ll_xattr_cache_list 0 19954 NULL
116500 +get_jack_mode_name_19976 get_jack_mode_name 4 19976 NULL
116501 +attach_hdlc_protocol_19986 attach_hdlc_protocol 3 19986 NULL
116502 +rtw_set_wps_probe_resp_19989 rtw_set_wps_probe_resp 3 19989 NULL nohasharray
116503 +i40e_reserve_msix_vectors_19989 i40e_reserve_msix_vectors 2 19989 &rtw_set_wps_probe_resp_19989
116504 +diva_um_idi_read_20003 diva_um_idi_read 0 20003 NULL
116505 +lov_stripe_md_size_20009 lov_stripe_md_size 0-1 20009 NULL nohasharray
116506 +event_trigger_write_20009 event_trigger_write 3 20009 &lov_stripe_md_size_20009
116507 +tree_mod_log_eb_move_20011 tree_mod_log_eb_move 5 20011 NULL
116508 +SYSC_fgetxattr_20027 SYSC_fgetxattr 4 20027 NULL
116509 +split_scan_timeout_read_20029 split_scan_timeout_read 3 20029 NULL
116510 +iwl_mvm_power_mac_dbgfs_read_20067 iwl_mvm_power_mac_dbgfs_read 0-4 20067 NULL
116511 +target_message_20072 target_message 2 20072 NULL
116512 +rawv6_sendmsg_20080 rawv6_sendmsg 4 20080 NULL
116513 +fuse_conn_limit_read_20084 fuse_conn_limit_read 3 20084 NULL
116514 +aat2870_reg_write_file_20086 aat2870_reg_write_file 3 20086 NULL
116515 +team_options_register_20091 team_options_register 3 20091 NULL
116516 +qla2x00_adjust_sdev_qdepth_up_20097 qla2x00_adjust_sdev_qdepth_up 2 20097 NULL
116517 +root_nfs_copy_20111 root_nfs_copy 3 20111 NULL
116518 +hptiop_adjust_disk_queue_depth_20122 hptiop_adjust_disk_queue_depth 2 20122 NULL
116519 +self_check_vid_hdr_20131 self_check_vid_hdr 0 20131 NULL
116520 +tomoyo_commit_ok_20167 tomoyo_commit_ok 2 20167 NULL
116521 +read_flush_pipefs_20171 read_flush_pipefs 3 20171 NULL
116522 +wep_addr_key_count_read_20174 wep_addr_key_count_read 3 20174 NULL
116523 +crystalhd_map_dio_20181 crystalhd_map_dio 3 20181 NULL
116524 +pvr2_ctrl_value_to_sym_20229 pvr2_ctrl_value_to_sym 5 20229 NULL
116525 +rose_sendmsg_20249 rose_sendmsg 4 20249 NULL
116526 +tm6000_i2c_send_regs_20250 tm6000_i2c_send_regs 5 20250 NULL
116527 +btrfs_header_nritems_20296 btrfs_header_nritems 0 20296 NULL
116528 +r10_sync_page_io_20307 r10_sync_page_io 3 20307 NULL
116529 +dm_get_reserved_bio_based_ios_20315 dm_get_reserved_bio_based_ios 0 20315 NULL
116530 +tx_tx_burst_programmed_read_20320 tx_tx_burst_programmed_read 3 20320 NULL
116531 +vx_send_msg_nolock_20322 vx_send_msg_nolock 0 20322 NULL
116532 +snd_cs4281_BA1_read_20323 snd_cs4281_BA1_read 5 20323 NULL
116533 +gfs2_glock_nq_m_20347 gfs2_glock_nq_m 1 20347 NULL
116534 +handle_arr_calc_size_20355 handle_arr_calc_size 0-1 20355 NULL
116535 +snd_pcm_stop_20376 snd_pcm_stop 0 20376 NULL
116536 +smk_set_cipso_20379 smk_set_cipso 3 20379 NULL
116537 +snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL
116538 +SyS_get_mempolicy_20399 SyS_get_mempolicy 3 20399 NULL nohasharray
116539 +__kfifo_from_user_20399 __kfifo_from_user 3 20399 &SyS_get_mempolicy_20399
116540 +compat_ipv6_setsockopt_20468 compat_ipv6_setsockopt 5 20468 NULL
116541 +read_buf_20469 read_buf 2 20469 NULL
116542 +bio_trim_20472 bio_trim 2 20472 NULL
116543 +btrfs_get_32_20476 btrfs_get_32 0 20476 NULL
116544 +xfs_iext_realloc_direct_20521 xfs_iext_realloc_direct 2 20521 NULL
116545 +drbd_bm_resize_20522 drbd_bm_resize 2 20522 NULL
116546 +amd_create_gatt_pages_20537 amd_create_gatt_pages 1 20537 NULL
116547 +scsi_report_opcode_20551 scsi_report_opcode 3 20551 NULL
116548 +venus_create_20555 venus_create 4 20555 NULL
116549 +btrfs_super_log_root_20565 btrfs_super_log_root 0 20565 NULL
116550 +crypto_ahash_reqsize_20569 crypto_ahash_reqsize 0 20569 NULL
116551 +kvm_test_age_hva_20593 kvm_test_age_hva 2 20593 NULL
116552 +set_secure_conn_20596 set_secure_conn 4 20596 NULL
116553 +sync_timeline_create_20601 sync_timeline_create 2 20601 NULL
116554 +lirc_write_20604 lirc_write 3 20604 NULL
116555 +qib_qsfp_write_20614 qib_qsfp_write 0-2-4 20614 NULL
116556 +snd_pcm_oss_prepare_20641 snd_pcm_oss_prepare 0 20641 NULL
116557 +get_extent_skip_holes_20642 get_extent_skip_holes 2 20642 NULL
116558 +kfifo_copy_to_user_20646 kfifo_copy_to_user 3-4 20646 NULL
116559 +cpulist_scnprintf_20648 cpulist_scnprintf 2-0 20648 NULL
116560 +oz_add_farewell_20652 oz_add_farewell 5 20652 NULL
116561 +oz_cdev_read_20659 oz_cdev_read 3 20659 NULL
116562 +snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL nohasharray
116563 +btrfs_qgroup_reserve_20676 btrfs_qgroup_reserve 0 20676 &snd_hdsp_playback_copy_20676
116564 +dvb_dmxdev_buffer_read_20682 dvb_dmxdev_buffer_read 0-4 20682 NULL
116565 +cpumask_size_20683 cpumask_size 0 20683 NULL
116566 +btrfs_node_blockptr_20685 btrfs_node_blockptr 0 20685 NULL
116567 +read_file_tgt_int_stats_20697 read_file_tgt_int_stats 3 20697 NULL
116568 +__maestro_read_20700 __maestro_read 0 20700 NULL
116569 +cipso_v4_gentag_rng_20703 cipso_v4_gentag_rng 0 20703 NULL
116570 +pcpu_page_first_chunk_20712 pcpu_page_first_chunk 1 20712 NULL
116571 +ocfs2_read_xattr_bucket_20722 ocfs2_read_xattr_bucket 0 20722 NULL
116572 +security_context_to_sid_force_20724 security_context_to_sid_force 2 20724 NULL
116573 +fb_prepare_logo_20743 fb_prepare_logo 0 20743 NULL
116574 +vol_cdev_direct_write_20751 vol_cdev_direct_write 3 20751 NULL
116575 +ocfs2_align_bytes_to_clusters_20754 ocfs2_align_bytes_to_clusters 2 20754 NULL
116576 +brcmf_p2p_escan_20763 brcmf_p2p_escan 2 20763 NULL nohasharray
116577 +mnt_clone_write_20763 mnt_clone_write 0 20763 &brcmf_p2p_escan_20763
116578 +ubi_io_read_20767 ubi_io_read 0 20767 NULL
116579 +fb_alloc_cmap_gfp_20792 fb_alloc_cmap_gfp 2 20792 NULL
116580 +iwl_dbgfs_rxon_flags_read_20795 iwl_dbgfs_rxon_flags_read 3 20795 NULL
116581 +lowpan_write_20800 lowpan_write 3 20800 NULL
116582 +strndup_user_20819 strndup_user 2 20819 NULL
116583 +tipc_msg_build_20825 tipc_msg_build 3 20825 NULL
116584 +wl1271_format_buffer_20834 wl1271_format_buffer 2 20834 NULL
116585 +uvc_alloc_entity_20836 uvc_alloc_entity 4-3 20836 NULL
116586 +p9_tag_alloc_20845 p9_tag_alloc 3 20845 NULL
116587 +nvme_trans_supported_vpd_pages_20847 nvme_trans_supported_vpd_pages 4 20847 NULL
116588 +get_name_20855 get_name 4 20855 NULL
116589 +iwl_dbgfs_pm_params_read_20866 iwl_dbgfs_pm_params_read 3 20866 NULL
116590 +snd_pcm_capture_avail_20867 snd_pcm_capture_avail 0 20867 NULL
116591 +srq_free_res_20868 srq_free_res 5 20868 NULL
116592 +cfs_cpt_table_create_20884 cfs_cpt_table_create 1 20884 NULL
116593 +rb_simple_write_20890 rb_simple_write 3 20890 NULL
116594 +sisusb_send_packet_20891 sisusb_send_packet 2 20891 NULL
116595 +key_icverrors_read_20895 key_icverrors_read 3 20895 NULL
116596 +vfio_msi_enable_20906 vfio_msi_enable 2 20906 NULL
116597 +lbs_rdbbp_write_20918 lbs_rdbbp_write 3 20918 NULL
116598 +htable_bits_20933 htable_bits 0 20933 NULL
116599 +altera_set_ir_post_20948 altera_set_ir_post 2 20948 NULL
116600 +rx_rx_phy_hdr_read_20950 rx_rx_phy_hdr_read 3 20950 NULL
116601 +rsxx_cram_read_20957 rsxx_cram_read 3 20957 NULL
116602 +nfs_map_name_to_uid_20962 nfs_map_name_to_uid 3 20962 NULL
116603 +snd_rme9652_playback_copy_20970 snd_rme9652_playback_copy 5 20970 NULL
116604 +alg_setsockopt_20985 alg_setsockopt 5 20985 NULL
116605 +qib_verbs_send_20999 qib_verbs_send 5-3 20999 NULL
116606 +btrfs_dirty_pages_21019 btrfs_dirty_pages 0 21019 NULL
116607 +btrfs_inode_ref_name_len_21024 btrfs_inode_ref_name_len 0 21024 NULL
116608 +rx_defrag_tkip_called_read_21031 rx_defrag_tkip_called_read 3 21031 NULL
116609 +srp_change_queue_depth_21038 srp_change_queue_depth 2 21038 NULL
116610 +fsl_edma_prep_dma_cyclic_21042 fsl_edma_prep_dma_cyclic 4-3 21042 NULL
116611 +lbs_threshold_read_21046 lbs_threshold_read 5 21046 NULL
116612 +reiserfs_direct_IO_21051 reiserfs_direct_IO 4 21051 NULL
116613 +proc_fault_inject_write_21058 proc_fault_inject_write 3 21058 NULL
116614 +qdisc_get_default_21072 qdisc_get_default 2 21072 NULL
116615 +event_calibration_read_21083 event_calibration_read 3 21083 NULL
116616 +bl_add_page_to_bio_21094 bl_add_page_to_bio 2 21094 NULL nohasharray
116617 +multipath_status_21094 multipath_status 5 21094 &bl_add_page_to_bio_21094
116618 +rate_control_pid_events_read_21099 rate_control_pid_events_read 3 21099 NULL
116619 +ath6kl_send_go_probe_resp_21113 ath6kl_send_go_probe_resp 3 21113 NULL
116620 +_efx_mcdi_rpc_async_21119 _efx_mcdi_rpc_async 4-5 21119 NULL
116621 +i2400m_rx_trace_21127 i2400m_rx_trace 3 21127 NULL
116622 +mei_dbgfs_read_active_21172 mei_dbgfs_read_active 3 21172 NULL
116623 +cx18_v4l2_read_21196 cx18_v4l2_read 3 21196 NULL
116624 +__generic_file_aio_write_21201 __generic_file_aio_write 0 21201 NULL
116625 +ipc_rcu_alloc_21208 ipc_rcu_alloc 1 21208 NULL
116626 +scsi_execute_req_flags_21215 scsi_execute_req_flags 5 21215 NULL
116627 +get_numpages_21227 get_numpages 0-2-1 21227 NULL
116628 +input_ff_create_21240 input_ff_create 2 21240 NULL
116629 +cfg80211_notify_new_peer_candidate_21242 cfg80211_notify_new_peer_candidate 4 21242 NULL
116630 +fru_length_21257 fru_length 0 21257 NULL
116631 +rtw_set_wps_beacon_21262 rtw_set_wps_beacon 3 21262 NULL
116632 +drm_universal_plane_init_21296 drm_universal_plane_init 6 21296 NULL
116633 +do_msg_fill_21307 do_msg_fill 3 21307 NULL
116634 +add_res_range_21310 add_res_range 4 21310 NULL
116635 +get_zeroed_page_21322 get_zeroed_page 0 21322 NULL
116636 +ftrace_profile_read_21327 ftrace_profile_read 3 21327 NULL
116637 +read_file_bool_bmps_21344 read_file_bool_bmps 3 21344 NULL
116638 +gfs2_ea_get_copy_21353 gfs2_ea_get_copy 0 21353 NULL
116639 +alloc_orinocodev_21371 alloc_orinocodev 1 21371 NULL
116640 +SYSC_rt_sigpending_21379 SYSC_rt_sigpending 2 21379 NULL
116641 +video_ioctl2_21380 video_ioctl2 2 21380 NULL
116642 +insert_ptr_21386 insert_ptr 6 21386 NULL
116643 +diva_get_driver_dbg_mask_21399 diva_get_driver_dbg_mask 0 21399 NULL
116644 +__clone_and_map_simple_bio_21404 __clone_and_map_simple_bio 4 21404 NULL
116645 +snd_m3_inw_21406 snd_m3_inw 0 21406 NULL
116646 +usnic_ib_dump_vf_hdr_21423 usnic_ib_dump_vf_hdr 3 21423 NULL
116647 +snapshot_read_next_21426 snapshot_read_next 0 21426 NULL
116648 +tcp_bound_to_half_wnd_21429 tcp_bound_to_half_wnd 0-2 21429 NULL
116649 +tracing_saved_cmdlines_read_21434 tracing_saved_cmdlines_read 3 21434 NULL
116650 +aggr_size_tx_agg_vs_rate_read_21438 aggr_size_tx_agg_vs_rate_read 3 21438 NULL
116651 +__ertm_hdr_size_21450 __ertm_hdr_size 0 21450 NULL
116652 +mei_nfc_send_21477 mei_nfc_send 3 21477 NULL
116653 +read_file_xmit_21487 read_file_xmit 3 21487 NULL
116654 +mmc_alloc_sg_21504 mmc_alloc_sg 1 21504 NULL
116655 +btrfs_file_aio_write_21520 btrfs_file_aio_write 4 21520 NULL
116656 +il_dbgfs_stations_read_21532 il_dbgfs_stations_read 3 21532 NULL
116657 +cipso_v4_map_cat_enum_hton_21540 cipso_v4_map_cat_enum_hton 0 21540 NULL
116658 +rxrpc_send_data_21553 rxrpc_send_data 5 21553 NULL
116659 +rx_rx_beacon_early_term_read_21559 rx_rx_beacon_early_term_read 3 21559 NULL
116660 +xfs_buf_read_uncached_21585 xfs_buf_read_uncached 3 21585 NULL
116661 +snd_es18xx_mixer_read_21586 snd_es18xx_mixer_read 0 21586 NULL
116662 +ocfs2_acl_from_xattr_21604 ocfs2_acl_from_xattr 2 21604 NULL
116663 +filemap_get_page_21606 filemap_get_page 2 21606 NULL
116664 +__jfs_getxattr_21631 __jfs_getxattr 0 21631 NULL
116665 +atalk_sendmsg_21677 atalk_sendmsg 4 21677 NULL
116666 +ocfs2_xattr_get_nolock_21678 ocfs2_xattr_get_nolock 0 21678 NULL
116667 +regmap_register_patch_21681 regmap_register_patch 3 21681 NULL
116668 +rtllib_alloc_txb_21687 rtllib_alloc_txb 1 21687 NULL
116669 +evdev_ioctl_handler_21705 evdev_ioctl_handler 2 21705 NULL
116670 +update_time_21719 update_time 0 21719 NULL
116671 +unix_skb_len_21722 unix_skb_len 0 21722 NULL
116672 +lprocfs_wr_import_21728 lprocfs_wr_import 3 21728 NULL
116673 +mthca_alloc_init_21754 mthca_alloc_init 2 21754 NULL
116674 +usbat_flash_read_data_21762 usbat_flash_read_data 4 21762 NULL
116675 +gen_pool_add_21776 gen_pool_add 3 21776 NULL
116676 +xfs_da_grow_inode_int_21785 xfs_da_grow_inode_int 3 21785 NULL
116677 +dvb_generic_ioctl_21810 dvb_generic_ioctl 2 21810 NULL
116678 +_iwl_dbgfs_sta_drain_write_21837 _iwl_dbgfs_sta_drain_write 3 21837 NULL
116679 +oom_adj_read_21847 oom_adj_read 3 21847 NULL
116680 +lpfc_idiag_extacc_avail_get_21865 lpfc_idiag_extacc_avail_get 0-3 21865 NULL
116681 +brcms_debugfs_hardware_read_21867 brcms_debugfs_hardware_read 3 21867 NULL
116682 +msix_capability_init_21870 msix_capability_init 0 21870 NULL
116683 +sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL
116684 +ldlm_lock_create_21888 ldlm_lock_create 7 21888 NULL
116685 +dbAllocCtl_21911 dbAllocCtl 0 21911 NULL
116686 +qsfp_1_read_21915 qsfp_1_read 3 21915 NULL
116687 +twl_i2c_write_u16_21953 twl_i2c_write_u16 3 21953 NULL
116688 +__build_xattrs_21979 __build_xattrs 0 21979 NULL
116689 +SYSC_prctl_21980 SYSC_prctl 4 21980 NULL
116690 +compat_rw_copy_check_uvector_22001 compat_rw_copy_check_uvector 3-0 22001 NULL nohasharray
116691 +rxpipe_descr_host_int_trig_rx_data_read_22001 rxpipe_descr_host_int_trig_rx_data_read 3 22001 &compat_rw_copy_check_uvector_22001
116692 +regcache_sync_block_raw_flush_22021 regcache_sync_block_raw_flush 3-4 22021 NULL
116693 +btrfs_get_16_22023 btrfs_get_16 0 22023 NULL
116694 +_sp2d_min_pg_22032 _sp2d_min_pg 0 22032 NULL
116695 +zd_usb_read_fw_22049 zd_usb_read_fw 4 22049 NULL
116696 +ieee80211_if_fmt_dropped_frames_ttl_22054 ieee80211_if_fmt_dropped_frames_ttl 3 22054 NULL
116697 +btrfs_reloc_clone_csums_22077 btrfs_reloc_clone_csums 2-3 22077 NULL
116698 +mem_rw_22085 mem_rw 3 22085 NULL
116699 +kstrtos32_from_user_22087 kstrtos32_from_user 2 22087 NULL
116700 +snd_pcm_xrun_22088 snd_pcm_xrun 0 22088 NULL
116701 +rt2x00debug_read_crypto_stats_22109 rt2x00debug_read_crypto_stats 3 22109 NULL
116702 +snd_hda_codec_read_22130 snd_hda_codec_read 0 22130 NULL
116703 +SyS_sched_setaffinity_22148 SyS_sched_setaffinity 2 22148 NULL
116704 +do_tcp_sendpages_22155 do_tcp_sendpages 4 22155 NULL
116705 +pci_request_region_22164 pci_request_region 0 22164 NULL
116706 +__kfifo_alloc_22173 __kfifo_alloc 3 22173 NULL
116707 +rfcomm_sock_recvmsg_22227 rfcomm_sock_recvmsg 4 22227 NULL
116708 +mem_write_22232 mem_write 3 22232 NULL
116709 +p9_virtio_zc_request_22240 p9_virtio_zc_request 6-5 22240 NULL
116710 +prepare_to_wait_event_22247 prepare_to_wait_event 0 22247 NULL
116711 +compat_process_vm_rw_22254 compat_process_vm_rw 3-5 22254 NULL
116712 +ping_common_sendmsg_22261 ping_common_sendmsg 5 22261 NULL
116713 +add_res_tree_22263 add_res_tree 7 22263 NULL
116714 +queue_max_sectors_22280 queue_max_sectors 0 22280 NULL
116715 +pci_vpd_srdt_size_22300 pci_vpd_srdt_size 0 22300 NULL nohasharray
116716 +__tun_chr_ioctl_22300 __tun_chr_ioctl 4 22300 &pci_vpd_srdt_size_22300
116717 +mesh_table_alloc_22305 mesh_table_alloc 1 22305 NULL
116718 +lov_setstripe_22307 lov_setstripe 2 22307 NULL
116719 +udpv6_sendmsg_22316 udpv6_sendmsg 4 22316 NULL
116720 +atomic_read_22342 atomic_read 0 22342 NULL
116721 +ll_lazystatfs_seq_write_22353 ll_lazystatfs_seq_write 3 22353 NULL
116722 +snd_pcm_alsa_frames_22363 snd_pcm_alsa_frames 2 22363 NULL
116723 +evdev_ioctl_22371 evdev_ioctl 2 22371 NULL
116724 +alloc_large_system_hash_22391 alloc_large_system_hash 2 22391 NULL
116725 +zoran_write_22404 zoran_write 3 22404 NULL
116726 +queue_reply_22416 queue_reply 3 22416 NULL
116727 +__set_enter_print_fmt_22431 __set_enter_print_fmt 0 22431 NULL
116728 +queue_max_segments_22441 queue_max_segments 0 22441 NULL
116729 +handle_received_packet_22457 handle_received_packet 3 22457 NULL
116730 +ecryptfs_write_22488 ecryptfs_write 4-3 22488 NULL
116731 +qib_user_sdma_alloc_header_22490 qib_user_sdma_alloc_header 2 22490 NULL
116732 +cache_write_procfs_22491 cache_write_procfs 3 22491 NULL
116733 +trim_no_bitmap_22524 trim_no_bitmap 4-3 22524 NULL
116734 +ntb_setup_bwd_msix_22549 ntb_setup_bwd_msix 2-0 22549 NULL
116735 +ocfs2_read_extent_block_22550 ocfs2_read_extent_block 0 22550 NULL
116736 +agp_alloc_page_array_22554 agp_alloc_page_array 1 22554 NULL
116737 +dbFindCtl_22587 dbFindCtl 0 22587 NULL
116738 +snapshot_read_22601 snapshot_read 3 22601 NULL
116739 +sctp_setsockopt_connectx_old_22631 sctp_setsockopt_connectx_old 3 22631 NULL
116740 +ide_core_cp_entry_22636 ide_core_cp_entry 3 22636 NULL
116741 +wl1271_rx_filter_get_fields_size_22638 wl1271_rx_filter_get_fields_size 0 22638 NULL
116742 +pwr_wake_on_timer_exp_read_22640 pwr_wake_on_timer_exp_read 3 22640 NULL
116743 +iwl_dbgfs_calib_disabled_read_22649 iwl_dbgfs_calib_disabled_read 3 22649 NULL
116744 +ext4_ext_direct_IO_22679 ext4_ext_direct_IO 4 22679 NULL
116745 +fill_gap_22681 fill_gap 0 22681 NULL nohasharray
116746 +l2tp_ip_recvmsg_22681 l2tp_ip_recvmsg 4 22681 &fill_gap_22681
116747 +bch_dump_read_22685 bch_dump_read 3 22685 NULL
116748 +reg_umr_22686 reg_umr 5 22686 NULL
116749 +SYSC_vmsplice_22697 SYSC_vmsplice 3 22697 NULL
116750 +alloc_libipw_22708 alloc_libipw 1 22708 NULL
116751 +cx18_copy_buf_to_user_22735 cx18_copy_buf_to_user 4-0 22735 NULL
116752 +ceph_decode_32_22738 ceph_decode_32 0 22738 NULL nohasharray
116753 +__mei_cl_send_22738 __mei_cl_send 3 22738 &ceph_decode_32_22738
116754 +__writeback_single_inode_22739 __writeback_single_inode 0 22739 NULL
116755 +iio_debugfs_write_reg_22742 iio_debugfs_write_reg 3 22742 NULL
116756 +qlcnic_sriov_init_22762 qlcnic_sriov_init 2 22762 NULL
116757 +print_frame_22769 print_frame 0 22769 NULL
116758 +ftrace_arch_read_dyn_info_22773 ftrace_arch_read_dyn_info 0 22773 NULL
116759 +__break_lease_22777 __break_lease 0 22777 NULL
116760 +vnic_dev_get_res_count_22791 vnic_dev_get_res_count 0 22791 NULL
116761 +pla_ocp_write_22802 pla_ocp_write 4 22802 NULL
116762 +__generic_copy_to_user_intel_22806 __generic_copy_to_user_intel 0-3 22806 NULL
116763 +create_attr_set_22861 create_attr_set 1 22861 NULL
116764 +hash_ip6_expire_22867 hash_ip6_expire 4 22867 NULL
116765 +vmw_execbuf_process_22885 vmw_execbuf_process 5 22885 NULL
116766 +usblp_new_writeurb_22894 usblp_new_writeurb 2 22894 NULL
116767 +mdc800_device_read_22896 mdc800_device_read 3 22896 NULL
116768 +ion_handle_test_kernel_22900 ion_handle_test_kernel 4-3 22900 NULL nohasharray
116769 +policy_emit_config_values_22900 policy_emit_config_values 3 22900 &ion_handle_test_kernel_22900
116770 +__set_xattr_22923 __set_xattr 0 22923 NULL
116771 +xstateregs_set_22932 xstateregs_set 4 22932 NULL
116772 +pcpu_mem_zalloc_22948 pcpu_mem_zalloc 1 22948 NULL
116773 +alloc_sglist_22960 alloc_sglist 2-3 22960 NULL
116774 +caif_seqpkt_sendmsg_22961 caif_seqpkt_sendmsg 4 22961 NULL
116775 +vme_get_size_22964 vme_get_size 0 22964 NULL
116776 +tx_frag_key_not_found_read_22971 tx_frag_key_not_found_read 3 22971 NULL
116777 +cached_dev_cache_miss_22979 cached_dev_cache_miss 4 22979 NULL
116778 +usb_get_langid_22983 usb_get_langid 0 22983 NULL
116779 +remote_settings_file_write_22987 remote_settings_file_write 3 22987 NULL
116780 +viafb_dvp0_proc_write_23023 viafb_dvp0_proc_write 3 23023 NULL
116781 +cifs_local_to_utf16_bytes_23025 cifs_local_to_utf16_bytes 0 23025 NULL
116782 +st_status_23032 st_status 5 23032 NULL
116783 +nv50_disp_chan_create__23056 nv50_disp_chan_create_ 5 23056 NULL
116784 +comedi_buf_write_n_available_23057 comedi_buf_write_n_available 0 23057 NULL
116785 +security_inode_killpriv_23060 security_inode_killpriv 0 23060 NULL
116786 +reiserfs_add_entry_23062 reiserfs_add_entry 4 23062 NULL nohasharray
116787 +unix_seqpacket_recvmsg_23062 unix_seqpacket_recvmsg 4 23062 &reiserfs_add_entry_23062
116788 +mei_cl_send_23068 mei_cl_send 3 23068 NULL
116789 +raw_sendmsg_23078 raw_sendmsg 4 23078 NULL
116790 +get_user_hdr_len_23079 get_user_hdr_len 0 23079 NULL
116791 +isr_tx_procs_read_23084 isr_tx_procs_read 3 23084 NULL
116792 +rt2x00debug_write_eeprom_23091 rt2x00debug_write_eeprom 3 23091 NULL
116793 +ntfs_ucstonls_23097 ntfs_ucstonls 3-5 23097 NULL
116794 +pipe_iov_copy_from_user_23102 pipe_iov_copy_from_user 3 23102 NULL
116795 +dgram_recvmsg_23104 dgram_recvmsg 4 23104 NULL
116796 +mwl8k_cmd_set_beacon_23110 mwl8k_cmd_set_beacon 4 23110 NULL
116797 +bset_tree_bytes_23111 bset_tree_bytes 0 23111 NULL nohasharray
116798 +nl80211_send_rx_auth_23111 nl80211_send_rx_auth 4 23111 &bset_tree_bytes_23111
116799 +__clear_user_23118 __clear_user 0-2 23118 NULL
116800 +drm_mode_create_tv_properties_23122 drm_mode_create_tv_properties 2 23122 NULL
116801 +ata_scsi_change_queue_depth_23126 ata_scsi_change_queue_depth 2 23126 NULL
116802 +read_file_ani_23161 read_file_ani 3 23161 NULL
116803 +usblp_write_23178 usblp_write 3 23178 NULL
116804 +gss_pipe_downcall_23182 gss_pipe_downcall 3 23182 NULL
116805 +mpi_alloc_limb_space_23190 mpi_alloc_limb_space 1 23190 NULL
116806 +nft_hash_tbl_alloc_23224 nft_hash_tbl_alloc 1 23224 NULL
116807 +tty_buffer_request_room_23228 tty_buffer_request_room 2-0 23228 NULL
116808 +xlog_get_bp_23229 xlog_get_bp 2 23229 NULL
116809 +ft1000_read_dpram_mag_32_23232 ft1000_read_dpram_mag_32 0 23232 NULL
116810 +rxrpc_client_sendmsg_23236 rxrpc_client_sendmsg 5 23236 NULL
116811 +__gfn_to_rmap_23240 __gfn_to_rmap 1-2 23240 NULL
116812 +nv50_ram_create__23241 nv50_ram_create_ 4 23241 NULL
116813 +sctp_recvmsg_23265 sctp_recvmsg 4 23265 NULL
116814 +uwb_dev_addr_print_23282 uwb_dev_addr_print 2 23282 NULL
116815 +diva_get_trace_filter_23286 diva_get_trace_filter 0 23286 NULL
116816 +i2cdev_write_23310 i2cdev_write 3 23310 NULL
116817 +__aa_kvmalloc_23320 __aa_kvmalloc 1 23320 NULL
116818 +page_readlink_23346 page_readlink 3 23346 NULL
116819 +kmem_zalloc_large_23351 kmem_zalloc_large 1 23351 NULL
116820 +get_dst_timing_23358 get_dst_timing 0 23358 NULL nohasharray
116821 +write_inode_23358 write_inode 0 23358 &get_dst_timing_23358
116822 +fd_setup_write_same_buf_23369 fd_setup_write_same_buf 3 23369 NULL
116823 +iscsi_change_queue_depth_23416 iscsi_change_queue_depth 2 23416 NULL
116824 +vga_mm_r_23419 vga_mm_r 0 23419 NULL
116825 +ocfs2_zero_tail_23447 ocfs2_zero_tail 3 23447 NULL
116826 +hidraw_send_report_23449 hidraw_send_report 3 23449 NULL
116827 +__ata_change_queue_depth_23484 __ata_change_queue_depth 3 23484 NULL
116828 +linear_conf_23485 linear_conf 2 23485 NULL nohasharray
116829 +sync_mapping_buffers_23485 sync_mapping_buffers 0 23485 &linear_conf_23485
116830 +event_filter_read_23494 event_filter_read 3 23494 NULL
116831 +lustre_acl_xattr_merge2ext_23502 lustre_acl_xattr_merge2ext 2 23502 NULL
116832 +devm_iio_device_alloc_23511 devm_iio_device_alloc 2 23511 NULL
116833 +__proc_cpt_table_23516 __proc_cpt_table 5 23516 NULL
116834 +hash_ipmark6_expire_23518 hash_ipmark6_expire 4 23518 NULL
116835 +ima_show_measurements_count_23536 ima_show_measurements_count 3 23536 NULL
116836 +tcp_current_mss_23552 tcp_current_mss 0 23552 NULL
116837 +dbg_leb_change_23555 dbg_leb_change 0 23555 NULL
116838 +btrfs_super_bytenr_23561 btrfs_super_bytenr 0 23561 NULL
116839 +venus_symlink_23570 venus_symlink 6-4 23570 NULL
116840 +iwl_dbgfs_interrupt_read_23574 iwl_dbgfs_interrupt_read 3 23574 NULL
116841 +xfpregs_get_23586 xfpregs_get 4 23586 NULL
116842 +snd_interval_min_23590 snd_interval_min 0 23590 NULL
116843 +islpci_mgt_transaction_23610 islpci_mgt_transaction 5 23610 NULL
116844 +__i2400mu_send_barker_23652 __i2400mu_send_barker 3 23652 NULL
116845 +sInW_23663 sInW 0 23663 NULL
116846 +SyS_connect_23669 SyS_connect 3 23669 NULL
116847 +cx18_read_23699 cx18_read 3 23699 NULL
116848 +at_get_23708 at_get 0 23708 NULL
116849 +rx_rx_dropped_frame_read_23748 rx_rx_dropped_frame_read 3 23748 NULL
116850 +__kfifo_max_r_23768 __kfifo_max_r 0-2-1 23768 NULL
116851 +__build_packet_message_23778 __build_packet_message 4-10 23778 NULL
116852 +security_inode_getxattr_23781 security_inode_getxattr 0 23781 NULL
116853 +cfg80211_inform_bss_width_frame_23782 cfg80211_inform_bss_width_frame 5 23782 NULL
116854 +mpt_free_res_23793 mpt_free_res 5 23793 NULL
116855 +map_write_23795 map_write 3 23795 NULL
116856 +rx_path_reset_read_23801 rx_path_reset_read 3 23801 NULL
116857 +__earlyonly_bootmem_alloc_23824 __earlyonly_bootmem_alloc 2 23824 NULL
116858 +lustre_msg_buflen_23827 lustre_msg_buflen 0 23827 NULL
116859 +ceph_copy_page_vector_to_user_23829 ceph_copy_page_vector_to_user 0-3-4 23829 NULL
116860 +pgdat_end_pfn_23842 pgdat_end_pfn 0 23842 NULL
116861 +iwl_dbgfs_nvm_read_23845 iwl_dbgfs_nvm_read 3 23845 NULL
116862 +p54_init_common_23850 p54_init_common 1 23850 NULL
116863 +bin_to_hex_dup_23853 bin_to_hex_dup 2 23853 NULL
116864 +ocfs2_xattr_get_clusters_23857 ocfs2_xattr_get_clusters 0 23857 NULL
116865 +ieee80211_if_read_dot11MeshMaxPeerLinks_23878 ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 NULL
116866 +nouveau_clock_create__23881 nouveau_clock_create_ 5 23881 NULL nohasharray
116867 +writeback_single_inode_23881 writeback_single_inode 0 23881 &nouveau_clock_create__23881
116868 +tipc_snprintf_23893 tipc_snprintf 2-0 23893 NULL
116869 +add_new_gdb_meta_bg_23911 add_new_gdb_meta_bg 3 23911 NULL nohasharray
116870 +ieee80211_if_read_hw_queues_23911 ieee80211_if_read_hw_queues 3 23911 &add_new_gdb_meta_bg_23911
116871 +f2fs_getxattr_23917 f2fs_getxattr 0 23917 NULL
116872 +ipath_reg_phys_mr_23918 ipath_reg_phys_mr 3 23918 NULL nohasharray
116873 +mpihelp_mul_karatsuba_case_23918 mpihelp_mul_karatsuba_case 5-3 23918 &ipath_reg_phys_mr_23918
116874 +kvm_read_guest_23928 kvm_read_guest 4-2 23928 NULL
116875 +uvc_endpoint_max_bpi_23944 uvc_endpoint_max_bpi 0 23944 NULL
116876 +cifs_setxattr_23957 cifs_setxattr 4 23957 NULL
116877 +size_roundup_power2_23958 size_roundup_power2 0-1 23958 NULL
116878 +sddr55_write_data_23983 sddr55_write_data 4 23983 NULL
116879 +zd_usb_iowrite16v_async_23984 zd_usb_iowrite16v_async 3 23984 NULL
116880 +cxgb_alloc_mem_24007 cxgb_alloc_mem 1 24007 NULL
116881 +give_pages_24021 give_pages 3 24021 NULL
116882 +adis16400_show_serial_number_24037 adis16400_show_serial_number 3 24037 NULL
116883 +hmac_setkey_24043 hmac_setkey 3 24043 NULL
116884 +afs_cell_alloc_24052 afs_cell_alloc 2 24052 NULL
116885 +iwl_dbgfs_low_latency_read_24062 iwl_dbgfs_low_latency_read 3 24062 NULL
116886 +vb2_fop_read_24080 vb2_fop_read 3 24080 NULL
116887 +C_SYSC_process_vm_writev_24102 C_SYSC_process_vm_writev 3-5 24102 NULL
116888 +pipeline_post_proc_swi_read_24108 pipeline_post_proc_swi_read 3 24108 NULL
116889 +request_key_auth_read_24109 request_key_auth_read 3 24109 NULL
116890 +lov_brw_24122 lov_brw 4 24122 NULL
116891 +mpu401_read_24126 mpu401_read 3 24126 NULL
116892 +_picolcd_flash_write_24134 _picolcd_flash_write 4 24134 NULL
116893 +irnet_ctrl_write_24139 irnet_ctrl_write 3 24139 NULL
116894 +SyS_sethostname_24150 SyS_sethostname 2 24150 NULL
116895 +trim_bitmaps_24158 trim_bitmaps 3 24158 NULL
116896 +adu_read_24177 adu_read 3 24177 NULL
116897 +safe_prepare_write_buffer_24187 safe_prepare_write_buffer 3 24187 NULL
116898 +irq_remapping_setup_msi_irqs_24194 irq_remapping_setup_msi_irqs 2 24194 NULL
116899 +ieee80211_if_read_dot11MeshHWMPpreqMinInterval_24208 ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 NULL
116900 +efx_vf_size_24213 efx_vf_size 0 24213 NULL
116901 +tcpprobe_sprint_24222 tcpprobe_sprint 0-2 24222 NULL
116902 +mei_amthif_read_24224 mei_amthif_read 4 24224 NULL nohasharray
116903 +pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 3-2-1 24224 &mei_amthif_read_24224
116904 +pci_num_vf_24235 pci_num_vf 0 24235 NULL
116905 +sel_read_bool_24236 sel_read_bool 3 24236 NULL
116906 +em28xx_alloc_urbs_24260 em28xx_alloc_urbs 4-6 24260 NULL
116907 +calculate_sizes_24273 calculate_sizes 2 24273 NULL
116908 +thin_status_24278 thin_status 5 24278 NULL
116909 +msg_size_24288 msg_size 0 24288 NULL
116910 +btmrvl_pscmd_read_24308 btmrvl_pscmd_read 3 24308 NULL
116911 +reserve_metadata_bytes_24313 reserve_metadata_bytes 0 24313 NULL
116912 +ath6kl_add_bss_if_needed_24317 ath6kl_add_bss_if_needed 6 24317 NULL
116913 +si476x_radio_read_acf_blob_24336 si476x_radio_read_acf_blob 3 24336 NULL
116914 +C_SYSC_pwritev_24345 C_SYSC_pwritev 3 24345 NULL
116915 +prepare_pages_24349 prepare_pages 0 24349 NULL
116916 +kzalloc_node_24352 kzalloc_node 1 24352 NULL
116917 +qla2x00_handle_queue_full_24365 qla2x00_handle_queue_full 2 24365 NULL
116918 +cfi_read_pri_24366 cfi_read_pri 3 24366 NULL
116919 +btrfs_item_size_nr_24367 btrfs_item_size_nr 0 24367 NULL
116920 +igetword_24373 igetword 0 24373 NULL nohasharray
116921 +break_deleg_24373 break_deleg 0 24373 &igetword_24373
116922 +max_io_len_24384 max_io_len 0-1 24384 NULL
116923 +mpt_alloc_res_24387 mpt_alloc_res 5 24387 NULL
116924 +osc_cur_grant_bytes_seq_write_24396 osc_cur_grant_bytes_seq_write 3 24396 NULL
116925 +getxattr_24398 getxattr 4 24398 NULL nohasharray
116926 +pvr2_v4l2_ioctl_24398 pvr2_v4l2_ioctl 2 24398 &getxattr_24398
116927 +populate_msi_sysfs_24399 populate_msi_sysfs 0 24399 NULL
116928 +blk_update_bidi_request_24415 blk_update_bidi_request 3-4 24415 NULL
116929 +nvme_trans_log_supp_pages_24418 nvme_trans_log_supp_pages 3 24418 NULL
116930 +b43_debugfs_read_24425 b43_debugfs_read 3 24425 NULL
116931 +xenbus_file_read_24427 xenbus_file_read 3 24427 NULL
116932 +ieee80211_rx_mgmt_beacon_24430 ieee80211_rx_mgmt_beacon 3 24430 NULL
116933 +copy_and_ioctl_24434 copy_and_ioctl 4 24434 NULL
116934 +ixgbe_alloc_q_vector_24439 ixgbe_alloc_q_vector 4-6 24439 NULL
116935 +rtw_set_wps_assoc_resp_24440 rtw_set_wps_assoc_resp 3 24440 NULL nohasharray
116936 +smk_user_access_24440 smk_user_access 3 24440 &rtw_set_wps_assoc_resp_24440
116937 +evdev_do_ioctl_24459 evdev_do_ioctl 2 24459 NULL
116938 +lbs_highsnr_write_24460 lbs_highsnr_write 3 24460 NULL
116939 +skb_copy_and_csum_datagram_iovec_24466 skb_copy_and_csum_datagram_iovec 2 24466 NULL
116940 +dut_mode_read_24489 dut_mode_read 3 24489 NULL
116941 +read_file_spec_scan_ctl_24491 read_file_spec_scan_ctl 3 24491 NULL
116942 +pd_video_read_24510 pd_video_read 3 24510 NULL
116943 +request_key_with_auxdata_24515 request_key_with_auxdata 4 24515 NULL
116944 +xfs_buf_get_map_24522 xfs_buf_get_map 3 24522 NULL
116945 +do_mpage_readpage_24536 do_mpage_readpage 3 24536 NULL
116946 +write_cache_pages_24562 write_cache_pages 0 24562 NULL
116947 +SyS_pselect6_24582 SyS_pselect6 1 24582 NULL
116948 +udf_compute_nr_groups_24594 udf_compute_nr_groups 0 24594 NULL
116949 +sensor_hub_get_physical_device_count_24605 sensor_hub_get_physical_device_count 0 24605 NULL nohasharray
116950 +lov_alloc_memmd_24605 lov_alloc_memmd 2 24605 &sensor_hub_get_physical_device_count_24605
116951 +SyS_poll_24620 SyS_poll 2 24620 NULL
116952 +context_alloc_24645 context_alloc 3 24645 NULL
116953 +blk_rq_err_bytes_24650 blk_rq_err_bytes 0 24650 NULL
116954 +btrfs_check_data_free_space_24692 btrfs_check_data_free_space 0 24692 NULL
116955 +datafab_write_data_24696 datafab_write_data 4 24696 NULL
116956 +intelfbhw_get_p1p2_24703 intelfbhw_get_p1p2 2 24703 NULL
116957 +simple_attr_read_24738 simple_attr_read 3 24738 NULL
116958 +qla2x00_change_queue_depth_24742 qla2x00_change_queue_depth 2 24742 NULL
116959 +get_dma_residue_24749 get_dma_residue 0 24749 NULL
116960 +kgdb_hex2mem_24755 kgdb_hex2mem 3 24755 NULL
116961 +ocfs2_read_blocks_24777 ocfs2_read_blocks 0 24777 NULL
116962 +datablob_hmac_verify_24786 datablob_hmac_verify 4 24786 NULL
116963 +cache_read_24790 cache_read 3 24790 NULL
116964 +user_regset_copyout_24796 user_regset_copyout 7 24796 NULL
116965 +kvm_read_guest_virt_helper_24804 kvm_read_guest_virt_helper 3-1 24804 NULL
116966 +ath6kl_fwlog_mask_write_24810 ath6kl_fwlog_mask_write 3 24810 NULL
116967 +snd_als4k_gcr_read_24840 snd_als4k_gcr_read 0 24840 NULL
116968 +snd_pcm_lib_buffer_bytes_24865 snd_pcm_lib_buffer_bytes 0 24865 NULL
116969 +pnp_alloc_24869 pnp_alloc 1 24869 NULL nohasharray
116970 +l2cap_create_basic_pdu_24869 l2cap_create_basic_pdu 3 24869 &pnp_alloc_24869
116971 +queues_read_24877 queues_read 3 24877 NULL
116972 +codec_list_read_file_24910 codec_list_read_file 3 24910 NULL
116973 +v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 NULL nohasharray
116974 +__btrfs_free_extent_24927 __btrfs_free_extent 7 24927 &v4l2_ctrl_new_24927
116975 +ocfs2_fiemap_24949 ocfs2_fiemap 3-4 24949 NULL
116976 +packet_sendmsg_24954 packet_sendmsg 4 24954 NULL
116977 +security_inode_rename_24971 security_inode_rename 0 24971 NULL
116978 +twl_i2c_write_u8_24976 twl_i2c_write_u8 3 24976 NULL
116979 +llc_ui_sendmsg_24987 llc_ui_sendmsg 4 24987 NULL
116980 +key_conf_hw_key_idx_read_25003 key_conf_hw_key_idx_read 3 25003 NULL
116981 +il_dbgfs_channels_read_25005 il_dbgfs_channels_read 3 25005 NULL
116982 +ni_660x_num_counters_25031 ni_660x_num_counters 0 25031 NULL
116983 +nfs_dns_resolve_name_25036 nfs_dns_resolve_name 3 25036 NULL
116984 +btrfs_stack_key_blockptr_25058 btrfs_stack_key_blockptr 0 25058 NULL
116985 +gs_buf_alloc_25067 gs_buf_alloc 2 25067 NULL
116986 +ll_track_pid_seq_write_25068 ll_track_pid_seq_write 3 25068 NULL
116987 +SYSC_listxattr_25072 SYSC_listxattr 3 25072 NULL
116988 +ima_appraise_measurement_25093 ima_appraise_measurement 6 25093 NULL
116989 +snd_rawmidi_kernel_write_25106 snd_rawmidi_kernel_write 3 25106 NULL
116990 +ipath_init_qp_table_25167 ipath_init_qp_table 2 25167 NULL
116991 +_iwl_dbgfs_reduced_txp_write_25169 _iwl_dbgfs_reduced_txp_write 3 25169 NULL nohasharray
116992 +kvm_mmu_notifier_change_pte_25169 kvm_mmu_notifier_change_pte 3 25169 &_iwl_dbgfs_reduced_txp_write_25169
116993 +sctp_getsockopt_local_addrs_25178 sctp_getsockopt_local_addrs 2 25178 NULL
116994 +mon_stat_read_25238 mon_stat_read 3 25238 NULL
116995 +stripe_status_25259 stripe_status 5 25259 NULL
116996 +snd_pcm_start_25273 snd_pcm_start 0 25273 NULL
116997 +crypto_alloc_instance2_25277 crypto_alloc_instance2 3 25277 NULL
116998 +vfs_writev_25278 vfs_writev 3 25278 NULL
116999 +l2tp_session_create_25286 l2tp_session_create 1 25286 NULL
117000 +ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 NULL
117001 +rng_buffer_size_25348 rng_buffer_size 0 25348 NULL
117002 +SYSC_kexec_load_25361 SYSC_kexec_load 2 25361 NULL
117003 +unix_mkname_25368 unix_mkname 0-2 25368 NULL
117004 +sel_read_mls_25369 sel_read_mls 3 25369 NULL
117005 +vsp1_entity_init_25407 vsp1_entity_init 3 25407 NULL
117006 +dai_list_read_file_25421 dai_list_read_file 3 25421 NULL
117007 +ipath_decode_err_25468 ipath_decode_err 3 25468 NULL
117008 +crypto_hash_digestsize_25469 crypto_hash_digestsize 0 25469 NULL
117009 +ivtv_buf_copy_from_user_25502 ivtv_buf_copy_from_user 4-0 25502 NULL
117010 +snd_pcm_plugin_build_25505 snd_pcm_plugin_build 5 25505 NULL
117011 +sb_permission_25523 sb_permission 0 25523 NULL
117012 +ext3_get_inode_loc_25542 ext3_get_inode_loc 0 25542 NULL
117013 +ieee80211_if_read_path_refresh_time_25545 ieee80211_if_read_path_refresh_time 3 25545 NULL
117014 +wimax_addr_scnprint_25548 wimax_addr_scnprint 2 25548 NULL
117015 +ht_print_chan_25556 ht_print_chan 0-3-4 25556 NULL
117016 +skb_tailroom_25567 skb_tailroom 0 25567 NULL
117017 +ping_recvmsg_25597 ping_recvmsg 4 25597 NULL
117018 +copy_user_generic_25611 copy_user_generic 0 25611 NULL
117019 +proc_coredump_filter_write_25625 proc_coredump_filter_write 3 25625 NULL
117020 +befs_utf2nls_25628 befs_utf2nls 3 25628 NULL nohasharray
117021 +__get_user_pages_25628 __get_user_pages 0 25628 &befs_utf2nls_25628
117022 +__direct_map_25647 __direct_map 5-6 25647 NULL
117023 +aircable_prepare_write_buffer_25669 aircable_prepare_write_buffer 3 25669 NULL
117024 +lpfc_idiag_cmd_get_25672 lpfc_idiag_cmd_get 2 25672 NULL
117025 +sta_inactive_ms_read_25690 sta_inactive_ms_read 3 25690 NULL
117026 +prom_early_alloc_25692 prom_early_alloc 1 25692 NULL
117027 +rx_filter_mc_filter_read_25712 rx_filter_mc_filter_read 3 25712 NULL
117028 +ibmasm_new_command_25714 ibmasm_new_command 2 25714 NULL
117029 +__alloc_bootmem_low_node_25726 __alloc_bootmem_low_node 2 25726 NULL nohasharray
117030 +sel_write_context_25726 sel_write_context 3 25726 &__alloc_bootmem_low_node_25726
117031 +cxgbi_device_portmap_create_25747 cxgbi_device_portmap_create 3 25747 NULL
117032 +event_rx_pool_read_25792 event_rx_pool_read 3 25792 NULL
117033 +sg_read_25799 sg_read 3 25799 NULL
117034 +system_enable_read_25815 system_enable_read 3 25815 NULL
117035 +realloc_buffer_25816 realloc_buffer 2 25816 NULL
117036 +pwr_missing_bcns_read_25824 pwr_missing_bcns_read 3 25824 NULL
117037 +parport_read_25855 parport_read 0 25855 NULL
117038 +xfs_dir2_sf_hdr_size_25858 xfs_dir2_sf_hdr_size 0 25858 NULL
117039 +key_attr_size_25865 key_attr_size 0 25865 NULL
117040 +ath6kl_regread_read_25884 ath6kl_regread_read 3 25884 NULL
117041 +run_delalloc_nocow_25896 run_delalloc_nocow 3-4 25896 NULL
117042 +sisusbcon_scroll_area_25899 sisusbcon_scroll_area 4-3 25899 NULL
117043 +lpfc_change_queue_depth_25905 lpfc_change_queue_depth 2 25905 NULL
117044 +nvme_trans_mode_page_create_25908 nvme_trans_mode_page_create 7-4 25908 NULL
117045 +do_jffs2_setxattr_25910 do_jffs2_setxattr 5 25910 NULL
117046 +rcname_read_25919 rcname_read 3 25919 NULL
117047 +snd_es1938_capture_copy_25930 snd_es1938_capture_copy 5 25930 NULL
117048 +key_flags_read_25931 key_flags_read 3 25931 NULL
117049 +copy_play_buf_25932 copy_play_buf 3 25932 NULL
117050 +flush_25957 flush 2 25957 NULL
117051 +_regmap_multi_reg_write_25967 _regmap_multi_reg_write 3 25967 NULL
117052 +udp_setsockopt_25985 udp_setsockopt 5 25985 NULL
117053 +lustre_msg_buflen_v2_25997 lustre_msg_buflen_v2 0 25997 NULL
117054 +SyS_process_vm_readv_26019 SyS_process_vm_readv 3-5 26019 NULL
117055 +mptscsih_change_queue_depth_26036 mptscsih_change_queue_depth 2 26036 NULL
117056 +selinux_inode_post_setxattr_26037 selinux_inode_post_setxattr 4 26037 NULL
117057 +keyctl_update_key_26061 keyctl_update_key 3 26061 NULL
117058 +pri_wm_latency_write_26063 pri_wm_latency_write 3 26063 NULL
117059 +rx_rx_wa_density_dropped_frame_read_26095 rx_rx_wa_density_dropped_frame_read 3 26095 NULL
117060 +i8042_pnp_id_to_string_26108 i8042_pnp_id_to_string 3 26108 NULL
117061 +read_sb_page_26119 read_sb_page 5 26119 NULL
117062 +ath9k_hw_name_26146 ath9k_hw_name 3 26146 NULL
117063 +copy_oldmem_page_26164 copy_oldmem_page 3 26164 NULL
117064 +gfs2_xattr_acl_get_26166 gfs2_xattr_acl_get 0 26166 NULL nohasharray
117065 +ath6kl_roam_table_read_26166 ath6kl_roam_table_read 3 26166 &gfs2_xattr_acl_get_26166
117066 +disk_devt_26180 disk_devt 0 26180 NULL
117067 +ieee80211_if_fmt_dot11MeshTTL_26198 ieee80211_if_fmt_dot11MeshTTL 3 26198 NULL
117068 +xfs_idata_realloc_26199 xfs_idata_realloc 2 26199 NULL
117069 +mce_write_26201 mce_write 3 26201 NULL
117070 +mwifiex_regrdwr_write_26225 mwifiex_regrdwr_write 3 26225 NULL
117071 +_scsih_change_queue_depth_26230 _scsih_change_queue_depth 2 26230 NULL
117072 +rxrpc_recvmsg_26233 rxrpc_recvmsg 4 26233 NULL
117073 +simple_setattr_26234 simple_setattr 0 26234 NULL
117074 +genwqe_ffdc_buff_size_26263 genwqe_ffdc_buff_size 0 26263 NULL
117075 +crypto_ctxsize_26278 crypto_ctxsize 0 26278 NULL
117076 +wacom_set_device_mode_26280 wacom_set_device_mode 3 26280 NULL
117077 +snd_pcm_plug_client_channels_buf_26309 snd_pcm_plug_client_channels_buf 0-3 26309 NULL
117078 +pwr_wake_on_host_read_26321 pwr_wake_on_host_read 3 26321 NULL
117079 +check_can_nocow_26336 check_can_nocow 2 26336 NULL
117080 +snd_vx_check_reg_bit_26344 snd_vx_check_reg_bit 0 26344 NULL
117081 +ocfs2_duplicate_clusters_by_page_26357 ocfs2_duplicate_clusters_by_page 6-3 26357 NULL
117082 +cifs_readdata_alloc_26360 cifs_readdata_alloc 1 26360 NULL
117083 +invalidate_inode_pages2_range_26403 invalidate_inode_pages2_range 0 26403 NULL
117084 +ntty_write_26404 ntty_write 3 26404 NULL
117085 +firmware_store_26408 firmware_store 4 26408 NULL
117086 +pagemap_read_26441 pagemap_read 3 26441 NULL
117087 +enc_pools_add_pages_26461 enc_pools_add_pages 1 26461 NULL nohasharray
117088 +tower_read_26461 tower_read 3 26461 &enc_pools_add_pages_26461
117089 +ib_alloc_device_26483 ib_alloc_device 1 26483 NULL
117090 +ulong_write_file_26485 ulong_write_file 3 26485 NULL
117091 +dvb_ca_en50221_io_ioctl_26490 dvb_ca_en50221_io_ioctl 2 26490 NULL
117092 +read_vmcore_26501 read_vmcore 3 26501 NULL
117093 +uhid_char_write_26502 uhid_char_write 3 26502 NULL
117094 +vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 4-3 26507 NULL
117095 +iwl_dbgfs_rf_reset_read_26512 iwl_dbgfs_rf_reset_read 3 26512 NULL
117096 +alloc_ep_req_26521 alloc_ep_req 3-2 26521 NULL
117097 +SyS_rt_sigpending_26538 SyS_rt_sigpending 2 26538 NULL
117098 +__vhost_add_used_n_26554 __vhost_add_used_n 3 26554 NULL
117099 +dio_new_bio_26562 dio_new_bio 0 26562 NULL
117100 +rts51x_read_mem_26577 rts51x_read_mem 4 26577 NULL
117101 +kernfs_name_locked_26617 kernfs_name_locked 3 26617 NULL
117102 +pwr_fix_tsf_ps_read_26627 pwr_fix_tsf_ps_read 3 26627 NULL
117103 +irq_alloc_generic_chip_26650 irq_alloc_generic_chip 2 26650 NULL nohasharray
117104 +inb_p_26650 inb_p 0 26650 &irq_alloc_generic_chip_26650
117105 +nouveau_volt_create__26654 nouveau_volt_create_ 4 26654 NULL
117106 +cipso_v4_map_cat_rbm_hton_26680 cipso_v4_map_cat_rbm_hton 0 26680 NULL
117107 +flowinfo_read_26683 flowinfo_read 3 26683 NULL
117108 +sysfs_add_file_26716 sysfs_add_file 0 26716 NULL
117109 +nouveau_namedb_create__26732 nouveau_namedb_create_ 7 26732 NULL
117110 +pipeline_tcp_rx_stat_fifo_int_read_26745 pipeline_tcp_rx_stat_fifo_int_read 3 26745 NULL
117111 +snd_hda_get_raw_connections_26762 snd_hda_get_raw_connections 0 26762 NULL
117112 +dma_map_single_attrs_26779 dma_map_single_attrs 0 26779 NULL
117113 +qlcnic_alloc_sds_rings_26795 qlcnic_alloc_sds_rings 2 26795 NULL
117114 +cipso_v4_genopt_26812 cipso_v4_genopt 0 26812 NULL
117115 +iwl_trans_read_mem32_26825 iwl_trans_read_mem32 0 26825 NULL
117116 +smk_write_load_26829 smk_write_load 3 26829 NULL
117117 +scnprint_id_26842 scnprint_id 3-0 26842 NULL
117118 +ecryptfs_miscdev_write_26847 ecryptfs_miscdev_write 3 26847 NULL
117119 +ss_alloc_ep_req_26848 ss_alloc_ep_req 2 26848 NULL
117120 +tipc_conn_sendmsg_26867 tipc_conn_sendmsg 5 26867 NULL
117121 +ath6kl_create_qos_write_26879 ath6kl_create_qos_write 3 26879 NULL
117122 +svc_print_xprts_26881 svc_print_xprts 0 26881 NULL
117123 +skb_zerocopy_headlen_26910 skb_zerocopy_headlen 0 26910 NULL
117124 +hhf_zalloc_26912 hhf_zalloc 1 26912 NULL
117125 +cfg80211_process_auth_26916 cfg80211_process_auth 3 26916 NULL
117126 +x25_asy_change_mtu_26928 x25_asy_change_mtu 2 26928 NULL
117127 +scsi_tgt_copy_sense_26933 scsi_tgt_copy_sense 3 26933 NULL
117128 +sctp_setsockopt_adaptation_layer_26935 sctp_setsockopt_adaptation_layer 3 26935 NULL nohasharray
117129 +pwr_ps_enter_read_26935 pwr_ps_enter_read 3 26935 &sctp_setsockopt_adaptation_layer_26935
117130 +hecubafb_write_26942 hecubafb_write 3 26942 NULL
117131 +extract_entropy_user_26952 extract_entropy_user 3 26952 NULL nohasharray
117132 +do_trimming_26952 do_trimming 3 26952 &extract_entropy_user_26952
117133 +do_direct_IO_26979 do_direct_IO 0 26979 NULL
117134 +__videobuf_alloc_vb_27062 __videobuf_alloc_vb 1 27062 NULL
117135 +ext4_convert_unwritten_extents_27064 ext4_convert_unwritten_extents 4-3-0 27064 NULL
117136 +snd_pcm_lib_period_bytes_27071 snd_pcm_lib_period_bytes 0 27071 NULL
117137 +paravirt_read_msr_27077 paravirt_read_msr 0 27077 NULL
117138 +alloc_fdmem_27083 alloc_fdmem 1 27083 NULL
117139 +btmrvl_hscmd_write_27089 btmrvl_hscmd_write 3 27089 NULL nohasharray
117140 +ath9k_hw_4k_dump_eeprom_27089 ath9k_hw_4k_dump_eeprom 5-4 27089 &btmrvl_hscmd_write_27089
117141 +__devcgroup_inode_permission_27108 __devcgroup_inode_permission 0 27108 NULL
117142 +get_kernel_page_27133 get_kernel_page 0 27133 NULL
117143 +drbd_get_capacity_27141 drbd_get_capacity 0 27141 NULL
117144 +pms_capture_27142 pms_capture 4 27142 NULL
117145 +btmrvl_hscfgcmd_write_27143 btmrvl_hscfgcmd_write 3 27143 NULL
117146 +snd_compr_calc_avail_27165 snd_compr_calc_avail 0 27165 NULL
117147 +ieee80211_if_read_rc_rateidx_mask_5ghz_27183 ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 NULL
117148 +write_kmem_27225 write_kmem 3 27225 NULL
117149 +dbAllocAG_27228 dbAllocAG 0 27228 NULL
117150 +rxrpc_request_key_27235 rxrpc_request_key 3 27235 NULL
117151 +ll_track_gid_seq_write_27267 ll_track_gid_seq_write 3 27267 NULL
117152 +comedi_alloc_devpriv_27272 comedi_alloc_devpriv 2 27272 NULL
117153 +copy_from_buf_27308 copy_from_buf 4-2 27308 NULL
117154 +virtqueue_add_inbuf_27312 virtqueue_add_inbuf 3 27312 NULL
117155 +snd_pcm_oss_write2_27332 snd_pcm_oss_write2 3-0 27332 NULL
117156 +afs_cell_create_27346 afs_cell_create 2 27346 NULL
117157 +iwl_dbgfs_csr_write_27363 iwl_dbgfs_csr_write 3 27363 NULL
117158 +pcbit_stat_27364 pcbit_stat 2 27364 NULL
117159 +seq_read_27411 seq_read 3 27411 NULL
117160 +ib_dma_map_sg_27413 ib_dma_map_sg 0 27413 NULL
117161 +ieee80211_if_read_smps_27416 ieee80211_if_read_smps 3 27416 NULL
117162 +cypress_write_27423 cypress_write 4 27423 NULL
117163 +sddr09_read_data_27447 sddr09_read_data 3 27447 NULL
117164 +v4l2_ctrl_new_std_menu_items_27487 v4l2_ctrl_new_std_menu_items 4 27487 NULL
117165 +hcd_buffer_alloc_27495 hcd_buffer_alloc 2 27495 NULL
117166 +ip_set_get_h32_27498 ip_set_get_h32 0 27498 NULL
117167 +btrfs_get_64_27499 btrfs_get_64 0 27499 NULL
117168 +garmin_read_process_27509 garmin_read_process 3 27509 NULL
117169 +oti_alloc_cookies_27510 oti_alloc_cookies 2 27510 NULL
117170 +ib_copy_to_udata_27525 ib_copy_to_udata 3 27525 NULL
117171 +snd_sonicvibes_getdmaa_27552 snd_sonicvibes_getdmaa 0 27552 NULL
117172 +SyS_fgetxattr_27571 SyS_fgetxattr 4 27571 NULL
117173 +sco_sock_recvmsg_27572 sco_sock_recvmsg 4 27572 NULL
117174 +libipw_alloc_txb_27579 libipw_alloc_txb 1 27579 NULL
117175 +C_SYSC_mbind_27636 C_SYSC_mbind 5 27636 NULL
117176 +ocfs2_xattr_ibody_get_27642 ocfs2_xattr_ibody_get 0 27642 NULL nohasharray
117177 +read_flush_procfs_27642 read_flush_procfs 3 27642 &ocfs2_xattr_ibody_get_27642 nohasharray
117178 +nl80211_send_connect_result_27642 nl80211_send_connect_result 5-7 27642 &read_flush_procfs_27642 nohasharray
117179 +ocfs2_direct_IO_27642 ocfs2_direct_IO 4 27642 &nl80211_send_connect_result_27642
117180 +add_new_gdb_27643 add_new_gdb 3 27643 NULL
117181 +btrfs_fallocate_27647 btrfs_fallocate 3-4 27647 NULL
117182 +qnx6_readpages_27657 qnx6_readpages 4 27657 NULL
117183 +cdrom_read_cdda_old_27664 cdrom_read_cdda_old 4 27664 NULL
117184 +ocfs2_extend_dir_27695 ocfs2_extend_dir 4 27695 NULL
117185 +fs_path_add_from_extent_buffer_27702 fs_path_add_from_extent_buffer 4 27702 NULL
117186 +evm_write_key_27715 evm_write_key 3 27715 NULL
117187 +ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol_27722 ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol 3 27722 NULL
117188 +xfs_dir2_block_sfsize_27727 xfs_dir2_block_sfsize 0 27727 NULL
117189 +SyS_setsockopt_27759 SyS_setsockopt 5 27759 NULL
117190 +transport_init_session_tags_27776 transport_init_session_tags 1-2 27776 NULL
117191 +__lov_setstripe_27782 __lov_setstripe 2 27782 NULL
117192 +twl4030_set_gpio_dataout_27792 twl4030_set_gpio_dataout 1 27792 NULL
117193 +SyS_readv_27804 SyS_readv 3 27804 NULL
117194 +mpihelp_mul_27805 mpihelp_mul 5-3 27805 NULL
117195 +hpt374_read_freq_27828 hpt374_read_freq 0 27828 NULL
117196 +init_header_complete_27833 init_header_complete 0 27833 NULL
117197 +read_profile_27859 read_profile 3 27859 NULL
117198 +sky2_pci_read16_27863 sky2_pci_read16 0 27863 NULL
117199 +ieee80211_if_read_dot11MeshHWMProotInterval_27873 ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 NULL
117200 +unix_seqpacket_sendmsg_27893 unix_seqpacket_sendmsg 4 27893 NULL
117201 +i915_error_object_create_sized_27919 i915_error_object_create_sized 4 27919 NULL
117202 +check_mapped_name_27943 check_mapped_name 3 27943 NULL
117203 +tracing_clock_write_27961 tracing_clock_write 3 27961 NULL nohasharray
117204 +bio_next_split_27961 bio_next_split 2 27961 &tracing_clock_write_27961
117205 +security_path_chown_27966 security_path_chown 0 27966 NULL
117206 +tipc_media_addr_printf_27971 tipc_media_addr_printf 2 27971 NULL
117207 +mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 NULL nohasharray
117208 +device_register_27972 device_register 0 27972 &mic_rx_pkts_read_27972
117209 +compat_SyS_set_mempolicy_27975 compat_SyS_set_mempolicy 3 27975 NULL
117210 +pci_enable_device_flags_27977 pci_enable_device_flags 0 27977 NULL
117211 +edt_ft5x06_debugfs_raw_data_read_28002 edt_ft5x06_debugfs_raw_data_read 3 28002 NULL
117212 +seq_get_buf_28006 seq_get_buf 0 28006 NULL
117213 +snd_rawmidi_write_28008 snd_rawmidi_write 3 28008 NULL
117214 +powercap_register_zone_28028 powercap_register_zone 6 28028 NULL
117215 +sctp_setsockopt_maxburst_28041 sctp_setsockopt_maxburst 3 28041 NULL
117216 +rts51x_xd_rw_28046 rts51x_xd_rw 3-4 28046 NULL
117217 +cx231xx_init_vbi_isoc_28053 cx231xx_init_vbi_isoc 3-2-4 28053 NULL
117218 +pool_status_28055 pool_status 5 28055 NULL
117219 +init_rs_non_canonical_28059 init_rs_non_canonical 1 28059 NULL
117220 +lpfc_idiag_mbxacc_read_28061 lpfc_idiag_mbxacc_read 3 28061 NULL
117221 +tx_frag_bad_mblk_num_read_28064 tx_frag_bad_mblk_num_read 3 28064 NULL
117222 +mmc_test_alloc_mem_28102 mmc_test_alloc_mem 3-2 28102 NULL
117223 +rx_defrag_need_defrag_read_28117 rx_defrag_need_defrag_read 3 28117 NULL
117224 +vgacon_adjust_height_28124 vgacon_adjust_height 2 28124 NULL
117225 +video_read_28148 video_read 3 28148 NULL
117226 +snd_midi_channel_alloc_set_28153 snd_midi_channel_alloc_set 1 28153 NULL
117227 +stats_dot11FCSErrorCount_read_28154 stats_dot11FCSErrorCount_read 3 28154 NULL
117228 +vread_28173 vread 0-3 28173 NULL
117229 +macvtap_get_user_28185 macvtap_get_user 4 28185 NULL
117230 +counter_free_res_28187 counter_free_res 5 28187 NULL
117231 +read_disk_sb_28188 read_disk_sb 2 28188 NULL
117232 +nouveau_mxm_create__28200 nouveau_mxm_create_ 4 28200 NULL
117233 +__qp_memcpy_from_queue_28220 __qp_memcpy_from_queue 3-4 28220 NULL
117234 +line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 NULL
117235 +amd_nb_num_28228 amd_nb_num 0 28228 NULL
117236 +fuse_direct_IO_28275 fuse_direct_IO 4 28275 NULL
117237 +usemap_size_28281 usemap_size 0 28281 NULL
117238 +inline_xattr_size_28285 inline_xattr_size 0 28285 NULL
117239 +dma_map_sg_attrs_28289 dma_map_sg_attrs 0 28289 NULL
117240 +SyS_ppoll_28290 SyS_ppoll 2 28290 NULL
117241 +kstrtos16_from_user_28300 kstrtos16_from_user 2 28300 NULL
117242 +nouveau_compat_ioctl_28305 nouveau_compat_ioctl 2 28305 NULL
117243 +snd_pcm_oss_read_28317 snd_pcm_oss_read 3 28317 NULL
117244 +security_inode_link_28327 security_inode_link 0 28327 NULL
117245 +generic_write_checks_28329 generic_write_checks 0 28329 NULL
117246 +bm_entry_write_28338 bm_entry_write 3 28338 NULL
117247 +tcp_copy_to_iovec_28344 tcp_copy_to_iovec 3 28344 NULL
117248 +snapshot_write_28351 snapshot_write 3 28351 NULL
117249 +xfs_iomap_write_unwritten_28365 xfs_iomap_write_unwritten 3-2 28365 NULL
117250 +batadv_handle_tt_response_28370 batadv_handle_tt_response 4 28370 NULL
117251 +dlmfs_file_read_28385 dlmfs_file_read 3 28385 NULL
117252 +tx_frag_cache_miss_read_28394 tx_frag_cache_miss_read 3 28394 NULL
117253 +bypass_pwup_write_28416 bypass_pwup_write 3 28416 NULL
117254 +subdev_ioctl_28417 subdev_ioctl 2 28417 NULL
117255 +ksocknal_alloc_tx_28426 ksocknal_alloc_tx 2 28426 NULL
117256 +mpage_readpages_28436 mpage_readpages 3 28436 NULL
117257 +snd_emu10k1_efx_read_28452 snd_emu10k1_efx_read 2 28452 NULL
117258 +key_mic_failures_read_28457 key_mic_failures_read 3 28457 NULL
117259 +alloc_irq_cpu_rmap_28459 alloc_irq_cpu_rmap 1 28459 NULL
117260 +ps_poll_upsd_utilization_read_28519 ps_poll_upsd_utilization_read 3 28519 NULL
117261 +i2400m_tx_stats_read_28527 i2400m_tx_stats_read 3 28527 NULL
117262 +early_init_dt_alloc_memory_arch_28528 early_init_dt_alloc_memory_arch 1 28528 NULL
117263 +sel_read_policycap_28544 sel_read_policycap 3 28544 NULL
117264 +mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 NULL nohasharray
117265 +aio_read_events_28545 aio_read_events 3 28545 &mptctl_getiocinfo_28545 nohasharray
117266 +run_delalloc_range_28545 run_delalloc_range 3-4 28545 &aio_read_events_28545
117267 +sysfs_create_bin_file_28551 sysfs_create_bin_file 0 28551 NULL
117268 +b43legacy_debugfs_write_28556 b43legacy_debugfs_write 3 28556 NULL
117269 +asymmetric_verify_28567 asymmetric_verify 3 28567 NULL
117270 +oxygen_read32_28582 oxygen_read32 0 28582 NULL
117271 +task_cgroup_path_28599 task_cgroup_path 3 28599 NULL
117272 +extract_entropy_28604 extract_entropy 5-3 28604 NULL
117273 +kfifo_unused_28612 kfifo_unused 0 28612 NULL
117274 +snd_nm256_capture_copy_28622 snd_nm256_capture_copy 3-5 28622 NULL
117275 +setup_usemap_28636 setup_usemap 3-4 28636 NULL
117276 +qib_handle_6120_hwerrors_28642 qib_handle_6120_hwerrors 3 28642 NULL
117277 +p9_fcall_alloc_28652 p9_fcall_alloc 1 28652 NULL
117278 +read_nic_io_byte_28654 read_nic_io_byte 0 28654 NULL
117279 +blk_queue_resize_tags_28670 blk_queue_resize_tags 2 28670 NULL
117280 +SyS_setgroups16_28686 SyS_setgroups16 1 28686 NULL
117281 +kvm_mmu_get_page_28692 kvm_mmu_get_page 2 28692 NULL
117282 +drm_plane_init_28731 drm_plane_init 6 28731 NULL
117283 +spi_execute_28736 spi_execute 5 28736 NULL
117284 +snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 NULL
117285 +read_file_btcoex_28743 read_file_btcoex 3 28743 NULL
117286 +max_hw_blocks_28748 max_hw_blocks 0 28748 NULL
117287 +rpc_pipe_generic_upcall_28766 rpc_pipe_generic_upcall 4 28766 NULL
117288 +ath6kl_get_num_reg_28780 ath6kl_get_num_reg 0 28780 NULL
117289 +sel_write_member_28800 sel_write_member 3 28800 NULL
117290 +iwl_dbgfs_rxon_filter_flags_read_28832 iwl_dbgfs_rxon_filter_flags_read 3 28832 NULL
117291 +kernel_tree_alloc_28833 kernel_tree_alloc 1 28833 NULL
117292 +vp_request_msix_vectors_28849 vp_request_msix_vectors 2 28849 NULL
117293 +ipv6_renew_options_28867 ipv6_renew_options 5 28867 NULL
117294 +max_io_len_target_boundary_28879 max_io_len_target_boundary 0-1 28879 NULL
117295 +packet_sendmsg_spkt_28885 packet_sendmsg_spkt 4 28885 NULL
117296 +da9055_group_write_28904 da9055_group_write 2-3 28904 NULL
117297 +ps_upsd_timeouts_read_28924 ps_upsd_timeouts_read 3 28924 NULL
117298 +iwl_dbgfs_sleep_level_override_write_28925 iwl_dbgfs_sleep_level_override_write 3 28925 NULL
117299 +push_rx_28939 push_rx 3 28939 NULL
117300 +mxuport_prepare_write_buffer_28943 mxuport_prepare_write_buffer 3 28943 NULL
117301 +btrfs_trim_block_group_28963 btrfs_trim_block_group 3-4 28963 NULL
117302 +alloc_sched_domains_28972 alloc_sched_domains 1 28972 NULL
117303 +hash_net6_expire_28979 hash_net6_expire 4 28979 NULL
117304 +hci_sock_setsockopt_28993 hci_sock_setsockopt 5 28993 NULL
117305 +bin_uuid_28999 bin_uuid 3 28999 NULL
117306 +fd_execute_rw_29004 fd_execute_rw 3 29004 NULL
117307 +ieee80211_if_read_ht_opmode_29044 ieee80211_if_read_ht_opmode 3 29044 NULL
117308 +rxrpc_sendmsg_29049 rxrpc_sendmsg 4 29049 NULL
117309 +btrfs_root_bytenr_29058 btrfs_root_bytenr 0 29058 NULL
117310 +iso_packets_buffer_init_29061 iso_packets_buffer_init 3-4 29061 NULL
117311 +lpfc_idiag_extacc_drivr_get_29067 lpfc_idiag_extacc_drivr_get 0-3 29067 NULL
117312 +sctp_getsockopt_assoc_stats_29074 sctp_getsockopt_assoc_stats 2 29074 NULL
117313 +iwl_dbgfs_log_event_write_29088 iwl_dbgfs_log_event_write 3 29088 NULL
117314 +ccp_init_dm_workarea_29097 ccp_init_dm_workarea 3 29097 NULL
117315 +__compat_sys_preadv64_29103 __compat_sys_preadv64 3 29103 NULL
117316 +isdn_ppp_write_29109 isdn_ppp_write 4 29109 NULL
117317 +snprintf_29125 snprintf 0 29125 NULL
117318 +iov_shorten_29130 iov_shorten 0 29130 NULL
117319 +proc_scsi_write_29142 proc_scsi_write 3 29142 NULL
117320 +kvm_mmu_notifier_clear_flush_young_29154 kvm_mmu_notifier_clear_flush_young 3 29154 NULL
117321 +drm_property_create_enum_29201 drm_property_create_enum 5 29201 NULL
117322 +wusb_prf_256_29203 wusb_prf_256 7 29203 NULL
117323 +iwl_dbgfs_temperature_read_29224 iwl_dbgfs_temperature_read 3 29224 NULL
117324 +nvme_trans_copy_from_user_29227 nvme_trans_copy_from_user 3 29227 NULL
117325 +irq_domain_add_linear_29236 irq_domain_add_linear 2 29236 NULL
117326 +recover_peb_29238 recover_peb 0 29238 NULL
117327 +evdev_handle_get_val_29242 evdev_handle_get_val 5-6 29242 NULL
117328 +security_context_to_sid_core_29248 security_context_to_sid_core 2 29248 NULL
117329 +rbd_osd_req_create_29260 rbd_osd_req_create 3 29260 NULL
117330 +prism2_set_genericelement_29277 prism2_set_genericelement 3 29277 NULL
117331 +ext4_fiemap_29296 ext4_fiemap 4 29296 NULL
117332 +sn9c102_read_29305 sn9c102_read 3 29305 NULL
117333 +__fuse_get_req_29315 __fuse_get_req 2 29315 NULL
117334 +lprocfs_write_helper_29323 lprocfs_write_helper 2 29323 NULL
117335 +kvm_handle_hva_29326 kvm_handle_hva 2 29326 NULL
117336 +tun_put_user_29337 tun_put_user 5 29337 NULL
117337 +__alloc_ei_netdev_29338 __alloc_ei_netdev 1 29338 NULL
117338 +l2cap_sock_setsockopt_old_29346 l2cap_sock_setsockopt_old 4 29346 NULL
117339 +read_file_tx99_power_29405 read_file_tx99_power 3 29405 NULL
117340 +mempool_create_29437 mempool_create 1 29437 NULL
117341 +crypto_ahash_alignmask_29445 crypto_ahash_alignmask 0 29445 NULL
117342 +p9_client_prepare_req_29448 p9_client_prepare_req 3 29448 NULL
117343 +validate_scan_freqs_29462 validate_scan_freqs 0 29462 NULL
117344 +SyS_flistxattr_29474 SyS_flistxattr 3 29474 NULL
117345 +do_register_entry_29478 do_register_entry 4 29478 NULL
117346 +simple_strtoul_29480 simple_strtoul 0 29480 NULL
117347 +btmrvl_pscmd_write_29504 btmrvl_pscmd_write 3 29504 NULL
117348 +btrfs_file_extent_disk_bytenr_29505 btrfs_file_extent_disk_bytenr 0 29505 NULL
117349 +i2c_add_adapter_29507 i2c_add_adapter 0 29507 NULL
117350 +usnic_vnic_spec_dump_29508 usnic_vnic_spec_dump 2 29508 NULL
117351 +write_file_regidx_29517 write_file_regidx 3 29517 NULL
117352 +atk_debugfs_ggrp_read_29522 atk_debugfs_ggrp_read 3 29522 NULL
117353 +pci_enable_msix_29524 pci_enable_msix 0 29524 NULL
117354 +ftrace_write_29551 ftrace_write 3 29551 NULL
117355 +idetape_queue_rw_tail_29562 idetape_queue_rw_tail 3 29562 NULL
117356 +leaf_dealloc_29566 leaf_dealloc 3 29566 NULL
117357 +kvm_read_guest_virt_system_29569 kvm_read_guest_virt_system 4-2 29569 NULL
117358 +lbs_lowsnr_read_29571 lbs_lowsnr_read 3 29571 NULL
117359 +security_path_chmod_29578 security_path_chmod 0 29578 NULL
117360 +iwl_dbgfs_missed_beacon_write_29586 iwl_dbgfs_missed_beacon_write 3 29586 NULL
117361 +pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 4-0 29589 NULL
117362 +dio_set_defer_completion_29599 dio_set_defer_completion 0 29599 NULL
117363 +slots_per_page_29601 slots_per_page 0 29601 NULL
117364 +osc_cached_mb_seq_write_29610 osc_cached_mb_seq_write 3 29610 NULL
117365 +nla_get_u16_29624 nla_get_u16 0 29624 NULL
117366 +tx_frag_cache_hit_read_29639 tx_frag_cache_hit_read 3 29639 NULL
117367 +sctp_make_abort_user_29654 sctp_make_abort_user 3 29654 NULL nohasharray
117368 +spmi_controller_alloc_29654 spmi_controller_alloc 2 29654 &sctp_make_abort_user_29654
117369 +sisusb_write_mem_bulk_29678 sisusb_write_mem_bulk 4 29678 NULL
117370 +lustre_posix_acl_xattr_2ext_29693 lustre_posix_acl_xattr_2ext 2 29693 NULL
117371 +posix_acl_from_xattr_29708 posix_acl_from_xattr 3 29708 NULL
117372 +probes_write_29711 probes_write 3 29711 NULL
117373 +read_cis_cache_29735 read_cis_cache 4 29735 NULL
117374 +xfs_new_eof_29737 xfs_new_eof 2 29737 NULL
117375 +std_nic_write_29752 std_nic_write 3 29752 NULL
117376 +tg3_irq_count_29786 tg3_irq_count 0 29786 NULL
117377 +dbAlloc_29794 dbAlloc 0 29794 NULL
117378 +tcp_sendpage_29829 tcp_sendpage 4 29829 NULL
117379 +__probe_kernel_write_29842 __probe_kernel_write 3 29842 NULL
117380 +kvm_read_hva_atomic_29848 kvm_read_hva_atomic 3 29848 NULL
117381 +count_partial_29850 count_partial 0 29850 NULL
117382 +write_file_bool_bmps_29870 write_file_bool_bmps 3 29870 NULL
117383 +ipv6_setsockopt_29871 ipv6_setsockopt 5 29871 NULL
117384 +scsi_end_request_29876 scsi_end_request 3 29876 NULL
117385 +crypto_aead_alignmask_29885 crypto_aead_alignmask 0 29885 NULL
117386 +rtw_cfg80211_indicate_sta_assoc_29897 rtw_cfg80211_indicate_sta_assoc 3 29897 NULL
117387 +lov_ost_pool_extend_29914 lov_ost_pool_extend 2 29914 NULL
117388 +write_file_queue_29922 write_file_queue 3 29922 NULL
117389 +__btrfs_getxattr_29947 __btrfs_getxattr 0 29947 NULL nohasharray
117390 +ipv6_recv_error_29947 ipv6_recv_error 3 29947 &__btrfs_getxattr_29947
117391 +arch_setup_dmar_msi_29992 arch_setup_dmar_msi 0 29992 NULL
117392 +dev_mem_write_30028 dev_mem_write 3 30028 NULL
117393 +alloc_netdev_mqs_30030 alloc_netdev_mqs 1 30030 NULL
117394 +sysfs_add_file_mode_ns_30038 sysfs_add_file_mode_ns 0 30038 NULL
117395 +scsi_vpd_inquiry_30040 scsi_vpd_inquiry 0-4 30040 NULL
117396 +drp_wmove_30043 drp_wmove 4 30043 NULL
117397 +__pci_request_selected_regions_30058 __pci_request_selected_regions 0 30058 NULL
117398 +cxgbi_ddp_reserve_30091 cxgbi_ddp_reserve 4 30091 NULL
117399 +snd_midi_channel_init_set_30092 snd_midi_channel_init_set 1 30092 NULL
117400 +rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 NULL
117401 +defragment_dma_buffer_30113 defragment_dma_buffer 0 30113 NULL
117402 +spi_async_locked_30117 spi_async_locked 0 30117 NULL
117403 +u_memcpya_30139 u_memcpya 3-2 30139 NULL
117404 +dbg_port_buf_30145 dbg_port_buf 2 30145 NULL
117405 +elfcorehdr_read_30159 elfcorehdr_read 2 30159 NULL
117406 +alloc_switch_ctx_30165 alloc_switch_ctx 2 30165 NULL
117407 +expand_inode_data_30169 expand_inode_data 3-2 30169 NULL
117408 +mempool_create_page_pool_30189 mempool_create_page_pool 1 30189 NULL
117409 +drm_property_create_bitmask_30195 drm_property_create_bitmask 5 30195 NULL
117410 +__genwqe_readq_30197 __genwqe_readq 0 30197 NULL
117411 +snd_pcm_playback_forward_30201 snd_pcm_playback_forward 0-2 30201 NULL
117412 +usblp_ioctl_30203 usblp_ioctl 2 30203 NULL
117413 +read_4k_modal_eeprom_30212 read_4k_modal_eeprom 3 30212 NULL
117414 +SyS_semop_30227 SyS_semop 3 30227 NULL
117415 +bitmap_file_set_bit_30228 bitmap_file_set_bit 2 30228 NULL
117416 +rawv6_recvmsg_30265 rawv6_recvmsg 4 30265 NULL
117417 +isr_pci_pm_read_30271 isr_pci_pm_read 3 30271 NULL nohasharray
117418 +try_break_deleg_30271 try_break_deleg 0 30271 &isr_pci_pm_read_30271
117419 +compat_readv_30273 compat_readv 3 30273 NULL
117420 +skcipher_sendmsg_30290 skcipher_sendmsg 4 30290 NULL
117421 +pipeline_sec_frag_swi_read_30294 pipeline_sec_frag_swi_read 3 30294 NULL
117422 +tcp_sendmsg_30296 tcp_sendmsg 4 30296 NULL
117423 +osc_contention_seconds_seq_write_30305 osc_contention_seconds_seq_write 3 30305 NULL
117424 +ext4_acl_from_disk_30320 ext4_acl_from_disk 2 30320 NULL
117425 +i8254_read_30330 i8254_read 0 30330 NULL
117426 +resource_from_user_30341 resource_from_user 3 30341 NULL
117427 +o2nm_this_node_30342 o2nm_this_node 0 30342 NULL
117428 +kstrtou32_from_user_30361 kstrtou32_from_user 2 30361 NULL
117429 +pagecache_write_begin_30364 pagecache_write_begin 0 30364 NULL
117430 +pvscsi_change_queue_depth_30365 pvscsi_change_queue_depth 2 30365 NULL
117431 +C_SYSC_readv_30369 C_SYSC_readv 3 30369 NULL
117432 +blkdev_issue_zeroout_30392 blkdev_issue_zeroout 3 30392 NULL
117433 +c4iw_init_resource_30393 c4iw_init_resource 2-3 30393 NULL
117434 +get_kernel_pages_30397 get_kernel_pages 0 30397 NULL
117435 +vb2_fop_write_30420 vb2_fop_write 3 30420 NULL
117436 +tx_tx_template_prepared_read_30424 tx_tx_template_prepared_read 3 30424 NULL
117437 +lstcon_session_info_30425 lstcon_session_info 6 30425 NULL
117438 +enable_write_30456 enable_write 3 30456 NULL
117439 +tx_tx_template_programmed_read_30461 tx_tx_template_programmed_read 3 30461 NULL
117440 +urandom_read_30462 urandom_read 3 30462 NULL
117441 +zoran_ioctl_30465 zoran_ioctl 2 30465 NULL
117442 +i2c_ctrl_read_30467 i2c_ctrl_read 0 30467 NULL
117443 +adu_write_30487 adu_write 3 30487 NULL
117444 +dtim_interval_write_30489 dtim_interval_write 3 30489 NULL
117445 +batadv_send_tt_request_30493 batadv_send_tt_request 5 30493 NULL
117446 +__send_duplicate_bios_30498 __send_duplicate_bios 4 30498 NULL
117447 +memblock_virt_alloc_node_30515 memblock_virt_alloc_node 1 30515 NULL
117448 +dwc3_testmode_write_30516 dwc3_testmode_write 3 30516 NULL
117449 +debug_debug2_read_30526 debug_debug2_read 3 30526 NULL
117450 +ixgbevf_acquire_msix_vectors_30559 ixgbevf_acquire_msix_vectors 2 30559 NULL
117451 +disk_expand_part_tbl_30561 disk_expand_part_tbl 2 30561 NULL
117452 +set_le_30581 set_le 4 30581 NULL
117453 +blk_init_tags_30592 blk_init_tags 1 30592 NULL
117454 +sgl_map_user_pages_30610 sgl_map_user_pages 2 30610 NULL
117455 +macvtap_sendmsg_30629 macvtap_sendmsg 4 30629 NULL
117456 +ieee80211_if_read_dot11MeshAwakeWindowDuration_30631 ieee80211_if_read_dot11MeshAwakeWindowDuration 3 30631 NULL
117457 +compat_raw_setsockopt_30634 compat_raw_setsockopt 5 30634 NULL
117458 +mlx5_ib_alloc_fast_reg_page_list_30638 mlx5_ib_alloc_fast_reg_page_list 2 30638 NULL
117459 +SyS_listxattr_30647 SyS_listxattr 3 30647 NULL
117460 +jffs2_flash_read_30667 jffs2_flash_read 0 30667 NULL
117461 +ni_ai_fifo_read_30681 ni_ai_fifo_read 3 30681 NULL
117462 +sst_hsw_get_dsp_position_30691 sst_hsw_get_dsp_position 0 30691 NULL
117463 +dccp_setsockopt_ccid_30701 dccp_setsockopt_ccid 4 30701 NULL
117464 +lbs_wrbbp_write_30712 lbs_wrbbp_write 3 30712 NULL
117465 +lbs_debugfs_read_30721 lbs_debugfs_read 3 30721 NULL
117466 +snd_nm256_playback_silence_30727 snd_nm256_playback_silence 3-4 30727 NULL
117467 +snapshot_status_30744 snapshot_status 5 30744 NULL
117468 +fuse_conn_limit_write_30777 fuse_conn_limit_write 3 30777 NULL
117469 +__bio_alloc_30787 __bio_alloc 3 30787 NULL
117470 +smk_read_doi_30813 smk_read_doi 3 30813 NULL
117471 +get_kobj_path_length_30831 get_kobj_path_length 0 30831 NULL
117472 +ath10k_write_fw_dbglog_30835 ath10k_write_fw_dbglog 3 30835 NULL
117473 +of_gpio_named_count_30841 of_gpio_named_count 0 30841 NULL
117474 +sctp_setsockopt_auth_chunk_30843 sctp_setsockopt_auth_chunk 3 30843 NULL
117475 +wd_autoreset_write_30862 wd_autoreset_write 3 30862 NULL
117476 +ieee80211_if_fmt_dropped_frames_no_route_30884 ieee80211_if_fmt_dropped_frames_no_route 3 30884 NULL
117477 +pn_recvmsg_30887 pn_recvmsg 4 30887 NULL
117478 +usnic_debugfs_buildinfo_read_30928 usnic_debugfs_buildinfo_read 3 30928 NULL
117479 +sctp_setsockopt_rtoinfo_30941 sctp_setsockopt_rtoinfo 3 30941 NULL
117480 +tty_insert_flip_string_flags_30969 tty_insert_flip_string_flags 4 30969 NULL
117481 +huge_page_mask_30981 huge_page_mask 0 30981 NULL
117482 +read_file_bt_ant_diversity_30983 read_file_bt_ant_diversity 3 30983 NULL
117483 +lbs_host_sleep_read_31013 lbs_host_sleep_read 3 31013 NULL
117484 +ima_eventsig_init_31022 ima_eventsig_init 5 31022 NULL
117485 +template_fmt_size_31033 template_fmt_size 0 31033 NULL
117486 +do_setup_msi_irqs_31043 do_setup_msi_irqs 2 31043 NULL
117487 +stride_pg_count_31053 stride_pg_count 0-3-2-1-4-5 31053 NULL
117488 +lbs_failcount_read_31063 lbs_failcount_read 3 31063 NULL
117489 +sctp_setsockopt_context_31091 sctp_setsockopt_context 3 31091 NULL
117490 +proc_gid_map_write_31093 proc_gid_map_write 3 31093 NULL
117491 +depth_read_31112 depth_read 3 31112 NULL
117492 +hash_ipportnet6_expire_31118 hash_ipportnet6_expire 4 31118 NULL
117493 +kimage_normal_alloc_31140 kimage_normal_alloc 3 31140 NULL
117494 +size_inside_page_31141 size_inside_page 0 31141 NULL
117495 +w9966_v4l_read_31148 w9966_v4l_read 3 31148 NULL
117496 +ch_do_scsi_31171 ch_do_scsi 4 31171 NULL
117497 +r592_read_fifo_pio_31198 r592_read_fifo_pio 3 31198 NULL
117498 +mtdchar_readoob_31200 mtdchar_readoob 4 31200 NULL
117499 +__btrfs_free_reserved_extent_31207 __btrfs_free_reserved_extent 2 31207 NULL
117500 +cpumask_weight_31215 cpumask_weight 0 31215 NULL
117501 +__read_reg_31216 __read_reg 0 31216 NULL
117502 +atm_get_addr_31221 atm_get_addr 3 31221 NULL
117503 +tcp_recvmsg_31238 tcp_recvmsg 4 31238 NULL
117504 +cyy_readb_31240 cyy_readb 0 31240 NULL
117505 +_create_sg_bios_31244 _create_sg_bios 4 31244 NULL
117506 +ieee80211_if_read_last_beacon_31257 ieee80211_if_read_last_beacon 3 31257 NULL
117507 +hash_netportnet4_expire_31290 hash_netportnet4_expire 4 31290 NULL
117508 +uvc_simplify_fraction_31303 uvc_simplify_fraction 3 31303 NULL
117509 +sisusbcon_scroll_31315 sisusbcon_scroll 5-2-3 31315 NULL
117510 +command_file_write_31318 command_file_write 3 31318 NULL
117511 +hwerr_crcbits_31334 hwerr_crcbits 4 31334 NULL
117512 +_regmap_raw_multi_reg_write_31336 _regmap_raw_multi_reg_write 3 31336 NULL
117513 +em28xx_init_usb_xfer_31337 em28xx_init_usb_xfer 4-6 31337 NULL
117514 +outlen_write_31358 outlen_write 3 31358 NULL
117515 +ieee80211_rx_mgmt_auth_31366 ieee80211_rx_mgmt_auth 3 31366 NULL
117516 +xprt_rdma_allocate_31372 xprt_rdma_allocate 2 31372 NULL
117517 +vb2_vmalloc_get_userptr_31374 vb2_vmalloc_get_userptr 3-2 31374 NULL
117518 +trace_parser_get_init_31379 trace_parser_get_init 2 31379 NULL
117519 +inb_31388 inb 0 31388 NULL
117520 +key_ifindex_read_31411 key_ifindex_read 3 31411 NULL
117521 +_sp2d_max_pg_31422 _sp2d_max_pg 0 31422 NULL
117522 +TSS_checkhmac1_31429 TSS_checkhmac1 5 31429 NULL
117523 +snd_aw2_saa7146_get_hw_ptr_capture_31431 snd_aw2_saa7146_get_hw_ptr_capture 0 31431 NULL
117524 +transport_alloc_session_tags_31449 transport_alloc_session_tags 2-3 31449 NULL
117525 +opera1_xilinx_rw_31453 opera1_xilinx_rw 5 31453 NULL
117526 +xfs_btree_get_numrecs_31477 xfs_btree_get_numrecs 0 31477 NULL
117527 +alg_setkey_31485 alg_setkey 3 31485 NULL
117528 +rds_message_map_pages_31487 rds_message_map_pages 2 31487 NULL
117529 +qsfp_2_read_31491 qsfp_2_read 3 31491 NULL
117530 +__alloc_bootmem_31498 __alloc_bootmem 1 31498 NULL
117531 +hidraw_write_31536 hidraw_write 3 31536 NULL
117532 +usbvision_read_31555 usbvision_read 3 31555 NULL
117533 +tx_frag_tkip_called_read_31575 tx_frag_tkip_called_read 3 31575 NULL
117534 +get_max_inline_xattr_value_size_31578 get_max_inline_xattr_value_size 0 31578 NULL
117535 +osst_write_31581 osst_write 3 31581 NULL
117536 +snd_compr_get_avail_31584 snd_compr_get_avail 0 31584 NULL
117537 +iwl_dbgfs_ucode_tx_stats_read_31611 iwl_dbgfs_ucode_tx_stats_read 3 31611 NULL
117538 +arvo_sysfs_read_31617 arvo_sysfs_read 6 31617 NULL nohasharray
117539 +memblock_virt_alloc_nopanic_31617 memblock_virt_alloc_nopanic 1 31617 &arvo_sysfs_read_31617
117540 +usnic_ib_dump_vf_31623 usnic_ib_dump_vf 3 31623 NULL
117541 +videobuf_read_one_31637 videobuf_read_one 3 31637 NULL
117542 +pod_alloc_sysex_buffer_31651 pod_alloc_sysex_buffer 3 31651 NULL
117543 +xfer_secondary_pool_31661 xfer_secondary_pool 2 31661 NULL
117544 +__lgread_31668 __lgread 4 31668 NULL
117545 +copy_from_user_nmi_31672 copy_from_user_nmi 3-0 31672 NULL
117546 +forced_ps_read_31685 forced_ps_read 3 31685 NULL
117547 +fst_recover_rx_error_31687 fst_recover_rx_error 3 31687 NULL
117548 +rs_pretty_print_rate_31727 rs_pretty_print_rate 0 31727 NULL
117549 +lu_buf_check_and_grow_31735 lu_buf_check_and_grow 2 31735 NULL nohasharray
117550 +utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 &lu_buf_check_and_grow_31735
117551 +shmem_pwrite_slow_31741 shmem_pwrite_slow 3-2 31741 NULL
117552 +input_abs_get_max_31742 input_abs_get_max 0 31742 NULL nohasharray
117553 +NCR_700_change_queue_depth_31742 NCR_700_change_queue_depth 2 31742 &input_abs_get_max_31742
117554 +bcm_char_read_31750 bcm_char_read 3 31750 NULL
117555 +snd_seq_device_new_31753 snd_seq_device_new 4 31753 NULL
117556 +SyS_lsetxattr_31766 SyS_lsetxattr 4 31766 NULL
117557 +osync_buffers_list_31789 osync_buffers_list 0 31789 NULL
117558 +usblp_cache_device_id_string_31790 usblp_cache_device_id_string 0 31790 NULL
117559 +ecryptfs_send_message_locked_31801 ecryptfs_send_message_locked 2 31801 NULL
117560 +isr_rx_procs_read_31804 isr_rx_procs_read 3 31804 NULL
117561 +data_write_31805 data_write 3 31805 NULL
117562 +SyS_msgsnd_31814 SyS_msgsnd 3 31814 NULL
117563 +strnlen_user_31815 strnlen_user 0-2 31815 NULL
117564 +sta_last_signal_read_31818 sta_last_signal_read 3 31818 NULL
117565 +clone_bio_31854 clone_bio 4-3 31854 NULL
117566 +SyS_ppoll_31855 SyS_ppoll 2 31855 NULL
117567 +iwl_dbgfs_disable_ht40_write_31876 iwl_dbgfs_disable_ht40_write 3 31876 NULL
117568 +drm_mode_crtc_set_gamma_size_31881 drm_mode_crtc_set_gamma_size 2 31881 NULL
117569 +ddb_output_write_31902 ddb_output_write 3-0 31902 NULL
117570 +xattr_permission_31907 xattr_permission 0 31907 NULL
117571 +lu_buf_realloc_31915 lu_buf_realloc 2 31915 NULL
117572 +new_dir_31919 new_dir 3 31919 NULL
117573 +kmem_alloc_31920 kmem_alloc 1 31920 NULL
117574 +era_status_31934 era_status 5 31934 NULL
117575 +SYSC_sethostname_31940 SYSC_sethostname 2 31940 NULL
117576 +read_mem_31942 read_mem 3 31942 NULL nohasharray
117577 +iov_iter_copy_from_user_31942 iov_iter_copy_from_user 4-0 31942 &read_mem_31942
117578 +ext4_zero_range_31944 ext4_zero_range 3-2 31944 NULL
117579 +vb2_write_31948 vb2_write 3 31948 NULL
117580 +pvr2_ctrl_get_valname_31951 pvr2_ctrl_get_valname 4 31951 NULL
117581 +regcache_rbtree_sync_31964 regcache_rbtree_sync 2 31964 NULL
117582 +iwl_rx_packet_payload_len_31965 iwl_rx_packet_payload_len 0 31965 NULL
117583 +copy_from_user_toio_31966 copy_from_user_toio 3 31966 NULL
117584 +iblock_execute_rw_31982 iblock_execute_rw 3 31982 NULL nohasharray
117585 +vx_read_status_31982 vx_read_status 0 31982 &iblock_execute_rw_31982
117586 +find_next_zero_bit_31990 find_next_zero_bit 0 31990 NULL
117587 +lustre_acl_xattr_merge2posix_31992 lustre_acl_xattr_merge2posix 2 31992 NULL
117588 +sysfs_create_file_31996 sysfs_create_file 0 31996 NULL
117589 +calc_hmac_32010 calc_hmac 3 32010 NULL
117590 +aead_len_32021 aead_len 0 32021 NULL nohasharray
117591 +aer_init_32021 aer_init 0 32021 &aead_len_32021
117592 +stk_read_32038 stk_read 3 32038 NULL
117593 +SYSC_llistxattr_32061 SYSC_llistxattr 3 32061 NULL
117594 +proc_scsi_devinfo_write_32064 proc_scsi_devinfo_write 3 32064 NULL
117595 +cow_file_range_inline_32091 cow_file_range_inline 3 32091 NULL
117596 +bio_alloc_32095 bio_alloc 2 32095 NULL
117597 +ath6kl_fwlog_read_32101 ath6kl_fwlog_read 3 32101 NULL
117598 +disk_status_32120 disk_status 4 32120 NULL
117599 +kobject_add_internal_32133 kobject_add_internal 0 32133 NULL
117600 +venus_link_32165 venus_link 5 32165 NULL
117601 +do_writepages_32173 do_writepages 0 32173 NULL
117602 +del_ptr_32197 del_ptr 4 32197 NULL
117603 +wusb_ccm_mac_32199 wusb_ccm_mac 7 32199 NULL
117604 +riva_get_cmap_len_32218 riva_get_cmap_len 0 32218 NULL
117605 +caif_seqpkt_recvmsg_32241 caif_seqpkt_recvmsg 4 32241 NULL
117606 +lbs_lowrssi_read_32242 lbs_lowrssi_read 3 32242 NULL
117607 +ocfs2_xattr_find_entry_32260 ocfs2_xattr_find_entry 0 32260 NULL
117608 +kvm_set_spte_hva_32312 kvm_set_spte_hva 2 32312 NULL
117609 +cas_calc_tabort_32316 cas_calc_tabort 0 32316 NULL
117610 +SyS_select_32319 SyS_select 1 32319 NULL
117611 +nouveau_bar_create__32332 nouveau_bar_create_ 4 32332 NULL
117612 +nl80211_send_mlme_event_32337 nl80211_send_mlme_event 4 32337 NULL
117613 +t4_alloc_mem_32342 t4_alloc_mem 1 32342 NULL
117614 +dispatch_ioctl_32357 dispatch_ioctl 2 32357 NULL nohasharray
117615 +rx_streaming_always_write_32357 rx_streaming_always_write 3 32357 &dispatch_ioctl_32357
117616 +sel_read_initcon_32362 sel_read_initcon 3 32362 NULL
117617 +ll_setxattr_common_32398 ll_setxattr_common 4 32398 NULL
117618 +xfs_iext_add_indirect_multi_32400 xfs_iext_add_indirect_multi 3 32400 NULL
117619 +vmci_qp_alloc_32405 vmci_qp_alloc 5-3 32405 NULL
117620 +snd_pcm_sync_ptr_32461 snd_pcm_sync_ptr 0 32461 NULL
117621 +cache_status_32462 cache_status 5 32462 NULL
117622 +fill_readbuf_32464 fill_readbuf 3 32464 NULL
117623 +ide_driver_proc_write_32493 ide_driver_proc_write 3 32493 NULL
117624 +bypass_pwoff_write_32499 bypass_pwoff_write 3 32499 NULL
117625 +mdc_pinger_recov_seq_write_32510 mdc_pinger_recov_seq_write 3 32510 NULL
117626 +ctrl_std_val_to_sym_32516 ctrl_std_val_to_sym 5 32516 NULL
117627 +disconnect_32521 disconnect 4 32521 NULL
117628 +qsfp_read_32522 qsfp_read 0-2-4 32522 NULL
117629 +ilo_read_32531 ilo_read 3 32531 NULL
117630 +ieee80211_if_read_estab_plinks_32533 ieee80211_if_read_estab_plinks 3 32533 NULL
117631 +format_devstat_counter_32550 format_devstat_counter 3 32550 NULL
117632 +aes_encrypt_fail_read_32562 aes_encrypt_fail_read 3 32562 NULL
117633 +osc_iocontrol_32565 osc_iocontrol 3 32565 NULL
117634 +mem_swapout_entry_32586 mem_swapout_entry 3 32586 NULL
117635 +pipeline_tcp_tx_stat_fifo_int_read_32589 pipeline_tcp_tx_stat_fifo_int_read 3 32589 NULL
117636 +read_file_beacon_32595 read_file_beacon 3 32595 NULL
117637 +ieee80211_if_read_dropped_frames_congestion_32603 ieee80211_if_read_dropped_frames_congestion 3 32603 NULL
117638 +__pci_request_region_32618 __pci_request_region 0 32618 NULL
117639 +irda_recvmsg_dgram_32631 irda_recvmsg_dgram 4 32631 NULL
117640 +cfg80211_roamed_32632 cfg80211_roamed 5-7 32632 NULL
117641 +kvmalloc_32646 kvmalloc 1 32646 NULL
117642 +ib_sg_dma_len_32649 ib_sg_dma_len 0 32649 NULL
117643 +generic_readlink_32654 generic_readlink 3 32654 NULL
117644 +move_addr_to_kernel_32673 move_addr_to_kernel 2 32673 NULL
117645 +compat_SyS_preadv_32679 compat_SyS_preadv 3 32679 NULL
117646 +jfs_readpages_32702 jfs_readpages 4 32702 NULL
117647 +rt2x00debug_read_queue_dump_32712 rt2x00debug_read_queue_dump 3 32712 NULL
117648 +megasas_change_queue_depth_32747 megasas_change_queue_depth 2 32747 NULL
117649 +stats_read_ul_32751 stats_read_ul 3 32751 NULL
117650 +vmci_transport_dgram_dequeue_32775 vmci_transport_dgram_dequeue 4 32775 NULL
117651 +sctp_tsnmap_grow_32784 sctp_tsnmap_grow 2 32784 NULL
117652 +rproc_name_read_32805 rproc_name_read 3 32805 NULL
117653 +sta_tx_latency_stat_read_32862 sta_tx_latency_stat_read 3 32862 NULL
117654 +new_tape_buffer_32866 new_tape_buffer 2 32866 NULL
117655 +ath6kl_usb_submit_ctrl_in_32880 ath6kl_usb_submit_ctrl_in 6 32880 NULL nohasharray
117656 +cifs_writedata_alloc_32880 cifs_writedata_alloc 1 32880 &ath6kl_usb_submit_ctrl_in_32880
117657 +vp702x_usb_inout_cmd_32884 vp702x_usb_inout_cmd 4-6 32884 NULL
117658 +tipc_link_iovec_xmit_fast_32913 tipc_link_iovec_xmit_fast 3 32913 NULL nohasharray
117659 +il_dbgfs_tx_stats_read_32913 il_dbgfs_tx_stats_read 3 32913 &tipc_link_iovec_xmit_fast_32913
117660 +zlib_inflate_workspacesize_32927 zlib_inflate_workspacesize 0 32927 NULL
117661 +rmap_recycle_32938 rmap_recycle 3 32938 NULL
117662 +compat_filldir_32999 compat_filldir 3 32999 NULL
117663 +SyS_syslog_33007 SyS_syslog 3 33007 NULL
117664 +br_multicast_set_hash_max_33012 br_multicast_set_hash_max 2 33012 NULL
117665 +write_file_bt_ant_diversity_33019 write_file_bt_ant_diversity 3 33019 NULL
117666 +snd_pcm_prepare_33036 snd_pcm_prepare 0 33036 NULL
117667 +mic_virtio_copy_to_user_33048 mic_virtio_copy_to_user 3 33048 NULL
117668 +SYSC_lgetxattr_33049 SYSC_lgetxattr 4 33049 NULL
117669 +pipeline_dec_packet_in_fifo_full_read_33052 pipeline_dec_packet_in_fifo_full_read 3 33052 NULL
117670 +ebt_compat_match_offset_33053 ebt_compat_match_offset 0-2 33053 NULL
117671 +bitmap_resize_33054 bitmap_resize 2 33054 NULL
117672 +stats_dot11RTSSuccessCount_read_33065 stats_dot11RTSSuccessCount_read 3 33065 NULL
117673 +sel_read_checkreqprot_33068 sel_read_checkreqprot 3 33068 NULL
117674 +alloc_tio_33077 alloc_tio 3 33077 NULL
117675 +acl_permission_check_33083 acl_permission_check 0 33083 NULL
117676 +fb_sys_write_33130 fb_sys_write 3 33130 NULL
117677 +notify_change_33143 notify_change 0 33143 NULL
117678 +SyS_poll_33152 SyS_poll 2 33152 NULL
117679 +_pci_add_cap_save_buffer_33153 _pci_add_cap_save_buffer 4 33153 NULL
117680 +debug_debug6_read_33168 debug_debug6_read 3 33168 NULL
117681 +dataflash_read_fact_otp_33204 dataflash_read_fact_otp 3-2 33204 NULL
117682 +pp_read_33210 pp_read 3 33210 NULL
117683 +xfs_file_aio_write_33234 xfs_file_aio_write 4 33234 NULL
117684 +snd_pcm_plug_client_size_33267 snd_pcm_plug_client_size 0-2 33267 NULL
117685 +cachefiles_cook_key_33274 cachefiles_cook_key 2 33274 NULL
117686 +sync_pt_create_33282 sync_pt_create 2 33282 NULL
117687 +mcs7830_get_reg_33308 mcs7830_get_reg 3 33308 NULL
117688 +isku_sysfs_read_keys_easyzone_33318 isku_sysfs_read_keys_easyzone 6 33318 NULL
117689 +vx_send_irq_dsp_33329 vx_send_irq_dsp 0 33329 NULL
117690 +joydev_ioctl_33343 joydev_ioctl 2 33343 NULL
117691 +lov_stripesize_seq_write_33353 lov_stripesize_seq_write 3 33353 NULL
117692 +create_xattr_datum_33356 create_xattr_datum 5 33356 NULL nohasharray
117693 +irq_pkt_threshold_read_33356 irq_pkt_threshold_read 3 33356 &create_xattr_datum_33356
117694 +pvscsi_allocate_sg_33357 pvscsi_allocate_sg 0 33357 NULL
117695 +read_file_regidx_33370 read_file_regidx 3 33370 NULL
117696 +ieee80211_if_read_dropped_frames_no_route_33383 ieee80211_if_read_dropped_frames_no_route 3 33383 NULL
117697 +scsi_varlen_cdb_length_33385 scsi_varlen_cdb_length 0 33385 NULL
117698 +nvc0_ram_create__33391 nvc0_ram_create_ 5 33391 NULL
117699 +ocfs2_allocate_unwritten_extents_33394 ocfs2_allocate_unwritten_extents 2-3 33394 NULL
117700 +cfs_trace_copyin_string_33396 cfs_trace_copyin_string 4 33396 NULL
117701 +snd_pcm_capture_ioctl1_33408 snd_pcm_capture_ioctl1 0 33408 NULL
117702 +hash_netiface6_expire_33421 hash_netiface6_expire 4 33421 NULL
117703 +dis_tap_write_33426 dis_tap_write 3 33426 NULL
117704 +message_stats_list_33440 message_stats_list 5 33440 NULL
117705 +ovs_vport_alloc_33475 ovs_vport_alloc 1 33475 NULL
117706 +create_entry_33479 create_entry 2 33479 NULL
117707 +ip_setsockopt_33487 ip_setsockopt 5 33487 NULL
117708 +res_counter_read_33499 res_counter_read 4 33499 NULL
117709 +hash_netnet4_expire_33500 hash_netnet4_expire 4 33500 NULL
117710 +fb_read_33506 fb_read 3 33506 NULL
117711 +musb_test_mode_write_33518 musb_test_mode_write 3 33518 NULL
117712 +ahash_setkey_unaligned_33521 ahash_setkey_unaligned 3 33521 NULL
117713 +nes_alloc_fast_reg_page_list_33523 nes_alloc_fast_reg_page_list 2 33523 NULL
117714 +aggr_size_rx_size_read_33526 aggr_size_rx_size_read 3 33526 NULL
117715 +tomoyo_read_self_33539 tomoyo_read_self 3 33539 NULL nohasharray
117716 +osc_max_rpcs_in_flight_seq_write_33539 osc_max_rpcs_in_flight_seq_write 3 33539 &tomoyo_read_self_33539
117717 +count_subheaders_33591 count_subheaders 0 33591 NULL
117718 +scsi_execute_33596 scsi_execute 5 33596 NULL
117719 +comedi_buf_write_n_allocated_33604 comedi_buf_write_n_allocated 0 33604 NULL
117720 +xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 NULL
117721 +usb_gstrings_attach_33615 usb_gstrings_attach 3 33615 NULL nohasharray
117722 +il_dbgfs_qos_read_33615 il_dbgfs_qos_read 3 33615 &usb_gstrings_attach_33615
117723 +stride_page_count_33641 stride_page_count 2 33641 NULL
117724 +irq_blk_threshold_read_33666 irq_blk_threshold_read 3 33666 NULL
117725 +inw_p_33668 inw_p 0 33668 NULL
117726 +arp_hdr_len_33671 arp_hdr_len 0 33671 NULL
117727 +i2c_hid_alloc_buffers_33673 i2c_hid_alloc_buffers 2 33673 NULL
117728 +submit_one_bio_33683 submit_one_bio 0 33683 NULL
117729 +nv50_disp_dmac_create__33696 nv50_disp_dmac_create_ 6 33696 NULL
117730 +netlink_sendmsg_33708 netlink_sendmsg 4 33708 NULL
117731 +tipc_link_stats_33716 tipc_link_stats 3 33716 NULL
117732 +pvr2_stream_buffer_count_33719 pvr2_stream_buffer_count 2 33719 NULL
117733 +write_file_spectral_count_33723 write_file_spectral_count 3 33723 NULL
117734 +read_file_node_recv_33729 read_file_node_recv 3 33729 NULL
117735 +rtw_cbuf_alloc23a_33740 rtw_cbuf_alloc23a 1 33740 NULL
117736 +vifs_state_read_33762 vifs_state_read 3 33762 NULL
117737 +hashtab_create_33769 hashtab_create 3 33769 NULL
117738 +i8042_create_aux_port_33777 i8042_create_aux_port 0 33777 NULL
117739 +if_sdio_read_rx_len_33800 if_sdio_read_rx_len 0 33800 NULL
117740 +filter_write_33819 filter_write 3 33819 NULL
117741 +sep_create_msgarea_context_33829 sep_create_msgarea_context 4 33829 NULL
117742 +scrub_setup_recheck_block_33831 scrub_setup_recheck_block 5-4 33831 NULL
117743 +ext4_journal_extend_33835 ext4_journal_extend 2 33835 NULL
117744 +snd_pcm_action_nonatomic_33844 snd_pcm_action_nonatomic 0 33844 NULL
117745 +oz_cdev_write_33852 oz_cdev_write 3 33852 NULL
117746 +get_user_pages_33908 get_user_pages 0 33908 NULL
117747 +sg_nents_33909 sg_nents 0 33909 NULL
117748 +ath6kl_roam_mode_write_33912 ath6kl_roam_mode_write 3 33912 NULL
117749 +queue_logical_block_size_33918 queue_logical_block_size 0 33918 NULL
117750 +sel_read_avc_cache_threshold_33942 sel_read_avc_cache_threshold 3 33942 NULL
117751 +lpfc_idiag_ctlacc_read_33943 lpfc_idiag_ctlacc_read 3 33943 NULL
117752 +read_file_tgt_rx_stats_33944 read_file_tgt_rx_stats 3 33944 NULL
117753 +__proc_dump_kernel_33954 __proc_dump_kernel 5 33954 NULL
117754 +btrfs_delalloc_reserve_metadata_33963 btrfs_delalloc_reserve_metadata 0 33963 NULL
117755 +vga_switcheroo_debugfs_write_33984 vga_switcheroo_debugfs_write 3 33984 NULL
117756 +lbs_lowrssi_write_34025 lbs_lowrssi_write 3 34025 NULL
117757 +ppp_write_34034 ppp_write 3 34034 NULL
117758 +tty_insert_flip_string_34042 tty_insert_flip_string 3-0 34042 NULL
117759 +calc_linear_pos_34067 calc_linear_pos 0-4 34067 NULL
117760 +memcg_update_all_caches_34068 memcg_update_all_caches 1 34068 NULL
117761 +pipeline_pipeline_fifo_full_read_34095 pipeline_pipeline_fifo_full_read 3 34095 NULL
117762 +__irq_domain_add_34101 __irq_domain_add 2 34101 NULL
117763 +proc_scsi_host_write_34107 proc_scsi_host_write 3 34107 NULL
117764 +islpci_mgt_transmit_34133 islpci_mgt_transmit 5 34133 NULL
117765 +ttm_dma_page_pool_free_34135 ttm_dma_page_pool_free 2-0 34135 NULL
117766 +ixgbe_dbg_netdev_ops_write_34141 ixgbe_dbg_netdev_ops_write 3 34141 NULL
117767 +shmem_pread_fast_34147 shmem_pread_fast 3 34147 NULL
117768 +skb_to_sgvec_34171 skb_to_sgvec 0 34171 NULL
117769 +rsi_debug_zone_write_34206 rsi_debug_zone_write 3 34206 NULL
117770 +ext4_da_write_begin_34215 ext4_da_write_begin 3-4 34215 NULL
117771 +bl_pipe_downcall_34264 bl_pipe_downcall 3 34264 NULL
117772 +device_private_init_34279 device_private_init 0 34279 NULL
117773 +ext4_get_groups_count_34324 ext4_get_groups_count 0 34324 NULL
117774 +pcpu_need_to_extend_34326 pcpu_need_to_extend 0 34326 NULL nohasharray
117775 +iov_iter_single_seg_count_34326 iov_iter_single_seg_count 0 34326 &pcpu_need_to_extend_34326
117776 +crypto_ablkcipher_ivsize_34363 crypto_ablkcipher_ivsize 0 34363 NULL nohasharray
117777 +sync_page_io_34363 sync_page_io 3 34363 &crypto_ablkcipher_ivsize_34363
117778 +rngapi_reset_34366 rngapi_reset 3 34366 NULL
117779 +_iwl_dbgfs_low_latency_write_34378 _iwl_dbgfs_low_latency_write 3 34378 NULL nohasharray
117780 +ea_read_34378 ea_read 0 34378 &_iwl_dbgfs_low_latency_write_34378
117781 +fuse_send_read_34379 fuse_send_read 4 34379 NULL
117782 +av7110_vbi_write_34384 av7110_vbi_write 3 34384 NULL
117783 +usbvision_v4l2_read_34386 usbvision_v4l2_read 3 34386 NULL
117784 +read_rbu_image_type_34387 read_rbu_image_type 6 34387 NULL
117785 +iwl_calib_set_34400 iwl_calib_set 3 34400 NULL nohasharray
117786 +ivtv_read_pos_34400 ivtv_read_pos 3 34400 &iwl_calib_set_34400
117787 +wd_exp_mode_write_34407 wd_exp_mode_write 3 34407 NULL
117788 +nl80211_send_disassoc_34424 nl80211_send_disassoc 4 34424 NULL
117789 +__extent_read_full_page_34437 __extent_read_full_page 0 34437 NULL
117790 +usbtest_alloc_urb_34446 usbtest_alloc_urb 3-5 34446 NULL
117791 +mwifiex_regrdwr_read_34472 mwifiex_regrdwr_read 3 34472 NULL
117792 +skcipher_sndbuf_34476 skcipher_sndbuf 0 34476 NULL
117793 +i2o_parm_field_get_34477 i2o_parm_field_get 5 34477 NULL
117794 +security_inode_permission_34488 security_inode_permission 0 34488 NULL
117795 +SyS_pwritev_34494 SyS_pwritev 3 34494 NULL
117796 +qp_alloc_res_34496 qp_alloc_res 5 34496 NULL
117797 +lu_buf_check_and_alloc_34505 lu_buf_check_and_alloc 2 34505 NULL
117798 +tracing_stats_read_34537 tracing_stats_read 3 34537 NULL nohasharray
117799 +ext4_fallocate_34537 ext4_fallocate 4-3 34537 &tracing_stats_read_34537
117800 +hugetlbfs_read_actor_34547 hugetlbfs_read_actor 2-5-4-0 34547 NULL
117801 +dbBackSplit_34561 dbBackSplit 0 34561 NULL
117802 +alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL nohasharray
117803 +self_check_peb_ec_hdr_34564 self_check_peb_ec_hdr 0 34564 &alloc_ieee80211_rsl_34564
117804 +lov_stripecount_seq_write_34582 lov_stripecount_seq_write 3 34582 NULL
117805 +init_send_hfcd_34586 init_send_hfcd 1 34586 NULL
117806 +inet6_ifla6_size_34591 inet6_ifla6_size 0 34591 NULL
117807 +ceph_msgpool_init_34599 ceph_msgpool_init 4 34599 NULL nohasharray
117808 +cw1200_queue_init_34599 cw1200_queue_init 4 34599 &ceph_msgpool_init_34599
117809 +bio_integrity_bytes_34602 bio_integrity_bytes 2 34602 NULL
117810 +__jffs2_ref_totlen_34609 __jffs2_ref_totlen 0 34609 NULL nohasharray
117811 +mtd_write_34609 mtd_write 0 34609 &__jffs2_ref_totlen_34609
117812 +__cfg80211_disconnected_34622 __cfg80211_disconnected 3 34622 NULL
117813 +cnic_alloc_dma_34641 cnic_alloc_dma 3 34641 NULL
117814 +kvm_set_spte_hva_34671 kvm_set_spte_hva 2 34671 NULL
117815 +sleep_auth_write_34676 sleep_auth_write 3 34676 NULL
117816 +isr_fiqs_read_34687 isr_fiqs_read 3 34687 NULL
117817 +batadv_tvlv_realloc_packet_buff_34688 batadv_tvlv_realloc_packet_buff 3-4 34688 NULL
117818 +port_print_34704 port_print 3 34704 NULL
117819 +ieee80211_if_read_num_sta_ps_34722 ieee80211_if_read_num_sta_ps 3 34722 NULL
117820 +platform_list_read_file_34734 platform_list_read_file 3 34734 NULL
117821 +reg_w_ixbuf_34736 reg_w_ixbuf 4 34736 NULL
117822 +lsm_alloc_plain_34755 lsm_alloc_plain 1 34755 NULL
117823 +bootmode_store_34762 bootmode_store 4 34762 NULL
117824 +device_add_34766 device_add 0 34766 NULL
117825 +qib_cdev_init_34778 qib_cdev_init 1 34778 NULL
117826 +SYSC_keyctl_34800 SYSC_keyctl 4 34800 NULL
117827 +can_nocow_extent_34801 can_nocow_extent 2 34801 NULL
117828 +drbd_get_max_capacity_34804 drbd_get_max_capacity 0 34804 NULL
117829 +ll_setxattr_34806 ll_setxattr 4 34806 NULL
117830 +file_page_index_34820 file_page_index 0-2 34820 NULL
117831 +bio_segments_34832 bio_segments 0 34832 NULL
117832 +b43_debugfs_write_34838 b43_debugfs_write 3 34838 NULL
117833 +nl_portid_hash_zalloc_34843 nl_portid_hash_zalloc 1 34843 NULL
117834 +acpi_system_write_wakeup_device_34853 acpi_system_write_wakeup_device 3 34853 NULL
117835 +usb_serial_generic_prepare_write_buffer_34857 usb_serial_generic_prepare_write_buffer 3 34857 NULL
117836 +ieee80211_if_read_txpower_34871 ieee80211_if_read_txpower 3 34871 NULL
117837 +msg_print_text_34889 msg_print_text 0 34889 NULL
117838 +ieee80211_if_write_34894 ieee80211_if_write 3 34894 NULL
117839 +si476x_radio_read_rsq_primary_blob_34916 si476x_radio_read_rsq_primary_blob 3 34916 NULL
117840 +__inode_permission_34925 __inode_permission 0 34925 NULL nohasharray
117841 +btrfs_super_chunk_root_34925 btrfs_super_chunk_root 0 34925 &__inode_permission_34925
117842 +ceph_aio_write_34930 ceph_aio_write 4 34930 NULL
117843 +sec_flags2str_34933 sec_flags2str 3 34933 NULL
117844 +snd_info_entry_read_34938 snd_info_entry_read 3 34938 NULL
117845 +do_add_page_to_bio_34974 do_add_page_to_bio 2-10 34974 NULL
117846 +schedule_erase_34996 schedule_erase 0 34996 NULL
117847 +rx_rx_hdr_overflow_read_35002 rx_rx_hdr_overflow_read 3 35002 NULL
117848 +l2cap_skbuff_fromiovec_35003 l2cap_skbuff_fromiovec 4-3 35003 NULL
117849 +rtw_cfg80211_rx_p2p_action_public_35010 rtw_cfg80211_rx_p2p_action_public 3 35010 NULL
117850 +sisusb_copy_memory_35016 sisusb_copy_memory 4 35016 NULL
117851 +coda_psdev_read_35029 coda_psdev_read 3 35029 NULL
117852 +pwr_connection_out_of_sync_read_35061 pwr_connection_out_of_sync_read 3 35061 NULL
117853 +__kfifo_uint_must_check_helper_35097 __kfifo_uint_must_check_helper 0-1 35097 NULL
117854 +capi_write_35104 capi_write 3 35104 NULL nohasharray
117855 +tx_tx_done_template_read_35104 tx_tx_done_template_read 3 35104 &capi_write_35104
117856 +ide_settings_proc_write_35110 ide_settings_proc_write 3 35110 NULL
117857 +message_stats_print_35158 message_stats_print 6 35158 NULL
117858 +iscsi_conn_setup_35159 iscsi_conn_setup 2 35159 NULL
117859 +ieee80211_if_read_bssid_35161 ieee80211_if_read_bssid 3 35161 NULL
117860 +compat_SyS_pselect6_35203 compat_SyS_pselect6 1 35203 NULL
117861 +unix_stream_recvmsg_35210 unix_stream_recvmsg 4 35210 NULL
117862 +security_key_getsecurity_35218 security_key_getsecurity 0 35218 NULL nohasharray
117863 +striped_read_35218 striped_read 0-2 35218 &security_key_getsecurity_35218
117864 +rx_rx_cmplt_task_read_35226 rx_rx_cmplt_task_read 3 35226 NULL
117865 +set_fd_set_35249 set_fd_set 1 35249 NULL
117866 +ioapic_setup_resources_35255 ioapic_setup_resources 1 35255 NULL
117867 +dis_disc_write_35265 dis_disc_write 3 35265 NULL
117868 +dma_show_regs_35266 dma_show_regs 3 35266 NULL
117869 +irda_recvmsg_stream_35280 irda_recvmsg_stream 4 35280 NULL
117870 +i2o_block_end_request_35282 i2o_block_end_request 3 35282 NULL
117871 +isr_rx_rdys_read_35283 isr_rx_rdys_read 3 35283 NULL
117872 +__btrfs_buffered_write_35311 __btrfs_buffered_write 3-0 35311 NULL nohasharray
117873 +brcmf_sdio_forensic_read_35311 brcmf_sdio_forensic_read 3 35311 &__btrfs_buffered_write_35311
117874 +tracing_read_pipe_35312 tracing_read_pipe 3 35312 NULL
117875 +sta_tx_latency_stat_write_35323 sta_tx_latency_stat_write 3 35323 NULL
117876 +ieee80211_if_fmt_ap_power_level_35347 ieee80211_if_fmt_ap_power_level 3 35347 NULL
117877 +nouveau_devinit_create__35348 nouveau_devinit_create_ 4 35348 NULL
117878 +ieee80211_rx_mgmt_deauth_35351 ieee80211_rx_mgmt_deauth 3 35351 NULL
117879 +compat_filldir64_35354 compat_filldir64 3 35354 NULL
117880 +read_kmem_35372 read_kmem 3 35372 NULL
117881 +SyS_getxattr_35408 SyS_getxattr 4 35408 NULL
117882 +rawv6_send_hdrinc_35425 rawv6_send_hdrinc 3 35425 NULL
117883 +iwl_dbgfs_drv_rx_stats_read_35430 iwl_dbgfs_drv_rx_stats_read 3 35430 NULL
117884 +buffer_to_user_35439 buffer_to_user 3 35439 NULL
117885 +efx_mcdi_rpc_async_quiet_35460 efx_mcdi_rpc_async_quiet 4-5 35460 NULL
117886 +macvtap_do_read_35475 macvtap_do_read 3 35475 NULL
117887 +fiemap_prepare_and_copy_exts_35494 fiemap_prepare_and_copy_exts 5 35494 NULL
117888 +btrfs_prealloc_file_range_trans_35500 btrfs_prealloc_file_range_trans 4 35500 NULL
117889 +async_setkey_35521 async_setkey 3 35521 NULL
117890 +__filemap_fdatawrite_range_35528 __filemap_fdatawrite_range 0 35528 NULL
117891 +iwl_dbgfs_bt_traffic_read_35534 iwl_dbgfs_bt_traffic_read 3 35534 NULL
117892 +pstore_mkfile_35536 pstore_mkfile 7 35536 NULL
117893 +rxpipe_tx_xfr_host_int_trig_rx_data_read_35538 rxpipe_tx_xfr_host_int_trig_rx_data_read 3 35538 NULL
117894 +ocfs2_write_zero_page_35539 ocfs2_write_zero_page 3 35539 NULL
117895 +ibnl_put_attr_35541 ibnl_put_attr 3 35541 NULL
117896 +ieee80211_if_write_smps_35550 ieee80211_if_write_smps 3 35550 NULL
117897 +ext4_blocks_for_truncate_35579 ext4_blocks_for_truncate 0 35579 NULL
117898 +ext2_acl_from_disk_35580 ext2_acl_from_disk 2 35580 NULL
117899 +spk_msg_set_35586 spk_msg_set 3 35586 NULL
117900 +kernel_readv_35617 kernel_readv 3 35617 NULL
117901 +reiserfs_readpages_35629 reiserfs_readpages 4 35629 NULL
117902 +pci_request_regions_35635 pci_request_regions 0 35635 NULL
117903 +ptlrpcd_steal_rqset_35637 ptlrpcd_steal_rqset 0 35637 NULL
117904 +spi_register_board_info_35651 spi_register_board_info 2 35651 NULL
117905 +rdmaltWithLock_35669 rdmaltWithLock 0 35669 NULL
117906 +SYSC_pwritev_35690 SYSC_pwritev 3 35690 NULL
117907 +rds_page_copy_user_35691 rds_page_copy_user 4 35691 NULL
117908 +md_super_write_35703 md_super_write 4 35703 NULL
117909 +iwl_dbgfs_disable_ht40_read_35761 iwl_dbgfs_disable_ht40_read 3 35761 NULL
117910 +udf_alloc_i_data_35786 udf_alloc_i_data 2 35786 NULL
117911 +pvr2_hdw_cpufw_get_35824 pvr2_hdw_cpufw_get 0-4-2 35824 NULL
117912 +tx_tx_cmplt_read_35854 tx_tx_cmplt_read 3 35854 NULL
117913 +vx_query_hbuffer_size_35859 vx_query_hbuffer_size 0 35859 NULL
117914 +mthca_buf_alloc_35861 mthca_buf_alloc 2 35861 NULL
117915 +fls64_35862 fls64 0 35862 NULL
117916 +kvm_dirty_bitmap_bytes_35886 kvm_dirty_bitmap_bytes 0 35886 NULL
117917 +ieee80211_if_fmt_dot11MeshRetryTimeout_35890 ieee80211_if_fmt_dot11MeshRetryTimeout 3 35890 NULL
117918 +uwb_rc_cmd_done_35892 uwb_rc_cmd_done 4 35892 NULL
117919 +kernel_setsockopt_35913 kernel_setsockopt 5 35913 NULL
117920 +rbio_nr_pages_35916 rbio_nr_pages 0-1-2 35916 NULL
117921 +sctp_tsnmap_mark_35929 sctp_tsnmap_mark 2 35929 NULL
117922 +rx_defrag_init_called_read_35935 rx_defrag_init_called_read 3 35935 NULL
117923 +put_cmsg_compat_35937 put_cmsg_compat 4 35937 NULL
117924 +ext_rts51x_sd_execute_write_data_35971 ext_rts51x_sd_execute_write_data 9 35971 NULL
117925 +generic_ocp_read_35974 generic_ocp_read 3 35974 NULL nohasharray
117926 +ceph_buffer_new_35974 ceph_buffer_new 1 35974 &generic_ocp_read_35974
117927 +acl_alloc_35979 acl_alloc 1 35979 NULL
117928 +device_add_class_symlinks_35985 device_add_class_symlinks 0 35985 NULL
117929 +kuc_alloc_35998 kuc_alloc 1 35998 NULL nohasharray
117930 +write_file_antenna_35998 write_file_antenna 3 35998 &kuc_alloc_35998
117931 +scsi_transfer_length_36011 scsi_transfer_length 0 36011 NULL
117932 +il3945_ucode_tx_stats_read_36016 il3945_ucode_tx_stats_read 3 36016 NULL
117933 +ubi_eba_write_leb_36029 ubi_eba_write_leb 0 36029 NULL
117934 +__videobuf_alloc_36031 __videobuf_alloc 1 36031 NULL
117935 +account_shadowed_36048 account_shadowed 2 36048 NULL
117936 +gpio_power_read_36059 gpio_power_read 3 36059 NULL
117937 +snd_pcm_playback_hw_avail_36061 snd_pcm_playback_hw_avail 0 36061 NULL
117938 +write_emulate_36065 write_emulate 2-4 36065 NULL
117939 +stack_max_size_write_36068 stack_max_size_write 3 36068 NULL
117940 +radeon_vm_num_pdes_36070 radeon_vm_num_pdes 0 36070 NULL
117941 +ieee80211_if_fmt_peer_36071 ieee80211_if_fmt_peer 3 36071 NULL
117942 +ieee80211_if_write_tsf_36077 ieee80211_if_write_tsf 3 36077 NULL
117943 +snd_pcm_plug_read_transfer_36080 snd_pcm_plug_read_transfer 0-3 36080 NULL
117944 +mtip_hw_read_device_status_36082 mtip_hw_read_device_status 3 36082 NULL
117945 +vga_arb_write_36112 vga_arb_write 3 36112 NULL
117946 +simple_xattr_alloc_36118 simple_xattr_alloc 2 36118 NULL
117947 +ext3_readpages_36144 ext3_readpages 4 36144 NULL
117948 +twl_set_36154 twl_set 2 36154 NULL
117949 +b1_alloc_card_36155 b1_alloc_card 1 36155 NULL
117950 +snd_korg1212_copy_from_36169 snd_korg1212_copy_from 6 36169 NULL
117951 +SyS_kexec_load_36176 SyS_kexec_load 2 36176 NULL
117952 +ramoops_init_przs_36199 ramoops_init_przs 4 36199 NULL
117953 +SYSC_sched_getaffinity_36208 SYSC_sched_getaffinity 2 36208 NULL
117954 +SYSC_process_vm_readv_36216 SYSC_process_vm_readv 3-5 36216 NULL
117955 +atomic_stats_read_36228 atomic_stats_read 3 36228 NULL
117956 +rtw_cfg80211_set_wpa_ie_36236 rtw_cfg80211_set_wpa_ie 3 36236 NULL
117957 +viafb_iga1_odev_proc_write_36241 viafb_iga1_odev_proc_write 3 36241 NULL
117958 +SYSC_getxattr_36242 SYSC_getxattr 4 36242 NULL
117959 +vmsplice_to_user_36245 vmsplice_to_user 3 36245 NULL nohasharray
117960 +rproc_recovery_read_36245 rproc_recovery_read 3 36245 &vmsplice_to_user_36245
117961 +cfs_hash_buckets_realloc_36276 cfs_hash_buckets_realloc 4 36276 NULL nohasharray
117962 +usb_buffer_alloc_36276 usb_buffer_alloc 2 36276 &cfs_hash_buckets_realloc_36276
117963 +codec_reg_read_file_36280 codec_reg_read_file 3 36280 NULL
117964 +crypto_shash_digestsize_36284 crypto_shash_digestsize 0 36284 NULL
117965 +lpfc_debugfs_dif_err_read_36303 lpfc_debugfs_dif_err_read 3 36303 NULL
117966 +cfg80211_rx_mlme_mgmt_36306 cfg80211_rx_mlme_mgmt 3 36306 NULL
117967 +ad7879_spi_xfer_36311 ad7879_spi_xfer 3 36311 NULL
117968 +__compat_sys_pwritev64_36328 __compat_sys_pwritev64 3 36328 NULL nohasharray
117969 +fat_compat_ioctl_filldir_36328 fat_compat_ioctl_filldir 3 36328 &__compat_sys_pwritev64_36328
117970 +lc_create_36332 lc_create 4 36332 NULL
117971 +jbd2_journal_init_revoke_table_36336 jbd2_journal_init_revoke_table 1 36336 NULL
117972 +isku_sysfs_read_key_mask_36343 isku_sysfs_read_key_mask 6 36343 NULL
117973 +ath6kl_regwrite_write_36351 ath6kl_regwrite_write 3 36351 NULL
117974 +v9fs_file_readn_36353 v9fs_file_readn 4 36353 NULL
117975 +to_sector_36361 to_sector 0-1 36361 NULL
117976 +tunables_read_36385 tunables_read 3 36385 NULL
117977 +afs_alloc_flat_call_36399 afs_alloc_flat_call 2-3 36399 NULL
117978 +sierra_write_36402 sierra_write 4 36402 NULL
117979 +SyS_sethostname_36417 SyS_sethostname 2 36417 NULL
117980 +sctp_tsnmap_init_36446 sctp_tsnmap_init 2 36446 NULL
117981 +alloc_etherdev_mqs_36450 alloc_etherdev_mqs 1 36450 NULL
117982 +SyS_process_vm_writev_36476 SyS_process_vm_writev 3-5 36476 NULL
117983 +lock_and_cleanup_extent_if_need_36480 lock_and_cleanup_extent_if_need 0 36480 NULL
117984 +b43_nphy_load_samples_36481 b43_nphy_load_samples 3 36481 NULL
117985 +tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 NULL nohasharray
117986 +ip6_append_data_36490 ip6_append_data 4 36490 &tx_tx_checksum_result_read_36490
117987 +__hwahc_op_set_ptk_36510 __hwahc_op_set_ptk 5 36510 NULL
117988 +mcam_v4l_read_36513 mcam_v4l_read 3 36513 NULL
117989 +_iwl_dbgfs_fw_nmi_write_36515 _iwl_dbgfs_fw_nmi_write 3 36515 NULL
117990 +get_param_l_36518 get_param_l 0 36518 NULL
117991 +ieee80211_if_read_fwded_frames_36520 ieee80211_if_read_fwded_frames 3 36520 NULL
117992 +crypto_aead_authsize_36537 crypto_aead_authsize 0 36537 NULL
117993 +cpu_type_read_36540 cpu_type_read 3 36540 NULL
117994 +__kfifo_to_user_36555 __kfifo_to_user 3-0 36555 NULL
117995 +btrfs_get_token_64_36572 btrfs_get_token_64 0 36572 NULL
117996 +__erst_read_36579 __erst_read 0 36579 NULL
117997 +put_cmsg_36589 put_cmsg 4 36589 NULL
117998 +fat_ioctl_filldir_36621 fat_ioctl_filldir 3 36621 NULL
117999 +vxge_config_vpaths_36636 vxge_config_vpaths 0 36636 NULL
118000 +convert_extent_item_v0_36645 convert_extent_item_v0 4 36645 NULL
118001 +ced_ioctl_36647 ced_ioctl 2 36647 NULL
118002 +lpfc_idiag_extacc_alloc_get_36648 lpfc_idiag_extacc_alloc_get 0-3 36648 NULL
118003 +osd_req_list_collection_objects_36664 osd_req_list_collection_objects 5 36664 NULL
118004 +iscsi_host_alloc_36671 iscsi_host_alloc 2 36671 NULL
118005 +xillybus_read_36678 xillybus_read 3 36678 NULL
118006 +gsmtty_write_36702 gsmtty_write 3 36702 NULL
118007 +snd_rawmidi_kernel_read1_36740 snd_rawmidi_kernel_read1 4-0 36740 NULL
118008 +cxgbi_device_register_36746 cxgbi_device_register 1-2 36746 NULL
118009 +ps_poll_upsd_timeouts_read_36755 ps_poll_upsd_timeouts_read 3 36755 NULL
118010 +i40e_init_lan_hmc_36796 i40e_init_lan_hmc 5-4-3-2 36796 NULL
118011 +proc_fault_inject_read_36802 proc_fault_inject_read 3 36802 NULL
118012 +hiddev_ioctl_36816 hiddev_ioctl 2 36816 NULL
118013 +int_hardware_entry_36833 int_hardware_entry 3 36833 NULL
118014 +fc_change_queue_depth_36841 fc_change_queue_depth 2 36841 NULL
118015 +keyctl_describe_key_36853 keyctl_describe_key 3 36853 NULL
118016 +cm_write_36858 cm_write 3 36858 NULL
118017 +tipc_link_iovec_long_xmit_36871 tipc_link_iovec_long_xmit 3 36871 NULL nohasharray
118018 +tx_tx_data_programmed_read_36871 tx_tx_data_programmed_read 3 36871 &tipc_link_iovec_long_xmit_36871
118019 +svc_setsockopt_36876 svc_setsockopt 5 36876 NULL
118020 +raid56_parity_write_36877 raid56_parity_write 5 36877 NULL
118021 +__btrfs_map_block_36883 __btrfs_map_block 3 36883 NULL
118022 +ib_ucm_alloc_data_36885 ib_ucm_alloc_data 3 36885 NULL
118023 +selinux_inode_notifysecctx_36896 selinux_inode_notifysecctx 3 36896 NULL
118024 +OS_kmalloc_36909 OS_kmalloc 1 36909 NULL
118025 +il4965_rs_sta_dbgfs_scale_table_write_36979 il4965_rs_sta_dbgfs_scale_table_write 3 36979 NULL
118026 +drbd_new_dev_size_36998 drbd_new_dev_size 0-3 36998 NULL
118027 +auok190xfb_write_37001 auok190xfb_write 3 37001 NULL
118028 +setxattr_37006 setxattr 4 37006 NULL
118029 +command_file_read_37038 command_file_read 3 37038 NULL
118030 +figure_loop_size_37051 figure_loop_size 2-3 37051 NULL
118031 +qp_broker_create_37053 qp_broker_create 6-5 37053 NULL nohasharray
118032 +ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 &qp_broker_create_37053
118033 +_iwl_dbgfs_bcast_filters_macs_write_37069 _iwl_dbgfs_bcast_filters_macs_write 3 37069 NULL
118034 +SYSC_setxattr_37078 SYSC_setxattr 4 37078 NULL
118035 +parse_command_37079 parse_command 2 37079 NULL
118036 +pipeline_cs_rx_packet_in_read_37089 pipeline_cs_rx_packet_in_read 3 37089 NULL
118037 +tun_get_user_37094 tun_get_user 5 37094 NULL
118038 +has_wrprotected_page_37123 has_wrprotected_page 2-3 37123 NULL
118039 +snd_hda_get_conn_list_37132 snd_hda_get_conn_list 0 37132 NULL
118040 +mtt_free_res_37144 mtt_free_res 5 37144 NULL
118041 +msg_word_37164 msg_word 0 37164 NULL
118042 +f2fs_direct_IO_37167 f2fs_direct_IO 4 37167 NULL
118043 +vcc_recvmsg_37198 vcc_recvmsg 4 37198 NULL
118044 +forced_ps_write_37209 forced_ps_write 3 37209 NULL
118045 +crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL nohasharray
118046 +ext4_ind_direct_IO_37212 ext4_ind_direct_IO 4-0 37212 &crypto_shash_descsize_37212
118047 +regmap_access_read_file_37223 regmap_access_read_file 3 37223 NULL
118048 +__do_replace_37227 __do_replace 5 37227 NULL
118049 +iwl_dbgfs_d3_sram_read_37237 iwl_dbgfs_d3_sram_read 3 37237 NULL
118050 +rx_filter_dup_filter_read_37238 rx_filter_dup_filter_read 3 37238 NULL
118051 +prot_queue_del_37258 prot_queue_del 0 37258 NULL
118052 +exofs_max_io_pages_37263 exofs_max_io_pages 0-2 37263 NULL
118053 +_iwl_dbgfs_fw_restart_write_37270 _iwl_dbgfs_fw_restart_write 3 37270 NULL
118054 +request_threaded_irq_37303 request_threaded_irq 0 37303 NULL
118055 +ieee80211_if_read_power_mode_37305 ieee80211_if_read_power_mode 3 37305 NULL
118056 +ext3_direct_IO_37308 ext3_direct_IO 4 37308 NULL
118057 +jffs2_write_dirent_37311 jffs2_write_dirent 5 37311 NULL
118058 +tipc_send_37315 tipc_send 3 37315 NULL
118059 +l2cap_create_connless_pdu_37327 l2cap_create_connless_pdu 3 37327 NULL nohasharray
118060 +bnx2x_vf_fill_fw_str_37327 bnx2x_vf_fill_fw_str 3 37327 &l2cap_create_connless_pdu_37327
118061 +scsi_mode_select_37330 scsi_mode_select 6 37330 NULL
118062 +rxrpc_server_sendmsg_37331 rxrpc_server_sendmsg 4 37331 NULL
118063 +security_inode_getsecurity_37354 security_inode_getsecurity 0 37354 NULL
118064 +hci_sock_sendmsg_37420 hci_sock_sendmsg 4 37420 NULL
118065 +acpi_os_allocate_zeroed_37422 acpi_os_allocate_zeroed 1 37422 NULL
118066 +tty_insert_flip_string_fixed_flag_37428 tty_insert_flip_string_fixed_flag 4-0 37428 NULL
118067 +iwl_print_last_event_logs_37433 iwl_print_last_event_logs 0-7-9 37433 NULL
118068 +fru_alloc_37442 fru_alloc 1 37442 NULL
118069 +tcp_established_options_37450 tcp_established_options 0 37450 NULL
118070 +brcmf_sdio_dump_console_37455 brcmf_sdio_dump_console 4 37455 NULL
118071 +get_est_timing_37484 get_est_timing 0 37484 NULL
118072 +kmem_realloc_37489 kmem_realloc 2 37489 NULL
118073 +bitmap_dirty_bits_37503 bitmap_dirty_bits 2 37503 NULL
118074 +osc_active_seq_write_37514 osc_active_seq_write 3 37514 NULL
118075 +bdev_writeseg_37519 bdev_writeseg 2-3 37519 NULL
118076 +xz_dec_test_write_37527 xz_dec_test_write 3 37527 NULL
118077 +fault_inject_read_37534 fault_inject_read 3 37534 NULL
118078 +hdr_size_37536 hdr_size 0 37536 NULL
118079 +extent_map_end_37550 extent_map_end 0 37550 NULL
118080 +sep_create_dcb_dmatables_context_37551 sep_create_dcb_dmatables_context 6 37551 NULL
118081 +fat_cont_expand_37552 fat_cont_expand 0 37552 NULL
118082 +xhci_alloc_streams_37586 xhci_alloc_streams 5 37586 NULL
118083 +qla2x00_debounce_register_37597 qla2x00_debounce_register 0 37597 NULL
118084 +kvm_read_guest_page_mmu_37611 kvm_read_guest_page_mmu 6 37611 NULL
118085 +SYSC_mbind_37622 SYSC_mbind 5 37622 NULL
118086 +SyS_mbind_37638 SyS_mbind 5 37638 NULL
118087 +may_delete_37656 may_delete 0 37656 NULL
118088 +bio_copy_user_iov_37660 bio_copy_user_iov 4 37660 NULL
118089 +vmw_framebuffer_dmabuf_dirty_37661 vmw_framebuffer_dmabuf_dirty 6 37661 NULL nohasharray
118090 +rfcomm_sock_sendmsg_37661 rfcomm_sock_sendmsg 4 37661 &vmw_framebuffer_dmabuf_dirty_37661
118091 +SYSC_get_mempolicy_37664 SYSC_get_mempolicy 3 37664 NULL
118092 +__wa_seg_calculate_isoc_frame_count_37672 __wa_seg_calculate_isoc_frame_count 0 37672 NULL
118093 +ieee80211_if_read_rc_rateidx_mcs_mask_2ghz_37675 ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 NULL
118094 +regmap_map_read_file_37685 regmap_map_read_file 3 37685 NULL
118095 +nametbl_header_37698 nametbl_header 2-0 37698 NULL
118096 +__le32_to_cpup_37702 __le32_to_cpup 0 37702 NULL
118097 +dynamic_ps_timeout_write_37713 dynamic_ps_timeout_write 3 37713 NULL
118098 +read_enabled_file_bool_37744 read_enabled_file_bool 3 37744 NULL
118099 +ocfs2_control_cfu_37750 ocfs2_control_cfu 2 37750 NULL
118100 +ipath_cdev_init_37752 ipath_cdev_init 1 37752 NULL
118101 +dccp_setsockopt_cscov_37766 dccp_setsockopt_cscov 2 37766 NULL
118102 +il4965_rs_sta_dbgfs_rate_scale_data_read_37792 il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 NULL
118103 +smk_read_logging_37804 smk_read_logging 3 37804 NULL
118104 +ocrdma_alloc_frmr_page_list_37815 ocrdma_alloc_frmr_page_list 2 37815 NULL
118105 +rx_decrypt_key_not_found_read_37820 rx_decrypt_key_not_found_read 3 37820 NULL
118106 +android_get_p2p_addr_37832 android_get_p2p_addr 0 37832 NULL
118107 +o2hb_debug_read_37851 o2hb_debug_read 3 37851 NULL
118108 +xfs_dir2_block_to_sf_37868 xfs_dir2_block_to_sf 3 37868 NULL
118109 +set_registers_37883 set_registers 4 37883 NULL
118110 +btrfs_stack_file_extent_disk_bytenr_37888 btrfs_stack_file_extent_disk_bytenr 0 37888 NULL
118111 +_rtw_malloc_37928 _rtw_malloc 1 37928 NULL nohasharray
118112 +pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 &_rtw_malloc_37928
118113 +read_rbu_packet_size_37939 read_rbu_packet_size 6 37939 NULL
118114 +write_file_bool_37957 write_file_bool 3 37957 NULL
118115 +fifo_alloc_37961 fifo_alloc 1 37961 NULL
118116 +rds_rdma_extra_size_37990 rds_rdma_extra_size 0 37990 NULL
118117 +persistent_ram_old_size_37997 persistent_ram_old_size 0 37997 NULL
118118 +vfs_readv_38011 vfs_readv 3 38011 NULL
118119 +aggr_recv_addba_req_evt_38037 aggr_recv_addba_req_evt 4 38037 NULL
118120 +il_dbgfs_chain_noise_read_38044 il_dbgfs_chain_noise_read 3 38044 NULL nohasharray
118121 +klsi_105_prepare_write_buffer_38044 klsi_105_prepare_write_buffer 3 38044 &il_dbgfs_chain_noise_read_38044
118122 +SyS_llistxattr_38048 SyS_llistxattr 3 38048 NULL
118123 +sysfs_do_create_link_38051 sysfs_do_create_link 0 38051 NULL
118124 +_xfs_buf_alloc_38058 _xfs_buf_alloc 3 38058 NULL
118125 +nsm_create_handle_38060 nsm_create_handle 4 38060 NULL
118126 +alloc_ltalkdev_38071 alloc_ltalkdev 1 38071 NULL
118127 +wcn36xx_smd_rsp_process_38081 wcn36xx_smd_rsp_process 3 38081 NULL nohasharray
118128 +xfs_buf_readahead_map_38081 xfs_buf_readahead_map 3 38081 &wcn36xx_smd_rsp_process_38081
118129 +uwb_mac_addr_print_38085 uwb_mac_addr_print 2 38085 NULL
118130 +request_key_auth_new_38092 request_key_auth_new 3 38092 NULL
118131 +proc_self_readlink_38094 proc_self_readlink 3 38094 NULL
118132 +ep0_read_38095 ep0_read 3 38095 NULL
118133 +osc_checksum_seq_write_38096 osc_checksum_seq_write 3 38096 NULL nohasharray
118134 +sk_wmem_schedule_38096 sk_wmem_schedule 2 38096 &osc_checksum_seq_write_38096
118135 +o2hb_read_slots_38105 o2hb_read_slots 2 38105 NULL
118136 +snd_pcm_oss_write_38108 snd_pcm_oss_write 3 38108 NULL
118137 +vmw_kms_present_38130 vmw_kms_present 9 38130 NULL
118138 +__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 4-3-0 38153 NULL
118139 +btrfs_extent_same_38163 btrfs_extent_same 3-2 38163 NULL
118140 +kvm_clear_guest_38164 kvm_clear_guest 3-2 38164 NULL
118141 +cdev_add_38176 cdev_add 2-3 38176 NULL
118142 +rt2x00debug_write_rf_38195 rt2x00debug_write_rf 3 38195 NULL
118143 +get_ucode_user_38202 get_ucode_user 3 38202 NULL
118144 +osd_req_list_partition_collections_38223 osd_req_list_partition_collections 5 38223 NULL
118145 +ceph_decode_16_38239 ceph_decode_16 0 38239 NULL
118146 +_ipw_read_reg32_38245 _ipw_read_reg32 0 38245 NULL
118147 +snd_pcm_playback_rewind_38249 snd_pcm_playback_rewind 0-2 38249 NULL
118148 +mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 NULL nohasharray
118149 +ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 &mthca_alloc_icm_table_38268
118150 +xfs_bmbt_to_bmdr_38275 xfs_bmbt_to_bmdr 3 38275 NULL nohasharray
118151 +xfs_bmdr_to_bmbt_38275 xfs_bmdr_to_bmbt 5 38275 &xfs_bmbt_to_bmdr_38275
118152 +ftdi_process_packet_38281 ftdi_process_packet 4 38281 NULL
118153 +C_SYSC_pselect6_38296 C_SYSC_pselect6 1 38296 NULL
118154 +ucma_query_path_38305 ucma_query_path 3 38305 NULL
118155 +isr_rx_headers_read_38325 isr_rx_headers_read 3 38325 NULL
118156 +ida_simple_get_38326 ida_simple_get 0 38326 NULL
118157 +__snd_gf1_look8_38333 __snd_gf1_look8 0 38333 NULL
118158 +btrfs_file_extent_disk_num_bytes_38363 btrfs_file_extent_disk_num_bytes 0 38363 NULL
118159 +dn_sendmsg_38390 dn_sendmsg 4 38390 NULL
118160 +ieee80211_if_read_dtim_count_38419 ieee80211_if_read_dtim_count 3 38419 NULL
118161 +pmcraid_copy_sglist_38431 pmcraid_copy_sglist 3 38431 NULL
118162 +kvm_write_guest_38454 kvm_write_guest 4-2 38454 NULL
118163 +_iwl_dbgfs_scan_ant_rxchain_write_38479 _iwl_dbgfs_scan_ant_rxchain_write 3 38479 NULL
118164 +blk_end_bidi_request_38482 blk_end_bidi_request 3-4 38482 NULL
118165 +dev_names_read_38509 dev_names_read 3 38509 NULL
118166 +iscsi_create_iface_38510 iscsi_create_iface 5 38510 NULL
118167 +event_rx_mismatch_read_38518 event_rx_mismatch_read 3 38518 NULL
118168 +set_queue_count_38519 set_queue_count 0 38519 NULL
118169 +ubifs_idx_node_sz_38546 ubifs_idx_node_sz 0-2 38546 NULL
118170 +btrfs_discard_extent_38547 btrfs_discard_extent 2 38547 NULL
118171 +kuc_len_38557 kuc_len 0-1 38557 NULL
118172 +irda_sendmsg_dgram_38563 irda_sendmsg_dgram 4 38563 NULL
118173 +il4965_rs_sta_dbgfs_scale_table_read_38564 il4965_rs_sta_dbgfs_scale_table_read 3 38564 NULL
118174 +_ipw_read32_38565 _ipw_read32 0 38565 NULL
118175 +snd_nm256_playback_copy_38567 snd_nm256_playback_copy 3-5 38567 NULL
118176 +copy_ctl_value_to_user_38587 copy_ctl_value_to_user 4 38587 NULL
118177 +rd_allocate_sgl_table_38607 rd_allocate_sgl_table 3 38607 NULL
118178 +icn_writecmd_38629 icn_writecmd 2 38629 NULL
118179 +write_enabled_file_bool_38630 write_enabled_file_bool 3 38630 NULL
118180 +ext2_readpages_38640 ext2_readpages 4 38640 NULL
118181 +audit_init_entry_38644 audit_init_entry 1 38644 NULL
118182 +qp_broker_alloc_38646 qp_broker_alloc 6-5 38646 NULL
118183 +mmc_send_cxd_data_38655 mmc_send_cxd_data 5 38655 NULL
118184 +nouveau_instmem_create__38664 nouveau_instmem_create_ 4 38664 NULL
118185 +snd_es1371_wait_src_ready_38673 snd_es1371_wait_src_ready 0 38673 NULL
118186 +iscsit_dump_data_payload_38683 iscsit_dump_data_payload 2 38683 NULL
118187 +validate_vid_hdr_38699 validate_vid_hdr 0 38699 NULL
118188 +rbio_add_io_page_38700 rbio_add_io_page 6 38700 NULL
118189 +udf_readpages_38761 udf_readpages 4 38761 NULL
118190 +iwl_dbgfs_thermal_throttling_read_38779 iwl_dbgfs_thermal_throttling_read 3 38779 NULL
118191 +bcache_device_init_38781 bcache_device_init 3 38781 NULL
118192 +snd_gus_dram_write_38784 snd_gus_dram_write 4 38784 NULL
118193 +do_pci_enable_device_38802 do_pci_enable_device 0 38802 NULL
118194 +err_decode_38804 err_decode 2 38804 NULL
118195 +ipv6_renew_option_38813 ipv6_renew_option 3 38813 NULL
118196 +direct_entry_38836 direct_entry 3 38836 NULL
118197 +compat_udp_setsockopt_38840 compat_udp_setsockopt 5 38840 NULL
118198 +read_nic_io_word_38853 read_nic_io_word 0 38853 NULL
118199 +interfaces_38859 interfaces 2 38859 NULL
118200 +dbgfs_state_38894 dbgfs_state 3 38894 NULL
118201 +il_dbgfs_sram_write_38942 il_dbgfs_sram_write 3 38942 NULL
118202 +__ath6kl_wmi_send_mgmt_cmd_38971 __ath6kl_wmi_send_mgmt_cmd 7 38971 NULL
118203 +usb_maxpacket_38977 usb_maxpacket 0 38977 NULL nohasharray
118204 +C_SYSC_preadv64_38977 C_SYSC_preadv64 3 38977 &usb_maxpacket_38977
118205 +OSDSetBlock_38986 OSDSetBlock 2-4 38986 NULL
118206 +bio_clone_range_38997 bio_clone_range 2 38997 NULL
118207 +lpfc_idiag_extacc_write_38998 lpfc_idiag_extacc_write 3 38998 NULL
118208 +get_nodes_39012 get_nodes 3 39012 NULL
118209 +twl6030_interrupt_unmask_39013 twl6030_interrupt_unmask 2 39013 NULL
118210 +force_sc_support_read_39014 force_sc_support_read 3 39014 NULL
118211 +__blkdev_issue_zeroout_39020 __blkdev_issue_zeroout 3 39020 NULL
118212 +_zd_iowrite32v_async_locked_39034 _zd_iowrite32v_async_locked 3 39034 NULL
118213 +do_write_kmem_39051 do_write_kmem 0-1-3 39051 NULL
118214 +tomoyo_truncate_39105 tomoyo_truncate 0 39105 NULL
118215 +leb_write_lock_39111 leb_write_lock 0 39111 NULL
118216 +__kfifo_to_user_r_39123 __kfifo_to_user_r 5-3 39123 NULL
118217 +ea_foreach_39133 ea_foreach 0 39133 NULL
118218 +generic_permission_39150 generic_permission 0 39150 NULL
118219 +proc_coredump_filter_read_39153 proc_coredump_filter_read 3 39153 NULL
118220 +ath9k_hw_ar9003_dump_eeprom_39156 ath9k_hw_ar9003_dump_eeprom 5-4 39156 NULL
118221 +echo_client_kbrw_39170 echo_client_kbrw 6 39170 NULL
118222 +ext3_xattr_check_names_39174 ext3_xattr_check_names 0 39174 NULL
118223 +ubi_more_update_data_39189 ubi_more_update_data 4 39189 NULL
118224 +qcam_read_bytes_39205 qcam_read_bytes 0 39205 NULL
118225 +ivtv_v4l2_write_39226 ivtv_v4l2_write 3 39226 NULL
118226 +posix_acl_to_xattr_39237 posix_acl_to_xattr 0 39237 NULL
118227 +snd_pcm_capture_forward_39248 snd_pcm_capture_forward 0-2 39248 NULL
118228 +r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 NULL nohasharray
118229 +pwr_cont_miss_bcns_spread_read_39250 pwr_cont_miss_bcns_spread_read 3 39250 &r128_compat_ioctl_39250
118230 +i915_error_state_read_39254 i915_error_state_read 3 39254 NULL
118231 +rx_filter_protection_filter_read_39282 rx_filter_protection_filter_read 3 39282 NULL
118232 +_iwl_dbgfs_pm_params_write_39325 _iwl_dbgfs_pm_params_write 3 39325 NULL
118233 +__cfg80211_connect_result_39326 __cfg80211_connect_result 4-6 39326 NULL
118234 +insert_reserved_file_extent_39327 insert_reserved_file_extent 3 39327 NULL
118235 +wimax_msg_alloc_39343 wimax_msg_alloc 4 39343 NULL
118236 +ide_complete_rq_39354 ide_complete_rq 3 39354 NULL
118237 +do_write_log_from_user_39362 do_write_log_from_user 3-0 39362 NULL
118238 +vortex_wtdma_getlinearpos_39371 vortex_wtdma_getlinearpos 0 39371 NULL
118239 +regmap_name_read_file_39379 regmap_name_read_file 3 39379 NULL
118240 +fnic_trace_debugfs_read_39380 fnic_trace_debugfs_read 3 39380 NULL
118241 +ps_poll_ps_poll_utilization_read_39383 ps_poll_ps_poll_utilization_read 3 39383 NULL
118242 +__send_to_port_39386 __send_to_port 3 39386 NULL
118243 +user_power_read_39414 user_power_read 3 39414 NULL
118244 +hash_ipmark4_expire_39419 hash_ipmark4_expire 4 39419 NULL
118245 +alloc_agpphysmem_i8xx_39427 alloc_agpphysmem_i8xx 1 39427 NULL
118246 +mic_desc_size_39464 mic_desc_size 0 39464 NULL
118247 +setkey_unaligned_39474 setkey_unaligned 3 39474 NULL
118248 +ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries_39499 ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries 3 39499 NULL
118249 +cl_req_alloc_39523 cl_req_alloc 4 39523 NULL
118250 +int_proc_write_39542 int_proc_write 3 39542 NULL
118251 +ext4_alloc_file_blocks_39551 ext4_alloc_file_blocks 3 39551 NULL
118252 +pp_write_39554 pp_write 3 39554 NULL
118253 +datablob_format_39571 datablob_format 2 39571 NULL nohasharray
118254 +ieee80211_if_read_fwded_mcast_39571 ieee80211_if_read_fwded_mcast 3 39571 &datablob_format_39571
118255 +memblock_virt_alloc_internal_39600 memblock_virt_alloc_internal 1 39600 NULL
118256 +ext_depth_39607 ext_depth 0 39607 NULL
118257 +batadv_tt_tvlv_generate_39615 batadv_tt_tvlv_generate 4 39615 NULL
118258 +nfs_idmap_get_key_39616 nfs_idmap_get_key 2 39616 NULL
118259 +sdio_readb_39618 sdio_readb 0 39618 NULL
118260 +prepare_uptodate_page_39622 prepare_uptodate_page 0 39622 NULL
118261 +set_dev_class_39645 set_dev_class 4 39645 NULL
118262 +snd_rme32_capture_copy_39653 snd_rme32_capture_copy 5 39653 NULL
118263 +tcp_try_rmem_schedule_39657 tcp_try_rmem_schedule 3 39657 NULL
118264 +kvm_read_guest_cached_39666 kvm_read_guest_cached 4 39666 NULL
118265 +v4l_stk_read_39672 v4l_stk_read 3 39672 NULL
118266 +hsc_msg_len_get_39673 hsc_msg_len_get 0 39673 NULL
118267 +do_surface_dirty_sou_39678 do_surface_dirty_sou 7 39678 NULL
118268 +sd_completed_bytes_39705 sd_completed_bytes 0 39705 NULL
118269 +ftrace_pid_write_39710 ftrace_pid_write 3 39710 NULL
118270 +adt7316_spi_multi_read_39765 adt7316_spi_multi_read 3 39765 NULL
118271 +security_inode_listsecurity_39812 security_inode_listsecurity 0 39812 NULL
118272 +snd_pcm_oss_writev3_39818 snd_pcm_oss_writev3 3 39818 NULL
118273 +get_priv_size_39828 get_priv_size 0-1 39828 NULL
118274 +pkt_add_39897 pkt_add 3 39897 NULL
118275 +read_file_modal_eeprom_39909 read_file_modal_eeprom 3 39909 NULL
118276 +gen_pool_add_virt_39913 gen_pool_add_virt 4 39913 NULL
118277 +dw210x_op_rw_39915 dw210x_op_rw 6 39915 NULL
118278 +__mnt_want_write_file_39917 __mnt_want_write_file 0 39917 NULL
118279 +aes_encrypt_interrupt_read_39919 aes_encrypt_interrupt_read 3 39919 NULL
118280 +exofs_read_kern_39921 exofs_read_kern 6 39921 NULL nohasharray
118281 +oom_score_adj_read_39921 oom_score_adj_read 3 39921 &exofs_read_kern_39921
118282 +__spi_async_39932 __spi_async 0 39932 NULL
118283 +__get_order_39935 __get_order 0 39935 NULL
118284 +error_error_frame_read_39947 error_error_frame_read 3 39947 NULL
118285 +tty_prepare_flip_string_39955 tty_prepare_flip_string 3-0 39955 NULL
118286 +lstcon_group_list_39958 lstcon_group_list 2 39958 NULL
118287 +bio_chain_clone_range_39967 bio_chain_clone_range 3 39967 NULL
118288 +dma_push_rx_39973 dma_push_rx 2 39973 NULL
118289 +broadsheetfb_write_39976 broadsheetfb_write 3 39976 NULL
118290 +mthca_array_init_39987 mthca_array_init 2 39987 NULL
118291 +fw_device_op_read_39990 fw_device_op_read 3 39990 NULL
118292 +server_name2svname_39998 server_name2svname 4 39998 NULL
118293 +xen_hvm_config_40018 xen_hvm_config 2 40018 NULL
118294 +ivtvfb_write_40023 ivtvfb_write 3 40023 NULL
118295 +disc_pwup_write_40027 disc_pwup_write 3 40027 NULL
118296 +ea_foreach_i_40028 ea_foreach_i 0 40028 NULL
118297 +datablob_hmac_append_40038 datablob_hmac_append 3 40038 NULL
118298 +l2cap_create_iframe_pdu_40055 l2cap_create_iframe_pdu 3 40055 NULL nohasharray
118299 +add_tty_40055 add_tty 1 40055 &l2cap_create_iframe_pdu_40055
118300 +atomic_xchg_40070 atomic_xchg 0 40070 NULL
118301 +snd_pcm_sw_params_user_40095 snd_pcm_sw_params_user 0 40095 NULL
118302 +sctp_setsockopt_delayed_ack_40129 sctp_setsockopt_delayed_ack 3 40129 NULL
118303 +dwc2_max_desc_num_40132 dwc2_max_desc_num 0 40132 NULL
118304 +rx_rx_frame_checksum_read_40140 rx_rx_frame_checksum_read 3 40140 NULL
118305 +ath10k_write_simulate_fw_crash_40143 ath10k_write_simulate_fw_crash 3 40143 NULL
118306 +iwch_alloc_fastreg_pbl_40153 iwch_alloc_fastreg_pbl 2 40153 NULL
118307 +pt_write_40159 pt_write 3 40159 NULL
118308 +scsi_sg_count_40182 scsi_sg_count 0 40182 NULL
118309 +ipr_alloc_ucode_buffer_40199 ipr_alloc_ucode_buffer 1 40199 NULL
118310 +allocate_probes_40204 allocate_probes 1 40204 NULL
118311 +au0828_v4l2_read_40220 au0828_v4l2_read 3 40220 NULL
118312 +compress_file_range_40225 compress_file_range 3-4 40225 NULL
118313 +ocrdma_dbgfs_ops_read_40232 ocrdma_dbgfs_ops_read 3 40232 NULL
118314 +osst_read_40237 osst_read 3 40237 NULL
118315 +lpage_info_slot_40243 lpage_info_slot 1-3 40243 NULL
118316 +ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 4 40248 NULL
118317 +of_get_child_count_40254 of_get_child_count 0 40254 NULL
118318 +rs_sta_dbgfs_scale_table_read_40262 rs_sta_dbgfs_scale_table_read 3 40262 NULL
118319 +ext2_fiemap_40271 ext2_fiemap 4 40271 NULL
118320 +usbnet_read_cmd_40275 usbnet_read_cmd 7 40275 NULL
118321 +rx_xfr_hint_trig_read_40283 rx_xfr_hint_trig_read 3 40283 NULL
118322 +SyS_bind_40303 SyS_bind 3 40303 NULL
118323 +ubi_io_write_data_40305 ubi_io_write_data 0 40305 NULL
118324 +ib_get_mad_data_offset_40336 ib_get_mad_data_offset 0 40336 NULL
118325 +mmio_read_40348 mmio_read 4 40348 NULL
118326 +event_rx_mem_empty_read_40363 event_rx_mem_empty_read 3 40363 NULL
118327 +ocfs2_check_range_for_refcount_40365 ocfs2_check_range_for_refcount 2-3 40365 NULL
118328 +get_chars_40373 get_chars 3 40373 NULL
118329 +fb_prepare_extra_logos_40429 fb_prepare_extra_logos 0-2 40429 NULL
118330 +tomoyo_update_policy_40458 tomoyo_update_policy 2 40458 NULL
118331 +zd_usb_scnprint_id_40459 zd_usb_scnprint_id 0-3 40459 NULL
118332 +gp2ap020a00f_write_event_threshold_40461 gp2ap020a00f_write_event_threshold 2 40461 NULL
118333 +SyS_writev_40467 SyS_writev 3 40467 NULL
118334 +SyS_select_40473 SyS_select 1 40473 NULL
118335 +afs_fs_store_data_40484 afs_fs_store_data 3-4-5-6 40484 NULL
118336 +batadv_hash_new_40491 batadv_hash_new 1 40491 NULL
118337 +devcgroup_inode_permission_40492 devcgroup_inode_permission 0 40492 NULL
118338 +__ethtool_get_sset_count_40511 __ethtool_get_sset_count 0 40511 NULL
118339 +TSS_checkhmac2_40520 TSS_checkhmac2 5-7 40520 NULL
118340 +ixgbe_dbg_reg_ops_read_40540 ixgbe_dbg_reg_ops_read 3 40540 NULL
118341 +ima_write_policy_40548 ima_write_policy 3 40548 NULL
118342 +esp_alloc_tmp_40558 esp_alloc_tmp 3-2 40558 NULL
118343 +get_priv_descr_and_size_40612 get_priv_descr_and_size 0 40612 NULL
118344 +i2c_register_adapter_40660 i2c_register_adapter 0 40660 NULL
118345 +twl4030_kpwrite_u8_40665 twl4030_kpwrite_u8 3 40665 NULL
118346 +__cfg80211_roamed_40668 __cfg80211_roamed 4-6 40668 NULL
118347 +pipeline_rx_complete_stat_fifo_int_read_40671 pipeline_rx_complete_stat_fifo_int_read 3 40671 NULL
118348 +fops_read_40672 fops_read 3 40672 NULL
118349 +idr_get_empty_slot_40674 idr_get_empty_slot 0 40674 NULL
118350 +alloc_rbio_40676 alloc_rbio 4 40676 NULL
118351 +videobuf_dma_init_user_locked_40678 videobuf_dma_init_user_locked 4-3 40678 NULL
118352 +pci_enable_resources_40680 pci_enable_resources 0 40680 NULL
118353 +nfc_hci_set_param_40697 nfc_hci_set_param 5 40697 NULL
118354 +__seq_open_private_40715 __seq_open_private 3 40715 NULL
118355 +set_extent_bit_40719 set_extent_bit 0 40719 NULL
118356 +of_pdt_build_one_prop_40735 of_pdt_build_one_prop 5 40735 NULL
118357 +fuse_readpages_40737 fuse_readpages 4 40737 NULL
118358 +xfs_iext_remove_direct_40744 xfs_iext_remove_direct 3 40744 NULL
118359 +security_inode_listxattr_40752 security_inode_listxattr 0 40752 NULL
118360 +card_send_command_40757 card_send_command 3 40757 NULL
118361 +ad1889_readl_40765 ad1889_readl 0 40765 NULL
118362 +pg_write_40766 pg_write 3 40766 NULL
118363 +kernfs_fop_read_40770 kernfs_fop_read 3 40770 NULL
118364 +show_list_40775 show_list 3-0 40775 NULL
118365 +kfifo_out_copy_r_40784 kfifo_out_copy_r 0-3 40784 NULL
118366 +bitmap_weight_40791 bitmap_weight 0 40791 NULL
118367 +pyra_sysfs_read_40795 pyra_sysfs_read 6 40795 NULL
118368 +rtw_add_beacon_40801 rtw_add_beacon 3-5 40801 NULL
118369 +add_action_40811 add_action 4 40811 NULL
118370 +nl80211_send_roamed_40825 nl80211_send_roamed 5-7 40825 NULL
118371 +nilfs_mdt_init_40849 nilfs_mdt_init 3 40849 NULL
118372 +v9fs_file_read_40858 v9fs_file_read 3 40858 NULL
118373 +read_file_queue_40895 read_file_queue 3 40895 NULL
118374 +waiters_read_40902 waiters_read 3 40902 NULL
118375 +isdn_add_channels_40905 isdn_add_channels 3 40905 NULL
118376 +gfs2_ea_find_40913 gfs2_ea_find 0 40913 NULL
118377 +vol_cdev_write_40915 vol_cdev_write 3 40915 NULL
118378 +snd_vx_create_40948 snd_vx_create 4 40948 NULL
118379 +rds_sendmsg_40976 rds_sendmsg 4 40976 NULL
118380 +insert_old_idx_40987 insert_old_idx 0 40987 NULL
118381 +il_dbgfs_fh_reg_read_40993 il_dbgfs_fh_reg_read 3 40993 NULL
118382 +iwl_dbgfs_scan_ant_rxchain_read_40999 iwl_dbgfs_scan_ant_rxchain_read 3 40999 NULL
118383 +mac80211_format_buffer_41010 mac80211_format_buffer 2 41010 NULL
118384 +mtd_block_isbad_41015 mtd_block_isbad 0 41015 NULL
118385 +__proc_dobitmasks_41029 __proc_dobitmasks 5 41029 NULL
118386 +_req_append_segment_41031 _req_append_segment 2 41031 NULL
118387 +mISDN_sock_sendmsg_41035 mISDN_sock_sendmsg 4 41035 NULL
118388 +ocfs2_xattr_index_block_find_41040 ocfs2_xattr_index_block_find 0 41040 NULL
118389 +lprocfs_write_frac_helper_41050 lprocfs_write_frac_helper 2 41050 NULL
118390 +vfs_listxattr_41062 vfs_listxattr 0 41062 NULL nohasharray
118391 +beacon_filtering_write_41062 beacon_filtering_write 3 41062 &vfs_listxattr_41062
118392 +sc_only_mode_read_41076 sc_only_mode_read 3 41076 NULL
118393 +cfg80211_inform_bss_frame_41078 cfg80211_inform_bss_frame 4 41078 NULL
118394 +nvme_map_user_pages_41093 nvme_map_user_pages 4-3 41093 NULL nohasharray
118395 +roccat_read_41093 roccat_read 3 41093 &nvme_map_user_pages_41093
118396 +dma_attach_41094 dma_attach 5-6 41094 NULL
118397 +provide_user_output_41105 provide_user_output 3 41105 NULL
118398 +f_audio_buffer_alloc_41110 f_audio_buffer_alloc 1 41110 NULL
118399 +ath10k_read_wmi_services_41112 ath10k_read_wmi_services 3 41112 NULL
118400 +v4l2_ctrl_new_int_menu_41151 v4l2_ctrl_new_int_menu 4 41151 NULL
118401 +tx_frag_mpdu_alloc_failed_read_41167 tx_frag_mpdu_alloc_failed_read 3 41167 NULL
118402 +dvb_ca_write_41171 dvb_ca_write 3 41171 NULL
118403 +netif_get_num_default_rss_queues_41187 netif_get_num_default_rss_queues 0 41187 NULL
118404 +request_irq_41192 request_irq 0 41192 NULL
118405 +dfs_file_write_41196 dfs_file_write 3 41196 NULL
118406 +nfs_page_array_len_41219 nfs_page_array_len 0-2-1 41219 NULL
118407 +cfg80211_process_disassoc_41231 cfg80211_process_disassoc 3 41231 NULL
118408 +hiddev_compat_ioctl_41255 hiddev_compat_ioctl 2 41255 NULL
118409 +erst_read_41260 erst_read 0 41260 NULL
118410 +alloc_context_41283 alloc_context 1 41283 NULL
118411 +of_count_phandle_with_args_41291 of_count_phandle_with_args 0 41291 NULL
118412 +o2hb_setup_one_bio_41341 o2hb_setup_one_bio 4 41341 NULL
118413 +twl_change_queue_depth_41342 twl_change_queue_depth 2 41342 NULL
118414 +rtw_android_set_block_41347 rtw_android_set_block 0 41347 NULL
118415 +ceph_do_getattr_41349 ceph_do_getattr 0 41349 NULL
118416 +cnic_init_id_tbl_41354 cnic_init_id_tbl 2 41354 NULL
118417 +kmp_init_41373 kmp_init 2 41373 NULL
118418 +isr_commands_read_41398 isr_commands_read 3 41398 NULL
118419 +rx_defrag_decrypt_failed_read_41411 rx_defrag_decrypt_failed_read 3 41411 NULL
118420 +xfs_iext_add_41422 xfs_iext_add 3 41422 NULL
118421 +isdn_ppp_fill_rq_41428 isdn_ppp_fill_rq 2 41428 NULL
118422 +lbs_rdrf_read_41431 lbs_rdrf_read 3 41431 NULL
118423 +iio_device_alloc_41440 iio_device_alloc 1 41440 NULL
118424 +ntfs_file_buffered_write_41442 ntfs_file_buffered_write 6-4 41442 NULL
118425 +pcpu_build_alloc_info_41443 pcpu_build_alloc_info 1-2-3 41443 NULL
118426 +se_io_cb_41461 se_io_cb 3 41461 NULL
118427 +layout_leb_in_gaps_41470 layout_leb_in_gaps 0 41470 NULL
118428 +snd_pcm_status_41472 snd_pcm_status 0 41472 NULL
118429 +rt2x00debug_write_rfcsr_41473 rt2x00debug_write_rfcsr 3 41473 NULL
118430 +bl_alloc_init_bio_41478 bl_alloc_init_bio 1 41478 NULL
118431 +kvm_unmap_hva_range_41484 kvm_unmap_hva_range 3-2 41484 NULL
118432 +wep_interrupt_read_41492 wep_interrupt_read 3 41492 NULL
118433 +hpfs_translate_name_41497 hpfs_translate_name 3 41497 NULL
118434 +xfrm_hash_new_size_41505 xfrm_hash_new_size 0-1 41505 NULL
118435 +SyS_preadv_41523 SyS_preadv 3 41523 NULL
118436 +dm_get_reserved_rq_based_ios_41529 dm_get_reserved_rq_based_ios 0 41529 NULL
118437 +tx_tx_frame_checksum_read_41553 tx_tx_frame_checksum_read 3 41553 NULL
118438 +ath6kl_endpoint_stats_read_41554 ath6kl_endpoint_stats_read 3 41554 NULL
118439 +nr_status_frames_41559 nr_status_frames 0-1 41559 NULL nohasharray
118440 +si476x_radio_fops_read_41559 si476x_radio_fops_read 3 41559 &nr_status_frames_41559
118441 +rng_dev_read_41581 rng_dev_read 3 41581 NULL
118442 +batadv_tvlv_container_ogm_append_41588 batadv_tvlv_container_ogm_append 4 41588 NULL
118443 +vga_io_r_41609 vga_io_r 0 41609 NULL
118444 +tcp_hdrlen_41610 tcp_hdrlen 0 41610 NULL
118445 +usb_endpoint_maxp_41613 usb_endpoint_maxp 0 41613 NULL nohasharray
118446 +lbs_bcnmiss_write_41613 lbs_bcnmiss_write 3 41613 &usb_endpoint_maxp_41613
118447 +a2mp_send_41615 a2mp_send 4 41615 NULL
118448 +lstcon_batch_list_41627 lstcon_batch_list 2 41627 NULL
118449 +mempool_create_kmalloc_pool_41650 mempool_create_kmalloc_pool 1 41650 NULL
118450 +rx_rx_pre_complt_read_41653 rx_rx_pre_complt_read 3 41653 NULL
118451 +get_std_timing_41654 get_std_timing 0 41654 NULL
118452 +ieee80211_if_fmt_bssid_41677 ieee80211_if_fmt_bssid 3 41677 NULL
118453 +fill_pcm_stream_name_41685 fill_pcm_stream_name 2 41685 NULL
118454 +lov_unpackmd_41701 lov_unpackmd 4 41701 NULL
118455 +fillonedir_41746 fillonedir 3 41746 NULL
118456 +iwl_dbgfs_bt_notif_read_41794 iwl_dbgfs_bt_notif_read 3 41794 NULL
118457 +hsi_alloc_controller_41802 hsi_alloc_controller 1 41802 NULL
118458 +rtw_android_get_macaddr_41812 rtw_android_get_macaddr 0 41812 NULL
118459 +sco_send_frame_41815 sco_send_frame 3 41815 NULL
118460 +ixgbe_dbg_netdev_ops_read_41839 ixgbe_dbg_netdev_ops_read 3 41839 NULL
118461 +do_ip_setsockopt_41852 do_ip_setsockopt 5 41852 NULL
118462 +keyctl_instantiate_key_41855 keyctl_instantiate_key 3 41855 NULL
118463 +pci_map_single_41869 pci_map_single 0 41869 NULL
118464 +v_APCI3120_InterruptDmaMoveBlock16bit_41914 v_APCI3120_InterruptDmaMoveBlock16bit 4 41914 NULL
118465 +get_fdb_entries_41916 get_fdb_entries 3 41916 NULL
118466 +ext4_da_write_inline_data_begin_41935 ext4_da_write_inline_data_begin 3-4 41935 NULL
118467 +sci_rxfill_41945 sci_rxfill 0 41945 NULL
118468 +read_gssp_41947 read_gssp 3 41947 NULL
118469 +ocfs2_xattr_bucket_get_name_value_41949 ocfs2_xattr_bucket_get_name_value 0 41949 NULL
118470 +portnames_read_41958 portnames_read 3 41958 NULL
118471 +ubi_self_check_all_ff_41959 ubi_self_check_all_ff 0 41959 NULL
118472 +dst_mtu_41969 dst_mtu 0 41969 NULL
118473 +cx24116_writeregN_41975 cx24116_writeregN 4 41975 NULL
118474 +ubi_io_is_bad_41983 ubi_io_is_bad 0 41983 NULL
118475 +pool_allocate_42012 pool_allocate 3 42012 NULL
118476 +spidev_sync_read_42014 spidev_sync_read 0 42014 NULL
118477 +rs_sta_dbgfs_scale_table_write_42017 rs_sta_dbgfs_scale_table_write 3 42017 NULL
118478 +acpi_ut_create_buffer_object_42030 acpi_ut_create_buffer_object 1 42030 NULL
118479 +__hwahc_op_set_gtk_42038 __hwahc_op_set_gtk 4 42038 NULL
118480 +alloc_trace_kprobe_42041 alloc_trace_kprobe 6 42041 NULL
118481 +irda_sendmsg_ultra_42047 irda_sendmsg_ultra 4 42047 NULL
118482 +jffs2_do_link_42048 jffs2_do_link 6 42048 NULL
118483 +ps_poll_upsd_max_ap_turn_read_42050 ps_poll_upsd_max_ap_turn_read 3 42050 NULL
118484 +InterfaceTransmitPacket_42058 InterfaceTransmitPacket 3 42058 NULL
118485 +scsi_execute_req_42088 scsi_execute_req 5 42088 NULL
118486 +sk_chk_filter_42095 sk_chk_filter 2 42095 NULL
118487 +submit_inquiry_42108 submit_inquiry 3 42108 NULL
118488 +dw_dma_cyclic_prep_42113 dw_dma_cyclic_prep 3-4 42113 NULL
118489 +blk_ioctl_zeroout_42160 blk_ioctl_zeroout 3 42160 NULL
118490 +mmc_align_data_size_42161 mmc_align_data_size 0-2 42161 NULL
118491 +read_file_base_eeprom_42168 read_file_base_eeprom 3 42168 NULL
118492 +oprofilefs_str_to_user_42182 oprofilefs_str_to_user 3 42182 NULL
118493 +write_file_beacon_42185 write_file_beacon 3 42185 NULL
118494 +get_znodes_to_commit_42201 get_znodes_to_commit 0 42201 NULL
118495 +pla_ocp_read_42235 pla_ocp_read 3 42235 NULL
118496 +rx_defrag_need_decrypt_read_42253 rx_defrag_need_decrypt_read 3 42253 NULL
118497 +find_last_bit_42260 find_last_bit 0 42260 NULL
118498 +__pcpu_size_to_slot_42271 __pcpu_size_to_slot 0 42271 NULL
118499 +__tty_buffer_request_room_42276 __tty_buffer_request_room 2-0 42276 NULL
118500 +snd_pcm_hw_param_value_max_42280 snd_pcm_hw_param_value_max 0 42280 NULL
118501 +__cpus_weight_42299 __cpus_weight 0 42299 NULL
118502 +sel_read_perm_42302 sel_read_perm 3 42302 NULL
118503 +sctp_setsockopt_del_key_42304 sctp_setsockopt_del_key 3 42304 NULL nohasharray
118504 +ulong_read_file_42304 ulong_read_file 3 42304 &sctp_setsockopt_del_key_42304
118505 +xfs_vm_readpages_42308 xfs_vm_readpages 4 42308 NULL
118506 +hysdn_conf_read_42324 hysdn_conf_read 3 42324 NULL
118507 +tcp_sync_mss_42330 tcp_sync_mss 2-0 42330 NULL
118508 +ide_raw_taskfile_42355 ide_raw_taskfile 4 42355 NULL
118509 +drbd_md_last_sector_42378 drbd_md_last_sector 0 42378 NULL
118510 +il_dbgfs_disable_ht40_read_42386 il_dbgfs_disable_ht40_read 3 42386 NULL
118511 +msnd_fifo_read_42406 msnd_fifo_read 0-3 42406 NULL
118512 +krng_get_random_42420 krng_get_random 3 42420 NULL
118513 +gsm_data_alloc_42437 gsm_data_alloc 3 42437 NULL
118514 +spr_wm_latency_write_42441 spr_wm_latency_write 3 42441 NULL
118515 +key_conf_keyidx_read_42443 key_conf_keyidx_read 3 42443 NULL
118516 +snd_pcm_action_group_42452 snd_pcm_action_group 0 42452 NULL
118517 +tcm_loop_change_queue_depth_42454 tcm_loop_change_queue_depth 2 42454 NULL
118518 +kuc_free_42455 kuc_free 2 42455 NULL
118519 +__simple_xattr_set_42474 __simple_xattr_set 4 42474 NULL
118520 +omfs_readpages_42490 omfs_readpages 4 42490 NULL
118521 +bypass_write_42498 bypass_write 3 42498 NULL
118522 +SyS_mincore_42511 SyS_mincore 2-1 42511 NULL
118523 +kvm_write_wall_clock_42520 kvm_write_wall_clock 2 42520 NULL
118524 +dio_bio_complete_42524 dio_bio_complete 0 42524 NULL
118525 +smk_write_netlbladdr_42525 smk_write_netlbladdr 3 42525 NULL
118526 +self_check_ec_hdr_42528 self_check_ec_hdr 0 42528 NULL
118527 +dbAllocNear_42546 dbAllocNear 0 42546 NULL
118528 +ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 NULL
118529 +udp_recvmsg_42558 udp_recvmsg 4 42558 NULL
118530 +iwl_print_event_log_42566 iwl_print_event_log 7-5-0 42566 NULL
118531 +xfrm_new_hash_mask_42579 xfrm_new_hash_mask 0-1 42579 NULL
118532 +oom_score_adj_write_42594 oom_score_adj_write 3 42594 NULL
118533 +ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout_42635 ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout 3 42635 NULL
118534 +scsi_activate_tcq_42640 scsi_activate_tcq 2 42640 NULL
118535 +br_mdb_rehash_42643 br_mdb_rehash 2 42643 NULL
118536 +_regmap_raw_write_42652 _regmap_raw_write 4-2 42652 NULL
118537 +request_key_and_link_42693 request_key_and_link 4 42693 NULL
118538 +vb2_read_42703 vb2_read 3 42703 NULL
118539 +dvb_demux_ioctl_42733 dvb_demux_ioctl 2 42733 NULL
118540 +set_aoe_iflist_42737 set_aoe_iflist 2 42737 NULL
118541 +ax25_setsockopt_42740 ax25_setsockopt 5 42740 NULL
118542 +dpm_sysfs_add_42756 dpm_sysfs_add 0 42756 NULL
118543 +x25_recvmsg_42777 x25_recvmsg 4 42777 NULL
118544 +snd_midi_event_decode_42780 snd_midi_event_decode 0 42780 NULL
118545 +cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 NULL nohasharray
118546 +isku_sysfs_read_info_42781 isku_sysfs_read_info 6 42781 &cryptd_hash_setkey_42781
118547 +elfcorehdr_read_notes_42786 elfcorehdr_read_notes 2 42786 NULL
118548 +koneplus_sysfs_read_42792 koneplus_sysfs_read 6 42792 NULL
118549 +ntfs_attr_extend_allocation_42796 ntfs_attr_extend_allocation 0 42796 NULL
118550 +fw_device_op_compat_ioctl_42804 fw_device_op_compat_ioctl 2 42804 NULL
118551 +drm_ioctl_42813 drm_ioctl 2 42813 NULL
118552 +iwl_dbgfs_ucode_bt_stats_read_42820 iwl_dbgfs_ucode_bt_stats_read 3 42820 NULL
118553 +set_arg_42824 set_arg 3 42824 NULL
118554 +si476x_radio_read_rsq_blob_42827 si476x_radio_read_rsq_blob 3 42827 NULL
118555 +ocfs2_clusters_for_bytes_42872 ocfs2_clusters_for_bytes 0-2 42872 NULL
118556 +nvme_trans_unit_serial_page_42879 nvme_trans_unit_serial_page 4 42879 NULL
118557 +xpc_kmalloc_cacheline_aligned_42895 xpc_kmalloc_cacheline_aligned 1 42895 NULL
118558 +hd_end_request_42904 hd_end_request 2 42904 NULL
118559 +sta_last_rx_rate_read_42909 sta_last_rx_rate_read 3 42909 NULL
118560 +sctp_getsockopt_maxburst_42941 sctp_getsockopt_maxburst 2 42941 NULL
118561 +vx_reset_chk_42946 vx_reset_chk 0 42946 NULL
118562 +blkdev_direct_IO_42962 blkdev_direct_IO 4 42962 NULL
118563 +ntb_setup_snb_msix_42971 ntb_setup_snb_msix 2-0 42971 NULL
118564 +compat_udpv6_setsockopt_42981 compat_udpv6_setsockopt 5 42981 NULL
118565 +nfs_idmap_get_desc_42990 nfs_idmap_get_desc 4-2 42990 NULL nohasharray
118566 +rtw_os_xmit_resource_alloc_42990 rtw_os_xmit_resource_alloc 3 42990 &nfs_idmap_get_desc_42990
118567 +isr_rx_mem_overflow_read_43025 isr_rx_mem_overflow_read 3 43025 NULL
118568 +wep_default_key_count_read_43035 wep_default_key_count_read 3 43035 NULL
118569 +nouveau_gpuobj_create__43072 nouveau_gpuobj_create_ 9 43072 NULL
118570 +nfs_map_group_to_gid_43082 nfs_map_group_to_gid 3 43082 NULL
118571 +_xfer_secondary_pool_43089 _xfer_secondary_pool 2 43089 NULL
118572 +sysfs_create_file_ns_43103 sysfs_create_file_ns 0 43103 NULL
118573 +ieee80211_if_fmt_drop_unencrypted_43107 ieee80211_if_fmt_drop_unencrypted 3 43107 NULL
118574 +calculate_node_totalpages_43118 calculate_node_totalpages 2-3 43118 NULL
118575 +e1000_request_msix_43134 e1000_request_msix 0 43134 NULL
118576 +read_file_dfs_43145 read_file_dfs 3 43145 NULL
118577 +cfs_cpt_table_alloc_43159 cfs_cpt_table_alloc 1 43159 NULL
118578 +usb_string_sub_43164 usb_string_sub 0 43164 NULL
118579 +il_dbgfs_power_save_status_read_43165 il_dbgfs_power_save_status_read 3 43165 NULL
118580 +ath6kl_set_assoc_req_ies_43185 ath6kl_set_assoc_req_ies 3 43185 NULL
118581 +ext4_xattr_ibody_get_43200 ext4_xattr_ibody_get 0 43200 NULL
118582 +uio_write_43202 uio_write 3 43202 NULL
118583 +iso_callback_43208 iso_callback 3 43208 NULL
118584 +ath10k_p2p_calc_noa_ie_len_43209 ath10k_p2p_calc_noa_ie_len 0 43209 NULL
118585 +f2fs_acl_from_disk_43210 f2fs_acl_from_disk 2 43210 NULL
118586 +atomic_long_add_return_43217 atomic_long_add_return 1-0 43217 NULL
118587 +batadv_tt_tvlv_unicast_handler_v1_43239 batadv_tt_tvlv_unicast_handler_v1 5 43239 NULL
118588 +vmemmap_alloc_block_43245 vmemmap_alloc_block 1 43245 NULL
118589 +ide_end_rq_43269 ide_end_rq 4 43269 NULL
118590 +nilfs_direct_IO_43271 nilfs_direct_IO 4 43271 NULL
118591 +evtchn_write_43278 evtchn_write 3 43278 NULL
118592 +filemap_write_and_wait_range_43279 filemap_write_and_wait_range 0 43279 NULL
118593 +mpage_alloc_43299 mpage_alloc 3 43299 NULL
118594 +mmu_set_spte_43327 mmu_set_spte 6-7 43327 NULL
118595 +__ext4_get_inode_loc_43332 __ext4_get_inode_loc 0 43332 NULL
118596 +xenfb_write_43412 xenfb_write 3 43412 NULL
118597 +__alloc_bootmem_low_43423 __alloc_bootmem_low 1 43423 NULL nohasharray
118598 +msi_capability_init_43423 msi_capability_init 0 43423 &__alloc_bootmem_low_43423
118599 +usb_alloc_urb_43436 usb_alloc_urb 1 43436 NULL
118600 +ath6kl_wmi_roam_tbl_event_rx_43440 ath6kl_wmi_roam_tbl_event_rx 3 43440 NULL
118601 +usb_string_43443 usb_string 0 43443 NULL nohasharray
118602 +usemap_size_43443 usemap_size 0-1-2 43443 &usb_string_43443
118603 +get_vm_area_size_43444 get_vm_area_size 0 43444 NULL
118604 +fs_path_prepare_for_add_43453 fs_path_prepare_for_add 2 43453 NULL
118605 +nvme_trans_device_id_page_43466 nvme_trans_device_id_page 4 43466 NULL
118606 +tx_tx_data_prepared_read_43497 tx_tx_data_prepared_read 3 43497 NULL
118607 +ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime_43505 ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime 3 43505 NULL
118608 +dvb_ca_en50221_io_write_43533 dvb_ca_en50221_io_write 3 43533 NULL
118609 +read_events_43534 read_events 3 43534 NULL
118610 +cachefiles_daemon_write_43535 cachefiles_daemon_write 3 43535 NULL
118611 +tx_frag_failed_read_43540 tx_frag_failed_read 3 43540 NULL
118612 +rpc_malloc_43573 rpc_malloc 2 43573 NULL
118613 +handle_frequent_errors_43599 handle_frequent_errors 4 43599 NULL
118614 +lpfc_idiag_drbacc_read_reg_43606 lpfc_idiag_drbacc_read_reg 0-3 43606 NULL
118615 +proc_read_43614 proc_read 3 43614 NULL
118616 +disable_dma_on_even_43618 disable_dma_on_even 0 43618 NULL
118617 +alloc_thread_groups_43625 alloc_thread_groups 2 43625 NULL
118618 +random_write_43656 random_write 3 43656 NULL
118619 +bio_integrity_tag_43658 bio_integrity_tag 3 43658 NULL
118620 +ext4_acl_count_43659 ext4_acl_count 0-1 43659 NULL
118621 +write_file_tx99_power_43670 write_file_tx99_power 3 43670 NULL
118622 +dmam_declare_coherent_memory_43679 dmam_declare_coherent_memory 4 43679 NULL
118623 +max77693_bulk_write_43698 max77693_bulk_write 2-3 43698 NULL
118624 +drbd_md_first_sector_43729 drbd_md_first_sector 0 43729 NULL
118625 +snd_rme32_playback_copy_43732 snd_rme32_playback_copy 5 43732 NULL
118626 +fuse_conn_congestion_threshold_write_43736 fuse_conn_congestion_threshold_write 3 43736 NULL
118627 +gigaset_initcs_43753 gigaset_initcs 2 43753 NULL
118628 +sctp_setsockopt_active_key_43755 sctp_setsockopt_active_key 3 43755 NULL
118629 +generic_file_direct_write_43770 generic_file_direct_write 0 43770 NULL
118630 +ocfs2_xattr_get_value_outside_43787 ocfs2_xattr_get_value_outside 0 43787 NULL nohasharray
118631 +byte_pos_43787 byte_pos 0 43787 &ocfs2_xattr_get_value_outside_43787
118632 +btrfs_copy_from_user_43806 btrfs_copy_from_user 3-1-0 43806 NULL
118633 +ieee80211_if_fmt_element_ttl_43825 ieee80211_if_fmt_element_ttl 3 43825 NULL
118634 +ieee80211_alloc_hw_43829 ieee80211_alloc_hw 1 43829 NULL
118635 +read_flush_43851 read_flush 3 43851 NULL
118636 +pm860x_bulk_write_43875 pm860x_bulk_write 2-3 43875 NULL
118637 +ec_dbgfs_cmd_write_43895 ec_dbgfs_cmd_write 3 43895 NULL
118638 +SendString_43928 SendString 3 43928 NULL
118639 +stats_dot11RTSFailureCount_read_43948 stats_dot11RTSFailureCount_read 3 43948 NULL
118640 +__get_required_blob_size_43980 __get_required_blob_size 0-3-2 43980 NULL
118641 +nla_reserve_43984 nla_reserve 3 43984 NULL
118642 +__clkdev_alloc_43990 __clkdev_alloc 1 43990 NULL
118643 +scsi_command_size_43992 scsi_command_size 0 43992 NULL nohasharray
118644 +bcm_recvmsg_43992 bcm_recvmsg 4 43992 &scsi_command_size_43992 nohasharray
118645 +kvm_read_guest_virt_43992 kvm_read_guest_virt 4-2 43992 &bcm_recvmsg_43992
118646 +ulist_add_43994 ulist_add 0 43994 NULL
118647 +emit_flags_44006 emit_flags 4-3 44006 NULL
118648 +write_flush_procfs_44011 write_flush_procfs 3 44011 NULL
118649 +fru_strlen_44046 fru_strlen 0 44046 NULL
118650 +ath9k_def_dump_modal_eeprom_44078 ath9k_def_dump_modal_eeprom 3-2-0 44078 NULL
118651 +SYSC_add_key_44079 SYSC_add_key 4 44079 NULL
118652 +pci_msix_vec_count_44093 pci_msix_vec_count 0 44093 NULL
118653 +xlog_recover_add_to_cont_trans_44102 xlog_recover_add_to_cont_trans 4 44102 NULL
118654 +skb_frag_dma_map_44112 skb_frag_dma_map 0 44112 NULL
118655 +tracing_set_trace_read_44122 tracing_set_trace_read 3 44122 NULL nohasharray
118656 +file_remove_suid_44122 file_remove_suid 0 44122 &tracing_set_trace_read_44122
118657 +SyS_process_vm_writev_44129 SyS_process_vm_writev 3-5 44129 NULL
118658 +ttm_get_pages_44142 ttm_get_pages 2 44142 NULL
118659 +scsi_get_resid_44147 scsi_get_resid 0 44147 NULL
118660 +ubifs_find_dirty_idx_leb_44169 ubifs_find_dirty_idx_leb 0 44169 NULL
118661 +ocfs2_xattr_bucket_find_44174 ocfs2_xattr_bucket_find 0 44174 NULL
118662 +SYSC_set_mempolicy_44176 SYSC_set_mempolicy 3 44176 NULL
118663 +handle_eviocgbit_44193 handle_eviocgbit 3 44193 NULL
118664 +srp_alloc_iu_44227 srp_alloc_iu 2 44227 NULL
118665 +scsi_track_queue_full_44239 scsi_track_queue_full 2 44239 NULL
118666 +sigma_action_write_regmap_44240 sigma_action_write_regmap 3 44240 NULL
118667 +device_create_file_44285 device_create_file 0 44285 NULL
118668 +ath6kl_keepalive_read_44303 ath6kl_keepalive_read 3 44303 NULL
118669 +bitmap_scnprintf_44318 bitmap_scnprintf 0-2 44318 NULL
118670 +dispatch_proc_write_44320 dispatch_proc_write 3 44320 NULL
118671 +ccp_init_data_44324 ccp_init_data 5 44324 NULL
118672 +rs_init_44327 rs_init 1 44327 NULL
118673 +blk_queue_init_tags_44355 blk_queue_init_tags 2 44355 NULL nohasharray
118674 +nfs_fscache_get_super_cookie_44355 nfs_fscache_get_super_cookie 3 44355 &blk_queue_init_tags_44355
118675 +rts_threshold_read_44384 rts_threshold_read 3 44384 NULL
118676 +mtip_hw_read_flags_44396 mtip_hw_read_flags 3 44396 NULL
118677 +aoedev_flush_44398 aoedev_flush 2 44398 NULL
118678 +strlcpy_44400 strlcpy 3 44400 NULL
118679 +drm_buffer_alloc_44405 drm_buffer_alloc 2 44405 NULL
118680 +osst_do_scsi_44410 osst_do_scsi 4 44410 NULL
118681 +ieee80211_if_read_rc_rateidx_mcs_mask_5ghz_44423 ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 NULL
118682 +write_file_debug_44476 write_file_debug 3 44476 NULL
118683 +btrfs_chunk_item_size_44478 btrfs_chunk_item_size 0-1 44478 NULL
118684 +sdio_align_size_44489 sdio_align_size 0-2 44489 NULL
118685 +bio_advance_44496 bio_advance 2 44496 NULL
118686 +ieee80211_if_read_dropped_frames_ttl_44500 ieee80211_if_read_dropped_frames_ttl 3 44500 NULL
118687 +ac_register_board_44504 ac_register_board 3 44504 NULL
118688 +security_getprocattr_44505 security_getprocattr 0 44505 NULL nohasharray
118689 +iwl_dbgfs_sram_read_44505 iwl_dbgfs_sram_read 3 44505 &security_getprocattr_44505
118690 +spidev_write_44510 spidev_write 3 44510 NULL
118691 +SyS_io_getevents_44519 SyS_io_getevents 3 44519 NULL
118692 +ieee80211_rx_mgmt_assoc_resp_44525 ieee80211_rx_mgmt_assoc_resp 3 44525 NULL
118693 +comm_write_44537 comm_write 3 44537 NULL
118694 +snd_pcm_drop_44542 snd_pcm_drop 0 44542 NULL
118695 +dgrp_config_proc_write_44571 dgrp_config_proc_write 3 44571 NULL
118696 +btrfs_set_extent_delalloc_44587 btrfs_set_extent_delalloc 0 44587 NULL
118697 +nouveau_perfmon_create__44602 nouveau_perfmon_create_ 4 44602 NULL
118698 +alloc_ctrl_packet_44667 alloc_ctrl_packet 1 44667 NULL
118699 +mpi_resize_44674 mpi_resize 2 44674 NULL
118700 +sysfs_create_link_44685 sysfs_create_link 0 44685 NULL
118701 +ts_read_44687 ts_read 3 44687 NULL
118702 +lov_emerg_alloc_44698 lov_emerg_alloc 1 44698 NULL
118703 +C_SYSC_select_44701 C_SYSC_select 1 44701 NULL
118704 +__generic_block_fiemap_44713 __generic_block_fiemap 4 44713 NULL nohasharray
118705 +xfer_to_user_44713 xfer_to_user 3 44713 &__generic_block_fiemap_44713
118706 +_zd_iowrite32v_locked_44725 _zd_iowrite32v_locked 3 44725 NULL
118707 +clusterip_proc_write_44729 clusterip_proc_write 3 44729 NULL
118708 +fib_count_nexthops_44730 fib_count_nexthops 0 44730 NULL
118709 +efx_wanted_parallelism_44732 efx_wanted_parallelism 0 44732 NULL
118710 +key_tx_rx_count_read_44742 key_tx_rx_count_read 3 44742 NULL
118711 +bch_bio_max_sectors_44755 bch_bio_max_sectors 0 44755 NULL
118712 +tnode_new_44757 tnode_new 3 44757 NULL nohasharray
118713 +pty_write_44757 pty_write 3 44757 &tnode_new_44757
118714 +__videobuf_copy_stream_44769 __videobuf_copy_stream 4-0 44769 NULL
118715 +handsfree_ramp_44777 handsfree_ramp 2 44777 NULL
118716 +irq_domain_add_legacy_44781 irq_domain_add_legacy 4-2 44781 NULL
118717 +sctp_setsockopt_44788 sctp_setsockopt 5 44788 NULL
118718 +rx_dropped_read_44799 rx_dropped_read 3 44799 NULL
118719 +qla4xxx_alloc_work_44813 qla4xxx_alloc_work 2 44813 NULL
118720 +force_static_address_write_44819 force_static_address_write 3 44819 NULL
118721 +mei_cl_read_start_44824 mei_cl_read_start 2 44824 NULL
118722 +rmap_write_protect_44833 rmap_write_protect 2 44833 NULL
118723 +sisusb_write_44834 sisusb_write 3 44834 NULL
118724 +kvm_read_hva_44847 kvm_read_hva 3 44847 NULL
118725 +qib_verbs_send_dma_44850 qib_verbs_send_dma 6 44850 NULL
118726 +copydesc_user_44855 copydesc_user 3 44855 NULL
118727 +set_advertising_44870 set_advertising 4 44870 NULL
118728 +init_rs_44873 init_rs 1 44873 NULL
118729 +skb_availroom_44883 skb_availroom 0 44883 NULL
118730 +do_tty_write_44896 do_tty_write 5 44896 NULL
118731 +regmap_spi_read_44921 regmap_spi_read 3-5 44921 NULL
118732 +tx_queue_status_read_44978 tx_queue_status_read 3 44978 NULL
118733 +bytepos_delta_45017 bytepos_delta 0 45017 NULL
118734 +ptrace_writedata_45021 ptrace_writedata 4 45021 NULL
118735 +dm_kvzalloc_45025 dm_kvzalloc 1 45025 NULL
118736 +sysfs_do_create_link_sd_45057 sysfs_do_create_link_sd 0 45057 NULL
118737 +sel_write_user_45060 sel_write_user 3 45060 NULL
118738 +snd_mixart_BA0_read_45069 snd_mixart_BA0_read 5 45069 NULL
118739 +snd_card_new_45104 snd_card_new 5 45104 NULL
118740 +kvm_mmu_page_get_gfn_45110 kvm_mmu_page_get_gfn 0-2 45110 NULL
118741 +pwr_missing_bcns_cnt_read_45113 pwr_missing_bcns_cnt_read 3 45113 NULL
118742 +usbdev_read_45114 usbdev_read 3 45114 NULL
118743 +send_to_tty_45141 send_to_tty 3 45141 NULL
118744 +cfs_trace_daemon_command_usrstr_45147 cfs_trace_daemon_command_usrstr 2 45147 NULL
118745 +gen_bitmask_string_45149 gen_bitmask_string 6 45149 NULL
118746 +device_write_45156 device_write 3 45156 NULL nohasharray
118747 +ocfs2_remove_inode_range_45156 ocfs2_remove_inode_range 3 45156 &device_write_45156
118748 +tomoyo_write_self_45161 tomoyo_write_self 3 45161 NULL
118749 +sta_agg_status_write_45164 sta_agg_status_write 3 45164 NULL
118750 +sctp_pack_cookie_45190 sctp_pack_cookie 6 45190 NULL nohasharray
118751 +snd_sb_csp_load_user_45190 snd_sb_csp_load_user 3 45190 &sctp_pack_cookie_45190
118752 +iso_alloc_urb_45206 iso_alloc_urb 4-5 45206 NULL
118753 +spi_alloc_master_45223 spi_alloc_master 2 45223 NULL
118754 +ieee80211_if_read_peer_45233 ieee80211_if_read_peer 3 45233 NULL
118755 +event_enable_write_45238 event_enable_write 3 45238 NULL
118756 +prism2_pda_proc_read_45246 prism2_pda_proc_read 3 45246 NULL
118757 +input_mt_init_slots_45279 input_mt_init_slots 2 45279 NULL
118758 +gfs2_fiemap_45282 gfs2_fiemap 4 45282 NULL
118759 +snd_pcm_oss_sync1_45298 snd_pcm_oss_sync1 2 45298 NULL
118760 +e1000_tx_map_45309 e1000_tx_map 5 45309 NULL
118761 +copy_vm86_regs_from_user_45340 copy_vm86_regs_from_user 3 45340 NULL
118762 +brcmf_sdio_died_dump_45359 brcmf_sdio_died_dump 3 45359 NULL
118763 +null_alloc_repbuf_45375 null_alloc_repbuf 3 45375 NULL
118764 +count_skb_frag_slots_45395 count_skb_frag_slots 0 45395 NULL
118765 +sock_recv_errqueue_45412 sock_recv_errqueue 3 45412 NULL
118766 +ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 NULL
118767 +ll_iocontrol_register_45430 ll_iocontrol_register 2 45430 NULL
118768 +tty_buffer_alloc_45437 tty_buffer_alloc 2 45437 NULL
118769 +rds_ib_set_wr_signal_state_45463 rds_ib_set_wr_signal_state 0 45463 NULL
118770 +tracing_read_dyn_info_45468 tracing_read_dyn_info 3 45468 NULL
118771 +snd_pcm_hwsync_45479 snd_pcm_hwsync 0 45479 NULL
118772 +rds_message_copy_from_user_45510 rds_message_copy_from_user 3 45510 NULL
118773 +copy_macs_45534 copy_macs 4 45534 NULL
118774 +nla_attr_size_45545 nla_attr_size 0-1 45545 NULL
118775 +v9fs_direct_read_45546 v9fs_direct_read 3 45546 NULL
118776 +cx18_copy_mdl_to_user_45549 cx18_copy_mdl_to_user 4 45549 NULL
118777 +stats_dot11ACKFailureCount_read_45558 stats_dot11ACKFailureCount_read 3 45558 NULL
118778 +_regmap_bus_raw_write_45559 _regmap_bus_raw_write 2 45559 NULL
118779 +posix_acl_xattr_size_45561 posix_acl_xattr_size 0-1 45561 NULL
118780 +venus_rmdir_45564 venus_rmdir 4 45564 NULL
118781 +ath6kl_keepalive_write_45600 ath6kl_keepalive_write 3 45600 NULL
118782 +hidraw_get_report_45609 hidraw_get_report 3 45609 NULL
118783 +compat_mpctl_ioctl_45671 compat_mpctl_ioctl 2 45671 NULL
118784 +dgram_sendmsg_45679 dgram_sendmsg 4 45679 NULL
118785 +smk_write_ambient_45691 smk_write_ambient 3 45691 NULL
118786 +bscnl_emit_45699 bscnl_emit 2-5-0 45699 NULL nohasharray
118787 +unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 &bscnl_emit_45699
118788 +sg_proc_write_adio_45704 sg_proc_write_adio 3 45704 NULL
118789 +snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL
118790 +rw_copy_check_uvector_45748 rw_copy_check_uvector 3-0 45748 NULL nohasharray
118791 +v4l2_ctrl_new_std_45748 v4l2_ctrl_new_std 5 45748 &rw_copy_check_uvector_45748
118792 +lkdtm_debugfs_read_45752 lkdtm_debugfs_read 3 45752 NULL
118793 +alloc_ts_config_45775 alloc_ts_config 1 45775 NULL
118794 +osc_checksum_type_seq_write_45785 osc_checksum_type_seq_write 3 45785 NULL
118795 +raw_setsockopt_45800 raw_setsockopt 5 45800 NULL
118796 +rds_tcp_inc_copy_to_user_45804 rds_tcp_inc_copy_to_user 3 45804 NULL
118797 +lbs_rdbbp_read_45805 lbs_rdbbp_read 3 45805 NULL
118798 +pcpu_alloc_alloc_info_45813 pcpu_alloc_alloc_info 1-2 45813 NULL
118799 +ll_max_readahead_mb_seq_write_45815 ll_max_readahead_mb_seq_write 3 45815 NULL
118800 +memcg_update_cache_size_45828 memcg_update_cache_size 2 45828 NULL
118801 +ipv6_recv_rxpmtu_45830 ipv6_recv_rxpmtu 3 45830 NULL
118802 +insert_state_45848 insert_state 0 45848 NULL
118803 +x509_process_extension_45854 x509_process_extension 5 45854 NULL
118804 +efx_tx_queue_insert_45859 efx_tx_queue_insert 2 45859 NULL
118805 +isdn_write_45863 isdn_write 3 45863 NULL
118806 +get_rdac_req_45882 get_rdac_req 3 45882 NULL
118807 +ocfs2_xattr_block_find_45891 ocfs2_xattr_block_find 0 45891 NULL
118808 +cfs_cpt_weight_45903 cfs_cpt_weight 0 45903 NULL
118809 +wm_adsp_region_to_reg_45915 wm_adsp_region_to_reg 0-2 45915 NULL
118810 +dbgfs_frame_45917 dbgfs_frame 3 45917 NULL
118811 +btree_keys_cachelines_45928 btree_keys_cachelines 0 45928 NULL
118812 +alloc_mr_45935 alloc_mr 1 45935 NULL
118813 +copy_to_45969 copy_to 3 45969 NULL
118814 +rb_simple_read_45972 rb_simple_read 3 45972 NULL
118815 +ioat2_dca_count_dca_slots_45984 ioat2_dca_count_dca_slots 0 45984 NULL
118816 +kobject_init_and_add_46003 kobject_init_and_add 0 46003 NULL
118817 +sierra_setup_urb_46029 sierra_setup_urb 5 46029 NULL
118818 +get_free_entries_46030 get_free_entries 1 46030 NULL nohasharray
118819 +fnic_reset_stats_read_46030 fnic_reset_stats_read 3 46030 &get_free_entries_46030
118820 +__access_remote_vm_46031 __access_remote_vm 0 46031 NULL
118821 +snd_emu10k1x_ptr_read_46049 snd_emu10k1x_ptr_read 0 46049 NULL
118822 +__ocfs2_move_extent_46060 __ocfs2_move_extent 3-4 46060 NULL nohasharray
118823 +dma_tx_errors_read_46060 dma_tx_errors_read 3 46060 &__ocfs2_move_extent_46060
118824 +sel_commit_bools_write_46077 sel_commit_bools_write 3 46077 NULL
118825 +memcg_update_array_size_46111 memcg_update_array_size 1 46111 NULL nohasharray
118826 +il3945_ucode_general_stats_read_46111 il3945_ucode_general_stats_read 3 46111 &memcg_update_array_size_46111
118827 +C_SYSC_writev_46113 C_SYSC_writev 3 46113 NULL
118828 +mlx4_ib_alloc_fast_reg_page_list_46119 mlx4_ib_alloc_fast_reg_page_list 2 46119 NULL
118829 +rtw_buf_update_46138 rtw_buf_update 4 46138 NULL
118830 +vb2_dma_sg_get_userptr_46146 vb2_dma_sg_get_userptr 3-2 46146 NULL
118831 +__netlink_change_ngroups_46156 __netlink_change_ngroups 2 46156 NULL
118832 +twl_direction_out_46182 twl_direction_out 2 46182 NULL
118833 +vxge_os_dma_malloc_46184 vxge_os_dma_malloc 2 46184 NULL
118834 +fq_resize_46195 fq_resize 2 46195 NULL
118835 +add_conn_list_46197 add_conn_list 3-0 46197 NULL
118836 +i2400m_op_msg_from_user_46213 i2400m_op_msg_from_user 4 46213 NULL
118837 +tm6000_i2c_recv_regs_46215 tm6000_i2c_recv_regs 5 46215 NULL
118838 +dsp_write_46218 dsp_write 2 46218 NULL
118839 +hash_netiface4_expire_46226 hash_netiface4_expire 4 46226 NULL
118840 +xen_setup_msi_irqs_46245 xen_setup_msi_irqs 2 46245 NULL
118841 +mpi_read_raw_data_46248 mpi_read_raw_data 2 46248 NULL
118842 +sg_proc_write_dressz_46316 sg_proc_write_dressz 3 46316 NULL
118843 +C_SYSC_ppoll_46319 C_SYSC_ppoll 2 46319 NULL
118844 +compat_SyS_readv_46328 compat_SyS_readv 3 46328 NULL nohasharray
118845 +__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 &compat_SyS_readv_46328
118846 +iwl_dbgfs_chain_noise_read_46355 iwl_dbgfs_chain_noise_read 3 46355 NULL
118847 +smk_write_direct_46363 smk_write_direct 3 46363 NULL
118848 +fuse_file_aio_write_46399 fuse_file_aio_write 4 46399 NULL
118849 +crypto_ablkcipher_reqsize_46411 crypto_ablkcipher_reqsize 0 46411 NULL
118850 +ttm_page_pool_get_pages_46431 ttm_page_pool_get_pages 0-5 46431 NULL
118851 +cfs_power2_roundup_46433 cfs_power2_roundup 0-1 46433 NULL
118852 +cp210x_set_config_46447 cp210x_set_config 4 46447 NULL
118853 +il_dbgfs_clear_traffic_stats_write_46458 il_dbgfs_clear_traffic_stats_write 3 46458 NULL
118854 +filldir64_46469 filldir64 3 46469 NULL
118855 +fill_in_write_vector_46498 fill_in_write_vector 0 46498 NULL
118856 +pin_code_reply_46510 pin_code_reply 4 46510 NULL
118857 +mthca_alloc_cq_buf_46512 mthca_alloc_cq_buf 3 46512 NULL
118858 +nouveau_drm_ioctl_46514 nouveau_drm_ioctl 2 46514 NULL nohasharray
118859 +kmsg_read_46514 kmsg_read 3 46514 &nouveau_drm_ioctl_46514
118860 +nl80211_send_rx_assoc_46538 nl80211_send_rx_assoc 4 46538 NULL
118861 +dn_current_mss_46574 dn_current_mss 0 46574 NULL
118862 +serverworks_create_gatt_pages_46582 serverworks_create_gatt_pages 1 46582 NULL
118863 +snd_compr_write_data_46592 snd_compr_write_data 3 46592 NULL
118864 +il3945_stats_flag_46606 il3945_stats_flag 0-3 46606 NULL
118865 +vscnprintf_46617 vscnprintf 0-2 46617 NULL
118866 +__kfifo_out_r_46623 __kfifo_out_r 0-3 46623 NULL
118867 +request_key_async_with_auxdata_46624 request_key_async_with_auxdata 4 46624 NULL
118868 +pci_enable_device_46642 pci_enable_device 0 46642 NULL
118869 +vfs_getxattr_alloc_46649 vfs_getxattr_alloc 0 46649 NULL
118870 +e1000_tx_map_46672 e1000_tx_map 4 46672 NULL
118871 +l2cap_create_le_flowctl_pdu_46682 l2cap_create_le_flowctl_pdu 3 46682 NULL
118872 +alloc_data_packet_46698 alloc_data_packet 1 46698 NULL
118873 +__ilog2_u32_46706 __ilog2_u32 0 46706 NULL
118874 +erst_dbg_write_46715 erst_dbg_write 3 46715 NULL
118875 +wl1271_rx_filter_alloc_field_46721 wl1271_rx_filter_alloc_field 5 46721 NULL
118876 +irq_domain_add_simple_46734 irq_domain_add_simple 2 46734 NULL
118877 +read_file_tx99_46741 read_file_tx99 3 46741 NULL
118878 +hest_ghes_dev_register_46766 hest_ghes_dev_register 1 46766 NULL
118879 +int_hw_irq_en_46776 int_hw_irq_en 3 46776 NULL
118880 +_xfs_buf_get_pages_46811 _xfs_buf_get_pages 2 46811 NULL
118881 +xfs_iroot_realloc_46826 xfs_iroot_realloc 2 46826 NULL
118882 +shmem_pwrite_fast_46842 shmem_pwrite_fast 3 46842 NULL
118883 +spi_async_46857 spi_async 0 46857 NULL
118884 +vsnprintf_46863 vsnprintf 0 46863 NULL
118885 +nvme_alloc_queue_46865 nvme_alloc_queue 3 46865 NULL
118886 +qp_memcpy_from_queue_iov_46874 qp_memcpy_from_queue_iov 5-4 46874 NULL
118887 +lov_iocontrol_46876 lov_iocontrol 3 46876 NULL
118888 +ixgbe_dbg_reg_ops_write_46895 ixgbe_dbg_reg_ops_write 3 46895 NULL
118889 +sk_mem_pages_46896 sk_mem_pages 0-1 46896 NULL
118890 +ieee80211_if_fmt_power_mode_46906 ieee80211_if_fmt_power_mode 3 46906 NULL
118891 +wlcore_alloc_hw_46917 wlcore_alloc_hw 3-1 46917 NULL
118892 +fb_write_46924 fb_write 3 46924 NULL
118893 +__sctp_setsockopt_connectx_46949 __sctp_setsockopt_connectx 3 46949 NULL
118894 +qla4xxx_post_aen_work_46953 qla4xxx_post_aen_work 3 46953 NULL
118895 +SYSC_poll_46965 SYSC_poll 2 46965 NULL
118896 +crypto_tfm_alg_alignmask_46971 crypto_tfm_alg_alignmask 0 46971 NULL
118897 +mgmt_pending_add_46976 mgmt_pending_add 5 46976 NULL
118898 +strlcat_46985 strlcat 3 46985 NULL
118899 +bitmap_file_clear_bit_46990 bitmap_file_clear_bit 2 46990 NULL
118900 +sel_write_bool_46996 sel_write_bool 3 46996 NULL
118901 +blk_rq_map_kern_47004 blk_rq_map_kern 4 47004 NULL
118902 +cx231xx_init_bulk_47024 cx231xx_init_bulk 3-2-4 47024 NULL
118903 +fs_path_len_47060 fs_path_len 0 47060 NULL
118904 +event_trigger_regex_write_47067 event_trigger_regex_write 3 47067 NULL
118905 +ext4_xattr_list_entries_47070 ext4_xattr_list_entries 0 47070 NULL
118906 +pipeline_dec_packet_in_read_47076 pipeline_dec_packet_in_read 3 47076 NULL
118907 +scsi_deactivate_tcq_47086 scsi_deactivate_tcq 2 47086 NULL
118908 +iwl_dump_nic_event_log_47089 iwl_dump_nic_event_log 0 47089 NULL
118909 +ptlrpc_lprocfs_threads_max_seq_write_47104 ptlrpc_lprocfs_threads_max_seq_write 3 47104 NULL
118910 +mousedev_read_47123 mousedev_read 3 47123 NULL
118911 +upcall_msg_size_47141 upcall_msg_size 2 47141 NULL
118912 +acpi_ut_initialize_buffer_47143 acpi_ut_initialize_buffer 2 47143 NULL nohasharray
118913 +ses_recv_diag_47143 ses_recv_diag 4 47143 &acpi_ut_initialize_buffer_47143
118914 +mxms_headerlen_47161 mxms_headerlen 0 47161 NULL
118915 +rs_sta_dbgfs_rate_scale_data_read_47165 rs_sta_dbgfs_rate_scale_data_read 3 47165 NULL
118916 +rts51x_ms_rw_47171 rts51x_ms_rw 3-4 47171 NULL
118917 +options_write_47243 options_write 3 47243 NULL
118918 +portcntrs_1_read_47253 portcntrs_1_read 3 47253 NULL
118919 +ablkcipher_next_slow_47274 ablkcipher_next_slow 4-3 47274 NULL
118920 +gfs2_readpages_47285 gfs2_readpages 4 47285 NULL
118921 +vsnprintf_47291 vsnprintf 0 47291 NULL
118922 +SYSC_semop_47292 SYSC_semop 3 47292 NULL
118923 +tx_internal_desc_overflow_read_47300 tx_internal_desc_overflow_read 3 47300 NULL
118924 +nouveau_fb_create__47316 nouveau_fb_create_ 4 47316 NULL
118925 +ieee80211_if_read_dot11MeshHoldingTimeout_47356 ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 NULL
118926 +avc_get_hash_stats_47359 avc_get_hash_stats 0 47359 NULL
118927 +kvm_arch_create_memslot_47364 kvm_arch_create_memslot 3 47364 NULL nohasharray
118928 +__output_copy_user_47364 __output_copy_user 3 47364 &kvm_arch_create_memslot_47364
118929 +__bio_map_kern_47379 __bio_map_kern 3 47379 NULL
118930 +nv_rd32_47390 nv_rd32 0 47390 NULL nohasharray
118931 +trace_options_core_read_47390 trace_options_core_read 3 47390 &nv_rd32_47390
118932 +nametbl_list_47391 nametbl_list 2 47391 NULL
118933 +dgrp_net_write_47392 dgrp_net_write 3 47392 NULL
118934 +pfkey_sendmsg_47394 pfkey_sendmsg 4 47394 NULL
118935 +lbs_wrmac_write_47400 lbs_wrmac_write 3 47400 NULL
118936 +sta_vht_capa_read_47409 sta_vht_capa_read 3 47409 NULL
118937 +crypto_ablkcipher_alignmask_47410 crypto_ablkcipher_alignmask 0 47410 NULL
118938 +lbs_wrrf_write_47418 lbs_wrrf_write 3 47418 NULL
118939 +C_SYSC_set_mempolicy_47466 C_SYSC_set_mempolicy 3 47466 NULL
118940 +nvme_trans_send_fw_cmd_47479 nvme_trans_send_fw_cmd 4 47479 NULL
118941 +newpart_47485 newpart 6-4 47485 NULL
118942 +mcp23s17_read_regs_47491 mcp23s17_read_regs 4 47491 NULL
118943 +core_sys_select_47494 core_sys_select 1 47494 NULL
118944 +as3722_block_write_47503 as3722_block_write 2-3 47503 NULL
118945 +alloc_arraycache_47505 alloc_arraycache 2 47505 NULL
118946 +unlink_simple_47506 unlink_simple 3 47506 NULL
118947 +pstore_decompress_47510 pstore_decompress 0 47510 NULL
118948 +__proc_lnet_portal_rotor_47529 __proc_lnet_portal_rotor 5 47529 NULL
118949 +snd_pcm_resume_47530 snd_pcm_resume 0 47530 NULL
118950 +process_vm_rw_47533 process_vm_rw 3-5 47533 NULL nohasharray
118951 +vscnprintf_47533 vscnprintf 0-2 47533 &process_vm_rw_47533
118952 +ieee80211_if_fmt_min_discovery_timeout_47539 ieee80211_if_fmt_min_discovery_timeout 3 47539 NULL
118953 +rtw_cfg80211_set_assoc_resp_wpsp2pie_47558 rtw_cfg80211_set_assoc_resp_wpsp2pie 3 47558 NULL
118954 +read_ldt_47570 read_ldt 2 47570 NULL
118955 +isku_sysfs_read_last_set_47572 isku_sysfs_read_last_set 6 47572 NULL
118956 +btrfs_stack_header_bytenr_47589 btrfs_stack_header_bytenr 0 47589 NULL
118957 +ext4_kvzalloc_47605 ext4_kvzalloc 1 47605 NULL
118958 +sctp_ssnmap_new_47608 sctp_ssnmap_new 2-1 47608 NULL
118959 +cache_read_pipefs_47615 cache_read_pipefs 3 47615 NULL
118960 +twl4030_clear_set_47624 twl4030_clear_set 4 47624 NULL
118961 +ccp_sha_setkey_47633 ccp_sha_setkey 3 47633 NULL
118962 +get_size_47644 get_size 1-2 47644 NULL
118963 +snd_pcm_info_47699 snd_pcm_info 0 47699 NULL
118964 +packet_recvmsg_47700 packet_recvmsg 4 47700 NULL nohasharray
118965 +ipath_format_hwmsg_47700 ipath_format_hwmsg 2 47700 &packet_recvmsg_47700
118966 +save_microcode_47717 save_microcode 3 47717 NULL
118967 +bits_to_user_47733 bits_to_user 2-3 47733 NULL
118968 +carl9170_debugfs_read_47738 carl9170_debugfs_read 3 47738 NULL
118969 +ir_prepare_write_buffer_47747 ir_prepare_write_buffer 3 47747 NULL
118970 +mvumi_alloc_mem_resource_47750 mvumi_alloc_mem_resource 3 47750 NULL
118971 +alloc_sched_domains_47756 alloc_sched_domains 1 47756 NULL
118972 +uwb_ie_dump_hex_47774 uwb_ie_dump_hex 4 47774 NULL
118973 +SyS_setgroups16_47780 SyS_setgroups16 1 47780 NULL
118974 +error_error_numll_frame_cts_start_read_47781 error_error_numll_frame_cts_start_read 3 47781 NULL
118975 +posix_acl_fix_xattr_from_user_47793 posix_acl_fix_xattr_from_user 2 47793 NULL
118976 +lov_packmd_47810 lov_packmd 0 47810 NULL
118977 +tree_mod_log_insert_move_47823 tree_mod_log_insert_move 5 47823 NULL
118978 +pinconf_dbg_config_write_47835 pinconf_dbg_config_write 3 47835 NULL
118979 +KEY_SIZE_47855 KEY_SIZE 0 47855 NULL
118980 +vhci_read_47878 vhci_read 3 47878 NULL
118981 +ubi_wl_put_peb_47886 ubi_wl_put_peb 0 47886 NULL
118982 +keyctl_instantiate_key_common_47889 keyctl_instantiate_key_common 4 47889 NULL
118983 +cfs_percpt_alloc_47918 cfs_percpt_alloc 2 47918 NULL
118984 +comedi_write_47926 comedi_write 3 47926 NULL
118985 +nvme_trans_get_blk_desc_len_47946 nvme_trans_get_blk_desc_len 0-2 47946 NULL
118986 +arch_setup_msi_irq_47959 arch_setup_msi_irq 0 47959 NULL
118987 +gether_get_ifname_47972 gether_get_ifname 3 47972 NULL
118988 +mempool_resize_47983 mempool_resize 2 47983 NULL nohasharray
118989 +iwl_dbgfs_ucode_tracing_read_47983 iwl_dbgfs_ucode_tracing_read 3 47983 &mempool_resize_47983
118990 +dbg_port_buf_47990 dbg_port_buf 2 47990 NULL
118991 +ib_umad_write_47993 ib_umad_write 3 47993 NULL
118992 +lustre_cfg_len_48002 lustre_cfg_len 0 48002 NULL
118993 +gdm_tty_recv_complete_48011 gdm_tty_recv_complete 2 48011 NULL
118994 +bio_integrity_set_tag_48035 bio_integrity_set_tag 3 48035 NULL
118995 +pppoe_sendmsg_48039 pppoe_sendmsg 4 48039 NULL
118996 +SYSC_writev_48040 SYSC_writev 3 48040 NULL
118997 +wpan_phy_alloc_48056 wpan_phy_alloc 1 48056 NULL
118998 +posix_acl_alloc_48063 posix_acl_alloc 1 48063 NULL
118999 +palmas_bulk_write_48068 palmas_bulk_write 2-3-5 48068 NULL
119000 +disc_write_48070 disc_write 3 48070 NULL
119001 +mmc_alloc_host_48097 mmc_alloc_host 1 48097 NULL
119002 +skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5 48102 NULL
119003 +wm_latency_write_48125 wm_latency_write 3 48125 NULL
119004 +vmw_framebuffer_surface_dirty_48132 vmw_framebuffer_surface_dirty 6 48132 NULL
119005 +set_discoverable_48141 set_discoverable 4 48141 NULL
119006 +dn_fib_count_nhs_48145 dn_fib_count_nhs 0 48145 NULL
119007 +SyS_vmsplice_48150 SyS_vmsplice 3 48150 NULL
119008 +_add_to_r4w_48152 _add_to_r4w 4 48152 NULL
119009 +isr_dma1_done_read_48159 isr_dma1_done_read 3 48159 NULL
119010 +c4iw_id_table_alloc_48163 c4iw_id_table_alloc 3 48163 NULL
119011 +rbd_obj_method_sync_48170 rbd_obj_method_sync 8 48170 NULL
119012 +alloc_cc770dev_48186 alloc_cc770dev 1 48186 NULL
119013 +cfg80211_process_deauth_48200 cfg80211_process_deauth 3 48200 NULL
119014 +ext4_index_trans_blocks_48205 ext4_index_trans_blocks 0-2 48205 NULL
119015 +snd_seq_dump_var_event_48209 snd_seq_dump_var_event 0 48209 NULL
119016 +ll_direct_IO_26_48216 ll_direct_IO_26 4 48216 NULL
119017 +uv_blade_nr_possible_cpus_48226 uv_blade_nr_possible_cpus 0 48226 NULL
119018 +nilfs_readpages_48229 nilfs_readpages 4 48229 NULL
119019 +read_file_recv_48232 read_file_recv 3 48232 NULL
119020 +unaccount_shadowed_48233 unaccount_shadowed 2 48233 NULL
119021 +nouveau_i2c_port_create__48240 nouveau_i2c_port_create_ 7 48240 NULL
119022 +nfsctl_transaction_read_48250 nfsctl_transaction_read 3 48250 NULL
119023 +batadv_socket_read_48257 batadv_socket_read 3 48257 NULL
119024 +cache_write_pipefs_48270 cache_write_pipefs 3 48270 NULL
119025 +trace_options_write_48275 trace_options_write 3 48275 NULL
119026 +send_set_info_48288 send_set_info 7 48288 NULL
119027 +lpfc_idiag_extacc_read_48301 lpfc_idiag_extacc_read 3 48301 NULL
119028 +timblogiw_read_48305 timblogiw_read 3 48305 NULL
119029 +hash_setkey_48310 hash_setkey 3 48310 NULL
119030 +skb_add_data_48363 skb_add_data 3 48363 NULL
119031 +tx_frag_init_called_read_48377 tx_frag_init_called_read 3 48377 NULL
119032 +lbs_debugfs_write_48413 lbs_debugfs_write 3 48413 NULL
119033 +uhid_event_from_user_48417 uhid_event_from_user 2 48417 NULL
119034 +div64_u64_rem_48418 div64_u64_rem 0-1-2 48418 NULL
119035 +snd_power_wait_48422 snd_power_wait 0 48422 NULL
119036 +pwr_tx_without_ps_read_48423 pwr_tx_without_ps_read 3 48423 NULL
119037 +print_filtered_48442 print_filtered 2-0 48442 NULL
119038 +tun_recvmsg_48463 tun_recvmsg 4 48463 NULL
119039 +compat_SyS_preadv64_48469 compat_SyS_preadv64 3 48469 NULL
119040 +_iwl_dbgfs_bt_tx_prio_write_48473 _iwl_dbgfs_bt_tx_prio_write 3 48473 NULL
119041 +ipath_format_hwerrors_48487 ipath_format_hwerrors 5 48487 NULL
119042 +r8712_usbctrl_vendorreq_48489 r8712_usbctrl_vendorreq 6 48489 NULL
119043 +send_control_msg_48498 send_control_msg 6 48498 NULL
119044 +count_masked_bytes_48507 count_masked_bytes 0-1 48507 NULL
119045 +diva_os_copy_to_user_48508 diva_os_copy_to_user 4 48508 NULL
119046 +brcmf_sdio_trap_info_48510 brcmf_sdio_trap_info 4 48510 NULL
119047 +phantom_get_free_48514 phantom_get_free 0 48514 NULL
119048 +drbd_bm_capacity_48530 drbd_bm_capacity 0 48530 NULL
119049 +raid10_size_48571 raid10_size 0-2-3 48571 NULL
119050 +llog_data_len_48607 llog_data_len 1 48607 NULL
119051 +do_ip_vs_set_ctl_48641 do_ip_vs_set_ctl 4 48641 NULL
119052 +ll_rw_extents_stats_pp_seq_write_48651 ll_rw_extents_stats_pp_seq_write 3 48651 NULL
119053 +mtd_read_48655 mtd_read 0 48655 NULL
119054 +aes_encrypt_packets_read_48666 aes_encrypt_packets_read 3 48666 NULL
119055 +sm501_create_subdev_48668 sm501_create_subdev 3-4 48668 NULL
119056 +ubi_eba_unmap_leb_48671 ubi_eba_unmap_leb 0 48671 NULL
119057 +security_inode_setattr_48689 security_inode_setattr 0 48689 NULL
119058 +hysdn_log_write_48694 hysdn_log_write 3 48694 NULL
119059 +altera_drscan_48698 altera_drscan 2 48698 NULL
119060 +kvm_set_irq_routing_48704 kvm_set_irq_routing 3 48704 NULL
119061 +lpfc_idiag_drbacc_write_48712 lpfc_idiag_drbacc_write 3 48712 NULL
119062 +SyS_lgetxattr_48719 SyS_lgetxattr 4 48719 NULL
119063 +ath6kl_usb_bmi_read_48745 ath6kl_usb_bmi_read 3 48745 NULL
119064 +ath6kl_regwrite_read_48747 ath6kl_regwrite_read 3 48747 NULL
119065 +l2cap_segment_sdu_48772 l2cap_segment_sdu 4 48772 NULL
119066 +gfs2_direct_IO_48774 gfs2_direct_IO 4 48774 NULL
119067 +il3945_sta_dbgfs_stats_table_read_48802 il3945_sta_dbgfs_stats_table_read 3 48802 NULL
119068 +twa_change_queue_depth_48808 twa_change_queue_depth 2 48808 NULL
119069 +atomic_counters_read_48827 atomic_counters_read 3 48827 NULL
119070 +azx_get_position_48841 azx_get_position 0 48841 NULL
119071 +vc_do_resize_48842 vc_do_resize 3-4 48842 NULL
119072 +comedi_buf_write_alloc_48846 comedi_buf_write_alloc 0-2 48846 NULL
119073 +suspend_dtim_interval_write_48854 suspend_dtim_interval_write 3 48854 NULL
119074 +C_SYSC_pwritev64_48864 C_SYSC_pwritev64 3 48864 NULL nohasharray
119075 +viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 &C_SYSC_pwritev64_48864
119076 +__ffs_ep0_read_events_48868 __ffs_ep0_read_events 3 48868 NULL
119077 +crypto_cipher_ctxsize_48890 crypto_cipher_ctxsize 0 48890 NULL
119078 +joydev_handle_JSIOCSAXMAP_48898 joydev_handle_JSIOCSAXMAP 3 48898 NULL
119079 +xdi_copy_to_user_48900 xdi_copy_to_user 4 48900 NULL
119080 +msg_hdr_sz_48908 msg_hdr_sz 0 48908 NULL
119081 +snd_pcm_update_hw_ptr_48925 snd_pcm_update_hw_ptr 0 48925 NULL
119082 +sep_crypto_dma_48937 sep_crypto_dma 0 48937 NULL
119083 +si5351_write_parameters_48940 si5351_write_parameters 2 48940 NULL
119084 +event_heart_beat_read_48961 event_heart_beat_read 3 48961 NULL
119085 +nand_ecc_test_run_48966 nand_ecc_test_run 1 48966 NULL
119086 +vmci_handle_arr_create_48971 vmci_handle_arr_create 1 48971 NULL
119087 +rds_rm_size_48996 rds_rm_size 0-2 48996 NULL
119088 +sel_write_enforce_48998 sel_write_enforce 3 48998 NULL
119089 +null_alloc_rs_49019 null_alloc_rs 2 49019 NULL
119090 +filemap_check_errors_49022 filemap_check_errors 0 49022 NULL
119091 +transient_status_49027 transient_status 4 49027 NULL
119092 +ll_xattr_cache_add_49032 ll_xattr_cache_add 4-0 49032 NULL
119093 +scsi_register_49094 scsi_register 2 49094 NULL
119094 +compat_do_readv_writev_49102 compat_do_readv_writev 4 49102 NULL
119095 +xfrm_replay_state_esn_len_49119 xfrm_replay_state_esn_len 0 49119 NULL
119096 +ll_max_cached_mb_seq_write_49122 ll_max_cached_mb_seq_write 3 49122 NULL
119097 +pt_read_49136 pt_read 3 49136 NULL nohasharray
119098 +netxen_setup_msi_interrupts_49136 netxen_setup_msi_interrupts 2 49136 &pt_read_49136
119099 +ipwireless_tty_received_49154 ipwireless_tty_received 3 49154 NULL
119100 +f2fs_acl_count_49155 f2fs_acl_count 0-1 49155 NULL
119101 +ipw_queue_tx_init_49161 ipw_queue_tx_init 3 49161 NULL
119102 +__jfs_setxattr_49175 __jfs_setxattr 5 49175 NULL
119103 +ath6kl_bgscan_int_write_49178 ath6kl_bgscan_int_write 3 49178 NULL
119104 +dvb_dvr_ioctl_49182 dvb_dvr_ioctl 2 49182 NULL
119105 +print_queue_49191 print_queue 0-4 49191 NULL
119106 +root_nfs_cat_49192 root_nfs_cat 3 49192 NULL
119107 +iwl_dbgfs_ucode_general_stats_read_49199 iwl_dbgfs_ucode_general_stats_read 3 49199 NULL
119108 +il4965_rs_sta_dbgfs_stats_table_read_49206 il4965_rs_sta_dbgfs_stats_table_read 3 49206 NULL
119109 +do_jffs2_getxattr_49210 do_jffs2_getxattr 0 49210 NULL
119110 +nouveau_therm_create__49228 nouveau_therm_create_ 4 49228 NULL
119111 +ieee80211_if_read_rssi_threshold_49260 ieee80211_if_read_rssi_threshold 3 49260 NULL
119112 +isku_sysfs_read_keys_media_49268 isku_sysfs_read_keys_media 6 49268 NULL
119113 +ptlrpc_check_set_49277 ptlrpc_check_set 0 49277 NULL
119114 +rx_filter_beacon_filter_read_49279 rx_filter_beacon_filter_read 3 49279 NULL
119115 +viafb_dfph_proc_write_49288 viafb_dfph_proc_write 3 49288 NULL
119116 +uio_read_49300 uio_read 3 49300 NULL
119117 +isku_sysfs_read_keys_macro_49312 isku_sysfs_read_keys_macro 6 49312 NULL
119118 +SYSC_mincore_49319 SYSC_mincore 2-1 49319 NULL
119119 +fwtty_port_handler_49327 fwtty_port_handler 9 49327 NULL
119120 +srpt_alloc_ioctx_ring_49330 srpt_alloc_ioctx_ring 2-4-3 49330 NULL
119121 +joydev_ioctl_common_49359 joydev_ioctl_common 2 49359 NULL
119122 +iscsi_alloc_session_49390 iscsi_alloc_session 3 49390 NULL
119123 +ext4_ext_index_trans_blocks_49396 ext4_ext_index_trans_blocks 0 49396 NULL
119124 +rx_streaming_always_read_49401 rx_streaming_always_read 3 49401 NULL
119125 +tnode_alloc_49407 tnode_alloc 1 49407 NULL
119126 +samples_to_bytes_49426 samples_to_bytes 0-2 49426 NULL
119127 +compat_do_msg_fill_49440 compat_do_msg_fill 3 49440 NULL
119128 +__hfsplus_getxattr_49460 __hfsplus_getxattr 0 49460 NULL
119129 +agp_3_5_isochronous_node_enable_49465 agp_3_5_isochronous_node_enable 3 49465 NULL
119130 +xfs_iformat_local_49472 xfs_iformat_local 4 49472 NULL
119131 +isr_decrypt_done_read_49490 isr_decrypt_done_read 3 49490 NULL
119132 +iwl_dbgfs_disable_power_off_read_49517 iwl_dbgfs_disable_power_off_read 3 49517 NULL
119133 +SyS_listxattr_49519 SyS_listxattr 3 49519 NULL
119134 +emulator_write_phys_49520 emulator_write_phys 2-4 49520 NULL
119135 +smk_write_access_49561 smk_write_access 3 49561 NULL
119136 +alloc_chunk_49575 alloc_chunk 1 49575 NULL
119137 +sctp_setsockopt_default_send_param_49578 sctp_setsockopt_default_send_param 3 49578 NULL
119138 +evm_inode_setattr_49594 evm_inode_setattr 0 49594 NULL
119139 +tap_write_49595 tap_write 3 49595 NULL
119140 +isr_wakeups_read_49607 isr_wakeups_read 3 49607 NULL
119141 +btrfs_mksubvol_49616 btrfs_mksubvol 3 49616 NULL
119142 +heap_init_49617 heap_init 2 49617 NULL
119143 +smk_write_doi_49621 smk_write_doi 3 49621 NULL
119144 +port_fops_read_49626 port_fops_read 3 49626 NULL
119145 +btrfsic_cmp_log_and_dev_bytenr_49628 btrfsic_cmp_log_and_dev_bytenr 2 49628 NULL
119146 +aa_simple_write_to_buffer_49683 aa_simple_write_to_buffer 3-4 49683 NULL
119147 +SyS_pwritev_49688 SyS_pwritev 3 49688 NULL
119148 +__setup_irq_49696 __setup_irq 0 49696 NULL
119149 +__copy_from_user_nocheck_49699 __copy_from_user_nocheck 0-3 49699 NULL
119150 +cx2341x_ctrl_new_menu_49700 cx2341x_ctrl_new_menu 3 49700 NULL
119151 +write_pool_49718 write_pool 3 49718 NULL
119152 +kvm_mmu_notifier_invalidate_page_49723 kvm_mmu_notifier_invalidate_page 3 49723 NULL
119153 +sep_create_dcb_dmatables_context_kernel_49728 sep_create_dcb_dmatables_context_kernel 6 49728 NULL
119154 +zd_usb_iowrite16v_49744 zd_usb_iowrite16v 3 49744 NULL
119155 +btrfs_chunk_num_stripes_49751 btrfs_chunk_num_stripes 0 49751 NULL
119156 +fuse_wr_pages_49753 fuse_wr_pages 0-2-1 49753 NULL
119157 +key_conf_keylen_read_49758 key_conf_keylen_read 3 49758 NULL
119158 +fuse_conn_waiting_read_49762 fuse_conn_waiting_read 3 49762 NULL
119159 +ceph_osdc_readpages_49789 ceph_osdc_readpages 0 49789 NULL
119160 +nfs4_acl_new_49806 nfs4_acl_new 1 49806 NULL
119161 +__of_parse_phandle_with_args_49807 __of_parse_phandle_with_args 0 49807 NULL
119162 +ntfs_copy_from_user_iovec_49829 ntfs_copy_from_user_iovec 6-3-0 49829 NULL
119163 +add_uuid_49831 add_uuid 4 49831 NULL
119164 +twl4030_write_49846 twl4030_write 2 49846 NULL
119165 +scsi_dispatch_cmd_entry_49848 scsi_dispatch_cmd_entry 3 49848 NULL
119166 +timeradd_entry_49850 timeradd_entry 3 49850 NULL
119167 +fiemap_count_to_size_49869 fiemap_count_to_size 0-1 49869 NULL
119168 +sctp_setsockopt_bindx_49870 sctp_setsockopt_bindx 3 49870 NULL
119169 +osc_brw_49896 osc_brw 4 49896 NULL
119170 +ieee80211_if_fmt_dtim_count_49987 ieee80211_if_fmt_dtim_count 3 49987 NULL
119171 +drm_buffer_copy_from_user_49990 drm_buffer_copy_from_user 3 49990 NULL
119172 +l2cap_chan_send_49995 l2cap_chan_send 3 49995 NULL
119173 +dn_mss_from_pmtu_50011 dn_mss_from_pmtu 0-2 50011 NULL
119174 +security_context_to_sid_50019 security_context_to_sid 2 50019 NULL
119175 +isdn_read_50021 isdn_read 3 50021 NULL
119176 +mdc_rename_pack_50023 mdc_rename_pack 4-6 50023 NULL
119177 +brcmf_debugfs_chipinfo_read_50033 brcmf_debugfs_chipinfo_read 3 50033 NULL
119178 +ioread8_50049 ioread8 0 50049 NULL
119179 +fuse_conn_max_background_write_50061 fuse_conn_max_background_write 3 50061 NULL
119180 +__kfifo_dma_in_prepare_50081 __kfifo_dma_in_prepare 4 50081 NULL
119181 +dev_set_alias_50084 dev_set_alias 3 50084 NULL
119182 +libcfs_ioctl_popdata_50087 libcfs_ioctl_popdata 3 50087 NULL
119183 +sock_setsockopt_50088 sock_setsockopt 5 50088 NULL
119184 +altera_swap_dr_50090 altera_swap_dr 2 50090 NULL
119185 +android_set_cntry_50100 android_set_cntry 0 50100 NULL
119186 +read_file_slot_50111 read_file_slot 3 50111 NULL
119187 +rx_streaming_interval_write_50120 rx_streaming_interval_write 3 50120 NULL
119188 +jfs_direct_IO_50125 jfs_direct_IO 4 50125 NULL
119189 +SYSC_preadv_50134 SYSC_preadv 3 50134 NULL
119190 +tx_frag_need_fragmentation_read_50153 tx_frag_need_fragmentation_read 3 50153 NULL
119191 +kmalloc_node_50163 kmalloc_node 1 50163 NULL
119192 +rx_filter_ibss_filter_read_50167 rx_filter_ibss_filter_read 3 50167 NULL
119193 +ahd_probe_stack_size_50168 ahd_probe_stack_size 0 50168 NULL
119194 +odev_update_50169 odev_update 2 50169 NULL
119195 +ubi_resize_volume_50172 ubi_resize_volume 2 50172 NULL nohasharray
119196 +ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 ieee80211_if_fmt_dot11MeshHWMPRannInterval 3 50172 &ubi_resize_volume_50172
119197 +cfg80211_roamed_bss_50198 cfg80211_roamed_bss 4-6 50198 NULL
119198 +cyttsp4_probe_50201 cyttsp4_probe 4 50201 NULL
119199 +rx_rx_timeout_wa_read_50204 rx_rx_timeout_wa_read 3 50204 NULL
119200 +l2cap_sock_setsockopt_50207 l2cap_sock_setsockopt 5 50207 NULL
119201 +mon_bin_compat_ioctl_50234 mon_bin_compat_ioctl 3 50234 NULL
119202 +sg_kmalloc_50240 sg_kmalloc 1 50240 NULL
119203 +rxrpc_setsockopt_50286 rxrpc_setsockopt 5 50286 NULL
119204 +soc_codec_reg_show_50302 soc_codec_reg_show 0-3 50302 NULL
119205 +SYSC_flistxattr_50307 SYSC_flistxattr 3 50307 NULL
119206 +SYSC_sched_setaffinity_50310 SYSC_sched_setaffinity 2 50310 NULL
119207 +soc_camera_read_50319 soc_camera_read 3 50319 NULL
119208 +do_launder_page_50329 do_launder_page 0 50329 NULL
119209 +nouveau_engine_create__50331 nouveau_engine_create_ 7 50331 NULL
119210 +lpfc_idiag_pcicfg_read_50334 lpfc_idiag_pcicfg_read 3 50334 NULL
119211 +snd_pcm_lib_writev_50337 snd_pcm_lib_writev 0-3 50337 NULL
119212 +tpm_read_50344 tpm_read 3 50344 NULL
119213 +isdn_ppp_read_50356 isdn_ppp_read 4 50356 NULL
119214 +iwl_dbgfs_echo_test_write_50362 iwl_dbgfs_echo_test_write 3 50362 NULL
119215 +xfrm_send_migrate_50365 xfrm_send_migrate 5 50365 NULL
119216 +roccat_common2_receive_50369 roccat_common2_receive 4 50369 NULL
119217 +sl_alloc_bufs_50380 sl_alloc_bufs 2 50380 NULL
119218 +l2tp_ip_sendmsg_50411 l2tp_ip_sendmsg 4 50411 NULL
119219 +iscsi_create_conn_50425 iscsi_create_conn 2 50425 NULL
119220 +validate_acl_mac_addrs_50429 validate_acl_mac_addrs 0 50429 NULL
119221 +btrfs_error_discard_extent_50444 btrfs_error_discard_extent 2 50444 NULL
119222 +pgctrl_write_50453 pgctrl_write 3 50453 NULL
119223 +device_create_sys_dev_entry_50458 device_create_sys_dev_entry 0 50458 NULL
119224 +cfs_size_round_50472 cfs_size_round 0-1 50472 NULL
119225 +cdrom_read_cdda_50478 cdrom_read_cdda 4 50478 NULL
119226 +mei_io_cb_alloc_req_buf_50493 mei_io_cb_alloc_req_buf 2 50493 NULL
119227 +pwr_rcvd_awake_beacons_read_50505 pwr_rcvd_awake_beacons_read 3 50505 NULL
119228 +ath6kl_set_ap_probe_resp_ies_50539 ath6kl_set_ap_probe_resp_ies 3 50539 NULL
119229 +usbat_flash_write_data_50553 usbat_flash_write_data 4 50553 NULL
119230 +self_check_peb_vid_hdr_50563 self_check_peb_vid_hdr 0 50563 NULL
119231 +fat_readpages_50582 fat_readpages 4 50582 NULL
119232 +iwl_dbgfs_missed_beacon_read_50584 iwl_dbgfs_missed_beacon_read 3 50584 NULL
119233 +xillybus_write_50605 xillybus_write 3 50605 NULL
119234 +rx_rx_checksum_result_read_50617 rx_rx_checksum_result_read 3 50617 NULL
119235 +sparse_early_usemaps_alloc_node_50623 sparse_early_usemaps_alloc_node 4 50623 NULL
119236 +simple_transaction_get_50633 simple_transaction_get 3 50633 NULL
119237 +ath6kl_tm_rx_event_50664 ath6kl_tm_rx_event 3 50664 NULL
119238 +bnad_debugfs_read_50665 bnad_debugfs_read 3 50665 NULL
119239 +prism2_read_fid_reg_50689 prism2_read_fid_reg 0 50689 NULL
119240 +xfs_growfs_get_hdr_buf_50697 xfs_growfs_get_hdr_buf 3 50697 NULL
119241 +dev_mem_read_50706 dev_mem_read 3 50706 NULL
119242 +blk_check_plugged_50736 blk_check_plugged 3 50736 NULL
119243 +__ext3_get_inode_loc_50744 __ext3_get_inode_loc 0 50744 NULL
119244 +ocfs2_xattr_block_get_50773 ocfs2_xattr_block_get 0 50773 NULL
119245 +tm6000_read_write_usb_50774 tm6000_read_write_usb 7 50774 NULL
119246 +bio_alloc_map_data_50782 bio_alloc_map_data 2 50782 NULL
119247 +ixgbe_acquire_msix_vectors_50789 ixgbe_acquire_msix_vectors 2 50789 NULL
119248 +tpm_write_50798 tpm_write 3 50798 NULL
119249 +tun_do_read_50800 tun_do_read 4 50800 NULL
119250 +write_flush_50803 write_flush 3 50803 NULL
119251 +dvb_play_50814 dvb_play 3 50814 NULL
119252 +btrfs_stack_file_extent_disk_num_bytes_50825 btrfs_stack_file_extent_disk_num_bytes 0 50825 NULL
119253 +dpcm_show_state_50827 dpcm_show_state 0 50827 NULL
119254 +SetArea_50835 SetArea 4 50835 NULL
119255 +videobuf_dma_init_user_50839 videobuf_dma_init_user 4-3 50839 NULL
119256 +self_check_write_50856 self_check_write 0 50856 NULL
119257 +carl9170_debugfs_write_50857 carl9170_debugfs_write 3 50857 NULL
119258 +SyS_lgetxattr_50889 SyS_lgetxattr 4 50889 NULL
119259 +netlbl_secattr_catmap_walk_rng_50894 netlbl_secattr_catmap_walk_rng 0-2 50894 NULL
119260 +__bdev_writeseg_50903 __bdev_writeseg 4 50903 NULL
119261 +xfs_iext_remove_50909 xfs_iext_remove 3 50909 NULL
119262 +blk_rq_cur_sectors_50910 blk_rq_cur_sectors 0 50910 NULL
119263 +hash_recvmsg_50924 hash_recvmsg 4 50924 NULL
119264 +chd_dec_fetch_cdata_50926 chd_dec_fetch_cdata 3 50926 NULL
119265 +show_device_status_50947 show_device_status 0 50947 NULL
119266 +irq_timeout_write_50950 irq_timeout_write 3 50950 NULL
119267 +virtio_cread16_50951 virtio_cread16 0 50951 NULL
119268 +sdio_uart_write_50954 sdio_uart_write 3 50954 NULL
119269 +SyS_setxattr_50957 SyS_setxattr 4 50957 NULL
119270 +of_modalias_node_50975 of_modalias_node 3 50975 NULL
119271 +iwl_statistics_flag_50981 iwl_statistics_flag 0-3 50981 NULL
119272 +timeout_write_50991 timeout_write 3 50991 NULL
119273 +proc_write_51003 proc_write 3 51003 NULL
119274 +jbd2_journal_extend_51012 jbd2_journal_extend 2 51012 NULL
119275 +lbs_dev_info_51023 lbs_dev_info 3 51023 NULL
119276 +fuse_conn_congestion_threshold_read_51028 fuse_conn_congestion_threshold_read 3 51028 NULL
119277 +BcmGetSectionValEndOffset_51039 BcmGetSectionValEndOffset 0 51039 NULL
119278 +dump_midi_51040 dump_midi 3 51040 NULL
119279 +usb_get_descriptor_51041 usb_get_descriptor 0 51041 NULL
119280 +srpt_alloc_ioctx_51042 srpt_alloc_ioctx 2-3 51042 NULL
119281 +do_arpt_set_ctl_51053 do_arpt_set_ctl 4 51053 NULL
119282 +wusb_prf_64_51065 wusb_prf_64 7 51065 NULL
119283 +jbd2_journal_init_revoke_51088 jbd2_journal_init_revoke 2 51088 NULL
119284 +__ocfs2_find_path_51096 __ocfs2_find_path 0 51096 NULL
119285 +ti_recv_51110 ti_recv 3 51110 NULL
119286 +alloc_rtllib_51136 alloc_rtllib 1 51136 NULL
119287 +simple_xattr_set_51140 simple_xattr_set 4 51140 NULL
119288 +xfs_trans_get_efd_51148 xfs_trans_get_efd 3 51148 NULL
119289 +snd_pcm_unlink_51210 snd_pcm_unlink 0 51210 NULL
119290 +iwl_dbgfs_bcast_filters_macs_read_51231 iwl_dbgfs_bcast_filters_macs_read 3 51231 NULL
119291 +nf_ct_ext_create_51232 nf_ct_ext_create 3 51232 NULL
119292 +snd_pcm_write_51235 snd_pcm_write 3 51235 NULL
119293 +drm_property_create_51239 drm_property_create 4 51239 NULL
119294 +st_read_51251 st_read 3 51251 NULL
119295 +compat_dccp_setsockopt_51263 compat_dccp_setsockopt 5 51263 NULL
119296 +target_alloc_sgl_51264 target_alloc_sgl 3 51264 NULL
119297 +dvb_audio_write_51275 dvb_audio_write 3 51275 NULL
119298 +ipwireless_network_packet_received_51277 ipwireless_network_packet_received 4 51277 NULL
119299 +pvr2_std_id_to_str_51288 pvr2_std_id_to_str 2 51288 NULL
119300 +bnad_debugfs_read_regrd_51308 bnad_debugfs_read_regrd 3 51308 NULL
119301 +init_map_ipmac_51317 init_map_ipmac 5 51317 NULL
119302 +alloc_hippi_dev_51320 alloc_hippi_dev 1 51320 NULL
119303 +ext2_xattr_get_51327 ext2_xattr_get 0 51327 NULL
119304 +alloc_smp_req_51337 alloc_smp_req 1 51337 NULL
119305 +ipw_get_event_log_len_51341 ipw_get_event_log_len 0 51341 NULL
119306 +ieee80211_if_fmt_estab_plinks_51370 ieee80211_if_fmt_estab_plinks 3 51370 NULL
119307 +radeon_kms_compat_ioctl_51371 radeon_kms_compat_ioctl 2 51371 NULL
119308 +blk_register_region_51424 blk_register_region 1-2 51424 NULL
119309 +mwifiex_rdeeprom_read_51429 mwifiex_rdeeprom_read 3 51429 NULL
119310 +hfsplus_brec_read_51436 hfsplus_brec_read 0 51436 NULL
119311 +ieee80211_if_read_dot11MeshHWMPRootMode_51441 ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 NULL
119312 +print_devstats_dot11ACKFailureCount_51443 print_devstats_dot11ACKFailureCount 3 51443 NULL
119313 +vmxnet3_acquire_msix_vectors_51462 vmxnet3_acquire_msix_vectors 2 51462 NULL
119314 +____alloc_ei_netdev_51475 ____alloc_ei_netdev 1 51475 NULL
119315 +xfs_buf_get_uncached_51477 xfs_buf_get_uncached 2 51477 NULL
119316 +kvm_fetch_guest_virt_51493 kvm_fetch_guest_virt 4-2 51493 NULL
119317 +ieee80211_if_write_uapsd_queues_51526 ieee80211_if_write_uapsd_queues 3 51526 NULL
119318 +__alloc_eip_netdev_51549 __alloc_eip_netdev 1 51549 NULL
119319 +batadv_tt_prepare_tvlv_local_data_51568 batadv_tt_prepare_tvlv_local_data 0 51568 NULL
119320 +ixgb_get_eeprom_len_51586 ixgb_get_eeprom_len 0 51586 NULL
119321 +aac_convert_sgraw2_51598 aac_convert_sgraw2 4 51598 NULL
119322 +table_size_to_number_of_entries_51613 table_size_to_number_of_entries 0-1 51613 NULL
119323 +extent_fiemap_51621 extent_fiemap 3 51621 NULL
119324 +sctp_auth_create_key_51641 sctp_auth_create_key 1 51641 NULL
119325 +iscsi_create_session_51647 iscsi_create_session 3 51647 NULL
119326 +ps_upsd_utilization_read_51669 ps_upsd_utilization_read 3 51669 NULL
119327 +sctp_setsockopt_associnfo_51684 sctp_setsockopt_associnfo 3 51684 NULL
119328 +rtw_os_xmit_resource_alloc23a_51693 rtw_os_xmit_resource_alloc23a 3 51693 NULL
119329 +host_mapping_level_51696 host_mapping_level 0 51696 NULL
119330 +sel_write_access_51704 sel_write_access 3 51704 NULL
119331 +tty_cdev_add_51714 tty_cdev_add 2-4 51714 NULL
119332 +v9fs_alloc_rdir_buf_51716 v9fs_alloc_rdir_buf 2 51716 NULL
119333 +drm_compat_ioctl_51717 drm_compat_ioctl 2 51717 NULL
119334 +sg_read_oxfer_51724 sg_read_oxfer 3 51724 NULL
119335 +cm4040_read_51732 cm4040_read 3 51732 NULL
119336 +get_user_pages_fast_51751 get_user_pages_fast 0 51751 NULL
119337 +ifx_spi_insert_flip_string_51752 ifx_spi_insert_flip_string 3 51752 NULL
119338 +if_write_51756 if_write 3 51756 NULL
119339 +ssd1307fb_alloc_array_51788 ssd1307fb_alloc_array 1 51788 NULL
119340 +qib_alloc_devdata_51819 qib_alloc_devdata 2 51819 NULL
119341 +buffer_from_user_51826 buffer_from_user 3 51826 NULL
119342 +ioread32_51847 ioread32 0 51847 NULL nohasharray
119343 +read_file_tgt_tx_stats_51847 read_file_tgt_tx_stats 3 51847 &ioread32_51847
119344 +do_readv_writev_51849 do_readv_writev 4 51849 NULL
119345 +SYSC_sendto_51852 SYSC_sendto 6 51852 NULL
119346 +bm_page_io_async_51858 bm_page_io_async 2 51858 NULL
119347 +pointer_size_read_51863 pointer_size_read 3 51863 NULL
119348 +get_indirect_ea_51869 get_indirect_ea 4 51869 NULL
119349 +user_read_51881 user_read 3 51881 NULL
119350 +dbAdjCtl_51888 dbAdjCtl 0 51888 NULL
119351 +SyS_mq_timedsend_51896 SyS_mq_timedsend 3 51896 NULL
119352 +wmi_set_ie_51919 wmi_set_ie 3 51919 NULL
119353 +dbg_status_buf_51930 dbg_status_buf 2 51930 NULL
119354 +__tcp_mtu_to_mss_51938 __tcp_mtu_to_mss 0-2 51938 NULL
119355 +xfrm_alg_len_51940 xfrm_alg_len 0 51940 NULL
119356 +scsi_get_vpd_page_51951 scsi_get_vpd_page 4 51951 NULL
119357 +snd_mask_min_51969 snd_mask_min 0 51969 NULL
119358 +__blkdev_get_51972 __blkdev_get 0 51972 NULL
119359 +get_zone_51981 get_zone 0-1 51981 NULL
119360 +ath6kl_sdio_alloc_prep_scat_req_51986 ath6kl_sdio_alloc_prep_scat_req 2 51986 NULL
119361 +dwc3_mode_write_51997 dwc3_mode_write 3 51997 NULL
119362 +scsi_sysfs_add_host_52010 scsi_sysfs_add_host 0 52010 NULL
119363 +skb_copy_datagram_from_iovec_52014 skb_copy_datagram_from_iovec 4-2-5 52014 NULL
119364 +rdmalt_52022 rdmalt 0 52022 NULL
119365 +override_release_52032 override_release 2 52032 NULL
119366 +end_port_52042 end_port 0 52042 NULL
119367 +dma_rx_errors_read_52045 dma_rx_errors_read 3 52045 NULL
119368 +msnd_fifo_write_52052 msnd_fifo_write 0-3 52052 NULL
119369 +dvb_ringbuffer_avail_52057 dvb_ringbuffer_avail 0 52057 NULL
119370 +__fuse_request_alloc_52060 __fuse_request_alloc 1 52060 NULL
119371 +isofs_readpages_52067 isofs_readpages 4 52067 NULL
119372 +mxuport_process_read_urb_data_52072 mxuport_process_read_urb_data 3 52072 NULL
119373 +nsm_get_handle_52089 nsm_get_handle 4 52089 NULL
119374 +ulist_add_merge_52096 ulist_add_merge 0 52096 NULL
119375 +o2net_debug_read_52105 o2net_debug_read 3 52105 NULL
119376 +split_scan_timeout_write_52128 split_scan_timeout_write 3 52128 NULL
119377 +retry_count_read_52129 retry_count_read 3 52129 NULL
119378 +snd_pcm_channel_info_user_52135 snd_pcm_channel_info_user 0 52135 NULL
119379 +gdm_usb_hci_send_52138 gdm_usb_hci_send 3 52138 NULL
119380 +sub_alloc_52140 sub_alloc 0 52140 NULL
119381 +hysdn_conf_write_52145 hysdn_conf_write 3 52145 NULL
119382 +htable_size_52148 htable_size 0-1 52148 NULL
119383 +smk_write_load2_52155 smk_write_load2 3 52155 NULL
119384 +ieee80211_if_read_dot11MeshRetryTimeout_52168 ieee80211_if_read_dot11MeshRetryTimeout 3 52168 NULL
119385 +mga_compat_ioctl_52170 mga_compat_ioctl 2 52170 NULL
119386 +print_prefix_52176 print_prefix 0 52176 NULL
119387 +proc_pid_readlink_52186 proc_pid_readlink 3 52186 NULL
119388 +reiserfs_posix_acl_from_disk_52191 reiserfs_posix_acl_from_disk 2 52191 NULL
119389 +vmci_qp_broker_alloc_52216 vmci_qp_broker_alloc 6-5 52216 NULL
119390 +fuse_request_alloc_52243 fuse_request_alloc 1 52243 NULL
119391 +mdiobus_alloc_size_52259 mdiobus_alloc_size 1 52259 NULL
119392 +shrink_slab_52261 shrink_slab 2 52261 NULL
119393 +sisusbcon_do_font_op_52271 sisusbcon_do_font_op 9 52271 NULL
119394 +handle_supp_msgs_52284 handle_supp_msgs 4 52284 NULL
119395 +kobject_set_name_vargs_52309 kobject_set_name_vargs 0 52309 NULL
119396 +read_file_reset_52310 read_file_reset 3 52310 NULL
119397 +ssd1307fb_write_52315 ssd1307fb_write 3 52315 NULL
119398 +request_asymmetric_key_52317 request_asymmetric_key 2-4 52317 NULL
119399 +hwflags_read_52318 hwflags_read 3 52318 NULL
119400 +snd_pcm_hw_free_52327 snd_pcm_hw_free 0 52327 NULL
119401 +test_unaligned_bulk_52333 test_unaligned_bulk 3 52333 NULL
119402 +hur_len_52339 hur_len 0 52339 NULL
119403 +bytes_to_frames_52362 bytes_to_frames 0-2 52362 NULL nohasharray
119404 +cap_inode_killpriv_52362 cap_inode_killpriv 0 52362 &bytes_to_frames_52362
119405 +copy_entries_to_user_52367 copy_entries_to_user 1 52367 NULL
119406 +iwl_dump_fh_52371 iwl_dump_fh 0 52371 NULL
119407 +hfsplus_find_attr_52374 hfsplus_find_attr 0 52374 NULL
119408 +mq_emit_config_values_52378 mq_emit_config_values 3 52378 NULL
119409 +isdn_writebuf_stub_52383 isdn_writebuf_stub 4 52383 NULL
119410 +jfs_setxattr_52389 jfs_setxattr 4 52389 NULL
119411 +aer_inject_write_52399 aer_inject_write 3 52399 NULL
119412 +line6_midibuf_init_52425 line6_midibuf_init 2 52425 NULL
119413 +hso_serial_common_create_52428 hso_serial_common_create 4 52428 NULL
119414 +delay_status_52431 delay_status 5 52431 NULL
119415 +ath6kl_delete_qos_write_52435 ath6kl_delete_qos_write 3 52435 NULL
119416 +ieee80211_if_fmt_num_sta_ps_52438 ieee80211_if_fmt_num_sta_ps 3 52438 NULL
119417 +alauda_read_data_52452 alauda_read_data 3 52452 NULL
119418 +ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1 52477 NULL
119419 +usb_tranzport_write_52479 usb_tranzport_write 3 52479 NULL
119420 +ocfs2_extend_no_holes_52483 ocfs2_extend_no_holes 3-4 52483 NULL
119421 +fd_do_rw_52495 fd_do_rw 3 52495 NULL
119422 +int_tasklet_entry_52500 int_tasklet_entry 3 52500 NULL
119423 +lmv_get_easize_52504 lmv_get_easize 0 52504 NULL
119424 +pm_qos_power_write_52513 pm_qos_power_write 3 52513 NULL
119425 +bt_sock_stream_recvmsg_52518 bt_sock_stream_recvmsg 4 52518 NULL
119426 +dup_variable_bug_52525 dup_variable_bug 3 52525 NULL
119427 +raw_recvmsg_52529 raw_recvmsg 4 52529 NULL
119428 +SyS_vmsplice_52540 SyS_vmsplice 3 52540 NULL
119429 +dccpprobe_read_52549 dccpprobe_read 3 52549 NULL
119430 +debug_level_proc_write_52572 debug_level_proc_write 3 52572 NULL
119431 +isku_sysfs_read_macro_52587 isku_sysfs_read_macro 6 52587 NULL
119432 +snd_pcm_sw_params_52594 snd_pcm_sw_params 0 52594 NULL
119433 +SyS_setsockopt_52610 SyS_setsockopt 5 52610 NULL
119434 +ll_sa_entry_alloc_52611 ll_sa_entry_alloc 4 52611 NULL
119435 +tps80031_writes_52638 tps80031_writes 3-4 52638 NULL
119436 +brcmf_sdio_assert_info_52653 brcmf_sdio_assert_info 4 52653 NULL
119437 +nvme_queue_extra_52661 nvme_queue_extra 0-1 52661 NULL
119438 +SYSC_gethostname_52677 SYSC_gethostname 2 52677 NULL
119439 +nvd0_disp_pioc_create__52693 nvd0_disp_pioc_create_ 5 52693 NULL
119440 +nouveau_client_create__52715 nouveau_client_create_ 5 52715 NULL
119441 +__dm_stat_bio_52722 __dm_stat_bio 3 52722 NULL
119442 +cx25840_ir_rx_read_52724 cx25840_ir_rx_read 3 52724 NULL
119443 +blkcipher_next_slow_52733 blkcipher_next_slow 3-4 52733 NULL
119444 +relay_alloc_page_array_52735 relay_alloc_page_array 1 52735 NULL
119445 +carl9170_debugfs_vif_dump_read_52755 carl9170_debugfs_vif_dump_read 3 52755 NULL
119446 +ieee80211_if_read_beacon_timeout_52756 ieee80211_if_read_beacon_timeout 3 52756 NULL
119447 +nvme_trans_ext_inq_page_52776 nvme_trans_ext_inq_page 3 52776 NULL
119448 +pwr_rcvd_beacons_read_52836 pwr_rcvd_beacons_read 3 52836 NULL
119449 +lb_alloc_ep_req_52837 lb_alloc_ep_req 2 52837 NULL
119450 +mon_bin_get_event_52863 mon_bin_get_event 4-6 52863 NULL
119451 +twl6030_gpadc_write_52867 twl6030_gpadc_write 1 52867 NULL
119452 +qib_decode_6120_err_52876 qib_decode_6120_err 3 52876 NULL
119453 +twlreg_write_52880 twlreg_write 3 52880 NULL
119454 +pvr2_ctrl_value_to_sym_internal_52881 pvr2_ctrl_value_to_sym_internal 5 52881 NULL
119455 +cache_read_procfs_52882 cache_read_procfs 3 52882 NULL
119456 +kvm_kvzalloc_52894 kvm_kvzalloc 1 52894 NULL
119457 +dio_bio_reap_52913 dio_bio_reap 0 52913 NULL
119458 +__kfifo_out_peek_r_52919 __kfifo_out_peek_r 3 52919 NULL
119459 +iblock_get_bio_52936 iblock_get_bio 3 52936 NULL
119460 +ieee80211_if_fmt_fwded_mcast_52961 ieee80211_if_fmt_fwded_mcast 3 52961 NULL
119461 +tx_tx_exch_read_52986 tx_tx_exch_read 3 52986 NULL
119462 +num_node_state_52989 num_node_state 0 52989 NULL
119463 +efivarfs_file_write_53000 efivarfs_file_write 3 53000 NULL
119464 +btrfs_free_and_pin_reserved_extent_53016 btrfs_free_and_pin_reserved_extent 2 53016 NULL
119465 +tx_tx_exch_pending_read_53018 tx_tx_exch_pending_read 3 53018 NULL
119466 +bio_cur_bytes_53037 bio_cur_bytes 0 53037 NULL
119467 +regcache_lzo_block_count_53056 regcache_lzo_block_count 0 53056 NULL
119468 +cfi_read_query_53066 cfi_read_query 0 53066 NULL
119469 +iwl_dbgfs_interrupt_write_53069 iwl_dbgfs_interrupt_write 3 53069 NULL
119470 +mwifiex_debug_read_53074 mwifiex_debug_read 3 53074 NULL
119471 +vmci_check_host_caps_53087 vmci_check_host_caps 0 53087 NULL
119472 +mic_virtio_copy_from_user_53107 mic_virtio_copy_from_user 3 53107 NULL
119473 +verity_status_53120 verity_status 5 53120 NULL
119474 +brcmf_usb_dl_cmd_53130 brcmf_usb_dl_cmd 4 53130 NULL
119475 +ps_poll_ps_poll_max_ap_turn_read_53140 ps_poll_ps_poll_max_ap_turn_read 3 53140 NULL nohasharray
119476 +inode_newsize_ok_53140 inode_newsize_ok 0 53140 &ps_poll_ps_poll_max_ap_turn_read_53140
119477 +ieee80211_bss_info_update_53170 ieee80211_bss_info_update 4 53170 NULL
119478 +btrfs_io_bio_alloc_53179 btrfs_io_bio_alloc 2 53179 NULL
119479 +clear_capture_buf_53192 clear_capture_buf 2 53192 NULL
119480 +tx_tx_start_data_read_53219 tx_tx_start_data_read 3 53219 NULL
119481 +ptlrpc_lprocfs_req_history_max_seq_write_53243 ptlrpc_lprocfs_req_history_max_seq_write 3 53243 NULL
119482 +xfs_trans_read_buf_map_53258 xfs_trans_read_buf_map 5 53258 NULL
119483 +wil_write_file_ssid_53266 wil_write_file_ssid 3 53266 NULL
119484 +btrfs_file_extent_num_bytes_53269 btrfs_file_extent_num_bytes 0 53269 NULL
119485 +ftrace_profile_write_53327 ftrace_profile_write 3 53327 NULL
119486 +find_nr_power_limit_53330 find_nr_power_limit 0 53330 NULL
119487 +gsm_control_reply_53333 gsm_control_reply 4 53333 NULL
119488 +btree_keys_bytes_53348 btree_keys_bytes 0 53348 NULL
119489 +sock_setbindtodevice_53369 sock_setbindtodevice 3 53369 NULL
119490 +get_random_bytes_arch_53370 get_random_bytes_arch 2 53370 NULL
119491 +isr_cmd_cmplt_read_53439 isr_cmd_cmplt_read 3 53439 NULL
119492 +mwifiex_info_read_53447 mwifiex_info_read 3 53447 NULL
119493 +apei_exec_run_optional_53452 apei_exec_run_optional 0 53452 NULL
119494 +paging64_prefetch_gpte_53468 paging64_prefetch_gpte 4 53468 NULL
119495 +ima_write_template_field_data_53475 ima_write_template_field_data 2 53475 NULL nohasharray
119496 +create_trace_kprobe_53475 create_trace_kprobe 1 53475 &ima_write_template_field_data_53475
119497 +iowarrior_read_53483 iowarrior_read 3 53483 NULL
119498 +osd_req_write_kern_53486 osd_req_write_kern 5 53486 NULL
119499 +do_verify_xattr_datum_53499 do_verify_xattr_datum 0 53499 NULL
119500 +snd_pcm_format_physical_width_53505 snd_pcm_format_physical_width 0 53505 NULL
119501 +dbAllocNext_53506 dbAllocNext 0 53506 NULL
119502 +force_sc_support_write_53512 force_sc_support_write 3 53512 NULL nohasharray
119503 +check_acl_53512 check_acl 0 53512 &force_sc_support_write_53512
119504 +nft_data_dump_53549 nft_data_dump 5 53549 NULL
119505 +SYSC_bind_53582 SYSC_bind 3 53582 NULL
119506 +cifs_utf16_bytes_53593 cifs_utf16_bytes 0 53593 NULL
119507 +proc_uid_map_write_53596 proc_uid_map_write 3 53596 NULL
119508 +pfkey_recvmsg_53604 pfkey_recvmsg 4 53604 NULL
119509 +___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1 53626 NULL
119510 +xd_write_multiple_pages_53633 xd_write_multiple_pages 6-5 53633 NULL
119511 +ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 NULL
119512 +nr_sendmsg_53656 nr_sendmsg 4 53656 NULL
119513 +fuse_fill_write_pages_53682 fuse_fill_write_pages 4-0 53682 NULL
119514 +v4l2_event_subscribe_53687 v4l2_event_subscribe 3 53687 NULL
119515 +bdev_logical_block_size_53690 bdev_logical_block_size 0 53690 NULL nohasharray
119516 +igb_alloc_q_vector_53690 igb_alloc_q_vector 4-6 53690 &bdev_logical_block_size_53690
119517 +find_overflow_devnum_53711 find_overflow_devnum 0 53711 NULL
119518 +__proc_debug_mb_53732 __proc_debug_mb 5 53732 NULL
119519 +wdm_write_53735 wdm_write 3 53735 NULL
119520 +lpfc_idiag_queacc_read_qe_53755 lpfc_idiag_queacc_read_qe 0-2 53755 NULL nohasharray
119521 +amdtp_out_stream_get_max_payload_53755 amdtp_out_stream_get_max_payload 0 53755 &lpfc_idiag_queacc_read_qe_53755
119522 +wa_populate_buf_in_urb_53758 wa_populate_buf_in_urb 3-4 53758 NULL
119523 +ext2_acl_count_53773 ext2_acl_count 0-1 53773 NULL
119524 +__kfifo_dma_in_prepare_r_53792 __kfifo_dma_in_prepare_r 4-5 53792 NULL
119525 +qp_alloc_host_work_53798 qp_alloc_host_work 5-3 53798 NULL
119526 +regmap_raw_write_53803 regmap_raw_write 2-4 53803 NULL
119527 +lpfc_idiag_ctlacc_read_reg_53809 lpfc_idiag_ctlacc_read_reg 0-3 53809 NULL
119528 +nls_nullsize_53815 nls_nullsize 0 53815 NULL
119529 +setup_data_read_53822 setup_data_read 3 53822 NULL
119530 +pms_read_53873 pms_read 3 53873 NULL
119531 +ieee80211_if_fmt_dropped_frames_congestion_53883 ieee80211_if_fmt_dropped_frames_congestion 3 53883 NULL
119532 +SyS_setgroups_53900 SyS_setgroups 1 53900 NULL
119533 +batadv_tt_tvlv_ogm_handler_v1_53909 batadv_tt_tvlv_ogm_handler_v1 5 53909 NULL
119534 +azx_via_get_position_53916 azx_via_get_position 0 53916 NULL
119535 +usb_serial_generic_write_53927 usb_serial_generic_write 4 53927 NULL
119536 +idetape_chrdev_write_53976 idetape_chrdev_write 3 53976 NULL
119537 +__ocfs2_xattr_set_value_outside_53981 __ocfs2_xattr_set_value_outside 5 53981 NULL
119538 +ieee80211_if_fmt_dot11MeshHWMPperrMinInterval_53998 ieee80211_if_fmt_dot11MeshHWMPperrMinInterval 3 53998 NULL
119539 +hfsplus_attr_build_key_54013 hfsplus_attr_build_key 0 54013 NULL
119540 +snd_pcm_lib_write_transfer_54018 snd_pcm_lib_write_transfer 5-2-4 54018 NULL
119541 +mdc_kuc_write_54019 mdc_kuc_write 3 54019 NULL
119542 +ipxrtr_route_packet_54036 ipxrtr_route_packet 4 54036 NULL
119543 +batadv_tt_update_orig_54049 batadv_tt_update_orig 6-4 54049 NULL
119544 +pipeline_dec_packet_out_read_54052 pipeline_dec_packet_out_read 3 54052 NULL
119545 +nl80211_send_disconnected_54056 nl80211_send_disconnected 5 54056 NULL
119546 +rproc_state_read_54057 rproc_state_read 3 54057 NULL
119547 +_malloc_54077 _malloc 1 54077 NULL
119548 +lustre_posix_acl_xattr_filter_54103 lustre_posix_acl_xattr_filter 2 54103 NULL nohasharray
119549 +altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 &lustre_posix_acl_xattr_filter_54103
119550 +__comedi_buf_write_alloc_54112 __comedi_buf_write_alloc 0-2 54112 NULL
119551 +strn_len_54122 strn_len 0 54122 NULL
119552 +isku_receive_54130 isku_receive 4 54130 NULL
119553 +isr_host_acknowledges_read_54136 isr_host_acknowledges_read 3 54136 NULL
119554 +irq_blk_threshold_write_54138 irq_blk_threshold_write 3 54138 NULL
119555 +memcpy_toiovec_54166 memcpy_toiovec 3 54166 NULL
119556 +nouveau_falcon_create__54169 nouveau_falcon_create_ 8 54169 NULL
119557 +p9_client_prepare_req_54175 p9_client_prepare_req 3 54175 NULL
119558 +do_sys_poll_54221 do_sys_poll 2 54221 NULL
119559 +__register_chrdev_54223 __register_chrdev 2-3 54223 NULL
119560 +pi_read_regr_54231 pi_read_regr 0 54231 NULL
119561 +mcp23s08_read_regs_54246 mcp23s08_read_regs 4 54246 NULL
119562 +reada_add_block_54247 reada_add_block 2 54247 NULL
119563 +xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 NULL
119564 +ceph_msgpool_get_54258 ceph_msgpool_get 2 54258 NULL
119565 +audio_write_54261 audio_write 4 54261 NULL nohasharray
119566 +wusb_prf_54261 wusb_prf 7 54261 &audio_write_54261
119567 +mwifiex_getlog_read_54269 mwifiex_getlog_read 3 54269 NULL
119568 +kstrtou16_from_user_54274 kstrtou16_from_user 2 54274 NULL
119569 +altera_set_dr_post_54291 altera_set_dr_post 2 54291 NULL
119570 +dlm_alloc_pagevec_54296 dlm_alloc_pagevec 1 54296 NULL
119571 +reclaim_pages_54301 reclaim_pages 3 54301 NULL
119572 +sprintf_54306 sprintf 0 54306 NULL
119573 +bio_add_pc_page_54319 bio_add_pc_page 4 54319 NULL
119574 +br_fdb_fillbuf_54339 br_fdb_fillbuf 0 54339 NULL
119575 +__alloc_dev_table_54343 __alloc_dev_table 2 54343 NULL
119576 +__get_free_pages_54352 __get_free_pages 0 54352 NULL
119577 +readlink_copy_54366 readlink_copy 2 54366 NULL
119578 +read_file_credit_dist_stats_54367 read_file_credit_dist_stats 3 54367 NULL
119579 +do_dccp_setsockopt_54377 do_dccp_setsockopt 5 54377 NULL nohasharray
119580 +intel_sdvo_write_cmd_54377 intel_sdvo_write_cmd 4 54377 &do_dccp_setsockopt_54377
119581 +ah_alloc_tmp_54378 ah_alloc_tmp 3-2 54378 NULL
119582 +snd_pcm_oss_read2_54387 snd_pcm_oss_read2 0-3 54387 NULL
119583 +iwl_dbgfs_power_save_status_read_54392 iwl_dbgfs_power_save_status_read 3 54392 NULL
119584 +ll_ra_count_get_54410 ll_ra_count_get 3 54410 NULL
119585 +copy_gadget_strings_54417 copy_gadget_strings 2-3 54417 NULL
119586 +sparse_early_mem_maps_alloc_node_54485 sparse_early_mem_maps_alloc_node 4 54485 NULL
119587 +simple_strtoull_54493 simple_strtoull 0 54493 NULL
119588 +btrfs_ordered_sum_size_54509 btrfs_ordered_sum_size 0-2 54509 NULL
119589 +sst_byt_get_dsp_position_54513 sst_byt_get_dsp_position 0-3 54513 NULL
119590 +rfc4106_set_key_54519 rfc4106_set_key 3 54519 NULL
119591 +vmci_transport_dgram_enqueue_54525 vmci_transport_dgram_enqueue 4 54525 NULL
119592 +viacam_read_54526 viacam_read 3 54526 NULL
119593 +unix_dgram_connect_54535 unix_dgram_connect 3 54535 NULL
119594 +setsockopt_54539 setsockopt 5 54539 NULL
119595 +lbs_lowsnr_write_54549 lbs_lowsnr_write 3 54549 NULL
119596 +SYSC_setsockopt_54561 SYSC_setsockopt 5 54561 NULL
119597 +nfsd_vfs_write_54577 nfsd_vfs_write 6 54577 NULL
119598 +fw_iso_buffer_init_54582 fw_iso_buffer_init 3 54582 NULL
119599 +nvme_npages_54601 nvme_npages 0-1 54601 NULL
119600 +irq_pkt_threshold_write_54605 irq_pkt_threshold_write 3 54605 NULL
119601 +port_fops_write_54627 port_fops_write 3 54627 NULL
119602 +tipc_send_stream_54648 tipc_send_stream 4 54648 NULL
119603 +irq_timeout_read_54653 irq_timeout_read 3 54653 NULL
119604 +dns_resolver_read_54658 dns_resolver_read 3 54658 NULL
119605 +twl6030_interrupt_mask_54659 twl6030_interrupt_mask 2 54659 NULL
119606 +tdp_page_fault_54663 tdp_page_fault 2 54663 NULL
119607 +bus_add_device_54665 bus_add_device 0 54665 NULL
119608 +cw1200_queue_stats_init_54670 cw1200_queue_stats_init 2 54670 NULL
119609 +bio_kmalloc_54672 bio_kmalloc 2 54672 NULL
119610 +evm_read_key_54674 evm_read_key 3 54674 NULL
119611 +__btrfs_inc_extent_ref_54706 __btrfs_inc_extent_ref 7 54706 NULL
119612 +rfkill_fop_read_54711 rfkill_fop_read 3 54711 NULL
119613 +ocfs2_control_write_54737 ocfs2_control_write 3 54737 NULL
119614 +kzalloc_54740 kzalloc 1 54740 NULL
119615 +wep_iv_read_54744 wep_iv_read 3 54744 NULL
119616 +lpfc_idiag_pcicfg_write_54749 lpfc_idiag_pcicfg_write 3 54749 NULL
119617 +crystalhd_user_data_54754 crystalhd_user_data 3 54754 NULL
119618 +iio_event_chrdev_read_54757 iio_event_chrdev_read 3 54757 NULL
119619 +adis16480_show_firmware_date_54762 adis16480_show_firmware_date 3 54762 NULL
119620 +ldsem_atomic_update_54774 ldsem_atomic_update 1 54774 NULL
119621 +flexcop_device_kmalloc_54793 flexcop_device_kmalloc 1 54793 NULL
119622 +nfsd_write_54809 nfsd_write 6 54809 NULL
119623 +ar9287_dump_modal_eeprom_54814 ar9287_dump_modal_eeprom 3-2 54814 NULL
119624 +crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 NULL nohasharray
119625 +kvzalloc_54815 kvzalloc 1 54815 &crypto_tfm_ctx_alignment_54815 nohasharray
119626 +aes_decrypt_fail_read_54815 aes_decrypt_fail_read 3 54815 &kvzalloc_54815
119627 +generic_perform_write_54832 generic_perform_write 3-0 54832 NULL
119628 +write_rio_54837 write_rio 3 54837 NULL
119629 +ext3_acl_from_disk_54839 ext3_acl_from_disk 2 54839 NULL nohasharray
119630 +nouveau_engctx_create__54839 nouveau_engctx_create_ 8 54839 &ext3_acl_from_disk_54839
119631 +ufx_ops_write_54848 ufx_ops_write 3 54848 NULL
119632 +printer_read_54851 printer_read 3 54851 NULL
119633 +assign_irq_vector_54852 assign_irq_vector 0 54852 NULL
119634 +broadsheet_spiflash_rewrite_sector_54864 broadsheet_spiflash_rewrite_sector 2 54864 NULL
119635 +prism_build_supp_rates_54865 prism_build_supp_rates 0 54865 NULL
119636 +iscsi_pool_init_54913 iscsi_pool_init 2-4 54913 NULL nohasharray
119637 +kobject_set_name_vargs_54913 kobject_set_name_vargs 0 54913 &iscsi_pool_init_54913
119638 +btrfs_stack_chunk_num_stripes_54923 btrfs_stack_chunk_num_stripes 0 54923 NULL
119639 +bio_add_page_54933 bio_add_page 0-3 54933 NULL
119640 +mxms_structlen_54939 mxms_structlen 0 54939 NULL
119641 +add_port_54941 add_port 2 54941 NULL
119642 +tipc_send2name_54946 tipc_send2name 5 54946 NULL
119643 +ath9k_dump_btcoex_54949 ath9k_dump_btcoex 0-3 54949 NULL
119644 +alauda_write_data_54967 alauda_write_data 3 54967 NULL
119645 +c4_add_card_54968 c4_add_card 3 54968 NULL
119646 +ext3_xattr_get_54989 ext3_xattr_get 0 54989 NULL
119647 +cx231xx_v4l2_read_55014 cx231xx_v4l2_read 3 55014 NULL
119648 +error_error_null_Frame_tx_start_read_55024 error_error_null_Frame_tx_start_read 3 55024 NULL
119649 +apei_exec_run_55075 apei_exec_run 0 55075 NULL
119650 +bitmap_storage_alloc_55077 bitmap_storage_alloc 2 55077 NULL
119651 +snd_pcm_capture_hw_avail_55086 snd_pcm_capture_hw_avail 0 55086 NULL
119652 +rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read_55106 rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read 3 55106 NULL
119653 +crypto_ahash_setkey_55134 crypto_ahash_setkey 3 55134 NULL
119654 +filldir_55137 filldir 3 55137 NULL
119655 +ocfs2_truncate_file_55148 ocfs2_truncate_file 3 55148 NULL
119656 +npages_to_npools_55149 npages_to_npools 0-1 55149 NULL
119657 +ieee80211_if_read_uapsd_queues_55150 ieee80211_if_read_uapsd_queues 3 55150 NULL
119658 +sel_write_relabel_55195 sel_write_relabel 3 55195 NULL
119659 +compat_SyS_ppoll_55196 compat_SyS_ppoll 2 55196 NULL
119660 +sched_feat_write_55202 sched_feat_write 3 55202 NULL
119661 +ht40allow_map_read_55209 ht40allow_map_read 3 55209 NULL
119662 +__kfifo_dma_out_prepare_r_55211 __kfifo_dma_out_prepare_r 4-5 55211 NULL
119663 +do_raw_setsockopt_55215 do_raw_setsockopt 5 55215 NULL
119664 +qxl_alloc_client_monitors_config_55216 qxl_alloc_client_monitors_config 2 55216 NULL
119665 +nouveau_mc_create__55217 nouveau_mc_create_ 4 55217 NULL
119666 +dbAllocDmap_55227 dbAllocDmap 0 55227 NULL
119667 +memcpy_fromiovec_55247 memcpy_fromiovec 3 55247 NULL
119668 +lbs_failcount_write_55276 lbs_failcount_write 3 55276 NULL
119669 +persistent_ram_new_55286 persistent_ram_new 1-2 55286 NULL
119670 +rx_streaming_interval_read_55291 rx_streaming_interval_read 3 55291 NULL
119671 +lov_get_stripecnt_55297 lov_get_stripecnt 0-3 55297 NULL
119672 +gsm_control_modem_55303 gsm_control_modem 3 55303 NULL
119673 +qp_alloc_guest_work_55305 qp_alloc_guest_work 5-3 55305 NULL nohasharray
119674 +compat_SyS_process_vm_readv_55305 compat_SyS_process_vm_readv 3-5 55305 &qp_alloc_guest_work_55305
119675 +compat_SyS_mbind_55329 compat_SyS_mbind 5 55329 NULL
119676 +vme_user_read_55338 vme_user_read 3 55338 NULL
119677 +__wa_xfer_setup_sizes_55342 __wa_xfer_setup_sizes 0 55342 NULL nohasharray
119678 +sctp_datamsg_from_user_55342 sctp_datamsg_from_user 4 55342 &__wa_xfer_setup_sizes_55342
119679 +cw1200_sdio_align_size_55391 cw1200_sdio_align_size 2 55391 NULL
119680 +iwl_dbgfs_plcp_delta_read_55407 iwl_dbgfs_plcp_delta_read 3 55407 NULL
119681 +nouveau_cli_create_55425 nouveau_cli_create 3 55425 NULL
119682 +si476x_radio_read_rds_blckcnt_blob_55427 si476x_radio_read_rds_blckcnt_blob 3 55427 NULL
119683 +__vxge_hw_channel_allocate_55462 __vxge_hw_channel_allocate 3 55462 NULL
119684 +cx23888_ir_rx_read_55473 cx23888_ir_rx_read 3 55473 NULL
119685 +snd_pcm_lib_write_55483 snd_pcm_lib_write 0-3 55483 NULL
119686 +i2o_pool_alloc_55485 i2o_pool_alloc 4 55485 NULL
119687 +batadv_tt_entries_55487 batadv_tt_entries 0-1 55487 NULL
119688 +ras_stride_increase_window_55501 ras_stride_increase_window 3 55501 NULL
119689 +tx_tx_done_int_template_read_55511 tx_tx_done_int_template_read 3 55511 NULL
119690 +ea_get_55522 ea_get 3-0 55522 NULL
119691 +buffer_size_55534 buffer_size 0 55534 NULL
119692 +set_msr_interception_55538 set_msr_interception 2 55538 NULL
119693 +tty_port_register_device_55543 tty_port_register_device 3 55543 NULL
119694 +hash_ipport6_expire_55549 hash_ipport6_expire 4 55549 NULL
119695 +dm_stats_list_55551 dm_stats_list 4 55551 NULL
119696 +compat_SyS_setsockopt_55581 compat_SyS_setsockopt 5 55581 NULL
119697 +add_partition_55588 add_partition 2 55588 NULL
119698 +kstrtou8_from_user_55599 kstrtou8_from_user 2 55599 NULL
119699 +SyS_keyctl_55602 SyS_keyctl 4 55602 NULL
119700 +macvtap_put_user_55609 macvtap_put_user 4 55609 NULL
119701 +selinux_setprocattr_55611 selinux_setprocattr 4 55611 NULL
119702 +edge_tty_recv_55622 edge_tty_recv 3 55622 NULL
119703 +reiserfs_xattr_get_55628 reiserfs_xattr_get 0 55628 NULL nohasharray
119704 +pktgen_if_write_55628 pktgen_if_write 3 55628 &reiserfs_xattr_get_55628
119705 +osc_obd_max_pages_per_rpc_seq_write_55636 osc_obd_max_pages_per_rpc_seq_write 3 55636 NULL
119706 +xfs_bmbt_maxrecs_55649 xfs_bmbt_maxrecs 0-2 55649 NULL
119707 +lpfc_idiag_queinfo_read_55662 lpfc_idiag_queinfo_read 3 55662 NULL
119708 +il_dbgfs_tx_queue_read_55668 il_dbgfs_tx_queue_read 3 55668 NULL
119709 +get_info_55681 get_info 3 55681 NULL
119710 +iwl_dbgfs_plcp_delta_write_55682 iwl_dbgfs_plcp_delta_write 3 55682 NULL
119711 +genl_allocate_reserve_groups_55705 genl_allocate_reserve_groups 1 55705 NULL
119712 +pm8001_store_update_fw_55716 pm8001_store_update_fw 4 55716 NULL
119713 +tap_pwup_write_55723 tap_pwup_write 3 55723 NULL
119714 +__iio_allocate_kfifo_55738 __iio_allocate_kfifo 2 55738 NULL
119715 +set_local_name_55757 set_local_name 4 55757 NULL
119716 +strlen_55778 strlen 0 55778 NULL nohasharray
119717 +is_idx_node_in_tnc_55778 is_idx_node_in_tnc 0 55778 &strlen_55778
119718 +set_spte_55783 set_spte 5-4 55783 NULL
119719 +req_bio_endio_55786 req_bio_endio 3 55786 NULL nohasharray
119720 +conf_read_55786 conf_read 3 55786 &req_bio_endio_55786
119721 +uwb_rc_neh_grok_event_55799 uwb_rc_neh_grok_event 3 55799 NULL
119722 +sb16_copy_from_user_55836 sb16_copy_from_user 10-6-7 55836 NULL
119723 +ip_hdrlen_55849 ip_hdrlen 0 55849 NULL
119724 +hcd_alloc_coherent_55862 hcd_alloc_coherent 5 55862 NULL
119725 +shmem_setxattr_55867 shmem_setxattr 4 55867 NULL
119726 +hsc_write_55875 hsc_write 3 55875 NULL
119727 +ramdisk_store_55885 ramdisk_store 4 55885 NULL
119728 +pm_qos_power_read_55891 pm_qos_power_read 3 55891 NULL
119729 +hash_ip4_expire_55911 hash_ip4_expire 4 55911 NULL
119730 +snd_pcm_hw_param_value_min_55917 snd_pcm_hw_param_value_min 0 55917 NULL
119731 +ext2_direct_IO_55932 ext2_direct_IO 4 55932 NULL
119732 +kvm_write_guest_virt_system_55944 kvm_write_guest_virt_system 4-2 55944 NULL
119733 +sel_read_policy_55947 sel_read_policy 3 55947 NULL
119734 +ceph_get_direct_page_vector_55956 ceph_get_direct_page_vector 2 55956 NULL
119735 +simple_read_from_buffer_55957 simple_read_from_buffer 2-5 55957 NULL
119736 +tx_tx_imm_resp_read_55964 tx_tx_imm_resp_read 3 55964 NULL
119737 +btrfs_clone_55977 btrfs_clone 5-3 55977 NULL
119738 +wa_xfer_create_subset_sg_55992 wa_xfer_create_subset_sg 3-2 55992 NULL
119739 +nvme_alloc_iod_56027 nvme_alloc_iod 1-2 56027 NULL
119740 +rtl8169_init_ring_56028 rtl8169_init_ring 0 56028 NULL
119741 +usb_ocp_write_56047 usb_ocp_write 4 56047 NULL
119742 +dccp_sendmsg_56058 dccp_sendmsg 4 56058 NULL
119743 +pscsi_get_bio_56103 pscsi_get_bio 1 56103 NULL
119744 +usb_alloc_stream_buffers_56123 usb_alloc_stream_buffers 3 56123 NULL
119745 +sel_read_handle_status_56139 sel_read_handle_status 3 56139 NULL
119746 +write_file_frameerrors_56145 write_file_frameerrors 3 56145 NULL
119747 +rawv6_setsockopt_56165 rawv6_setsockopt 5 56165 NULL
119748 +ath9k_dump_legacy_btcoex_56194 ath9k_dump_legacy_btcoex 3-0 56194 NULL
119749 +vring_add_indirect_56222 vring_add_indirect 4 56222 NULL
119750 +ocfs2_find_xe_in_bucket_56224 ocfs2_find_xe_in_bucket 0 56224 NULL
119751 +do_ipt_set_ctl_56238 do_ipt_set_ctl 4 56238 NULL
119752 +fd_copyin_56247 fd_copyin 3 56247 NULL
119753 +sk_rmem_schedule_56255 sk_rmem_schedule 3 56255 NULL
119754 +acpi_ex_get_serial_access_length_56275 acpi_ex_get_serial_access_length 0-2 56275 NULL
119755 +il4965_ucode_general_stats_read_56277 il4965_ucode_general_stats_read 3 56277 NULL
119756 +ieee80211_if_fmt_user_power_level_56283 ieee80211_if_fmt_user_power_level 3 56283 NULL
119757 +RESIZE_IF_NEEDED_56286 RESIZE_IF_NEEDED 2 56286 NULL
119758 +dvb_aplay_56296 dvb_aplay 3 56296 NULL
119759 +btmrvl_hscfgcmd_read_56303 btmrvl_hscfgcmd_read 3 56303 NULL
119760 +speakup_file_write_56310 speakup_file_write 3 56310 NULL
119761 +pipeline_pre_to_defrag_swi_read_56321 pipeline_pre_to_defrag_swi_read 3 56321 NULL
119762 +journal_init_revoke_table_56331 journal_init_revoke_table 1 56331 NULL
119763 +snd_rawmidi_read_56337 snd_rawmidi_read 3 56337 NULL
119764 +vxge_os_dma_malloc_async_56348 vxge_os_dma_malloc_async 3 56348 NULL
119765 +mite_device_bytes_transferred_56355 mite_device_bytes_transferred 0 56355 NULL
119766 +iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 4-0 56368 NULL
119767 +dev_read_56369 dev_read 3 56369 NULL
119768 +ath10k_read_simulate_fw_crash_56371 ath10k_read_simulate_fw_crash 3 56371 NULL
119769 +snd_pcm_common_ioctl1_56382 snd_pcm_common_ioctl1 0 56382 NULL
119770 +write_gssp_56404 write_gssp 3 56404 NULL
119771 +ocfs2_control_read_56405 ocfs2_control_read 3 56405 NULL
119772 +store_msg_56417 store_msg 3 56417 NULL
119773 +pppol2tp_sendmsg_56420 pppol2tp_sendmsg 4 56420 NULL
119774 +l2cap_segment_le_sdu_56426 l2cap_segment_le_sdu 4 56426 NULL
119775 +ec_dbgfs_cmd_read_56431 ec_dbgfs_cmd_read 3 56431 NULL
119776 +fl_create_56435 fl_create 5 56435 NULL
119777 +gnttab_map_56439 gnttab_map 2 56439 NULL
119778 +cx231xx_init_isoc_56453 cx231xx_init_isoc 3-2-4 56453 NULL
119779 +set_connectable_56458 set_connectable 4 56458 NULL
119780 +osd_req_list_partition_objects_56464 osd_req_list_partition_objects 5 56464 NULL
119781 +putused_user_56467 putused_user 3 56467 NULL
119782 +ocfs2_zero_extend_range_56468 ocfs2_zero_extend_range 3-2 56468 NULL
119783 +lbs_rdmac_write_56471 lbs_rdmac_write 3 56471 NULL
119784 +crypto_shash_alignmask_56486 crypto_shash_alignmask 0 56486 NULL
119785 +ieee80211_rx_mgmt_probe_beacon_56491 ieee80211_rx_mgmt_probe_beacon 3 56491 NULL
119786 +memblock_virt_alloc_56501 memblock_virt_alloc 1 56501 NULL
119787 +init_map_ip_56508 init_map_ip 5 56508 NULL
119788 +lustre_posix_acl_xattr_reduce_space_56512 lustre_posix_acl_xattr_reduce_space 3 56512 NULL
119789 +cfg80211_connect_result_56515 cfg80211_connect_result 4-6 56515 NULL
119790 +ip_options_get_56538 ip_options_get 4 56538 NULL
119791 +ll_wr_track_id_56544 ll_wr_track_id 2 56544 NULL
119792 +alloc_apertures_56561 alloc_apertures 1 56561 NULL
119793 +rs_sta_dbgfs_stats_table_read_56573 rs_sta_dbgfs_stats_table_read 3 56573 NULL
119794 +portcntrs_2_read_56586 portcntrs_2_read 3 56586 NULL
119795 +gro_pull_from_frag0_56593 gro_pull_from_frag0 2 56593 NULL
119796 +event_filter_write_56609 event_filter_write 3 56609 NULL
119797 +nvme_trans_log_temperature_56613 nvme_trans_log_temperature 3 56613 NULL
119798 +gather_array_56641 gather_array 3 56641 NULL
119799 +lookup_extent_backref_56644 lookup_extent_backref 9 56644 NULL
119800 +uvc_debugfs_stats_read_56651 uvc_debugfs_stats_read 3 56651 NULL
119801 +tg3_nvram_write_block_56666 tg3_nvram_write_block 3 56666 NULL
119802 +snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 NULL
119803 +dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3-0 56702 NULL
119804 +sta_flags_read_56710 sta_flags_read 3 56710 NULL
119805 +ipv6_getsockopt_sticky_56711 ipv6_getsockopt_sticky 5 56711 NULL
119806 +__wa_xfer_setup_segs_56725 __wa_xfer_setup_segs 2 56725 NULL
119807 +__copy_from_user_ll_56738 __copy_from_user_ll 0-3 56738 NULL
119808 +drm_agp_bind_pages_56748 drm_agp_bind_pages 3 56748 NULL
119809 +btrfsic_map_block_56751 btrfsic_map_block 2 56751 NULL
119810 +ttm_alloc_new_pages_56792 ttm_alloc_new_pages 5 56792 NULL
119811 +ion_ioctl_56806 ion_ioctl 2 56806 NULL
119812 +do_syslog_56807 do_syslog 3 56807 NULL
119813 +mtdchar_write_56831 mtdchar_write 3 56831 NULL
119814 +snd_rawmidi_kernel_write1_56847 snd_rawmidi_kernel_write1 4-0 56847 NULL
119815 +si476x_radio_read_agc_blob_56849 si476x_radio_read_agc_blob 3 56849 NULL
119816 +ext3_xattr_ibody_get_56880 ext3_xattr_ibody_get 0 56880 NULL
119817 +pvr2_debugifc_print_status_56890 pvr2_debugifc_print_status 3 56890 NULL
119818 +debug_debug3_read_56894 debug_debug3_read 3 56894 NULL
119819 +batadv_tt_update_changes_56895 batadv_tt_update_changes 3 56895 NULL nohasharray
119820 +le_auto_conn_write_56895 le_auto_conn_write 3 56895 &batadv_tt_update_changes_56895
119821 +hfsplus_find_cat_56899 hfsplus_find_cat 0 56899 NULL
119822 +strcspn_56913 strcspn 0 56913 NULL
119823 +__kfifo_out_56927 __kfifo_out 0-3 56927 NULL
119824 +journal_init_revoke_56933 journal_init_revoke 2 56933 NULL
119825 +nouveau_xtensa_create__56952 nouveau_xtensa_create_ 8 56952 NULL
119826 +diva_get_driver_info_56967 diva_get_driver_info 0 56967 NULL
119827 +sptlrpc_secflags2str_56995 sptlrpc_secflags2str 3 56995 NULL
119828 +vlsi_alloc_ring_57003 vlsi_alloc_ring 3-4 57003 NULL
119829 +btrfs_super_csum_size_57004 btrfs_super_csum_size 0 57004 NULL
119830 +aircable_process_packet_57027 aircable_process_packet 4 57027 NULL
119831 +ieee80211_if_fmt_state_57043 ieee80211_if_fmt_state 3 57043 NULL nohasharray
119832 +skb_network_offset_57043 skb_network_offset 0 57043 &ieee80211_if_fmt_state_57043
119833 +bytes_to_samples_57049 bytes_to_samples 0-2 57049 NULL
119834 +xfs_buf_read_map_57053 xfs_buf_read_map 3 57053 NULL
119835 +cx2341x_ctrl_new_std_57061 cx2341x_ctrl_new_std 4 57061 NULL
119836 +sca3000_read_data_57064 sca3000_read_data 4 57064 NULL
119837 +pcmcia_replace_cis_57066 pcmcia_replace_cis 3 57066 NULL
119838 +tracing_set_trace_write_57096 tracing_set_trace_write 3 57096 NULL
119839 +altera_get_note_57099 altera_get_note 6 57099 NULL
119840 +hpfs_readpages_57106 hpfs_readpages 4 57106 NULL
119841 +snd_pcm_hw_params_old_user_57108 snd_pcm_hw_params_old_user 0 57108 NULL
119842 +crypto_compress_ctxsize_57109 crypto_compress_ctxsize 0 57109 NULL
119843 +cipso_v4_gentag_loc_57119 cipso_v4_gentag_loc 0 57119 NULL
119844 +ima_show_htable_value_57136 ima_show_htable_value 2 57136 NULL nohasharray
119845 +rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 &ima_show_htable_value_57136 nohasharray
119846 +nl80211_send_deauth_57136 nl80211_send_deauth 4 57136 &rds_ib_sub_signaled_57136
119847 +snd_sonicvibes_getdmac_57140 snd_sonicvibes_getdmac 0 57140 NULL
119848 +_iwl_dbgfs_bf_params_write_57141 _iwl_dbgfs_bf_params_write 3 57141 NULL
119849 +udl_prime_create_57159 udl_prime_create 2 57159 NULL
119850 +stk_prepare_sio_buffers_57168 stk_prepare_sio_buffers 2 57168 NULL
119851 +rx_hw_stuck_read_57179 rx_hw_stuck_read 3 57179 NULL
119852 +hash_netnet6_expire_57191 hash_netnet6_expire 4 57191 NULL
119853 +tt3650_ci_msg_57219 tt3650_ci_msg 4 57219 NULL
119854 +dma_fifo_alloc_57236 dma_fifo_alloc 2-3-5 57236 NULL
119855 +flush_space_57241 flush_space 0 57241 NULL
119856 +rsxx_cram_write_57244 rsxx_cram_write 3 57244 NULL
119857 +ieee80211_if_fmt_tsf_57249 ieee80211_if_fmt_tsf 3 57249 NULL
119858 +oprofilefs_ulong_from_user_57251 oprofilefs_ulong_from_user 3 57251 NULL
119859 +alloc_flex_gd_57259 alloc_flex_gd 1 57259 NULL
119860 +lbs_sleepparams_write_57283 lbs_sleepparams_write 3 57283 NULL
119861 +pstore_file_read_57288 pstore_file_read 3 57288 NULL
119862 +snd_pcm_read_57289 snd_pcm_read 3 57289 NULL
119863 +ftdi_elan_write_57309 ftdi_elan_write 3 57309 NULL
119864 +write_file_regval_57313 write_file_regval 3 57313 NULL
119865 +__mxt_write_reg_57326 __mxt_write_reg 3 57326 NULL
119866 +usblp_read_57342 usblp_read 3 57342 NULL
119867 +print_devstats_dot11RTSFailureCount_57347 print_devstats_dot11RTSFailureCount 3 57347 NULL
119868 +dio_send_cur_page_57348 dio_send_cur_page 0 57348 NULL
119869 +tipc_bclink_stats_57372 tipc_bclink_stats 2 57372 NULL
119870 +tty_register_device_attr_57381 tty_register_device_attr 2 57381 NULL
119871 +read_file_blob_57406 read_file_blob 3 57406 NULL
119872 +enclosure_register_57412 enclosure_register 3 57412 NULL
119873 +compat_keyctl_instantiate_key_iov_57431 compat_keyctl_instantiate_key_iov 3 57431 NULL
119874 +copy_to_user_fromio_57432 copy_to_user_fromio 3 57432 NULL
119875 +__roundup_pow_of_two_57461 __roundup_pow_of_two 0 57461 NULL
119876 +sisusb_clear_vram_57466 sisusb_clear_vram 2-3 57466 NULL
119877 +ieee80211_if_read_flags_57470 ieee80211_if_read_flags 3 57470 NULL
119878 +bnad_debugfs_write_regwr_57500 bnad_debugfs_write_regwr 3 57500 NULL
119879 +skb_headlen_57501 skb_headlen 0 57501 NULL
119880 +copy_in_user_57502 copy_in_user 3 57502 NULL
119881 +ckhdid_printf_57505 ckhdid_printf 2 57505 NULL
119882 +init_tag_map_57515 init_tag_map 3 57515 NULL
119883 +wil_read_file_ssid_57517 wil_read_file_ssid 3 57517 NULL nohasharray
119884 +il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 &wil_read_file_ssid_57517
119885 +cmm_read_57520 cmm_read 3 57520 NULL
119886 +inode_permission_57531 inode_permission 0 57531 NULL
119887 +acpi_dev_get_resources_57534 acpi_dev_get_resources 0 57534 NULL
119888 +ptlrpc_lprocfs_hp_ratio_seq_write_57537 ptlrpc_lprocfs_hp_ratio_seq_write 3 57537 NULL
119889 +compat_SyS_process_vm_writev_57542 compat_SyS_process_vm_writev 3-5 57542 NULL
119890 +obd_unpackmd_57563 obd_unpackmd 0 57563 NULL
119891 +snd_pcm_playback_ioctl1_57569 snd_pcm_playback_ioctl1 0 57569 NULL
119892 +get_bridge_ifindices_57579 get_bridge_ifindices 0 57579 NULL
119893 +ldlm_cli_enqueue_local_57582 ldlm_cli_enqueue_local 11 57582 NULL
119894 +il_dbgfs_interrupt_write_57591 il_dbgfs_interrupt_write 3 57591 NULL
119895 +read_file_spectral_fft_period_57593 read_file_spectral_fft_period 3 57593 NULL
119896 +tx_tx_retry_template_read_57623 tx_tx_retry_template_read 3 57623 NULL
119897 +sisusbcon_putcs_57630 sisusbcon_putcs 3 57630 NULL
119898 +mem_read_57631 mem_read 3 57631 NULL
119899 +pci_enable_msi_block_57632 pci_enable_msi_block 0 57632 NULL
119900 +msi_compose_msg_57637 msi_compose_msg 0 57637 NULL
119901 +r3964_write_57662 r3964_write 4 57662 NULL
119902 +proc_ns_readlink_57664 proc_ns_readlink 3 57664 NULL
119903 +__lgwrite_57669 __lgwrite 4 57669 NULL
119904 +i2400m_rx_stats_read_57706 i2400m_rx_stats_read 3 57706 NULL
119905 +ieee80211_if_read_dot11MeshHWMPconfirmationInterval_57722 ieee80211_if_read_dot11MeshHWMPconfirmationInterval 3 57722 NULL
119906 +vm_find_vqs_57729 vm_find_vqs 0 57729 NULL
119907 +nouveau_gpio_create__57735 nouveau_gpio_create_ 4-5 57735 NULL
119908 +pppol2tp_recvmsg_57742 pppol2tp_recvmsg 4 57742 NULL
119909 +ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval_57762 ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval 3 57762 NULL
119910 +SYSC_process_vm_writev_57776 SYSC_process_vm_writev 3-5 57776 NULL
119911 +security_inode_unlink_57791 security_inode_unlink 0 57791 NULL
119912 +ld2_57794 ld2 0 57794 NULL
119913 +ivtv_read_57796 ivtv_read 3 57796 NULL
119914 +ion_test_ioctl_57799 ion_test_ioctl 2 57799 NULL
119915 +bfad_debugfs_read_regrd_57830 bfad_debugfs_read_regrd 3 57830 NULL
119916 +copy_to_user_57835 copy_to_user 0-3 57835 NULL
119917 +flash_read_57843 flash_read 3 57843 NULL
119918 +kiblnd_create_tx_pool_57846 kiblnd_create_tx_pool 2 57846 NULL
119919 +radeon_ttm_gtt_read_57879 radeon_ttm_gtt_read 3 57879 NULL
119920 +xt_alloc_table_info_57903 xt_alloc_table_info 1 57903 NULL
119921 +iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 NULL
119922 +ll_xattr_find_get_lock_57912 ll_xattr_find_get_lock 0 57912 NULL
119923 +memcg_caches_array_size_57918 memcg_caches_array_size 0-1 57918 NULL
119924 +twl_i2c_write_57923 twl_i2c_write 3-4 57923 NULL
119925 +__snd_gf1_look16_57925 __snd_gf1_look16 0 57925 NULL
119926 +sel_read_handle_unknown_57933 sel_read_handle_unknown 3 57933 NULL
119927 +xfs_mru_cache_create_57943 xfs_mru_cache_create 3 57943 NULL
119928 +key_algorithm_read_57946 key_algorithm_read 3 57946 NULL
119929 +ip_set_alloc_57953 ip_set_alloc 1 57953 NULL nohasharray
119930 +ioat3_dca_count_dca_slots_57953 ioat3_dca_count_dca_slots 0 57953 &ip_set_alloc_57953
119931 +rx_reset_counter_read_58001 rx_reset_counter_read 3 58001 NULL
119932 +iwl_dbgfs_ucode_rx_stats_read_58023 iwl_dbgfs_ucode_rx_stats_read 3 58023 NULL
119933 +io_playback_transfer_58030 io_playback_transfer 4 58030 NULL
119934 +mce_async_out_58056 mce_async_out 3 58056 NULL
119935 +ocfs2_find_leaf_58065 ocfs2_find_leaf 0 58065 NULL
119936 +dt3155_alloc_coherent_58073 dt3155_alloc_coherent 2 58073 NULL
119937 +cm4040_write_58079 cm4040_write 3 58079 NULL
119938 +ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 NULL nohasharray
119939 +slhc_init_58135 slhc_init 1-2 58135 &ipv6_flowlabel_opt_58135
119940 +garmin_write_bulk_58191 garmin_write_bulk 3 58191 NULL
119941 +ieee80211_if_fmt_flags_58205 ieee80211_if_fmt_flags 3 58205 NULL
119942 +i40evf_allocate_virt_mem_d_58210 i40evf_allocate_virt_mem_d 3 58210 NULL
119943 +btrfsic_create_link_to_next_block_58246 btrfsic_create_link_to_next_block 4 58246 NULL
119944 +read_file_debug_58256 read_file_debug 3 58256 NULL
119945 +osc_max_dirty_mb_seq_write_58263 osc_max_dirty_mb_seq_write 3 58263 NULL
119946 +cfg80211_mgmt_tx_status_58266 cfg80211_mgmt_tx_status 4 58266 NULL
119947 +profile_load_58267 profile_load 3 58267 NULL
119948 +kstrtos8_from_user_58268 kstrtos8_from_user 2 58268 NULL
119949 +acpi_ds_build_internal_package_obj_58271 acpi_ds_build_internal_package_obj 3 58271 NULL
119950 +iscsi_decode_text_input_58292 iscsi_decode_text_input 4 58292 NULL
119951 +ieee80211_if_read_dot11MeshTTL_58307 ieee80211_if_read_dot11MeshTTL 3 58307 NULL
119952 +tx_tx_start_int_templates_read_58324 tx_tx_start_int_templates_read 3 58324 NULL
119953 +ext4_ext_truncate_extend_restart_58331 ext4_ext_truncate_extend_restart 3 58331 NULL
119954 +__copy_from_user_swizzled_58337 __copy_from_user_swizzled 2-4 58337 NULL
119955 +brcmf_debugfs_sdio_counter_read_58369 brcmf_debugfs_sdio_counter_read 3 58369 NULL
119956 +il_dbgfs_status_read_58388 il_dbgfs_status_read 3 58388 NULL
119957 +_drbd_md_sync_page_io_58403 _drbd_md_sync_page_io 6 58403 NULL
119958 +idetape_pad_zeros_58406 idetape_pad_zeros 2 58406 NULL
119959 +i2400m_pld_size_58415 i2400m_pld_size 0 58415 NULL
119960 +capabilities_read_58457 capabilities_read 3 58457 NULL
119961 +usnic_vnic_get_resources_58462 usnic_vnic_get_resources 3 58462 NULL
119962 +compat_do_ipt_set_ctl_58466 compat_do_ipt_set_ctl 4 58466 NULL nohasharray
119963 +lpfc_idiag_baracc_read_58466 lpfc_idiag_baracc_read 3 58466 &compat_do_ipt_set_ctl_58466
119964 +nv_rd08_58472 nv_rd08 0 58472 NULL
119965 +acpi_tables_sysfs_init_58477 acpi_tables_sysfs_init 0 58477 NULL
119966 +snd_gf1_read_addr_58483 snd_gf1_read_addr 0 58483 NULL
119967 +snd_rme96_capture_copy_58484 snd_rme96_capture_copy 5 58484 NULL
119968 +btrfs_cont_expand_58498 btrfs_cont_expand 2-3-0 58498 NULL
119969 +tcf_hash_create_58507 tcf_hash_create 4 58507 NULL
119970 +rndis_add_response_58544 rndis_add_response 2 58544 NULL
119971 +wep_decrypt_fail_read_58567 wep_decrypt_fail_read 3 58567 NULL
119972 +scnprint_mac_oui_58578 scnprint_mac_oui 3-0 58578 NULL
119973 +cur_wm_latency_write_58581 cur_wm_latency_write 3 58581 NULL
119974 +get_rhf_errstring_58582 get_rhf_errstring 3 58582 NULL
119975 +ea_read_inline_58589 ea_read_inline 0 58589 NULL
119976 +isku_sysfs_read_keys_thumbster_58590 isku_sysfs_read_keys_thumbster 6 58590 NULL
119977 +xip_file_read_58592 xip_file_read 3 58592 NULL
119978 +ecryptfs_write_end_58594 ecryptfs_write_end 5-3 58594 NULL
119979 +radeon_bo_size_58606 radeon_bo_size 0 58606 NULL
119980 +skb_copy_to_page_nocache_58624 skb_copy_to_page_nocache 6 58624 NULL
119981 +filemap_fdatawrite_range_58630 filemap_fdatawrite_range 0 58630 NULL
119982 +tx_tx_start_fw_gen_read_58648 tx_tx_start_fw_gen_read 3 58648 NULL
119983 +iwl_dbgfs_rx_handlers_write_58655 iwl_dbgfs_rx_handlers_write 3 58655 NULL
119984 +find_zero_58685 find_zero 0-1 58685 NULL
119985 +uwb_bce_print_IEs_58686 uwb_bce_print_IEs 4 58686 NULL
119986 +tps6586x_writes_58689 tps6586x_writes 2-3 58689 NULL
119987 +scsi_setup_command_freelist_58703 scsi_setup_command_freelist 0 58703 NULL
119988 +vx_send_msg_58711 vx_send_msg 0 58711 NULL
119989 +csum_exist_in_range_58730 csum_exist_in_range 2-3 58730 NULL
119990 +frames_to_bytes_58741 frames_to_bytes 0-2 58741 NULL
119991 +ieee80211_if_write_tkip_mic_test_58748 ieee80211_if_write_tkip_mic_test 3 58748 NULL
119992 +agp_allocate_memory_58761 agp_allocate_memory 2 58761 NULL
119993 +regmap_calc_reg_len_58795 regmap_calc_reg_len 0 58795 NULL
119994 +raw_send_hdrinc_58803 raw_send_hdrinc 4 58803 NULL
119995 +isku_sysfs_read_58806 isku_sysfs_read 5 58806 NULL
119996 +ep_read_58813 ep_read 3 58813 NULL
119997 +command_write_58841 command_write 3 58841 NULL
119998 +ath6kl_wmi_send_action_cmd_58860 ath6kl_wmi_send_action_cmd 7 58860 NULL
119999 +gs_alloc_req_58883 gs_alloc_req 2 58883 NULL
120000 +esas2r_change_queue_depth_58886 esas2r_change_queue_depth 2 58886 NULL
120001 +lprocfs_wr_pinger_recov_58914 lprocfs_wr_pinger_recov 3 58914 NULL
120002 +print_devstats_dot11FCSErrorCount_58919 print_devstats_dot11FCSErrorCount 3 58919 NULL
120003 +pipeline_cs_rx_packet_out_read_58926 pipeline_cs_rx_packet_out_read 3 58926 NULL
120004 +wait_table_hash_nr_entries_58962 wait_table_hash_nr_entries 0 58962 NULL
120005 +ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout_58965 ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout 3 58965 NULL
120006 +crypto_aead_ivsize_58970 crypto_aead_ivsize 0 58970 NULL
120007 +init_list_set_59005 init_list_set 3 59005 NULL
120008 +ep_write_59008 ep_write 3 59008 NULL
120009 +lpfc_idiag_baracc_write_59014 lpfc_idiag_baracc_write 3 59014 NULL
120010 +SyS_preadv_59029 SyS_preadv 3 59029 NULL
120011 +init_pci_cap_msi_perm_59033 init_pci_cap_msi_perm 2 59033 NULL
120012 +selinux_transaction_write_59038 selinux_transaction_write 3 59038 NULL
120013 +crypto_aead_reqsize_59039 crypto_aead_reqsize 0 59039 NULL
120014 +regmap_bulk_write_59049 regmap_bulk_write 2-4 59049 NULL nohasharray
120015 +i8042_enable_kbd_port_59049 i8042_enable_kbd_port 0 59049 &regmap_bulk_write_59049
120016 +mmc_sd_num_wr_blocks_59112 mmc_sd_num_wr_blocks 0 59112 NULL
120017 +sta_tx_latency_stat_table_59122 sta_tx_latency_stat_table 0-4-5 59122 NULL nohasharray
120018 +scsi_io_completion_59122 scsi_io_completion 2 59122 &sta_tx_latency_stat_table_59122
120019 +nfc_llcp_send_i_frame_59130 nfc_llcp_send_i_frame 3 59130 NULL
120020 +framebuffer_alloc_59145 framebuffer_alloc 1 59145 NULL nohasharray
120021 +print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 &framebuffer_alloc_59145
120022 +radeon_compat_ioctl_59150 radeon_compat_ioctl 2 59150 NULL
120023 +pvr2_hdw_report_clients_59152 pvr2_hdw_report_clients 3 59152 NULL
120024 +ksize_59176 ksize 0 59176 NULL
120025 +setup_window_59178 setup_window 4-2-5-7 59178 NULL
120026 +ocfs2_move_extent_59187 ocfs2_move_extent 2-5 59187 NULL
120027 +xfs_iext_realloc_indirect_59211 xfs_iext_realloc_indirect 2 59211 NULL
120028 +check_mapped_selector_name_59216 check_mapped_selector_name 5 59216 NULL
120029 +dt3155_read_59226 dt3155_read 3 59226 NULL
120030 +paging64_gpte_to_gfn_lvl_59229 paging64_gpte_to_gfn_lvl 0-2-1 59229 NULL
120031 +nla_len_59258 nla_len 0 59258 NULL
120032 +drbd_bm_write_page_59290 drbd_bm_write_page 2 59290 NULL
120033 +btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4 59304 NULL
120034 +fd_copyout_59323 fd_copyout 3 59323 NULL
120035 +read_9287_modal_eeprom_59327 read_9287_modal_eeprom 3 59327 NULL
120036 +set_state_private_59336 set_state_private 0 59336 NULL
120037 +rx_defrag_in_process_called_read_59338 rx_defrag_in_process_called_read 3 59338 NULL
120038 +xfs_attrmulti_attr_set_59346 xfs_attrmulti_attr_set 4 59346 NULL
120039 +f2fs_fallocate_59377 f2fs_fallocate 4-3 59377 NULL
120040 +pvr2_debugifc_print_info_59380 pvr2_debugifc_print_info 3 59380 NULL
120041 +journal_init_dev_59384 journal_init_dev 5 59384 NULL
120042 +__net_get_random_once_59389 __net_get_random_once 2 59389 NULL
120043 +isku_sysfs_read_keys_function_59412 isku_sysfs_read_keys_function 6 59412 NULL
120044 +pci_ctrl_read_59424 pci_ctrl_read 0 59424 NULL
120045 +vxge_hw_ring_rxds_per_block_get_59425 vxge_hw_ring_rxds_per_block_get 0 59425 NULL
120046 +snd_pcm_tstamp_59431 snd_pcm_tstamp 0 59431 NULL
120047 +SyS_sched_setaffinity_59442 SyS_sched_setaffinity 2 59442 NULL
120048 +fs_path_ensure_buf_59445 fs_path_ensure_buf 2 59445 NULL
120049 +tipc_recv_stream_59456 tipc_recv_stream 4 59456 NULL
120050 +_iwl_dbgfs_bcast_filters_write_59491 _iwl_dbgfs_bcast_filters_write 3 59491 NULL
120051 +rtw_cfg80211_set_mgnt_wpsp2pie_59497 rtw_cfg80211_set_mgnt_wpsp2pie 3 59497 NULL
120052 +ib_copy_from_udata_59502 ib_copy_from_udata 3 59502 NULL
120053 +C_SYSC_get_mempolicy_59516 C_SYSC_get_mempolicy 3 59516 NULL
120054 +mic_vringh_copy_59523 mic_vringh_copy 4 59523 NULL
120055 +msix_setup_entries_59545 msix_setup_entries 0 59545 NULL nohasharray
120056 +idr_alloc_59545 idr_alloc 0 59545 &msix_setup_entries_59545
120057 +mpi_get_nbits_59551 mpi_get_nbits 0 59551 NULL
120058 +tunables_write_59563 tunables_write 3 59563 NULL
120059 +bio_split_59564 bio_split 2 59564 NULL
120060 +__copy_from_user_ll_nozero_59571 __copy_from_user_ll_nozero 0-3 59571 NULL
120061 +memdup_user_59590 memdup_user 2 59590 NULL
120062 +xrcdn_free_res_59616 xrcdn_free_res 5 59616 NULL nohasharray
120063 +mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 &xrcdn_free_res_59616
120064 +ath6kl_endpoint_stats_write_59621 ath6kl_endpoint_stats_write 3 59621 NULL
120065 +mtrr_write_59622 mtrr_write 3 59622 NULL
120066 +find_first_zero_bit_59636 find_first_zero_bit 0 59636 NULL
120067 +SyS_setdomainname_59646 SyS_setdomainname 2 59646 NULL
120068 +file_update_time_59647 file_update_time 0 59647 NULL
120069 +hidraw_read_59650 hidraw_read 3 59650 NULL
120070 +v9fs_xattr_set_acl_59651 v9fs_xattr_set_acl 4 59651 NULL
120071 +__devcgroup_check_permission_59665 __devcgroup_check_permission 0 59665 NULL
120072 +iwl_dbgfs_mac_params_read_59666 iwl_dbgfs_mac_params_read 3 59666 NULL
120073 +alloc_dca_provider_59670 alloc_dca_provider 2 59670 NULL
120074 +mic_calc_failure_read_59700 mic_calc_failure_read 3 59700 NULL
120075 +ioperm_get_59701 ioperm_get 4-3 59701 NULL
120076 +snd_pcm_info_user_59711 snd_pcm_info_user 0 59711 NULL
120077 +prism2_info_scanresults_59729 prism2_info_scanresults 3 59729 NULL
120078 +ieee80211_if_read_fwded_unicast_59740 ieee80211_if_read_fwded_unicast 3 59740 NULL
120079 +fat_direct_IO_59741 fat_direct_IO 4 59741 NULL
120080 +qib_decode_7220_sdma_errs_59745 qib_decode_7220_sdma_errs 4 59745 NULL
120081 +strnlen_59746 strnlen 0 59746 NULL
120082 +ext3_acl_count_59754 ext3_acl_count 0-1 59754 NULL
120083 +long_retry_limit_read_59766 long_retry_limit_read 3 59766 NULL nohasharray
120084 +cap_inode_need_killpriv_59766 cap_inode_need_killpriv 0 59766 &long_retry_limit_read_59766
120085 +venus_remove_59781 venus_remove 4 59781 NULL
120086 +mei_nfc_recv_59784 mei_nfc_recv 3 59784 NULL
120087 +C_SYSC_preadv_59801 C_SYSC_preadv 3 59801 NULL
120088 +ipw_write_59807 ipw_write 3 59807 NULL
120089 +scsi_init_shared_tag_map_59812 scsi_init_shared_tag_map 2 59812 NULL
120090 +ieee80211_if_read_dot11MeshHWMPmaxPREQretries_59829 ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 NULL
120091 +gspca_dev_probe2_59833 gspca_dev_probe2 4 59833 NULL
120092 +regmap_raw_write_async_59849 regmap_raw_write_async 2-4 59849 NULL
120093 +pvr2_ioread_set_sync_key_59882 pvr2_ioread_set_sync_key 3 59882 NULL
120094 +l2cap_sock_recvmsg_59886 l2cap_sock_recvmsg 4 59886 NULL
120095 +ffs_prepare_buffer_59892 ffs_prepare_buffer 2 59892 NULL
120096 +kvm_mmu_notifier_invalidate_range_start_59944 kvm_mmu_notifier_invalidate_range_start 3-4 59944 NULL
120097 +ath10k_read_dfs_stats_59949 ath10k_read_dfs_stats 3 59949 NULL
120098 +dapm_widget_power_read_file_59950 dapm_widget_power_read_file 3 59950 NULL nohasharray
120099 +il_dbgfs_rxon_flags_read_59950 il_dbgfs_rxon_flags_read 3 59950 &dapm_widget_power_read_file_59950
120100 +il_dbgfs_missed_beacon_read_59956 il_dbgfs_missed_beacon_read 3 59956 NULL
120101 +__arch_hweight16_59975 __arch_hweight16 0 59975 NULL
120102 +osd_req_read_kern_59990 osd_req_read_kern 5 59990 NULL
120103 +ghash_async_setkey_60001 ghash_async_setkey 3 60001 NULL
120104 +ieee80211_if_fmt_dot11MeshAwakeWindowDuration_60006 ieee80211_if_fmt_dot11MeshAwakeWindowDuration 3 60006 NULL
120105 +copy_items_60009 copy_items 7 60009 NULL
120106 +rawsock_sendmsg_60010 rawsock_sendmsg 4 60010 NULL
120107 +mthca_init_cq_60011 mthca_init_cq 2 60011 NULL
120108 +osd_req_list_dev_partitions_60027 osd_req_list_dev_partitions 4 60027 NULL
120109 +xlog_bread_offset_60030 xlog_bread_offset 3 60030 NULL
120110 +bio_integrity_hw_sectors_60039 bio_integrity_hw_sectors 0-2 60039 NULL
120111 +do_ip6t_set_ctl_60040 do_ip6t_set_ctl 4 60040 NULL
120112 +vcs_size_60050 vcs_size 0 60050 NULL
120113 +gru_alloc_gts_60056 gru_alloc_gts 3-2 60056 NULL
120114 +compat_writev_60063 compat_writev 3 60063 NULL
120115 +ath6kl_listen_int_write_60066 ath6kl_listen_int_write 3 60066 NULL
120116 +c4iw_num_stags_60073 c4iw_num_stags 0 60073 NULL
120117 +rxrpc_kernel_send_data_60083 rxrpc_kernel_send_data 3 60083 NULL
120118 +ieee80211_if_fmt_fwded_frames_60103 ieee80211_if_fmt_fwded_frames 3 60103 NULL
120119 +SYSC_msgsnd_60113 SYSC_msgsnd 3 60113 NULL
120120 +nfs_idmap_request_key_60124 nfs_idmap_request_key 2 60124 NULL
120121 +__mutex_lock_common_60134 __mutex_lock_common 0 60134 NULL
120122 +ld_usb_read_60156 ld_usb_read 3 60156 NULL
120123 +jmb38x_ms_count_slots_60164 jmb38x_ms_count_slots 0 60164 NULL
120124 +init_state_60165 init_state 2 60165 NULL
120125 +jffs2_alloc_full_dirent_60179 jffs2_alloc_full_dirent 1 60179 NULL nohasharray
120126 +sg_build_sgat_60179 sg_build_sgat 3 60179 &jffs2_alloc_full_dirent_60179
120127 +fuse_async_req_send_60183 fuse_async_req_send 0-3 60183 NULL
120128 +arch_setup_msi_irqs_60193 arch_setup_msi_irqs 0 60193 NULL nohasharray
120129 +rx_rx_tkip_replays_read_60193 rx_rx_tkip_replays_read 3 60193 &arch_setup_msi_irqs_60193
120130 +qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 NULL
120131 +btrfs_get_token_16_60220 btrfs_get_token_16 0 60220 NULL
120132 +irq_alloc_domain_generic_chips_60264 irq_alloc_domain_generic_chips 2-3 60264 NULL
120133 +display_crc_ctl_write_60273 display_crc_ctl_write 3 60273 NULL
120134 +printer_write_60276 printer_write 3 60276 NULL
120135 +do_xip_mapping_read_60297 do_xip_mapping_read 5 60297 NULL
120136 +getDataLength_60301 getDataLength 0 60301 NULL
120137 +bch_subtract_dirty_60306 bch_subtract_dirty 3-4 60306 NULL
120138 +usb_alphatrack_write_60341 usb_alphatrack_write 3 60341 NULL
120139 +__kfifo_from_user_r_60345 __kfifo_from_user_r 5-3 60345 NULL
120140 +dccp_setsockopt_60367 dccp_setsockopt 5 60367 NULL
120141 +ubi_eba_atomic_leb_change_60379 ubi_eba_atomic_leb_change 0 60379 NULL
120142 +mthca_alloc_resize_buf_60394 mthca_alloc_resize_buf 3 60394 NULL
120143 +ocfs2_zero_extend_60396 ocfs2_zero_extend 3 60396 NULL
120144 +driver_names_read_60399 driver_names_read 3 60399 NULL
120145 +simple_alloc_urb_60420 simple_alloc_urb 3 60420 NULL
120146 +excessive_retries_read_60425 excessive_retries_read 3 60425 NULL
120147 +kmalloc_60432 kmalloc 1 60432 NULL nohasharray
120148 +tstats_write_60432 tstats_write 3 60432 &kmalloc_60432
120149 +snd_hda_get_num_raw_conns_60462 snd_hda_get_num_raw_conns 0 60462 NULL
120150 +crypto_shash_setkey_60483 crypto_shash_setkey 3 60483 NULL
120151 +lustre_msg_early_size_60496 lustre_msg_early_size 0 60496 NULL
120152 +compat_SyS_get_mempolicy_60527 compat_SyS_get_mempolicy 3 60527 NULL
120153 +v9fs_fid_readn_60544 v9fs_fid_readn 4 60544 NULL
120154 +nonpaging_map_60551 nonpaging_map 4 60551 NULL
120155 +osc_lockless_truncate_seq_write_60553 osc_lockless_truncate_seq_write 3 60553 NULL
120156 +tracing_entries_write_60563 tracing_entries_write 3 60563 NULL
120157 +memblock_virt_alloc_try_nid_nopanic_60604 memblock_virt_alloc_try_nid_nopanic 1 60604 NULL
120158 +inode_change_ok_60614 inode_change_ok 0 60614 NULL
120159 +skb_transport_offset_60619 skb_transport_offset 0 60619 NULL
120160 +wl1273_fm_fops_write_60621 wl1273_fm_fops_write 3 60621 NULL
120161 +acl_alloc_stack_init_60630 acl_alloc_stack_init 1 60630 NULL
120162 +__proc_lnet_stats_60647 __proc_lnet_stats 5 60647 NULL
120163 +if_sdio_host_to_card_60666 if_sdio_host_to_card 4 60666 NULL
120164 +ieee80211_if_read_dot11MeshConfirmTimeout_60670 ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 NULL
120165 +vga_rcrt_60731 vga_rcrt 0 60731 NULL
120166 +snd_ice1712_ds_read_60754 snd_ice1712_ds_read 0 60754 NULL
120167 +raid_status_60755 raid_status 5 60755 NULL
120168 +sel_write_checkreqprot_60774 sel_write_checkreqprot 3 60774 NULL
120169 +opticon_write_60775 opticon_write 4 60775 NULL
120170 +acl_alloc_num_60778 acl_alloc_num 1-2 60778 NULL
120171 +snd_pcm_oss_readv3_60792 snd_pcm_oss_readv3 3 60792 NULL
120172 +pwr_tx_with_ps_read_60851 pwr_tx_with_ps_read 3 60851 NULL
120173 +__clone_and_map_data_bio_60861 __clone_and_map_data_bio 3-4 60861 NULL
120174 +alloc_buf_60864 alloc_buf 3-2 60864 NULL
120175 +generic_writepages_60871 generic_writepages 0 60871 NULL
120176 +ubifs_read_one_lp_60882 ubifs_read_one_lp 0 60882 NULL
120177 +ext4_update_inline_data_60888 ext4_update_inline_data 3 60888 NULL
120178 +iio_debugfs_read_reg_60908 iio_debugfs_read_reg 3 60908 NULL
120179 +libcfs_sock_ioctl_60915 libcfs_sock_ioctl 0 60915 NULL
120180 +mgt_set_varlen_60916 mgt_set_varlen 4 60916 NULL
120181 +submit_extent_page_60928 submit_extent_page 5 60928 NULL
120182 +pti_char_write_60960 pti_char_write 3 60960 NULL
120183 +mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 2-3 60961 NULL
120184 +__a2mp_build_60987 __a2mp_build 3 60987 NULL
120185 +hsc_msg_alloc_60990 hsc_msg_alloc 1 60990 NULL
120186 +ath6kl_lrssi_roam_read_61022 ath6kl_lrssi_roam_read 3 61022 NULL
120187 +graph_depth_write_61024 graph_depth_write 3 61024 NULL
120188 +sdhci_pltfm_register_61031 sdhci_pltfm_register 3 61031 NULL
120189 +lpfc_idiag_queacc_write_61043 lpfc_idiag_queacc_write 3 61043 NULL
120190 +symtab_init_61050 symtab_init 2 61050 NULL
120191 +fuse_send_write_61053 fuse_send_write 0-4 61053 NULL
120192 +snd_pcm_pause_61054 snd_pcm_pause 0 61054 NULL
120193 +bitmap_scnlistprintf_61062 bitmap_scnlistprintf 2-0 61062 NULL
120194 +ahash_align_buffer_size_61070 ahash_align_buffer_size 0-1-2 61070 NULL
120195 +snd_pcm_update_hw_ptr0_61084 snd_pcm_update_hw_ptr0 0 61084 NULL
120196 +get_derived_key_61100 get_derived_key 4 61100 NULL
120197 +i40e_calculate_l2fpm_size_61104 i40e_calculate_l2fpm_size 0-4-3-2-1 61104 NULL
120198 +alloc_chrdev_region_61112 alloc_chrdev_region 0 61112 NULL
120199 +__probe_kernel_read_61119 __probe_kernel_read 3 61119 NULL
120200 +vmemmap_alloc_block_buf_61126 vmemmap_alloc_block_buf 1 61126 NULL
120201 +afs_proc_cells_write_61139 afs_proc_cells_write 3 61139 NULL
120202 +pair_device_61175 pair_device 4 61175 NULL nohasharray
120203 +event_oom_late_read_61175 event_oom_late_read 3 61175 &pair_device_61175
120204 +dio_bio_add_page_61178 dio_bio_add_page 0 61178 NULL
120205 +SyS_prctl_61202 SyS_prctl 4 61202 NULL
120206 +arch_hibernation_header_save_61212 arch_hibernation_header_save 0 61212 NULL
120207 +smk_read_ambient_61220 smk_read_ambient 3 61220 NULL
120208 +v9fs_mmap_file_read_61262 v9fs_mmap_file_read 3 61262 NULL
120209 +btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 NULL nohasharray
120210 +find_get_pages_tag_61270 find_get_pages_tag 0 61270 &btrfs_bio_alloc_61270 nohasharray
120211 +ifalias_store_61270 ifalias_store 4 61270 &find_get_pages_tag_61270
120212 +vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 NULL nohasharray
120213 +hfsplus_getxattr_finder_info_61283 hfsplus_getxattr_finder_info 0 61283 &vortex_adbdma_getlinearpos_61283
120214 +nvme_trans_copy_to_user_61288 nvme_trans_copy_to_user 3 61288 NULL
120215 +xfer_from_user_61307 xfer_from_user 3 61307 NULL
120216 +xfrm_user_sec_ctx_size_61320 xfrm_user_sec_ctx_size 0 61320 NULL
120217 +C_SYSC_msgsnd_61330 C_SYSC_msgsnd 3 61330 NULL
120218 +write_file_spectral_short_repeat_61335 write_file_spectral_short_repeat 3 61335 NULL
120219 +st5481_setup_isocpipes_61340 st5481_setup_isocpipes 6-4 61340 NULL
120220 +rx_rx_wa_ba_not_expected_read_61341 rx_rx_wa_ba_not_expected_read 3 61341 NULL
120221 +__dm_get_reserved_ios_61342 __dm_get_reserved_ios 0-3-2 61342 NULL
120222 +debug_debug4_read_61367 debug_debug4_read 3 61367 NULL
120223 +system_enable_write_61396 system_enable_write 3 61396 NULL
120224 +unix_stream_sendmsg_61455 unix_stream_sendmsg 4 61455 NULL
120225 +snd_pcm_lib_writev_transfer_61483 snd_pcm_lib_writev_transfer 5-4-2 61483 NULL
120226 +btrfs_item_size_61485 btrfs_item_size 0 61485 NULL
120227 +erst_errno_61526 erst_errno 0 61526 NULL
120228 +compat_SyS_select_61542 compat_SyS_select 1 61542 NULL
120229 +trace_options_core_write_61551 trace_options_core_write 3 61551 NULL
120230 +dvb_net_ioctl_61559 dvb_net_ioctl 2 61559 NULL
120231 +fan_proc_write_61569 fan_proc_write 3 61569 NULL
120232 +ieee80211_if_read_rc_rateidx_mask_2ghz_61570 ieee80211_if_read_rc_rateidx_mask_2ghz 3 61570 NULL
120233 +ldlm_pool_rw_atomic_seq_write_61572 ldlm_pool_rw_atomic_seq_write 3 61572 NULL
120234 +seq_open_private_61589 seq_open_private 3 61589 NULL
120235 +ept_gpte_to_gfn_lvl_61591 ept_gpte_to_gfn_lvl 0-2-1 61591 NULL
120236 +netlink_recvmsg_61600 netlink_recvmsg 4 61600 NULL
120237 +nfs4_init_uniform_client_string_61601 nfs4_init_uniform_client_string 3 61601 NULL
120238 +configfs_write_file_61621 configfs_write_file 3 61621 NULL
120239 +ieee80211_if_fmt_hw_queues_61629 ieee80211_if_fmt_hw_queues 3 61629 NULL
120240 +i2o_parm_table_get_61635 i2o_parm_table_get 6 61635 NULL
120241 +snd_pcm_oss_read3_61643 snd_pcm_oss_read3 0-3 61643 NULL nohasharray
120242 +tcf_hashinfo_init_61643 tcf_hashinfo_init 2 61643 &snd_pcm_oss_read3_61643
120243 +resize_stripes_61650 resize_stripes 2 61650 NULL
120244 +ttm_page_pool_free_61661 ttm_page_pool_free 2-0 61661 NULL
120245 +insert_one_name_61668 insert_one_name 7 61668 NULL
120246 +snd_pcm_playback_avail_61671 snd_pcm_playback_avail 0 61671 NULL
120247 +qib_format_hwmsg_61679 qib_format_hwmsg 2 61679 NULL
120248 +lock_loop_61681 lock_loop 1 61681 NULL
120249 +__do_tune_cpucache_61684 __do_tune_cpucache 2 61684 NULL
120250 +filter_read_61692 filter_read 3 61692 NULL
120251 +iov_length_61716 iov_length 0 61716 NULL
120252 +fragmentation_threshold_read_61718 fragmentation_threshold_read 3 61718 NULL
120253 +null_alloc_reqbuf_61719 null_alloc_reqbuf 3 61719 NULL
120254 +read_file_interrupt_61742 read_file_interrupt 3 61742 NULL nohasharray
120255 +read_file_regval_61742 read_file_regval 3 61742 &read_file_interrupt_61742
120256 +SyS_sendto_61763 SyS_sendto 6 61763 NULL
120257 +mls_compute_context_len_61812 mls_compute_context_len 0 61812 NULL
120258 +bfad_debugfs_write_regwr_61841 bfad_debugfs_write_regwr 3 61841 NULL
120259 +regcache_sync_block_61846 regcache_sync_block 5-4 61846 NULL
120260 +ath9k_hw_def_dump_eeprom_61853 ath9k_hw_def_dump_eeprom 5-4 61853 NULL
120261 +evdev_compute_buffer_size_61863 evdev_compute_buffer_size 0 61863 NULL
120262 +SYSC_lsetxattr_61869 SYSC_lsetxattr 4 61869 NULL
120263 +get_fw_name_61874 get_fw_name 3 61874 NULL
120264 +btrfs_ioctl_clone_61886 btrfs_ioctl_clone 3-4-5 61886 NULL
120265 +lprocfs_write_frac_u64_helper_61897 lprocfs_write_frac_u64_helper 2 61897 NULL
120266 +lov_mds_md_stripecnt_61899 lov_mds_md_stripecnt 0-1 61899 NULL
120267 +clear_refs_write_61904 clear_refs_write 3 61904 NULL
120268 +kernfs_name_61910 kernfs_name 3 61910 NULL
120269 +rx_filter_arp_filter_read_61914 rx_filter_arp_filter_read 3 61914 NULL
120270 +au0828_init_isoc_61917 au0828_init_isoc 3-2-4 61917 NULL
120271 +sctp_sendmsg_61919 sctp_sendmsg 4 61919 NULL
120272 +SyS_kexec_load_61946 SyS_kexec_load 2 61946 NULL
120273 +il4965_ucode_rx_stats_read_61948 il4965_ucode_rx_stats_read 3 61948 NULL
120274 +squashfs_read_id_index_table_61961 squashfs_read_id_index_table 4 61961 NULL
120275 +fix_read_error_61965 fix_read_error 4 61965 NULL
120276 +cow_file_range_61979 cow_file_range 3 61979 NULL
120277 +set_extent_delalloc_61982 set_extent_delalloc 0 61982 NULL
120278 +dequeue_event_62000 dequeue_event 3 62000 NULL
120279 +xt_compat_match_offset_62011 xt_compat_match_offset 0 62011 NULL
120280 +SyS_setxattr_62019 SyS_setxattr 4 62019 NULL
120281 +jffs2_do_unlink_62020 jffs2_do_unlink 4 62020 NULL
120282 +SYSC_select_62024 SYSC_select 1 62024 NULL
120283 +pmcraid_build_passthrough_ioadls_62034 pmcraid_build_passthrough_ioadls 2 62034 NULL
120284 +sctp_user_addto_chunk_62047 sctp_user_addto_chunk 2-3 62047 NULL
120285 +do_pselect_62061 do_pselect 1 62061 NULL
120286 +pcpu_alloc_bootmem_62074 pcpu_alloc_bootmem 2 62074 NULL
120287 +fat_setattr_62084 fat_setattr 0 62084 NULL
120288 +jffs2_security_setxattr_62107 jffs2_security_setxattr 4 62107 NULL
120289 +btrfs_direct_IO_62114 btrfs_direct_IO 4 62114 NULL
120290 +ip_recv_error_62117 ip_recv_error 3 62117 NULL
120291 +generic_block_fiemap_62122 generic_block_fiemap 4 62122 NULL
120292 +llc_ui_header_len_62131 llc_ui_header_len 0 62131 NULL
120293 +qib_diag_write_62133 qib_diag_write 3 62133 NULL nohasharray
120294 +kobject_add_varg_62133 kobject_add_varg 0 62133 &qib_diag_write_62133
120295 +ql_status_62135 ql_status 5 62135 NULL nohasharray
120296 +device_add_attrs_62135 device_add_attrs 0 62135 &ql_status_62135
120297 +video_usercopy_62151 video_usercopy 2 62151 NULL
120298 +SyS_getxattr_62166 SyS_getxattr 4 62166 NULL
120299 +prism54_wpa_bss_ie_get_62173 prism54_wpa_bss_ie_get 0 62173 NULL
120300 +write_file_dfs_62180 write_file_dfs 3 62180 NULL
120301 +alloc_upcall_62186 alloc_upcall 2 62186 NULL
120302 +sock_kmalloc_62205 sock_kmalloc 2 62205 NULL
120303 +smk_read_syslog_62227 smk_read_syslog 3 62227 NULL
120304 +SYSC_setgroups16_62232 SYSC_setgroups16 1 62232 NULL
120305 +nfsd_read_file_62241 nfsd_read_file 6 62241 NULL
120306 +ion_handle_test_dma_62262 ion_handle_test_dma 4-5 62262 NULL
120307 +il_dbgfs_sram_read_62296 il_dbgfs_sram_read 3 62296 NULL
120308 +sparse_early_usemaps_alloc_pgdat_section_62304 sparse_early_usemaps_alloc_pgdat_section 2 62304 NULL
120309 +subsystem_filter_read_62310 subsystem_filter_read 3 62310 NULL
120310 +Wb35Reg_BurstWrite_62327 Wb35Reg_BurstWrite 4 62327 NULL
120311 +subseq_list_62332 subseq_list 3-0 62332 NULL
120312 +ll_statahead_max_seq_write_62333 ll_statahead_max_seq_write 3 62333 NULL
120313 +flash_write_62354 flash_write 3 62354 NULL
120314 +xfpregs_set_62363 xfpregs_set 4 62363 NULL
120315 +rx_rx_timeout_read_62389 rx_rx_timeout_read 3 62389 NULL
120316 +altera_irscan_62396 altera_irscan 2 62396 NULL
120317 +set_ssp_62411 set_ssp 4 62411 NULL
120318 +udf_expand_file_adinicb_62470 udf_expand_file_adinicb 0 62470 NULL
120319 +ext_rts51x_sd_execute_read_data_62501 ext_rts51x_sd_execute_read_data 9 62501 NULL
120320 +pep_sendmsg_62524 pep_sendmsg 4 62524 NULL
120321 +test_iso_queue_62534 test_iso_queue 5 62534 NULL
120322 +debugfs_read_62535 debugfs_read 3 62535 NULL
120323 +sco_sock_sendmsg_62542 sco_sock_sendmsg 4 62542 NULL
120324 +qib_refresh_qsfp_cache_62547 qib_refresh_qsfp_cache 0 62547 NULL
120325 +xfrm_user_policy_62573 xfrm_user_policy 4 62573 NULL
120326 +get_subdir_62581 get_subdir 3 62581 NULL
120327 +nfsd_vfs_read_62605 nfsd_vfs_read 6 62605 NULL
120328 +dut_mode_write_62630 dut_mode_write 3 62630 NULL
120329 +vfs_fsync_range_62635 vfs_fsync_range 0 62635 NULL
120330 +lpfc_sli4_queue_alloc_62646 lpfc_sli4_queue_alloc 3 62646 NULL
120331 +printer_req_alloc_62687 printer_req_alloc 2 62687 NULL
120332 +bioset_integrity_create_62708 bioset_integrity_create 2 62708 NULL
120333 +gfs2_log_write_62717 gfs2_log_write 3 62717 NULL
120334 +rdm_62719 rdm 0 62719 NULL
120335 +obd_ioctl_popdata_62741 obd_ioctl_popdata 3 62741 NULL
120336 +key_replays_read_62746 key_replays_read 3 62746 NULL
120337 +lov_verify_lmm_62747 lov_verify_lmm 2 62747 NULL
120338 +mwifiex_rdeeprom_write_62754 mwifiex_rdeeprom_write 3 62754 NULL
120339 +ax25_sendmsg_62770 ax25_sendmsg 4 62770 NULL
120340 +C_SYSC_ipc_62776 C_SYSC_ipc 3 62776 NULL
120341 +SyS_sched_getaffinity_62786 SyS_sched_getaffinity 2 62786 NULL
120342 +dm_stats_account_io_62787 dm_stats_account_io 3 62787 NULL
120343 +tracing_total_entries_read_62817 tracing_total_entries_read 3 62817 NULL
120344 +__rounddown_pow_of_two_62836 __rounddown_pow_of_two 0 62836 NULL
120345 +bio_get_nr_vecs_62838 bio_get_nr_vecs 0 62838 NULL
120346 +xlog_recover_add_to_trans_62839 xlog_recover_add_to_trans 4 62839 NULL
120347 +rx_fcs_err_read_62844 rx_fcs_err_read 3 62844 NULL
120348 +read_nic_io_dword_62859 read_nic_io_dword 0 62859 NULL
120349 +l2tp_ip6_recvmsg_62874 l2tp_ip6_recvmsg 4 62874 NULL
120350 +aoechr_write_62883 aoechr_write 3 62883 NULL
120351 +if_spi_host_to_card_62890 if_spi_host_to_card 4 62890 NULL
120352 +mempool_create_slab_pool_62907 mempool_create_slab_pool 1 62907 NULL
120353 +getdqbuf_62908 getdqbuf 1 62908 NULL
120354 +ll_statahead_agl_seq_write_62928 ll_statahead_agl_seq_write 3 62928 NULL
120355 +agp_create_user_memory_62955 agp_create_user_memory 1 62955 NULL
120356 +kstrtoull_from_user_63026 kstrtoull_from_user 2 63026 NULL
120357 +__vb2_perform_fileio_63033 __vb2_perform_fileio 3 63033 NULL
120358 +pipeline_defrag_to_csum_swi_read_63037 pipeline_defrag_to_csum_swi_read 3 63037 NULL
120359 +scsi_host_alloc_63041 scsi_host_alloc 2 63041 NULL
120360 +unlink1_63059 unlink1 3 63059 NULL
120361 +xen_set_nslabs_63066 xen_set_nslabs 0 63066 NULL
120362 +iwl_dbgfs_fw_rx_stats_read_63070 iwl_dbgfs_fw_rx_stats_read 3 63070 NULL
120363 +sep_prepare_input_output_dma_table_in_dcb_63087 sep_prepare_input_output_dma_table_in_dcb 4-5 63087 NULL
120364 +iwl_dbgfs_sensitivity_read_63116 iwl_dbgfs_sensitivity_read 3 63116 NULL
120365 +ext4_chunk_trans_blocks_63123 ext4_chunk_trans_blocks 0-2 63123 NULL
120366 +snd_pcm_status_user_63140 snd_pcm_status_user 0 63140 NULL
120367 +ubifs_change_one_lp_63157 ubifs_change_one_lp 0 63157 NULL
120368 +smk_write_revoke_subj_63173 smk_write_revoke_subj 3 63173 NULL
120369 +SyS_syslog_63178 SyS_syslog 3 63178 NULL
120370 +vme_master_read_63221 vme_master_read 0 63221 NULL
120371 +SyS_gethostname_63227 SyS_gethostname 2 63227 NULL
120372 +ptp_read_63251 ptp_read 4 63251 NULL
120373 +xfs_dir2_leaf_getdents_63262 xfs_dir2_leaf_getdents 3 63262 NULL
120374 +iwl_dbgfs_fw_error_dump_read_63263 iwl_dbgfs_fw_error_dump_read 3 63263 NULL
120375 +raid5_resize_63306 raid5_resize 2 63306 NULL
120376 +ath10k_read_fw_dbglog_63323 ath10k_read_fw_dbglog 3 63323 NULL
120377 +proc_info_read_63344 proc_info_read 3 63344 NULL
120378 +ps_upsd_max_sptime_read_63362 ps_upsd_max_sptime_read 3 63362 NULL
120379 +idmouse_read_63374 idmouse_read 3 63374 NULL
120380 +usbnet_read_cmd_nopm_63388 usbnet_read_cmd_nopm 7 63388 NULL nohasharray
120381 +edac_pci_alloc_ctl_info_63388 edac_pci_alloc_ctl_info 1 63388 &usbnet_read_cmd_nopm_63388
120382 +rxpipe_missed_beacon_host_int_trig_rx_data_read_63405 rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 NULL
120383 +nouveau_event_create_63411 nouveau_event_create 1 63411 NULL
120384 +l2cap_sock_sendmsg_63427 l2cap_sock_sendmsg 4 63427 NULL
120385 +nfsd_symlink_63442 nfsd_symlink 6 63442 NULL
120386 +si5351_bulk_write_63468 si5351_bulk_write 2-3 63468 NULL
120387 +snd_info_entry_write_63474 snd_info_entry_write 3 63474 NULL
120388 +reada_find_extent_63486 reada_find_extent 2 63486 NULL
120389 +read_kcore_63488 read_kcore 3 63488 NULL
120390 +iwl_dbgfs_bcast_filters_read_63489 iwl_dbgfs_bcast_filters_read 3 63489 NULL
120391 +snd_pcm_plug_write_transfer_63503 snd_pcm_plug_write_transfer 0-3 63503 NULL
120392 +efx_mcdi_rpc_async_63529 efx_mcdi_rpc_async 4-5 63529 NULL
120393 +ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4 63534 NULL nohasharray
120394 +generic_cont_expand_simple_63534 generic_cont_expand_simple 0 63534 &ubi_more_leb_change_data_63534
120395 +write_file_spectral_period_63536 write_file_spectral_period 3 63536 NULL
120396 +if_sdio_read_scratch_63540 if_sdio_read_scratch 0 63540 NULL
120397 +append_to_buffer_63550 append_to_buffer 3 63550 NULL
120398 +kvm_write_guest_page_63555 kvm_write_guest_page 5 63555 NULL
120399 +rproc_alloc_63577 rproc_alloc 5 63577 NULL
120400 +write_debug_level_63613 write_debug_level 3 63613 NULL
120401 +__spi_validate_63618 __spi_validate 0 63618 NULL
120402 +symbol_build_supp_rates_63634 symbol_build_supp_rates 0 63634 NULL
120403 +hid_report_len_63637 hid_report_len 0 63637 NULL
120404 +proc_loginuid_write_63648 proc_loginuid_write 3 63648 NULL
120405 +ValidateDSDParamsChecksum_63654 ValidateDSDParamsChecksum 3 63654 NULL
120406 +ldlm_cli_enqueue_63657 ldlm_cli_enqueue 8 63657 NULL
120407 +hidraw_ioctl_63658 hidraw_ioctl 2 63658 NULL
120408 +vbi_read_63673 vbi_read 3 63673 NULL
120409 +write_file_spectral_fft_period_63696 write_file_spectral_fft_period 3 63696 NULL
120410 +nouveau_object_create__63715 nouveau_object_create_ 5 63715 NULL
120411 +btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4 63720 NULL
120412 +selinux_secctx_to_secid_63744 selinux_secctx_to_secid 2 63744 NULL
120413 +snd_pcm_oss_read1_63771 snd_pcm_oss_read1 3 63771 NULL
120414 +snd_pcm_link_63772 snd_pcm_link 0 63772 NULL
120415 +snd_opl4_mem_proc_read_63774 snd_opl4_mem_proc_read 5 63774 NULL
120416 +spidev_compat_ioctl_63778 spidev_compat_ioctl 2 63778 NULL
120417 +mwifiex_11n_create_rx_reorder_tbl_63806 mwifiex_11n_create_rx_reorder_tbl 4 63806 NULL
120418 +copy_nodes_to_user_63807 copy_nodes_to_user 2 63807 NULL
120419 +C_SYSC_process_vm_readv_63811 C_SYSC_process_vm_readv 3-5 63811 NULL
120420 +regmap_multi_reg_write_63826 regmap_multi_reg_write 3 63826 NULL
120421 +sel_write_load_63830 sel_write_load 3 63830 NULL
120422 +proc_pid_attr_write_63845 proc_pid_attr_write 3 63845 NULL
120423 +xhci_alloc_stream_info_63902 xhci_alloc_stream_info 3 63902 NULL
120424 +uvc_alloc_urb_buffers_63922 uvc_alloc_urb_buffers 0-2-3 63922 NULL
120425 +snd_compr_write_63923 snd_compr_write 3 63923 NULL
120426 +afs_send_simple_reply_63940 afs_send_simple_reply 3 63940 NULL
120427 +__team_options_register_63941 __team_options_register 3 63941 NULL
120428 +macvtap_recvmsg_63949 macvtap_recvmsg 4 63949 NULL
120429 +set_bredr_63975 set_bredr 4 63975 NULL
120430 +construct_key_and_link_63985 construct_key_and_link 3 63985 NULL
120431 +rs_extent_to_bm_page_63996 rs_extent_to_bm_page 0-1 63996 NULL
120432 +read_file_frameerrors_64001 read_file_frameerrors 3 64001 NULL
120433 +SyS_rt_sigpending_64018 SyS_rt_sigpending 2 64018 NULL
120434 +dbAllocDmapLev_64030 dbAllocDmapLev 0 64030 NULL
120435 +SyS_fsetxattr_64039 SyS_fsetxattr 4 64039 NULL
120436 +get_u8_64076 get_u8 0 64076 NULL
120437 +xilly_malloc_64077 xilly_malloc 2 64077 NULL
120438 +sl_realloc_bufs_64086 sl_realloc_bufs 2 64086 NULL
120439 +vmci_handle_arr_get_size_64088 vmci_handle_arr_get_size 0 64088 NULL
120440 +lbs_highrssi_read_64089 lbs_highrssi_read 3 64089 NULL
120441 +SyS_set_mempolicy_64096 SyS_set_mempolicy 3 64096 NULL
120442 +to_bytes_64103 to_bytes 0-1 64103 NULL
120443 +SyS_mq_timedsend_64107 SyS_mq_timedsend 3 64107 NULL
120444 +rdma_addr_size_64116 rdma_addr_size 0 64116 NULL
120445 +do_load_xattr_datum_64118 do_load_xattr_datum 0 64118 NULL
120446 +bypass_wd_write_64120 bypass_wd_write 3 64120 NULL
120447 +ext4_prepare_inline_data_64124 ext4_prepare_inline_data 3 64124 NULL
120448 +init_bch_64130 init_bch 1-2 64130 NULL
120449 +ablkcipher_copy_iv_64140 ablkcipher_copy_iv 3 64140 NULL
120450 +dlfb_ops_write_64150 dlfb_ops_write 3 64150 NULL
120451 +bnx2x_vf_mcast_64166 bnx2x_vf_mcast 4 64166 NULL
120452 +cpumask_scnprintf_64170 cpumask_scnprintf 0-2 64170 NULL
120453 +kernfs_iop_setxattr_64220 kernfs_iop_setxattr 4 64220 NULL
120454 +xfs_vm_direct_IO_64223 xfs_vm_direct_IO 4 64223 NULL
120455 +read_pulse_64227 read_pulse 0-3 64227 NULL
120456 +ea_len_64229 ea_len 0 64229 NULL
120457 +io_capture_transfer_64276 io_capture_transfer 4 64276 NULL
120458 +btrfs_file_extent_offset_64278 btrfs_file_extent_offset 0 64278 NULL
120459 +sta_current_tx_rate_read_64286 sta_current_tx_rate_read 3 64286 NULL
120460 +xfs_dir_cilookup_result_64288 xfs_dir_cilookup_result 3 64288 NULL nohasharray
120461 +event_id_read_64288 event_id_read 3 64288 &xfs_dir_cilookup_result_64288
120462 +ocfs2_block_check_validate_bhs_64302 ocfs2_block_check_validate_bhs 0 64302 NULL
120463 +snd_hda_get_sub_nodes_64304 snd_hda_get_sub_nodes 0 64304 NULL
120464 +error_error_bar_retry_read_64305 error_error_bar_retry_read 3 64305 NULL
120465 +sisusbcon_clear_64329 sisusbcon_clear 4-3-5 64329 NULL
120466 +ts_write_64336 ts_write 3 64336 NULL
120467 +usbtmc_write_64340 usbtmc_write 3 64340 NULL
120468 +qlcnic_82xx_calculate_msix_vector_64354 qlcnic_82xx_calculate_msix_vector 0 64354 NULL
120469 +user_regset_copyin_64360 user_regset_copyin 7 64360 NULL
120470 +wlc_phy_loadsampletable_nphy_64367 wlc_phy_loadsampletable_nphy 3 64367 NULL
120471 +reg_create_64372 reg_create 5 64372 NULL nohasharray
120472 +bnx2_enable_msix_64372 bnx2_enable_msix 2 64372 &reg_create_64372
120473 +ilo_write_64378 ilo_write 3 64378 NULL
120474 +btrfs_map_block_64379 btrfs_map_block 3 64379 NULL
120475 +vmcs_readl_64381 vmcs_readl 0 64381 NULL
120476 +nilfs_alloc_seg_bio_64383 nilfs_alloc_seg_bio 3 64383 NULL
120477 +ir_lirc_transmit_ir_64403 ir_lirc_transmit_ir 3 64403 NULL
120478 +pidlist_allocate_64404 pidlist_allocate 1 64404 NULL
120479 +rx_hdr_overflow_read_64407 rx_hdr_overflow_read 3 64407 NULL
120480 +keyctl_get_security_64418 keyctl_get_security 3 64418 NULL
120481 +oom_adj_write_64428 oom_adj_write 3 64428 NULL
120482 +read_file_spectral_short_repeat_64431 read_file_spectral_short_repeat 3 64431 NULL
120483 +ax25_recvmsg_64441 ax25_recvmsg 4 64441 NULL
120484 +__i2c_add_numbered_adapter_64445 __i2c_add_numbered_adapter 0 64445 NULL
120485 +single_open_size_64483 single_open_size 4 64483 NULL
120486 +p54_parse_rssical_64493 p54_parse_rssical 3 64493 NULL
120487 +msg_data_sz_64503 msg_data_sz 0 64503 NULL
120488 +remove_uuid_64505 remove_uuid 4 64505 NULL
120489 +opera1_usb_i2c_msgxfer_64521 opera1_usb_i2c_msgxfer 4 64521 NULL
120490 +iwl_dbgfs_ucode_tracing_write_64524 iwl_dbgfs_ucode_tracing_write 3 64524 NULL
120491 +ses_send_diag_64527 ses_send_diag 4 64527 NULL
120492 +prctl_set_mm_64538 prctl_set_mm 3 64538 NULL
120493 +SyS_bind_64544 SyS_bind 3 64544 NULL
120494 +rbd_obj_read_sync_64554 rbd_obj_read_sync 3-4 64554 NULL
120495 +__btrfs_prealloc_file_range_64557 __btrfs_prealloc_file_range 3 64557 NULL
120496 +ll_max_rw_chunk_seq_write_64561 ll_max_rw_chunk_seq_write 3 64561 NULL nohasharray
120497 +__spi_sync_64561 __spi_sync 0 64561 &ll_max_rw_chunk_seq_write_64561
120498 +__apei_exec_run_64563 __apei_exec_run 0 64563 NULL
120499 +kstrtoul_from_user_64569 kstrtoul_from_user 2 64569 NULL
120500 +do_erase_64574 do_erase 4 64574 NULL
120501 +fanotify_write_64623 fanotify_write 3 64623 NULL
120502 +_iwl_dbgfs_d0i3_refs_write_64642 _iwl_dbgfs_d0i3_refs_write 3 64642 NULL
120503 +regmap_read_debugfs_64658 regmap_read_debugfs 5 64658 NULL
120504 +tlbflush_read_file_64661 tlbflush_read_file 3 64661 NULL nohasharray
120505 +ocfs2_read_xattr_block_64661 ocfs2_read_xattr_block 0 64661 &tlbflush_read_file_64661
120506 +efx_tsoh_get_buffer_64664 efx_tsoh_get_buffer 3 64664 NULL
120507 +rx_rx_out_of_mpdu_nodes_read_64668 rx_rx_out_of_mpdu_nodes_read 3 64668 NULL
120508 +nr_free_zone_pages_64680 nr_free_zone_pages 0 64680 NULL
120509 +snd_pcm_oss_capture_position_fixup_64713 snd_pcm_oss_capture_position_fixup 0 64713 NULL
120510 +dapm_bias_read_file_64715 dapm_bias_read_file 3 64715 NULL
120511 +atomic_add_return_64720 atomic_add_return 0-1 64720 NULL
120512 +i2400m_msg_to_dev_64722 i2400m_msg_to_dev 3 64722 NULL
120513 +squashfs_read_inode_lookup_table_64739 squashfs_read_inode_lookup_table 4 64739 NULL
120514 +bio_map_kern_64751 bio_map_kern 3 64751 NULL
120515 +rt2x00debug_write_csr_64753 rt2x00debug_write_csr 3 64753 NULL
120516 +message_for_md_64777 message_for_md 5 64777 NULL
120517 +isr_low_rssi_read_64789 isr_low_rssi_read 3 64789 NULL
120518 +regmap_reg_ranges_read_file_64798 regmap_reg_ranges_read_file 3 64798 NULL
120519 +nfsctl_transaction_write_64800 nfsctl_transaction_write 3 64800 NULL
120520 +rfkill_fop_write_64808 rfkill_fop_write 3 64808 NULL
120521 +proc_projid_map_write_64810 proc_projid_map_write 3 64810 NULL
120522 +megaraid_change_queue_depth_64815 megaraid_change_queue_depth 2 64815 NULL
120523 +ecryptfs_send_miscdev_64816 ecryptfs_send_miscdev 2 64816 NULL
120524 +do_kimage_alloc_64827 do_kimage_alloc 3 64827 NULL
120525 +altera_set_dr_pre_64862 altera_set_dr_pre 2 64862 NULL
120526 +pci_vc_do_save_buffer_64876 pci_vc_do_save_buffer 0 64876 NULL
120527 +lprocfs_write_u64_helper_64880 lprocfs_write_u64_helper 2 64880 NULL
120528 +ieee80211_if_read_ave_beacon_64924 ieee80211_if_read_ave_beacon 3 64924 NULL
120529 +ip_options_get_from_user_64958 ip_options_get_from_user 4 64958 NULL nohasharray
120530 +tipc_port_iovec_reject_64958 tipc_port_iovec_reject 4 64958 &ip_options_get_from_user_64958
120531 +traceprobe_probes_write_64969 traceprobe_probes_write 3 64969 NULL
120532 +suspend_dtim_interval_read_64971 suspend_dtim_interval_read 3 64971 NULL
120533 +crypto_ahash_digestsize_65014 crypto_ahash_digestsize 0 65014 NULL
120534 +insert_dent_65034 insert_dent 7 65034 NULL
120535 +snd_hda_get_pin_label_65035 snd_hda_get_pin_label 5 65035 NULL
120536 +ext4_ind_trans_blocks_65053 ext4_ind_trans_blocks 0-2 65053 NULL
120537 +pcibios_enable_device_65059 pcibios_enable_device 0 65059 NULL
120538 +make_idx_node_65068 make_idx_node 0 65068 NULL
120539 +__alloc_bootmem_node_high_65076 __alloc_bootmem_node_high 2 65076 NULL
120540 +batadv_socket_write_65083 batadv_socket_write 3 65083 NULL
120541 +ocfs2_truncate_cluster_pages_65086 ocfs2_truncate_cluster_pages 2 65086 NULL
120542 +ath9k_dump_mci_btcoex_65090 ath9k_dump_mci_btcoex 3-0 65090 NULL
120543 +scsi_add_host_with_dma_65093 scsi_add_host_with_dma 0 65093 NULL
120544 +generic_ocp_write_65107 generic_ocp_write 4 65107 NULL
120545 +rx_rx_done_read_65217 rx_rx_done_read 3 65217 NULL
120546 +print_endpoint_stat_65232 print_endpoint_stat 0-3-4 65232 NULL
120547 +whci_n_caps_65247 whci_n_caps 0 65247 NULL
120548 +kmalloc_parameter_65279 kmalloc_parameter 1 65279 NULL
120549 +compat_core_sys_select_65285 compat_core_sys_select 1 65285 NULL
120550 +mpi_set_buffer_65294 mpi_set_buffer 3 65294 NULL
120551 +redirected_tty_write_65297 redirected_tty_write 3 65297 NULL
120552 +get_var_len_65304 get_var_len 0 65304 NULL
120553 +unpack_array_65318 unpack_array 0 65318 NULL
120554 +pci_vpd_find_tag_65325 pci_vpd_find_tag 0-2 65325 NULL
120555 +dccp_setsockopt_service_65336 dccp_setsockopt_service 4 65336 NULL
120556 +dma_rx_requested_read_65354 dma_rx_requested_read 3 65354 NULL
120557 +alloc_cpu_rmap_65363 alloc_cpu_rmap 1 65363 NULL
120558 +SyS_writev_65372 SyS_writev 3 65372 NULL
120559 +__alloc_bootmem_nopanic_65397 __alloc_bootmem_nopanic 1 65397 NULL
120560 +trace_seq_to_user_65398 trace_seq_to_user 3 65398 NULL
120561 +__read_vmcore_65402 __read_vmcore 2 65402 NULL
120562 +ocfs2_write_begin_nolock_65410 ocfs2_write_begin_nolock 3-4 65410 NULL
120563 +device_add_groups_65423 device_add_groups 0 65423 NULL
120564 +xpc_kzalloc_cacheline_aligned_65433 xpc_kzalloc_cacheline_aligned 1 65433 NULL
120565 +usb_alloc_coherent_65444 usb_alloc_coherent 2 65444 NULL
120566 +il_dbgfs_wd_timeout_write_65464 il_dbgfs_wd_timeout_write 3 65464 NULL
120567 +clear_user_65470 clear_user 2 65470 NULL
120568 +dpcm_state_read_file_65489 dpcm_state_read_file 3 65489 NULL
120569 +lookup_inline_extent_backref_65493 lookup_inline_extent_backref 9 65493 NULL
120570 +nvme_trans_standard_inquiry_page_65526 nvme_trans_standard_inquiry_page 4 65526 NULL
120571 +tree_mod_log_eb_copy_65535 tree_mod_log_eb_copy 6 65535 NULL
120572 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_hash_aux.data b/tools/gcc/size_overflow_plugin/size_overflow_hash_aux.data
120573 new file mode 100644
120574 index 0000000..560cd7b
120575 --- /dev/null
120576 +++ b/tools/gcc/size_overflow_plugin/size_overflow_hash_aux.data
120577 @@ -0,0 +1,92 @@
120578 +spa_set_aux_vdevs_746 spa_set_aux_vdevs 3 746 NULL
120579 +zfs_lookup_2144 zfs_lookup 0 2144 NULL
120580 +mappedread_2627 mappedread 2 2627 NULL
120581 +vdev_disk_dio_alloc_2957 vdev_disk_dio_alloc 1 2957 NULL
120582 +nv_alloc_pushpage_spl_4286 nv_alloc_pushpage_spl 2 4286 NULL
120583 +zpl_xattr_get_4574 zpl_xattr_get 0 4574 NULL
120584 +sa_replace_all_by_template_5699 sa_replace_all_by_template 3 5699 NULL
120585 +dmu_write_6048 dmu_write 4-3 6048 NULL
120586 +dmu_buf_hold_array_6095 dmu_buf_hold_array 4-3 6095 NULL
120587 +update_pages_6225 update_pages 2-3 6225 NULL
120588 +bio_nr_pages_7117 bio_nr_pages 0-2 7117 NULL
120589 +dmu_buf_hold_array_by_bonus_8562 dmu_buf_hold_array_by_bonus 3-2 8562 NULL
120590 +zpios_dmu_write_8858 zpios_dmu_write 4-5 8858 NULL
120591 +ddi_copyout_9401 ddi_copyout 3 9401 NULL
120592 +avl_numnodes_12384 avl_numnodes 0 12384 NULL
120593 +dmu_write_uio_dnode_12473 dmu_write_uio_dnode 3 12473 NULL
120594 +dmu_xuio_init_12866 dmu_xuio_init 2 12866 NULL
120595 +zpl_read_common_14389 zpl_read_common 0 14389 NULL
120596 +dmu_snapshot_realname_14632 dmu_snapshot_realname 4 14632 NULL
120597 +kmem_alloc_debug_14852 kmem_alloc_debug 1 14852 NULL
120598 +kmalloc_node_nofail_15151 kmalloc_node_nofail 1 15151 NULL
120599 +dmu_write_uio_16351 dmu_write_uio 4 16351 NULL
120600 +zfs_log_write_16524 zfs_log_write 6-5 16524 NULL
120601 +sa_build_layouts_16910 sa_build_layouts 3 16910 NULL
120602 +dsl_dir_namelen_17053 dsl_dir_namelen 0 17053 NULL
120603 +kcopy_copy_to_user_17336 kcopy_copy_to_user 5 17336 NULL
120604 +sa_add_layout_entry_17507 sa_add_layout_entry 3 17507 NULL
120605 +sa_attr_table_setup_18029 sa_attr_table_setup 3 18029 NULL
120606 +uiocopy_18680 uiocopy 2 18680 NULL
120607 +dmu_buf_hold_array_by_dnode_19125 dmu_buf_hold_array_by_dnode 2-3 19125 NULL
120608 +zpl_acl_from_xattr_21141 zpl_acl_from_xattr 2 21141 NULL
120609 +dsl_pool_tx_assign_init_22518 dsl_pool_tx_assign_init 2 22518 NULL
120610 +nvlist_lookup_byte_array_22527 nvlist_lookup_byte_array 0 22527 NULL
120611 +sa_replace_all_by_template_locked_22533 sa_replace_all_by_template_locked 3 22533 NULL
120612 +tsd_hash_table_init_22559 tsd_hash_table_init 1 22559 NULL
120613 +spa_vdev_remove_aux_23966 spa_vdev_remove_aux 4 23966 NULL
120614 +zpl_xattr_acl_set_access_24129 zpl_xattr_acl_set_access 4 24129 NULL
120615 +dmu_assign_arcbuf_24622 dmu_assign_arcbuf 2 24622 NULL
120616 +zap_lookup_norm_25166 zap_lookup_norm 9 25166 NULL
120617 +dmu_prealloc_25456 dmu_prealloc 4-3 25456 NULL
120618 +kmalloc_nofail_26347 kmalloc_nofail 1 26347 NULL
120619 +zfsctl_snapshot_zpath_27578 zfsctl_snapshot_zpath 2 27578 NULL
120620 +zpios_dmu_read_30015 zpios_dmu_read 4-5 30015 NULL
120621 +splat_write_30943 splat_write 3 30943 NULL
120622 +zpl_xattr_get_sa_31183 zpl_xattr_get_sa 0 31183 NULL
120623 +dmu_read_uio_31467 dmu_read_uio 4 31467 NULL
120624 +zfs_replay_fuids_31479 zfs_replay_fuids 4 31479 NULL
120625 +spa_history_log_to_phys_31632 spa_history_log_to_phys 0-1 31632 NULL
120626 +__zpl_xattr_get_32601 __zpl_xattr_get 0 32601 NULL
120627 +proc_copyout_string_34049 proc_copyout_string 2 34049 NULL
120628 +nv_alloc_sleep_spl_34544 nv_alloc_sleep_spl 2 34544 NULL
120629 +nv_alloc_nosleep_spl_34761 nv_alloc_nosleep_spl 2 34761 NULL
120630 +zap_leaf_array_match_36922 zap_leaf_array_match 4 36922 NULL
120631 +copyinstr_36980 copyinstr 3 36980 NULL
120632 +zpl_xattr_acl_set_default_37864 zpl_xattr_acl_set_default 4 37864 NULL
120633 +splat_read_38116 splat_read 3 38116 NULL
120634 +sa_setup_38756 sa_setup 4 38756 NULL
120635 +vdev_disk_physio_39898 vdev_disk_physio 3 39898 NULL
120636 +arc_buf_size_39982 arc_buf_size 0 39982 NULL
120637 +kzalloc_nofail_40719 kzalloc_nofail 1 40719 NULL
120638 +fuidstr_to_sid_40777 fuidstr_to_sid 4 40777 NULL
120639 +vdev_raidz_matrix_reconstruct_40852 vdev_raidz_matrix_reconstruct 2-3 40852 NULL
120640 +sa_find_layout_40892 sa_find_layout 4 40892 NULL
120641 +zpl_xattr_get_dir_41918 zpl_xattr_get_dir 0 41918 NULL
120642 +zfs_sa_get_xattr_42600 zfs_sa_get_xattr 0 42600 NULL
120643 +zpl_xattr_acl_set_42808 zpl_xattr_acl_set 4 42808 NULL
120644 +xdr_dec_array_43091 xdr_dec_array 5 43091 NULL
120645 +dsl_dataset_namelen_43136 dsl_dataset_namelen 0 43136 NULL
120646 +kcopy_write_43683 kcopy_write 3 43683 NULL
120647 +uiomove_44355 uiomove 2 44355 NULL
120648 +dmu_read_44418 dmu_read 4-3 44418 NULL
120649 +ddi_copyin_44846 ddi_copyin 3 44846 NULL
120650 +kcopy_do_get_45061 kcopy_do_get 5 45061 NULL
120651 +copyin_45945 copyin 3 45945 NULL
120652 +zil_itx_create_46555 zil_itx_create 2 46555 NULL
120653 +dmu_write_uio_dbuf_48064 dmu_write_uio_dbuf 3 48064 NULL
120654 +blk_rq_pos_48233 blk_rq_pos 0 48233 NULL
120655 +spa_history_write_49650 spa_history_write 3 49650 NULL
120656 +kcopy_copy_pages_to_user_49823 kcopy_copy_pages_to_user 3-4 49823 NULL
120657 +zfs_log_write_50162 zfs_log_write 6-5 50162 NULL
120658 +i_fm_alloc_51038 i_fm_alloc 2 51038 NULL
120659 +copyout_51409 copyout 3 51409 NULL
120660 +zvol_log_write_54898 zvol_log_write 4-3 54898 NULL
120661 +zfs_acl_node_alloc_55641 zfs_acl_node_alloc 1 55641 NULL
120662 +get_nvlist_56685 get_nvlist 2 56685 NULL
120663 +zprop_get_numprops_56820 zprop_get_numprops 0 56820 NULL
120664 +splat_taskq_test4_common_59829 splat_taskq_test4_common 5 59829 NULL
120665 +zfs_replay_domain_cnt_61399 zfs_replay_domain_cnt 0 61399 NULL
120666 +zpios_write_61823 zpios_write 3 61823 NULL
120667 +proc_copyin_string_62019 proc_copyin_string 4 62019 NULL
120668 +random_get_pseudo_bytes_64611 random_get_pseudo_bytes 2 64611 NULL
120669 +zpios_read_64734 zpios_read 3 64734 NULL
120670 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_plugin.c b/tools/gcc/size_overflow_plugin/size_overflow_plugin.c
120671 new file mode 100644
120672 index 0000000..a15328d
120673 --- /dev/null
120674 +++ b/tools/gcc/size_overflow_plugin/size_overflow_plugin.c
120675 @@ -0,0 +1,259 @@
120676 +/*
120677 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
120678 + * Licensed under the GPL v2, or (at your option) v3
120679 + *
120680 + * Homepage:
120681 + * http://www.grsecurity.net/~ephox/overflow_plugin/
120682 + *
120683 + * Documentation:
120684 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
120685 + *
120686 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
120687 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
120688 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
120689 + *
120690 + * Usage:
120691 + * $ make
120692 + * $ make run
120693 + */
120694 +
120695 +#include "gcc-common.h"
120696 +#include "size_overflow.h"
120697 +
120698 +int plugin_is_GPL_compatible;
120699 +
120700 +tree report_size_overflow_decl;
120701 +
120702 +tree size_overflow_type_HI;
120703 +tree size_overflow_type_SI;
120704 +tree size_overflow_type_DI;
120705 +tree size_overflow_type_TI;
120706 +
120707 +static struct plugin_info size_overflow_plugin_info = {
120708 + .version = "20140713",
120709 + .help = "no-size-overflow\tturn off size overflow checking\n",
120710 +};
120711 +
120712 +static tree handle_size_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
120713 +{
120714 + unsigned int arg_count;
120715 + enum tree_code code = TREE_CODE(*node);
120716 +
120717 + switch (code) {
120718 + case FUNCTION_DECL:
120719 + arg_count = type_num_arguments(TREE_TYPE(*node));
120720 + break;
120721 + case FUNCTION_TYPE:
120722 + case METHOD_TYPE:
120723 + arg_count = type_num_arguments(*node);
120724 + break;
120725 + default:
120726 + *no_add_attrs = true;
120727 + error("%s: %qE attribute only applies to functions", __func__, name);
120728 + return NULL_TREE;
120729 + }
120730 +
120731 + for (; args; args = TREE_CHAIN(args)) {
120732 + tree position = TREE_VALUE(args);
120733 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) {
120734 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
120735 + *no_add_attrs = true;
120736 + }
120737 + }
120738 + return NULL_TREE;
120739 +}
120740 +
120741 +static tree handle_intentional_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
120742 +{
120743 + unsigned int arg_count;
120744 + enum tree_code code = TREE_CODE(*node);
120745 +
120746 + switch (code) {
120747 + case FUNCTION_DECL:
120748 + arg_count = type_num_arguments(TREE_TYPE(*node));
120749 + break;
120750 + case FUNCTION_TYPE:
120751 + case METHOD_TYPE:
120752 + arg_count = type_num_arguments(*node);
120753 + break;
120754 + case FIELD_DECL:
120755 + return NULL_TREE;
120756 + default:
120757 + *no_add_attrs = true;
120758 + error("%qE attribute only applies to functions", name);
120759 + return NULL_TREE;
120760 + }
120761 +
120762 + if (TREE_INT_CST_HIGH(TREE_VALUE(args)) != 0)
120763 + return NULL_TREE;
120764 +
120765 + for (; args; args = TREE_CHAIN(args)) {
120766 + tree position = TREE_VALUE(args);
120767 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) {
120768 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
120769 + *no_add_attrs = true;
120770 + }
120771 + }
120772 + return NULL_TREE;
120773 +}
120774 +
120775 +static struct attribute_spec size_overflow_attr = {
120776 + .name = "size_overflow",
120777 + .min_length = 1,
120778 + .max_length = -1,
120779 + .decl_required = true,
120780 + .type_required = false,
120781 + .function_type_required = false,
120782 + .handler = handle_size_overflow_attribute,
120783 +#if BUILDING_GCC_VERSION >= 4007
120784 + .affects_type_identity = false
120785 +#endif
120786 +};
120787 +
120788 +static struct attribute_spec intentional_overflow_attr = {
120789 + .name = "intentional_overflow",
120790 + .min_length = 1,
120791 + .max_length = -1,
120792 + .decl_required = true,
120793 + .type_required = false,
120794 + .function_type_required = false,
120795 + .handler = handle_intentional_overflow_attribute,
120796 +#if BUILDING_GCC_VERSION >= 4007
120797 + .affects_type_identity = false
120798 +#endif
120799 +};
120800 +
120801 +static void register_attributes(void __unused *event_data, void __unused *data)
120802 +{
120803 + register_attribute(&size_overflow_attr);
120804 + register_attribute(&intentional_overflow_attr);
120805 +}
120806 +
120807 +static tree create_typedef(tree type, const char* ident)
120808 +{
120809 + tree new_type, decl;
120810 +
120811 + new_type = build_variant_type_copy(type);
120812 + decl = build_decl(BUILTINS_LOCATION, TYPE_DECL, get_identifier(ident), new_type);
120813 + DECL_ORIGINAL_TYPE(decl) = type;
120814 + TYPE_NAME(new_type) = decl;
120815 + return new_type;
120816 +}
120817 +
120818 +// Create the noreturn report_size_overflow() function decl.
120819 +static void size_overflow_start_unit(void __unused *gcc_data, void __unused *user_data)
120820 +{
120821 + tree const_char_ptr_type_node;
120822 + tree fntype;
120823 +
120824 + const_char_ptr_type_node = build_pointer_type(build_type_variant(char_type_node, 1, 0));
120825 +
120826 + size_overflow_type_HI = create_typedef(intHI_type_node, "size_overflow_type_HI");
120827 + size_overflow_type_SI = create_typedef(intSI_type_node, "size_overflow_type_SI");
120828 + size_overflow_type_DI = create_typedef(intDI_type_node, "size_overflow_type_DI");
120829 + size_overflow_type_TI = create_typedef(intTI_type_node, "size_overflow_type_TI");
120830 +
120831 + // void report_size_overflow(const char *loc_file, unsigned int loc_line, const char *current_func, const char *ssa_var)
120832 + fntype = build_function_type_list(void_type_node,
120833 + const_char_ptr_type_node,
120834 + unsigned_type_node,
120835 + const_char_ptr_type_node,
120836 + const_char_ptr_type_node,
120837 + NULL_TREE);
120838 + report_size_overflow_decl = build_fn_decl("report_size_overflow", fntype);
120839 +
120840 + DECL_ASSEMBLER_NAME(report_size_overflow_decl);
120841 + TREE_PUBLIC(report_size_overflow_decl) = 1;
120842 + DECL_EXTERNAL(report_size_overflow_decl) = 1;
120843 + DECL_ARTIFICIAL(report_size_overflow_decl) = 1;
120844 + TREE_THIS_VOLATILE(report_size_overflow_decl) = 1;
120845 +}
120846 +
120847 +
120848 +extern struct gimple_opt_pass pass_dce;
120849 +
120850 +static struct opt_pass *make_dce_pass(void)
120851 +{
120852 +#if BUILDING_GCC_VERSION >= 4009
120853 + return make_pass_dce(g);
120854 +#else
120855 + return &pass_dce.pass;
120856 +#endif
120857 +}
120858 +
120859 +
120860 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
120861 +{
120862 + int i;
120863 + const char * const plugin_name = plugin_info->base_name;
120864 + const int argc = plugin_info->argc;
120865 + const struct plugin_argument * const argv = plugin_info->argv;
120866 + bool enable = true;
120867 + struct register_pass_info insert_size_overflow_asm_pass_info;
120868 + struct register_pass_info __unused dump_before_pass_info;
120869 + struct register_pass_info __unused dump_after_pass_info;
120870 + struct register_pass_info insert_size_overflow_check_info;
120871 + struct register_pass_info dce_pass_info;
120872 + static const struct ggc_root_tab gt_ggc_r_gt_size_overflow[] = {
120873 + {
120874 + .base = &report_size_overflow_decl,
120875 + .nelt = 1,
120876 + .stride = sizeof(report_size_overflow_decl),
120877 + .cb = &gt_ggc_mx_tree_node,
120878 + .pchw = &gt_pch_nx_tree_node
120879 + },
120880 + LAST_GGC_ROOT_TAB
120881 + };
120882 +
120883 + insert_size_overflow_asm_pass_info.pass = make_insert_size_overflow_asm_pass();
120884 + insert_size_overflow_asm_pass_info.reference_pass_name = "ssa";
120885 + insert_size_overflow_asm_pass_info.ref_pass_instance_number = 1;
120886 + insert_size_overflow_asm_pass_info.pos_op = PASS_POS_INSERT_AFTER;
120887 +
120888 + dump_before_pass_info.pass = make_dump_pass();
120889 + dump_before_pass_info.reference_pass_name = "increase_alignment";
120890 + dump_before_pass_info.ref_pass_instance_number = 1;
120891 + dump_before_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
120892 +
120893 + insert_size_overflow_check_info.pass = make_insert_size_overflow_check();
120894 + insert_size_overflow_check_info.reference_pass_name = "increase_alignment";
120895 + insert_size_overflow_check_info.ref_pass_instance_number = 1;
120896 + insert_size_overflow_check_info.pos_op = PASS_POS_INSERT_BEFORE;
120897 +
120898 + dump_after_pass_info.pass = make_dump_pass();
120899 + dump_after_pass_info.reference_pass_name = "increase_alignment";
120900 + dump_after_pass_info.ref_pass_instance_number = 1;
120901 + dump_after_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
120902 +
120903 + dce_pass_info.pass = make_dce_pass();
120904 + dce_pass_info.reference_pass_name = "vrp";
120905 + dce_pass_info.ref_pass_instance_number = 1;
120906 + dce_pass_info.pos_op = PASS_POS_INSERT_AFTER;
120907 +
120908 + if (!plugin_default_version_check(version, &gcc_version)) {
120909 + error(G_("incompatible gcc/plugin versions"));
120910 + return 1;
120911 + }
120912 +
120913 + for (i = 0; i < argc; ++i) {
120914 + if (!strcmp(argv[i].key, "no-size-overflow")) {
120915 + enable = false;
120916 + continue;
120917 + }
120918 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
120919 + }
120920 +
120921 + register_callback(plugin_name, PLUGIN_INFO, NULL, &size_overflow_plugin_info);
120922 + if (enable) {
120923 + register_callback(plugin_name, PLUGIN_START_UNIT, &size_overflow_start_unit, NULL);
120924 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_size_overflow);
120925 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &insert_size_overflow_asm_pass_info);
120926 +// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_before_pass_info);
120927 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &insert_size_overflow_check_info);
120928 +// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_after_pass_info);
120929 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dce_pass_info);
120930 + }
120931 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
120932 +
120933 + return 0;
120934 +}
120935 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_plugin_hash.c b/tools/gcc/size_overflow_plugin/size_overflow_plugin_hash.c
120936 new file mode 100644
120937 index 0000000..0888f6c
120938 --- /dev/null
120939 +++ b/tools/gcc/size_overflow_plugin/size_overflow_plugin_hash.c
120940 @@ -0,0 +1,364 @@
120941 +/*
120942 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
120943 + * Licensed under the GPL v2, or (at your option) v3
120944 + *
120945 + * Homepage:
120946 + * http://www.grsecurity.net/~ephox/overflow_plugin/
120947 + *
120948 + * Documentation:
120949 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
120950 + *
120951 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
120952 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
120953 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
120954 + *
120955 + * Usage:
120956 + * $ make
120957 + * $ make run
120958 + */
120959 +
120960 +#include "gcc-common.h"
120961 +#include "size_overflow.h"
120962 +
120963 +#include "size_overflow_hash.h"
120964 +#include "size_overflow_hash_aux.h"
120965 +
120966 +#define CODES_LIMIT 32
120967 +
120968 +static unsigned char get_tree_code(const_tree type)
120969 +{
120970 + switch (TREE_CODE(type)) {
120971 + case ARRAY_TYPE:
120972 + return 0;
120973 + case BOOLEAN_TYPE:
120974 + return 1;
120975 + case ENUMERAL_TYPE:
120976 + return 2;
120977 + case FUNCTION_TYPE:
120978 + return 3;
120979 + case INTEGER_TYPE:
120980 + return 4;
120981 + case POINTER_TYPE:
120982 + return 5;
120983 + case RECORD_TYPE:
120984 + return 6;
120985 + case UNION_TYPE:
120986 + return 7;
120987 + case VOID_TYPE:
120988 + return 8;
120989 + case REAL_TYPE:
120990 + return 9;
120991 + case VECTOR_TYPE:
120992 + return 10;
120993 + case REFERENCE_TYPE:
120994 + return 11;
120995 + case OFFSET_TYPE:
120996 + return 12;
120997 + case COMPLEX_TYPE:
120998 + return 13;
120999 + default:
121000 + debug_tree((tree)type);
121001 + gcc_unreachable();
121002 + }
121003 +}
121004 +
121005 +struct function_hash {
121006 + size_t tree_codes_len;
121007 + unsigned char tree_codes[CODES_LIMIT];
121008 + const_tree fndecl;
121009 + unsigned int hash;
121010 +};
121011 +
121012 +// http://www.team5150.com/~andrew/noncryptohashzoo2~/CrapWow.html
121013 +static unsigned int CrapWow(const char *key, unsigned int len, unsigned int seed)
121014 +{
121015 +#define cwfold( a, b, lo, hi ) { p = (unsigned int)(a) * (unsigned long long)(b); lo ^= (unsigned int)p; hi ^= (unsigned int)(p >> 32); }
121016 +#define cwmixa( in ) { cwfold( in, m, k, h ); }
121017 +#define cwmixb( in ) { cwfold( in, n, h, k ); }
121018 +
121019 + unsigned int m = 0x57559429;
121020 + unsigned int n = 0x5052acdb;
121021 + const unsigned int *key4 = (const unsigned int *)key;
121022 + unsigned int h = len;
121023 + unsigned int k = len + seed + n;
121024 + unsigned long long p;
121025 +
121026 + while (len >= 8) {
121027 + cwmixb(key4[0]) cwmixa(key4[1]) key4 += 2;
121028 + len -= 8;
121029 + }
121030 + if (len >= 4) {
121031 + cwmixb(key4[0]) key4 += 1;
121032 + len -= 4;
121033 + }
121034 + if (len)
121035 + cwmixa(key4[0] & ((1 << (len * 8)) - 1 ));
121036 + cwmixb(h ^ (k + n));
121037 + return k ^ h;
121038 +
121039 +#undef cwfold
121040 +#undef cwmixa
121041 +#undef cwmixb
121042 +}
121043 +
121044 +static void set_hash(const char *fn_name, struct function_hash *fn_hash_data)
121045 +{
121046 + unsigned int fn, codes, seed = 0;
121047 +
121048 + fn = CrapWow(fn_name, strlen(fn_name), seed) & 0xffff;
121049 + codes = CrapWow((const char*)fn_hash_data->tree_codes, fn_hash_data->tree_codes_len, seed) & 0xffff;
121050 +
121051 + fn_hash_data->hash = fn ^ codes;
121052 +}
121053 +
121054 +static void set_node_codes(const_tree type, struct function_hash *fn_hash_data)
121055 +{
121056 + gcc_assert(type != NULL_TREE);
121057 + gcc_assert(TREE_CODE_CLASS(TREE_CODE(type)) == tcc_type);
121058 +
121059 + while (type && fn_hash_data->tree_codes_len < CODES_LIMIT) {
121060 + fn_hash_data->tree_codes[fn_hash_data->tree_codes_len] = get_tree_code(type);
121061 + fn_hash_data->tree_codes_len++;
121062 + type = TREE_TYPE(type);
121063 + }
121064 +}
121065 +
121066 +static void set_result_codes(const_tree node, struct function_hash *fn_hash_data)
121067 +{
121068 + const_tree result;
121069 +
121070 + gcc_assert(node != NULL_TREE);
121071 +
121072 + if (DECL_P(node)) {
121073 + result = DECL_RESULT(node);
121074 + if (result != NULL_TREE)
121075 + return set_node_codes(TREE_TYPE(result), fn_hash_data);
121076 + return set_result_codes(TREE_TYPE(node), fn_hash_data);
121077 + }
121078 +
121079 + gcc_assert(TYPE_P(node));
121080 +
121081 + if (TREE_CODE(node) == FUNCTION_TYPE)
121082 + return set_result_codes(TREE_TYPE(node), fn_hash_data);
121083 +
121084 + return set_node_codes(node, fn_hash_data);
121085 +}
121086 +
121087 +static void set_function_codes(struct function_hash *fn_hash_data)
121088 +{
121089 + const_tree arg, type = TREE_TYPE(fn_hash_data->fndecl);
121090 + enum tree_code code = TREE_CODE(type);
121091 +
121092 + gcc_assert(code == FUNCTION_TYPE || code == METHOD_TYPE);
121093 +
121094 + set_result_codes(fn_hash_data->fndecl, fn_hash_data);
121095 +
121096 + for (arg = TYPE_ARG_TYPES(type); arg != NULL_TREE && fn_hash_data->tree_codes_len < CODES_LIMIT; arg = TREE_CHAIN(arg))
121097 + set_node_codes(TREE_VALUE(arg), fn_hash_data);
121098 +}
121099 +
121100 +static const struct size_overflow_hash *get_proper_hash_chain(const struct size_overflow_hash *entry, const char *func_name)
121101 +{
121102 + while (entry) {
121103 + if (!strcmp(entry->name, func_name))
121104 + return entry;
121105 + entry = entry->next;
121106 + }
121107 + return NULL;
121108 +}
121109 +
121110 +const struct size_overflow_hash *get_function_hash(const_tree fndecl)
121111 +{
121112 + const struct size_overflow_hash *entry;
121113 + struct function_hash fn_hash_data;
121114 + const char *func_name;
121115 +
121116 + // skip builtins __builtin_constant_p
121117 + if (DECL_BUILT_IN(fndecl))
121118 + return NULL;
121119 +
121120 + fn_hash_data.fndecl = fndecl;
121121 + fn_hash_data.tree_codes_len = 0;
121122 +
121123 + set_function_codes(&fn_hash_data);
121124 + gcc_assert(fn_hash_data.tree_codes_len != 0);
121125 +
121126 + func_name = DECL_NAME_POINTER(fn_hash_data.fndecl);
121127 + set_hash(func_name, &fn_hash_data);
121128 +
121129 + entry = size_overflow_hash[fn_hash_data.hash];
121130 + entry = get_proper_hash_chain(entry, func_name);
121131 + if (entry)
121132 + return entry;
121133 + entry = size_overflow_hash_aux[fn_hash_data.hash];
121134 + return get_proper_hash_chain(entry, func_name);
121135 +}
121136 +
121137 +static void print_missing_msg(const_tree func, unsigned int argnum)
121138 +{
121139 + location_t loc;
121140 + const char *curfunc;
121141 + struct function_hash fn_hash_data;
121142 +
121143 + fn_hash_data.fndecl = DECL_ORIGIN(func);
121144 + fn_hash_data.tree_codes_len = 0;
121145 +
121146 + loc = DECL_SOURCE_LOCATION(fn_hash_data.fndecl);
121147 + curfunc = DECL_NAME_POINTER(fn_hash_data.fndecl);
121148 +
121149 + set_function_codes(&fn_hash_data);
121150 + set_hash(curfunc, &fn_hash_data);
121151 +
121152 + inform(loc, "Function %s is missing from the size_overflow hash table +%s+%u+%u+", curfunc, curfunc, argnum, fn_hash_data.hash);
121153 +}
121154 +
121155 +unsigned int find_arg_number_tree(const_tree arg, const_tree func)
121156 +{
121157 + tree var;
121158 + unsigned int argnum = 1;
121159 +
121160 + if (TREE_CODE(arg) == SSA_NAME)
121161 + arg = SSA_NAME_VAR(arg);
121162 +
121163 + for (var = DECL_ARGUMENTS(func); var; var = TREE_CHAIN(var), argnum++) {
121164 + if (!operand_equal_p(arg, var, 0) && strcmp(DECL_NAME_POINTER(var), DECL_NAME_POINTER(arg)))
121165 + continue;
121166 + if (!skip_types(var))
121167 + return argnum;
121168 + }
121169 +
121170 + return CANNOT_FIND_ARG;
121171 +}
121172 +
121173 +static const char *get_asm_string(const_gimple stmt)
121174 +{
121175 + if (!stmt)
121176 + return NULL;
121177 + if (gimple_code(stmt) != GIMPLE_ASM)
121178 + return NULL;
121179 +
121180 + return gimple_asm_string(stmt);
121181 +}
121182 +
121183 +bool is_size_overflow_intentional_asm_turn_off(const_gimple stmt)
121184 +{
121185 + const char *str;
121186 +
121187 + str = get_asm_string(stmt);
121188 + if (!str)
121189 + return false;
121190 + return !strncmp(str, TURN_OFF_ASM_STR, sizeof(TURN_OFF_ASM_STR) - 1);
121191 +}
121192 +
121193 +bool is_size_overflow_intentional_asm_yes(const_gimple stmt)
121194 +{
121195 + const char *str;
121196 +
121197 + str = get_asm_string(stmt);
121198 + if (!str)
121199 + return false;
121200 + return !strncmp(str, YES_ASM_STR, sizeof(YES_ASM_STR) - 1);
121201 +}
121202 +
121203 +bool is_size_overflow_asm(const_gimple stmt)
121204 +{
121205 + const char *str;
121206 +
121207 + str = get_asm_string(stmt);
121208 + if (!str)
121209 + return false;
121210 + return !strncmp(str, OK_ASM_STR, sizeof(OK_ASM_STR) - 1);
121211 +}
121212 +
121213 +bool is_a_return_check(const_tree node)
121214 +{
121215 + if (TREE_CODE(node) == FUNCTION_DECL)
121216 + return true;
121217 +
121218 + gcc_assert(TREE_CODE(node) == PARM_DECL);
121219 + return false;
121220 +}
121221 +
121222 +// Get the argnum of a function decl, if node is a return then the argnum is 0
121223 +unsigned int get_function_num(const_tree node, const_tree orig_fndecl)
121224 +{
121225 + if (is_a_return_check(node))
121226 + return 0;
121227 + else
121228 + return find_arg_number_tree(node, orig_fndecl);
121229 +}
121230 +
121231 +unsigned int get_correct_arg_count(unsigned int argnum, const_tree fndecl)
121232 +{
121233 + const struct size_overflow_hash *hash;
121234 + unsigned int new_argnum;
121235 + tree arg;
121236 + const_tree origarg;
121237 +
121238 + if (argnum == 0)
121239 + return argnum;
121240 +
121241 + hash = get_function_hash(fndecl);
121242 + if (hash && hash->param & (1U << argnum))
121243 + return argnum;
121244 +
121245 + if (DECL_EXTERNAL(fndecl))
121246 + return argnum;
121247 +
121248 + origarg = DECL_ARGUMENTS(DECL_ORIGIN(fndecl));
121249 + argnum--;
121250 + while (origarg && argnum) {
121251 + origarg = TREE_CHAIN(origarg);
121252 + argnum--;
121253 + }
121254 + gcc_assert(argnum == 0);
121255 + gcc_assert(origarg != NULL_TREE);
121256 +
121257 + for (arg = DECL_ARGUMENTS(fndecl), new_argnum = 1; arg; arg = TREE_CHAIN(arg), new_argnum++)
121258 + if (operand_equal_p(origarg, arg, 0) || !strcmp(DECL_NAME_POINTER(origarg), DECL_NAME_POINTER(arg)))
121259 + return new_argnum;
121260 +
121261 + return CANNOT_FIND_ARG;
121262 +}
121263 +
121264 +static bool is_in_hash_table(const_tree fndecl, unsigned int num)
121265 +{
121266 + const struct size_overflow_hash *hash;
121267 +
121268 + hash = get_function_hash(fndecl);
121269 + if (hash && (hash->param & (1U << num)))
121270 + return true;
121271 + return false;
121272 +}
121273 +
121274 +/* Check if the function has a size_overflow attribute or it is in the size_overflow hash table.
121275 + * If the function is missing everywhere then print the missing message into stderr.
121276 + */
121277 +bool is_missing_function(const_tree orig_fndecl, unsigned int num)
121278 +{
121279 + switch (DECL_FUNCTION_CODE(orig_fndecl)) {
121280 +#if BUILDING_GCC_VERSION >= 4008
121281 + case BUILT_IN_BSWAP16:
121282 +#endif
121283 + case BUILT_IN_BSWAP32:
121284 + case BUILT_IN_BSWAP64:
121285 + case BUILT_IN_EXPECT:
121286 + case BUILT_IN_MEMCMP:
121287 + return false;
121288 + default:
121289 + break;
121290 + }
121291 +
121292 + // skip test.c
121293 + if (strcmp(DECL_NAME_POINTER(current_function_decl), "coolmalloc")) {
121294 + if (lookup_attribute("size_overflow", DECL_ATTRIBUTES(orig_fndecl)))
121295 + warning(0, "unnecessary size_overflow attribute on: %s\n", DECL_NAME_POINTER(orig_fndecl));
121296 + }
121297 +
121298 + if (is_in_hash_table(orig_fndecl, num))
121299 + return false;
121300 +
121301 + print_missing_msg(orig_fndecl, num);
121302 + return true;
121303 +}
121304 +
121305 diff --git a/tools/gcc/stackleak_plugin.c b/tools/gcc/stackleak_plugin.c
121306 new file mode 100644
121307 index 0000000..dd94983
121308 --- /dev/null
121309 +++ b/tools/gcc/stackleak_plugin.c
121310 @@ -0,0 +1,376 @@
121311 +/*
121312 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
121313 + * Licensed under the GPL v2
121314 + *
121315 + * Note: the choice of the license means that the compilation process is
121316 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
121317 + * but for the kernel it doesn't matter since it doesn't link against
121318 + * any of the gcc libraries
121319 + *
121320 + * gcc plugin to help implement various PaX features
121321 + *
121322 + * - track lowest stack pointer
121323 + *
121324 + * TODO:
121325 + * - initialize all local variables
121326 + *
121327 + * BUGS:
121328 + * - none known
121329 + */
121330 +
121331 +#include "gcc-common.h"
121332 +
121333 +int plugin_is_GPL_compatible;
121334 +
121335 +static int track_frame_size = -1;
121336 +static const char track_function[] = "pax_track_stack";
121337 +static const char check_function[] = "pax_check_alloca";
121338 +static tree track_function_decl, check_function_decl;
121339 +static bool init_locals;
121340 +
121341 +static struct plugin_info stackleak_plugin_info = {
121342 + .version = "201402131920",
121343 + .help = "track-lowest-sp=nn\ttrack sp in functions whose frame size is at least nn bytes\n"
121344 +// "initialize-locals\t\tforcibly initialize all stack frames\n"
121345 +};
121346 +
121347 +static void stackleak_check_alloca(gimple_stmt_iterator *gsi)
121348 +{
121349 + gimple check_alloca;
121350 + tree alloca_size;
121351 +
121352 + // insert call to void pax_check_alloca(unsigned long size)
121353 + alloca_size = gimple_call_arg(gsi_stmt(*gsi), 0);
121354 + check_alloca = gimple_build_call(check_function_decl, 1, alloca_size);
121355 + gsi_insert_before(gsi, check_alloca, GSI_SAME_STMT);
121356 +}
121357 +
121358 +static void stackleak_add_instrumentation(gimple_stmt_iterator *gsi)
121359 +{
121360 + gimple track_stack;
121361 +
121362 + // insert call to void pax_track_stack(void)
121363 + track_stack = gimple_build_call(track_function_decl, 0);
121364 + gsi_insert_after(gsi, track_stack, GSI_CONTINUE_LINKING);
121365 +}
121366 +
121367 +static bool is_alloca(gimple stmt)
121368 +{
121369 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA))
121370 + return true;
121371 +
121372 +#if BUILDING_GCC_VERSION >= 4007
121373 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA_WITH_ALIGN))
121374 + return true;
121375 +#endif
121376 +
121377 + return false;
121378 +}
121379 +
121380 +static unsigned int execute_stackleak_tree_instrument(void)
121381 +{
121382 + basic_block bb, entry_bb;
121383 + bool prologue_instrumented = false, is_leaf = true;
121384 +
121385 + entry_bb = ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb;
121386 +
121387 + // 1. loop through BBs and GIMPLE statements
121388 + FOR_EACH_BB_FN(bb, cfun) {
121389 + gimple_stmt_iterator gsi;
121390 +
121391 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
121392 + gimple stmt;
121393 +
121394 + stmt = gsi_stmt(gsi);
121395 +
121396 + if (is_gimple_call(stmt))
121397 + is_leaf = false;
121398 +
121399 + // gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA attributes <tree_list 0xb7576450>
121400 + if (!is_alloca(stmt))
121401 + continue;
121402 +
121403 + // 2. insert stack overflow check before each __builtin_alloca call
121404 + stackleak_check_alloca(&gsi);
121405 +
121406 + // 3. insert track call after each __builtin_alloca call
121407 + stackleak_add_instrumentation(&gsi);
121408 + if (bb == entry_bb)
121409 + prologue_instrumented = true;
121410 + }
121411 + }
121412 +
121413 + // special cases for some bad linux code: taking the address of static inline functions will materialize them
121414 + // but we mustn't instrument some of them as the resulting stack alignment required by the function call ABI
121415 + // will break other assumptions regarding the expected (but not otherwise enforced) register clobbering ABI.
121416 + // case in point: native_save_fl on amd64 when optimized for size clobbers rdx if it were instrumented here.
121417 + if (is_leaf && !TREE_PUBLIC(current_function_decl) && DECL_DECLARED_INLINE_P(current_function_decl))
121418 + return 0;
121419 + if (is_leaf && !strncmp(IDENTIFIER_POINTER(DECL_NAME(current_function_decl)), "_paravirt_", 10))
121420 + return 0;
121421 +
121422 + // 4. insert track call at the beginning
121423 + if (!prologue_instrumented) {
121424 + gimple_stmt_iterator gsi;
121425 +
121426 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
121427 + if (dom_info_available_p(CDI_DOMINATORS))
121428 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
121429 + gsi = gsi_start_bb(bb);
121430 + stackleak_add_instrumentation(&gsi);
121431 + }
121432 +
121433 + return 0;
121434 +}
121435 +
121436 +static unsigned int execute_stackleak_final(void)
121437 +{
121438 + rtx insn, next;
121439 +
121440 + if (cfun->calls_alloca)
121441 + return 0;
121442 +
121443 + // keep calls only if function frame is big enough
121444 + if (get_frame_size() >= track_frame_size)
121445 + return 0;
121446 +
121447 + // 1. find pax_track_stack calls
121448 + for (insn = get_insns(); insn; insn = next) {
121449 + // rtl match: (call_insn 8 7 9 3 (call (mem (symbol_ref ("pax_track_stack") [flags 0x41] <function_decl 0xb7470e80 pax_track_stack>) [0 S1 A8]) (4)) -1 (nil) (nil))
121450 + rtx body;
121451 +
121452 + next = NEXT_INSN(insn);
121453 + if (!CALL_P(insn))
121454 + continue;
121455 + body = PATTERN(insn);
121456 + if (GET_CODE(body) != CALL)
121457 + continue;
121458 + body = XEXP(body, 0);
121459 + if (GET_CODE(body) != MEM)
121460 + continue;
121461 + body = XEXP(body, 0);
121462 + if (GET_CODE(body) != SYMBOL_REF)
121463 + continue;
121464 +// if (strcmp(XSTR(body, 0), track_function))
121465 + if (SYMBOL_REF_DECL(body) != track_function_decl)
121466 + continue;
121467 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
121468 + // 2. delete call
121469 + delete_insn_and_edges(insn);
121470 +#if BUILDING_GCC_VERSION >= 4007
121471 + if (GET_CODE(next) == NOTE && NOTE_KIND(next) == NOTE_INSN_CALL_ARG_LOCATION) {
121472 + insn = next;
121473 + next = NEXT_INSN(insn);
121474 + delete_insn_and_edges(insn);
121475 + }
121476 +#endif
121477 + }
121478 +
121479 +// print_simple_rtl(stderr, get_insns());
121480 +// print_rtl(stderr, get_insns());
121481 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
121482 +
121483 + return 0;
121484 +}
121485 +
121486 +static bool gate_stackleak_track_stack(void)
121487 +{
121488 + return track_frame_size >= 0;
121489 +}
121490 +
121491 +static void stackleak_start_unit(void *gcc_data, void *user_data)
121492 +{
121493 + tree fntype;
121494 +
121495 + // void pax_track_stack(void)
121496 + fntype = build_function_type_list(void_type_node, NULL_TREE);
121497 + track_function_decl = build_fn_decl(track_function, fntype);
121498 + DECL_ASSEMBLER_NAME(track_function_decl); // for LTO
121499 + TREE_PUBLIC(track_function_decl) = 1;
121500 + DECL_EXTERNAL(track_function_decl) = 1;
121501 + DECL_ARTIFICIAL(track_function_decl) = 1;
121502 +
121503 + // void pax_check_alloca(unsigned long)
121504 + fntype = build_function_type_list(void_type_node, long_unsigned_type_node, NULL_TREE);
121505 + check_function_decl = build_fn_decl(check_function, fntype);
121506 + DECL_ASSEMBLER_NAME(check_function_decl); // for LTO
121507 + TREE_PUBLIC(check_function_decl) = 1;
121508 + DECL_EXTERNAL(check_function_decl) = 1;
121509 + DECL_ARTIFICIAL(check_function_decl) = 1;
121510 +}
121511 +
121512 +#if BUILDING_GCC_VERSION >= 4009
121513 +static const struct pass_data stackleak_tree_instrument_pass_data = {
121514 +#else
121515 +static struct gimple_opt_pass stackleak_tree_instrument_pass = {
121516 + .pass = {
121517 +#endif
121518 + .type = GIMPLE_PASS,
121519 + .name = "stackleak_tree_instrument",
121520 +#if BUILDING_GCC_VERSION >= 4008
121521 + .optinfo_flags = OPTGROUP_NONE,
121522 +#endif
121523 +#if BUILDING_GCC_VERSION >= 4009
121524 + .has_gate = true,
121525 + .has_execute = true,
121526 +#else
121527 + .gate = gate_stackleak_track_stack,
121528 + .execute = execute_stackleak_tree_instrument,
121529 + .sub = NULL,
121530 + .next = NULL,
121531 + .static_pass_number = 0,
121532 +#endif
121533 + .tv_id = TV_NONE,
121534 + .properties_required = PROP_gimple_leh | PROP_cfg,
121535 + .properties_provided = 0,
121536 + .properties_destroyed = 0,
121537 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
121538 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa | TODO_rebuild_cgraph_edges
121539 +#if BUILDING_GCC_VERSION < 4009
121540 + }
121541 +#endif
121542 +};
121543 +
121544 +#if BUILDING_GCC_VERSION >= 4009
121545 +static const struct pass_data stackleak_final_rtl_opt_pass_data = {
121546 +#else
121547 +static struct rtl_opt_pass stackleak_final_rtl_opt_pass = {
121548 + .pass = {
121549 +#endif
121550 + .type = RTL_PASS,
121551 + .name = "stackleak_final",
121552 +#if BUILDING_GCC_VERSION >= 4008
121553 + .optinfo_flags = OPTGROUP_NONE,
121554 +#endif
121555 +#if BUILDING_GCC_VERSION >= 4009
121556 + .has_gate = true,
121557 + .has_execute = true,
121558 +#else
121559 + .gate = gate_stackleak_track_stack,
121560 + .execute = execute_stackleak_final,
121561 + .sub = NULL,
121562 + .next = NULL,
121563 + .static_pass_number = 0,
121564 +#endif
121565 + .tv_id = TV_NONE,
121566 + .properties_required = 0,
121567 + .properties_provided = 0,
121568 + .properties_destroyed = 0,
121569 + .todo_flags_start = 0,
121570 + .todo_flags_finish = TODO_dump_func
121571 +#if BUILDING_GCC_VERSION < 4009
121572 + }
121573 +#endif
121574 +};
121575 +
121576 +#if BUILDING_GCC_VERSION >= 4009
121577 +namespace {
121578 +class stackleak_tree_instrument_pass : public gimple_opt_pass {
121579 +public:
121580 + stackleak_tree_instrument_pass() : gimple_opt_pass(stackleak_tree_instrument_pass_data, g) {}
121581 + bool gate() { return gate_stackleak_track_stack(); }
121582 + unsigned int execute() { return execute_stackleak_tree_instrument(); }
121583 +};
121584 +
121585 +class stackleak_final_rtl_opt_pass : public rtl_opt_pass {
121586 +public:
121587 + stackleak_final_rtl_opt_pass() : rtl_opt_pass(stackleak_final_rtl_opt_pass_data, g) {}
121588 + bool gate() { return gate_stackleak_track_stack(); }
121589 + unsigned int execute() { return execute_stackleak_final(); }
121590 +};
121591 +}
121592 +
121593 +static opt_pass *make_stackleak_tree_instrument_pass(void)
121594 +{
121595 + return new stackleak_tree_instrument_pass();
121596 +}
121597 +
121598 +static opt_pass *make_stackleak_final_rtl_opt_pass(void)
121599 +{
121600 + return new stackleak_final_rtl_opt_pass();
121601 +}
121602 +#else
121603 +static struct opt_pass *make_stackleak_tree_instrument_pass(void)
121604 +{
121605 + return &stackleak_tree_instrument_pass.pass;
121606 +}
121607 +
121608 +static struct opt_pass *make_stackleak_final_rtl_opt_pass(void)
121609 +{
121610 + return &stackleak_final_rtl_opt_pass.pass;
121611 +}
121612 +#endif
121613 +
121614 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
121615 +{
121616 + const char * const plugin_name = plugin_info->base_name;
121617 + const int argc = plugin_info->argc;
121618 + const struct plugin_argument * const argv = plugin_info->argv;
121619 + int i;
121620 + struct register_pass_info stackleak_tree_instrument_pass_info;
121621 + struct register_pass_info stackleak_final_pass_info;
121622 + static const struct ggc_root_tab gt_ggc_r_gt_stackleak[] = {
121623 + {
121624 + .base = &track_function_decl,
121625 + .nelt = 1,
121626 + .stride = sizeof(track_function_decl),
121627 + .cb = &gt_ggc_mx_tree_node,
121628 + .pchw = &gt_pch_nx_tree_node
121629 + },
121630 + {
121631 + .base = &check_function_decl,
121632 + .nelt = 1,
121633 + .stride = sizeof(check_function_decl),
121634 + .cb = &gt_ggc_mx_tree_node,
121635 + .pchw = &gt_pch_nx_tree_node
121636 + },
121637 + LAST_GGC_ROOT_TAB
121638 + };
121639 +
121640 + stackleak_tree_instrument_pass_info.pass = make_stackleak_tree_instrument_pass();
121641 +// stackleak_tree_instrument_pass_info.reference_pass_name = "tree_profile";
121642 + stackleak_tree_instrument_pass_info.reference_pass_name = "optimized";
121643 + stackleak_tree_instrument_pass_info.ref_pass_instance_number = 1;
121644 + stackleak_tree_instrument_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
121645 +
121646 + stackleak_final_pass_info.pass = make_stackleak_final_rtl_opt_pass();
121647 + stackleak_final_pass_info.reference_pass_name = "final";
121648 + stackleak_final_pass_info.ref_pass_instance_number = 1;
121649 + stackleak_final_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
121650 +
121651 + if (!plugin_default_version_check(version, &gcc_version)) {
121652 + error(G_("incompatible gcc/plugin versions"));
121653 + return 1;
121654 + }
121655 +
121656 + register_callback(plugin_name, PLUGIN_INFO, NULL, &stackleak_plugin_info);
121657 +
121658 + for (i = 0; i < argc; ++i) {
121659 + if (!strcmp(argv[i].key, "track-lowest-sp")) {
121660 + if (!argv[i].value) {
121661 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
121662 + continue;
121663 + }
121664 + track_frame_size = atoi(argv[i].value);
121665 + if (argv[i].value[0] < '0' || argv[i].value[0] > '9' || track_frame_size < 0)
121666 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
121667 + continue;
121668 + }
121669 + if (!strcmp(argv[i].key, "initialize-locals")) {
121670 + if (argv[i].value) {
121671 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
121672 + continue;
121673 + }
121674 + init_locals = true;
121675 + continue;
121676 + }
121677 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
121678 + }
121679 +
121680 + register_callback(plugin_name, PLUGIN_START_UNIT, &stackleak_start_unit, NULL);
121681 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_stackleak);
121682 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_tree_instrument_pass_info);
121683 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_final_pass_info);
121684 +
121685 + return 0;
121686 +}
121687 diff --git a/tools/gcc/structleak_plugin.c b/tools/gcc/structleak_plugin.c
121688 new file mode 100644
121689 index 0000000..4ee2231
121690 --- /dev/null
121691 +++ b/tools/gcc/structleak_plugin.c
121692 @@ -0,0 +1,274 @@
121693 +/*
121694 + * Copyright 2013-2014 by PaX Team <pageexec@freemail.hu>
121695 + * Licensed under the GPL v2
121696 + *
121697 + * Note: the choice of the license means that the compilation process is
121698 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
121699 + * but for the kernel it doesn't matter since it doesn't link against
121700 + * any of the gcc libraries
121701 + *
121702 + * gcc plugin to forcibly initialize certain local variables that could
121703 + * otherwise leak kernel stack to userland if they aren't properly initialized
121704 + * by later code
121705 + *
121706 + * Homepage: http://pax.grsecurity.net/
121707 + *
121708 + * Usage:
121709 + * $ # for 4.5/4.6/C based 4.7
121710 + * $ gcc -I`gcc -print-file-name=plugin`/include -I`gcc -print-file-name=plugin`/include/c-family -fPIC -shared -O2 -o structleak_plugin.so structleak_plugin.c
121711 + * $ # for C++ based 4.7/4.8+
121712 + * $ g++ -I`g++ -print-file-name=plugin`/include -I`g++ -print-file-name=plugin`/include/c-family -fPIC -shared -O2 -o structleak_plugin.so structleak_plugin.c
121713 + * $ gcc -fplugin=./structleak_plugin.so test.c -O2
121714 + *
121715 + * TODO: eliminate redundant initializers
121716 + * increase type coverage
121717 + */
121718 +
121719 +#include "gcc-common.h"
121720 +
121721 +// unused C type flag in all versions 4.5-4.9
121722 +#define TYPE_USERSPACE(TYPE) TYPE_LANG_FLAG_3(TYPE)
121723 +
121724 +int plugin_is_GPL_compatible;
121725 +
121726 +static struct plugin_info structleak_plugin_info = {
121727 + .version = "201401260140",
121728 + .help = "disable\tdo not activate plugin\n",
121729 +};
121730 +
121731 +static tree handle_user_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
121732 +{
121733 + *no_add_attrs = true;
121734 +
121735 + // check for types? for now accept everything linux has to offer
121736 + if (TREE_CODE(*node) != FIELD_DECL)
121737 + return NULL_TREE;
121738 +
121739 + *no_add_attrs = false;
121740 + return NULL_TREE;
121741 +}
121742 +
121743 +static struct attribute_spec user_attr = {
121744 + .name = "user",
121745 + .min_length = 0,
121746 + .max_length = 0,
121747 + .decl_required = false,
121748 + .type_required = false,
121749 + .function_type_required = false,
121750 + .handler = handle_user_attribute,
121751 +#if BUILDING_GCC_VERSION >= 4007
121752 + .affects_type_identity = true
121753 +#endif
121754 +};
121755 +
121756 +static void register_attributes(void *event_data, void *data)
121757 +{
121758 + register_attribute(&user_attr);
121759 +// register_attribute(&force_attr);
121760 +}
121761 +
121762 +static tree get_field_type(tree field)
121763 +{
121764 + return strip_array_types(TREE_TYPE(field));
121765 +}
121766 +
121767 +static bool is_userspace_type(tree type)
121768 +{
121769 + tree field;
121770 +
121771 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
121772 + tree fieldtype = get_field_type(field);
121773 + enum tree_code code = TREE_CODE(fieldtype);
121774 +
121775 + if (code == RECORD_TYPE || code == UNION_TYPE)
121776 + if (is_userspace_type(fieldtype))
121777 + return true;
121778 +
121779 + if (lookup_attribute("user", DECL_ATTRIBUTES(field)))
121780 + return true;
121781 + }
121782 + return false;
121783 +}
121784 +
121785 +static void finish_type(void *event_data, void *data)
121786 +{
121787 + tree type = (tree)event_data;
121788 +
121789 + if (TYPE_USERSPACE(type))
121790 + return;
121791 +
121792 + if (is_userspace_type(type))
121793 + TYPE_USERSPACE(type) = 1;
121794 +}
121795 +
121796 +static void initialize(tree var)
121797 +{
121798 + basic_block bb;
121799 + gimple_stmt_iterator gsi;
121800 + tree initializer;
121801 + gimple init_stmt;
121802 +
121803 + // this is the original entry bb before the forced split
121804 + // TODO: check further BBs in case more splits occured before us
121805 + bb = ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb->next_bb;
121806 +
121807 + // first check if the variable is already initialized, warn otherwise
121808 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
121809 + gimple stmt = gsi_stmt(gsi);
121810 + tree rhs1;
121811 +
121812 + // we're looking for an assignment of a single rhs...
121813 + if (!gimple_assign_single_p(stmt))
121814 + continue;
121815 + rhs1 = gimple_assign_rhs1(stmt);
121816 +#if BUILDING_GCC_VERSION >= 4007
121817 + // ... of a non-clobbering expression...
121818 + if (TREE_CLOBBER_P(rhs1))
121819 + continue;
121820 +#endif
121821 + // ... to our variable...
121822 + if (gimple_get_lhs(stmt) != var)
121823 + continue;
121824 + // if it's an initializer then we're good
121825 + if (TREE_CODE(rhs1) == CONSTRUCTOR)
121826 + return;
121827 + }
121828 +
121829 + // these aren't the 0days you're looking for
121830 +// inform(DECL_SOURCE_LOCATION(var), "userspace variable will be forcibly initialized");
121831 +
121832 + // build the initializer expression
121833 + initializer = build_constructor(TREE_TYPE(var), NULL);
121834 +
121835 + // build the initializer stmt
121836 + init_stmt = gimple_build_assign(var, initializer);
121837 + gsi = gsi_start_bb(ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb);
121838 + gsi_insert_before(&gsi, init_stmt, GSI_NEW_STMT);
121839 + update_stmt(init_stmt);
121840 +}
121841 +
121842 +static unsigned int handle_function(void)
121843 +{
121844 + basic_block bb;
121845 + unsigned int ret = 0;
121846 + tree var;
121847 + unsigned int i;
121848 +
121849 + // split the first bb where we can put the forced initializers
121850 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
121851 + if (dom_info_available_p(CDI_DOMINATORS))
121852 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
121853 +
121854 + // enumarate all local variables and forcibly initialize our targets
121855 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
121856 + tree type = TREE_TYPE(var);
121857 +
121858 + gcc_assert(DECL_P(var));
121859 + if (!auto_var_in_fn_p(var, current_function_decl))
121860 + continue;
121861 +
121862 + // only care about structure types
121863 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
121864 + continue;
121865 +
121866 + // if the type is of interest, examine the variable
121867 + if (TYPE_USERSPACE(type))
121868 + initialize(var);
121869 + }
121870 +
121871 + return ret;
121872 +}
121873 +
121874 +#if BUILDING_GCC_VERSION >= 4009
121875 +static const struct pass_data structleak_pass_data = {
121876 +#else
121877 +static struct gimple_opt_pass structleak_pass = {
121878 + .pass = {
121879 +#endif
121880 + .type = GIMPLE_PASS,
121881 + .name = "structleak",
121882 +#if BUILDING_GCC_VERSION >= 4008
121883 + .optinfo_flags = OPTGROUP_NONE,
121884 +#endif
121885 +#if BUILDING_GCC_VERSION >= 4009
121886 + .has_gate = false,
121887 + .has_execute = true,
121888 +#else
121889 + .gate = NULL,
121890 + .execute = handle_function,
121891 + .sub = NULL,
121892 + .next = NULL,
121893 + .static_pass_number = 0,
121894 +#endif
121895 + .tv_id = TV_NONE,
121896 + .properties_required = PROP_cfg,
121897 + .properties_provided = 0,
121898 + .properties_destroyed = 0,
121899 + .todo_flags_start = 0,
121900 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa | TODO_ggc_collect | TODO_verify_flow
121901 +#if BUILDING_GCC_VERSION < 4009
121902 + }
121903 +#endif
121904 +};
121905 +
121906 +#if BUILDING_GCC_VERSION >= 4009
121907 +namespace {
121908 +class structleak_pass : public gimple_opt_pass {
121909 +public:
121910 + structleak_pass() : gimple_opt_pass(structleak_pass_data, g) {}
121911 + unsigned int execute() { return handle_function(); }
121912 +};
121913 +}
121914 +
121915 +static opt_pass *make_structleak_pass(void)
121916 +{
121917 + return new structleak_pass();
121918 +}
121919 +#else
121920 +static struct opt_pass *make_structleak_pass(void)
121921 +{
121922 + return &structleak_pass.pass;
121923 +}
121924 +#endif
121925 +
121926 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
121927 +{
121928 + int i;
121929 + const char * const plugin_name = plugin_info->base_name;
121930 + const int argc = plugin_info->argc;
121931 + const struct plugin_argument * const argv = plugin_info->argv;
121932 + bool enable = true;
121933 + struct register_pass_info structleak_pass_info;
121934 +
121935 + structleak_pass_info.pass = make_structleak_pass();
121936 + structleak_pass_info.reference_pass_name = "ssa";
121937 + structleak_pass_info.ref_pass_instance_number = 1;
121938 + structleak_pass_info.pos_op = PASS_POS_INSERT_AFTER;
121939 +
121940 + if (!plugin_default_version_check(version, &gcc_version)) {
121941 + error(G_("incompatible gcc/plugin versions"));
121942 + return 1;
121943 + }
121944 +
121945 + if (strcmp(lang_hooks.name, "GNU C")) {
121946 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
121947 + enable = false;
121948 + }
121949 +
121950 + for (i = 0; i < argc; ++i) {
121951 + if (!strcmp(argv[i].key, "disable")) {
121952 + enable = false;
121953 + continue;
121954 + }
121955 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
121956 + }
121957 +
121958 + register_callback(plugin_name, PLUGIN_INFO, NULL, &structleak_plugin_info);
121959 + if (enable) {
121960 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &structleak_pass_info);
121961 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
121962 + }
121963 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
121964 +
121965 + return 0;
121966 +}
121967 diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h
121968 index fbc6665..5e9ce79 100644
121969 --- a/tools/include/linux/compiler.h
121970 +++ b/tools/include/linux/compiler.h
121971 @@ -35,4 +35,12 @@
121972 # define unlikely(x) __builtin_expect(!!(x), 0)
121973 #endif
121974
121975 +#ifndef __size_overflow
121976 +# define __size_overflow(...)
121977 +#endif
121978 +
121979 +#ifndef __intentional_overflow
121980 +# define __intentional_overflow(...)
121981 +#endif
121982 +
121983 #endif /* _TOOLS_LINUX_COMPILER_H */
121984 diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
121985 index ce00f7e..0aca5e4 100644
121986 --- a/tools/lib/api/Makefile
121987 +++ b/tools/lib/api/Makefile
121988 @@ -16,7 +16,7 @@ LIB_OBJS += $(OUTPUT)fs/fs.o
121989
121990 LIBFILE = libapikfs.a
121991
121992 -CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
121993 +CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
121994 EXTLIBS = -lelf -lpthread -lrt -lm
121995 ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
121996 ALL_LDFLAGS = $(LDFLAGS)
121997 diff --git a/tools/perf/util/include/asm/alternative-asm.h b/tools/perf/util/include/asm/alternative-asm.h
121998 index 6789d788..4afd019e 100644
121999 --- a/tools/perf/util/include/asm/alternative-asm.h
122000 +++ b/tools/perf/util/include/asm/alternative-asm.h
122001 @@ -5,4 +5,7 @@
122002
122003 #define altinstruction_entry #
122004
122005 + .macro pax_force_retaddr rip=0, reload=0
122006 + .endm
122007 +
122008 #endif
122009 diff --git a/tools/virtio/linux/uaccess.h b/tools/virtio/linux/uaccess.h
122010 index 0a578fe..b81f62d 100644
122011 --- a/tools/virtio/linux/uaccess.h
122012 +++ b/tools/virtio/linux/uaccess.h
122013 @@ -13,7 +13,7 @@ static inline void __chk_user_ptr(const volatile void *p, size_t size)
122014 ({ \
122015 typeof(ptr) __pu_ptr = (ptr); \
122016 __chk_user_ptr(__pu_ptr, sizeof(*__pu_ptr)); \
122017 - ACCESS_ONCE(*(__pu_ptr)) = x; \
122018 + ACCESS_ONCE_RW(*(__pu_ptr)) = x; \
122019 0; \
122020 })
122021
122022 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
122023 index 56baae8..2c889c2 100644
122024 --- a/virt/kvm/kvm_main.c
122025 +++ b/virt/kvm/kvm_main.c
122026 @@ -76,12 +76,17 @@ LIST_HEAD(vm_list);
122027
122028 static cpumask_var_t cpus_hardware_enabled;
122029 static int kvm_usage_count = 0;
122030 -static atomic_t hardware_enable_failed;
122031 +static atomic_unchecked_t hardware_enable_failed;
122032
122033 struct kmem_cache *kvm_vcpu_cache;
122034 EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
122035
122036 -static __read_mostly struct preempt_ops kvm_preempt_ops;
122037 +static void kvm_sched_in(struct preempt_notifier *pn, int cpu);
122038 +static void kvm_sched_out(struct preempt_notifier *pn, struct task_struct *next);
122039 +static struct preempt_ops kvm_preempt_ops = {
122040 + .sched_in = kvm_sched_in,
122041 + .sched_out = kvm_sched_out,
122042 +};
122043
122044 struct dentry *kvm_debugfs_dir;
122045
122046 @@ -755,7 +760,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
122047 /* We can read the guest memory with __xxx_user() later on. */
122048 if ((mem->slot < KVM_USER_MEM_SLOTS) &&
122049 ((mem->userspace_addr & (PAGE_SIZE - 1)) ||
122050 - !access_ok(VERIFY_WRITE,
122051 + !access_ok_noprefault(VERIFY_WRITE,
122052 (void __user *)(unsigned long)mem->userspace_addr,
122053 mem->memory_size)))
122054 goto out;
122055 @@ -1612,9 +1617,17 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_cached);
122056
122057 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len)
122058 {
122059 - const void *zero_page = (const void *) __va(page_to_phys(ZERO_PAGE(0)));
122060 + int r;
122061 + unsigned long addr;
122062
122063 - return kvm_write_guest_page(kvm, gfn, zero_page, offset, len);
122064 + addr = gfn_to_hva(kvm, gfn);
122065 + if (kvm_is_error_hva(addr))
122066 + return -EFAULT;
122067 + r = __clear_user((void __user *)addr + offset, len);
122068 + if (r)
122069 + return -EFAULT;
122070 + mark_page_dirty(kvm, gfn);
122071 + return 0;
122072 }
122073 EXPORT_SYMBOL_GPL(kvm_clear_guest_page);
122074
122075 @@ -1864,7 +1877,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
122076 return 0;
122077 }
122078
122079 -static struct file_operations kvm_vcpu_fops = {
122080 +static file_operations_no_const kvm_vcpu_fops __read_only = {
122081 .release = kvm_vcpu_release,
122082 .unlocked_ioctl = kvm_vcpu_ioctl,
122083 #ifdef CONFIG_COMPAT
122084 @@ -2534,7 +2547,7 @@ out:
122085 }
122086 #endif
122087
122088 -static struct file_operations kvm_vm_fops = {
122089 +static file_operations_no_const kvm_vm_fops __read_only = {
122090 .release = kvm_vm_release,
122091 .unlocked_ioctl = kvm_vm_ioctl,
122092 #ifdef CONFIG_COMPAT
122093 @@ -2634,7 +2647,7 @@ out:
122094 return r;
122095 }
122096
122097 -static struct file_operations kvm_chardev_ops = {
122098 +static file_operations_no_const kvm_chardev_ops __read_only = {
122099 .unlocked_ioctl = kvm_dev_ioctl,
122100 .compat_ioctl = kvm_dev_ioctl,
122101 .llseek = noop_llseek,
122102 @@ -2660,7 +2673,7 @@ static void hardware_enable_nolock(void *junk)
122103
122104 if (r) {
122105 cpumask_clear_cpu(cpu, cpus_hardware_enabled);
122106 - atomic_inc(&hardware_enable_failed);
122107 + atomic_inc_unchecked(&hardware_enable_failed);
122108 printk(KERN_INFO "kvm: enabling virtualization on "
122109 "CPU%d failed\n", cpu);
122110 }
122111 @@ -2716,10 +2729,10 @@ static int hardware_enable_all(void)
122112
122113 kvm_usage_count++;
122114 if (kvm_usage_count == 1) {
122115 - atomic_set(&hardware_enable_failed, 0);
122116 + atomic_set_unchecked(&hardware_enable_failed, 0);
122117 on_each_cpu(hardware_enable_nolock, NULL, 1);
122118
122119 - if (atomic_read(&hardware_enable_failed)) {
122120 + if (atomic_read_unchecked(&hardware_enable_failed)) {
122121 hardware_disable_all_nolock();
122122 r = -EBUSY;
122123 }
122124 @@ -3123,7 +3136,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
122125 kvm_arch_vcpu_put(vcpu);
122126 }
122127
122128 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
122129 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
122130 struct module *module)
122131 {
122132 int r;
122133 @@ -3170,7 +3183,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
122134 if (!vcpu_align)
122135 vcpu_align = __alignof__(struct kvm_vcpu);
122136 kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
122137 - 0, NULL);
122138 + SLAB_USERCOPY, NULL);
122139 if (!kvm_vcpu_cache) {
122140 r = -ENOMEM;
122141 goto out_free_3;
122142 @@ -3180,9 +3193,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
122143 if (r)
122144 goto out_free;
122145
122146 + pax_open_kernel();
122147 kvm_chardev_ops.owner = module;
122148 kvm_vm_fops.owner = module;
122149 kvm_vcpu_fops.owner = module;
122150 + pax_close_kernel();
122151
122152 r = misc_register(&kvm_dev);
122153 if (r) {
122154 @@ -3192,9 +3207,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
122155
122156 register_syscore_ops(&kvm_syscore_ops);
122157
122158 - kvm_preempt_ops.sched_in = kvm_sched_in;
122159 - kvm_preempt_ops.sched_out = kvm_sched_out;
122160 -
122161 r = kvm_init_debug();
122162 if (r) {
122163 printk(KERN_ERR "kvm: create debugfs files failed\n");
Unofficial grsecurity patch archive (https://github.com/slashbeast/grsecurity-scrape)